diff options
author | Qing He <qing.he@intel.com> | 2011-04-15 16:11:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-18 05:51:20 +0100 |
commit | 47cb36d1c897ac72718ce67f0acdf118da894228 (patch) | |
tree | d51755484ba02aecc8d63283e53b0e958eb712b1 /meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch | |
parent | 2f3c46d953da38193fc2255b442b3f4903f48036 (diff) | |
download | poky-47cb36d1c897ac72718ce67f0acdf118da894228.tar.gz |
openssl: upgrade to version 0.9.8r
[YOCTO #979]
from 0.9.8p
fixes CVE-2010-4180, CVE-2010-4252, CVE-2010-0014
(From OE-Core rev: e28e11930a22a4e89075e7e026e58c081f984ddf)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch new file mode 100644 index 0000000000..19de11243a --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff --git a/Makefile.org b/Makefile.org | ||
4 | index e87d623..25ff367 100644 | ||
5 | --- a/Makefile.org | ||
6 | +++ b/Makefile.org | ||
7 | @@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) | ||
8 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
9 | if [ "$(FIPSCANLIB)" = "libfips" ]; then \ | ||
10 | $(ARD) libcrypto.a fipscanister.o ; \ | ||
11 | - $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ | ||
12 | + $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ | ||
13 | $(AR) libcrypto.a fips/fipscanister.o ; \ | ||
14 | else \ | ||
15 | if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ | ||
16 | @@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
17 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
18 | shlibdeps=-lcrypto; \ | ||
19 | [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \ | ||
20 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ | ||
21 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ | ||
22 | else \ | ||
23 | echo "There's no support for shared libraries on this platform" >&2 ; \ | ||
24 | exit 1; \ | ||
25 | diff --git a/crypto/Makefile b/crypto/Makefile | ||
26 | index 6557f2b..a69bf7c 100644 | ||
27 | --- a/crypto/Makefile | ||
28 | +++ b/crypto/Makefile | ||
29 | @@ -103,7 +103,7 @@ $(LIB): $(LIBOBJ) | ||
30 | |||
31 | shared: buildinf.h lib subdirs | ||
32 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
33 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
34 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
35 | fi | ||
36 | |||
37 | libs: | ||
38 | diff --git a/ssl/Makefile b/ssl/Makefile | ||
39 | index 5ac3507..77ea2bd 100644 | ||
40 | --- a/ssl/Makefile | ||
41 | +++ b/ssl/Makefile | ||
42 | @@ -62,7 +62,7 @@ lib: $(LIBOBJ) | ||
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: | ||