summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-07-20 08:38:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:40:09 +0100
commit57f45fca7b8e1c0cf98d295bc0fd8839799dfa86 (patch)
treeaabc65fb5b62b1af284818fd21fbba220c97dd25 /meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch
parenteffb75d42098b3e367d393215fd5d52a0191e954 (diff)
downloadopenembedded-core-57f45fca7b8e1c0cf98d295bc0fd8839799dfa86.tar.gz
openembedded-core-57f45fca7b8e1c0cf98d295bc0fd8839799dfa86.tar.bz2
openembedded-core-57f45fca7b8e1c0cf98d295bc0fd8839799dfa86.zip
openssl: upgrade to 1.0.0j
Addresses CVE-2012-2333 Fixes [YOCTO #2682] Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0j/shared-libs.patch50
1 files changed, 50 insertions, 0 deletions
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: