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>
This commit is contained in:
Radu Moisan
2013-04-09 10:06:27 +03:00
committed by Richard Purdie
parent fb37dd6822
commit f720f8f3d2
20 changed files with 482 additions and 387 deletions

View File

@@ -0,0 +1,41 @@
Upstream-Status: Inappropriate [configuration]
Index: openssl-1.0.1e/crypto/Makefile
===================================================================
--- openssl-1.0.1e.orig/crypto/Makefile
+++ openssl-1.0.1e/crypto/Makefile
@@ -108,7 +108,7 @@ $(LIB): $(LIBOBJ)
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.1e/Makefile.org
===================================================================
--- openssl-1.0.1e.orig/Makefile.org
+++ openssl-1.0.1e/Makefile.org
@@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_
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.1e/ssl/Makefile
===================================================================
--- openssl-1.0.1e.orig/ssl/Makefile
+++ openssl-1.0.1e/ssl/Makefile
@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
shared: lib
if [ -n "$(SHARED_LIBS)" ]; then \
- (cd ..; $(MAKE) $(SHARED_LIB)); \
+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
fi
files: