mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 18:05:05 +00:00
205a56fcfa
Please see this security advisory: https://www.openssl.org/news/secadv/20180612.txt Refresh patches (From OE-Core rev: ff3db93e53c4f9d56807d3755c799459944e9a87) (From OE-Core rev: 84233553e963e26ca5f9f983662d4bd133176bb9) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
Index: openssl-1.0.1e/crypto/Makefile
|
|
===================================================================
|
|
--- openssl-1.0.1e.orig/crypto/Makefile
|
|
+++ openssl-1.0.1e/crypto/Makefile
|
|
@@ -108,7 +108,7 @@ $(LIB): $(LIBOBJ)
|
|
|
|
shared: buildinf.h lib subdirs
|
|
if [ -n "$(SHARED_LIBS)" ]; then \
|
|
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
|
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
|
fi
|
|
|
|
libs:
|
|
Index: openssl-1.0.1e/Makefile.org
|
|
===================================================================
|
|
--- openssl-1.0.1e.orig/Makefile.org
|
|
+++ openssl-1.0.1e/Makefile.org
|
|
@@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_
|
|
|
|
libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
|
|
@if [ "$(SHLIB_TARGET)" != "" ]; then \
|
|
- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
|
|
+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
|
|
else \
|
|
echo "There's no support for shared libraries on this platform" >&2; \
|
|
exit 1; \
|
|
Index: openssl-1.0.1e/ssl/Makefile
|
|
===================================================================
|
|
--- openssl-1.0.1e.orig/ssl/Makefile
|
|
+++ openssl-1.0.1e/ssl/Makefile
|
|
@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
|
|
|
|
shared: lib
|
|
if [ -n "$(SHARED_LIBS)" ]; then \
|
|
- (cd ..; $(MAKE) $(SHARED_LIB)); \
|
|
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
|
|
fi
|
|
|
|
files:
|