diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-03-19 23:11:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 15:33:04 +0000 |
commit | 96dde9513c08430e12f4f1f6e6e54ca2a244bfcd (patch) | |
tree | 55203cd875fddee191bb51042dc85851961cdc54 /meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch | |
parent | ded4c8eea1e13ade4e07298aef3e1f53487953d7 (diff) | |
download | poky-96dde9513c08430e12f4f1f6e6e54ca2a244bfcd.tar.gz |
openssl: upgrade to 1.0.0.h
Removed pkg-config.patch, which was incorporated upstream.
Addresses CVE-2012-0884.
Fixes bug [YOCTO #2139].
(From OE-Core rev: 50d99fc8c5a158c7f3ce3e72377827f53406d88f)
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.0h/shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch new file mode 100644 index 0000000000..09986731a8 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/shared-libs.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: openssl-1.0.0/crypto/Makefile | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0.orig/crypto/Makefile | ||
6 | +++ openssl-1.0.0/crypto/Makefile | ||
7 | @@ -104,7 +104,7 @@ | ||
8 | |||
9 | shared: buildinf.h lib subdirs | ||
10 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
11 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
12 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
13 | fi | ||
14 | |||
15 | libs: | ||
16 | Index: openssl-1.0.0/Makefile.org | ||
17 | =================================================================== | ||
18 | --- openssl-1.0.0.orig/Makefile.org | ||
19 | +++ openssl-1.0.0/Makefile.org | ||
20 | @@ -260,7 +260,7 @@ | ||
21 | |||
22 | libcrypto$(SHLIB_EXT): libcrypto.a | ||
23 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
24 | - $(MAKE) SHLIBDIRS=crypto build-shared; \ | ||
25 | + $(MAKE) -e SHLIBDIRS=crypto build-shared; \ | ||
26 | else \ | ||
27 | echo "There's no support for shared libraries on this platform" >&2; \ | ||
28 | exit 1; \ | ||
29 | @@ -268,7 +268,7 @@ | ||
30 | |||
31 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
32 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
33 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
34 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
35 | else \ | ||
36 | echo "There's no support for shared libraries on this platform" >&2; \ | ||
37 | exit 1; \ | ||
38 | Index: openssl-1.0.0/ssl/Makefile | ||
39 | =================================================================== | ||
40 | --- openssl-1.0.0.orig/ssl/Makefile | ||
41 | +++ openssl-1.0.0/ssl/Makefile | ||
42 | @@ -62,7 +62,7 @@ | ||
43 | |||
44 | shared: lib | ||
45 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
46 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
47 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
48 | fi | ||
49 | |||
50 | files: | ||