From d6935247dd1a34617fde968160f2df28ab793949 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Fri, 20 Jul 2012 08:38:34 -0700 Subject: openssl: upgrade to 1.0.0j Addresses CVE-2012-2333 Fixes [YOCTO #2682] Fixes denzil [YOCTO #2701] (From OE-Core rev: cf84ebac391b243099fe0d05223433ecb8e71641) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../openssl/openssl-1.0.0j/shared-libs.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch') diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch new file mode 100644 index 0000000000..09986731a8 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch @@ -0,0 +1,50 @@ +Upstream-Status: Inappropriate [configuration] + +Index: openssl-1.0.0/crypto/Makefile +=================================================================== +--- openssl-1.0.0.orig/crypto/Makefile ++++ openssl-1.0.0/crypto/Makefile +@@ -104,7 +104,7 @@ + + 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.0/Makefile.org +=================================================================== +--- openssl-1.0.0.orig/Makefile.org ++++ openssl-1.0.0/Makefile.org +@@ -260,7 +260,7 @@ + + libcrypto$(SHLIB_EXT): libcrypto.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- $(MAKE) SHLIBDIRS=crypto build-shared; \ ++ $(MAKE) -e SHLIBDIRS=crypto build-shared; \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ +@@ -268,7 +268,7 @@ + + 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.0/ssl/Makefile +=================================================================== +--- openssl-1.0.0.orig/ssl/Makefile ++++ openssl-1.0.0/ssl/Makefile +@@ -62,7 +62,7 @@ + + shared: lib + if [ -n "$(SHARED_LIBS)" ]; then \ +- (cd ..; $(MAKE) $(SHARED_LIB)); \ ++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ + fi + + files: -- cgit v1.2.3-54-g00ecf