Author: nbd Date: 2016-01-28 19:20:06 +0100 (Thu, 28 Jan 2016) New Revision: 48531
Modified: trunk/package/libs/openssl/Makefile trunk/package/libs/openssl/patches/110-optimize-for-size.patch trunk/package/libs/openssl/patches/150-no_engines.patch trunk/package/libs/openssl/patches/160-disable_doc_tests.patch trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch trunk/package/libs/openssl/patches/200-parallel_build.patch Log: openssl: update to 1.0.2f (fixes CVE-2016-0701, CVE-2015-3197) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/libs/openssl/Makefile =================================================================== --- trunk/package/libs/openssl/Makefile 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/Makefile 2016-01-28 18:20:06 UTC (rev 48531) @@ -9,7 +9,7 @@ PKG_NAME:=openssl PKG_BASE:=1.0.2 -PKG_BUGFIX:=e +PKG_BUGFIX:=f PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -22,7 +22,7 @@ http://www.openssl.org/source/old/$(PKG_BASE)/ \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=5262bfa25b60ed9de9f28d5d52d77fc5 +PKG_MD5SUM:=932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE Modified: trunk/package/libs/openssl/patches/110-optimize-for-size.patch =================================================================== --- trunk/package/libs/openssl/patches/110-optimize-for-size.patch 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/patches/110-optimize-for-size.patch 2016-01-28 18:20:06 UTC (rev 48531) @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -461,6 +461,12 @@ my %table=( +@@ -464,6 +464,12 @@ my %table=( "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", Modified: trunk/package/libs/openssl/patches/150-no_engines.patch =================================================================== --- trunk/package/libs/openssl/patches/150-no_engines.patch 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/patches/150-no_engines.patch 2016-01-28 18:20:06 UTC (rev 48531) @@ -1,6 +1,6 @@ --- a/Configure +++ b/Configure -@@ -2106,6 +2106,11 @@ EOF +@@ -2103,6 +2103,11 @@ EOF close(OUT); } Modified: trunk/package/libs/openssl/patches/160-disable_doc_tests.patch =================================================================== --- trunk/package/libs/openssl/patches/160-disable_doc_tests.patch 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/patches/160-disable_doc_tests.patch 2016-01-28 18:20:06 UTC (rev 48531) @@ -27,7 +27,7 @@ WDIRS= windows LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) -@@ -274,7 +274,7 @@ reflect: +@@ -273,7 +273,7 @@ reflect: sub_all: build_all @@ -36,9 +36,9 @@ build_libs: build_libcrypto build_libssl openssl.pc -@@ -534,7 +534,7 @@ dist: - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) +@@ -530,7 +530,7 @@ dist: + @$(MAKE) SDIRS='$(SDIRS)' clean + @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar -install: all install_docs install_sw +install: all install_sw @@ -47,9 +47,9 @@ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ --- a/Makefile.org +++ b/Makefile.org -@@ -532,7 +532,7 @@ dist: - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) +@@ -528,7 +528,7 @@ dist: + @$(MAKE) SDIRS='$(SDIRS)' clean + @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar -install: all install_docs install_sw +install: all install_sw Modified: trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch =================================================================== --- trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/patches/190-remove_timestamp_check.patch 2016-01-28 18:20:06 UTC (rev 48531) @@ -1,6 +1,6 @@ --- a/Makefile.org +++ b/Makefile.org -@@ -185,7 +185,7 @@ WTARFILE= $(NAME)-win.tar +@@ -184,7 +184,7 @@ TARFILE= ../$(NAME).tar EXHEADER= e_os2.h HEADER= e_os.h @@ -9,7 +9,7 @@ # as we stick to -e, CLEARENV ensures that local variables in lower # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn -@@ -401,11 +401,6 @@ openssl.pc: Makefile +@@ -400,11 +400,6 @@ openssl.pc: Makefile echo 'Version: '$(VERSION); \ echo 'Requires: libssl libcrypto' ) > openssl.pc Modified: trunk/package/libs/openssl/patches/200-parallel_build.patch =================================================================== --- trunk/package/libs/openssl/patches/200-parallel_build.patch 2016-01-28 18:19:59 UTC (rev 48530) +++ trunk/package/libs/openssl/patches/200-parallel_build.patch 2016-01-28 18:20:06 UTC (rev 48531) @@ -1,6 +1,6 @@ --- a/Makefile.org +++ b/Makefile.org -@@ -280,17 +280,17 @@ build_libcrypto: build_crypto build_engi +@@ -279,17 +279,17 @@ build_libcrypto: build_crypto build_engi build_libssl: build_ssl libssl.pc build_crypto: @@ -24,7 +24,7 @@ all_testapps: build_libs build_testapps build_testapps: -@@ -462,7 +462,7 @@ update: errors stacks util/libeay.num ut +@@ -461,7 +461,7 @@ update: errors stacks util/libeay.num ut @set -e; target=update; $(RECURSIVE_BUILD_CMD) depend: @@ -33,9 +33,9 @@ lint: @set -e; target=lint; $(RECURSIVE_BUILD_CMD) -@@ -527,9 +527,9 @@ dist: - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) +@@ -523,9 +523,9 @@ dist: + @$(MAKE) SDIRS='$(SDIRS)' clean + @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar -install: all install_sw +install: install_sw @@ -45,7 +45,7 @@ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ -@@ -538,12 +538,19 @@ install_sw: +@@ -534,12 +534,19 @@ install_sw: $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ $(INSTALL_PREFIX)$(OPENSSLDIR)/private @@ -66,7 +66,7 @@ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ do \ if [ -f "$$i" ]; then \ -@@ -627,12 +634,7 @@ install_html_docs: +@@ -623,12 +630,7 @@ install_html_docs: done; \ done _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
