mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
f720f8f3d2
Dropped obolete patches and pulled updates for debian patches. Addresses CVEs: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2686 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0166 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0169 [YOCTO #3965] (From OE-Core rev: 0470edd01c0aebaa78db137e365a7e22bfb199e9) Signed-off-by: Radu Moisan <radu.moisan@intel.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:
|