diff options
| author | Radu Moisan <radu.moisan@intel.com> | 2013-04-09 10:06:27 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-09 13:16:53 +0100 |
| commit | f720f8f3d24fe914aaa2e7f6db190118769abf63 (patch) | |
| tree | 1145f63be04aafa0b6532c184a47df46ab3f9dfe /meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch | |
| parent | fb37dd6822578fced05fa4ab66b56341a46b3bbc (diff) | |
| download | poky-f720f8f3d24fe914aaa2e7f6db190118769abf63.tar.gz | |
openssl: Upgrade to v1.0.1e
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>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch new file mode 100644 index 0000000000..a7ca0a3078 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/shared-libs.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | Index: openssl-1.0.1e/crypto/Makefile | ||
| 4 | =================================================================== | ||
| 5 | --- openssl-1.0.1e.orig/crypto/Makefile | ||
| 6 | +++ openssl-1.0.1e/crypto/Makefile | ||
| 7 | @@ -108,7 +108,7 @@ $(LIB): $(LIBOBJ) | ||
| 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.1e/Makefile.org | ||
| 17 | =================================================================== | ||
| 18 | --- openssl-1.0.1e.orig/Makefile.org | ||
| 19 | +++ openssl-1.0.1e/Makefile.org | ||
| 20 | @@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_ | ||
| 21 | |||
| 22 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
| 23 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
| 24 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
| 25 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
| 26 | else \ | ||
| 27 | echo "There's no support for shared libraries on this platform" >&2; \ | ||
| 28 | exit 1; \ | ||
| 29 | Index: openssl-1.0.1e/ssl/Makefile | ||
| 30 | =================================================================== | ||
| 31 | --- openssl-1.0.1e.orig/ssl/Makefile | ||
| 32 | +++ openssl-1.0.1e/ssl/Makefile | ||
| 33 | @@ -62,7 +62,7 @@ lib: $(LIBOBJ) | ||
| 34 | |||
| 35 | shared: lib | ||
| 36 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
| 37 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
| 38 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
| 39 | fi | ||
| 40 | |||
| 41 | files: | ||