Changeset 48532


Ignore:
Timestamp:
2016-01-28T19:26:18+01:00 (2 years ago)
Author:
nbd
Message:

openssl: update to 1.0.2f (fixes CVE-2016-0701, CVE-2015-3197)

Signed-off-by: Felix Fietkau <nbd@…>

Backport of r48531

Location:
branches/chaos_calmer/package/libs/openssl
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/chaos_calmer/package/libs/openssl/Makefile

    r47727 r48532  
    99 
    1010PKG_NAME:=openssl 
    11 PKG_VERSION:=1.0.2e 
     11PKG_VERSION:=1.0.2f 
    1212PKG_RELEASE:=1 
    1313PKG_USE_MIPS16:=0 
     
    1919        ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ 
    2020        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ 
    21 PKG_MD5SUM:=5262bfa25b60ed9de9f28d5d52d77fc5 
     21PKG_MD5SUM:=b3bf73f507172be9292ea2a8c28b659d 
    2222 
    2323PKG_LICENSE:=OpenSSL 
  • branches/chaos_calmer/package/libs/openssl/patches/110-optimize-for-size.patch

    r47727 r48532  
    11--- a/Configure 
    22+++ b/Configure 
    3 @@ -461,6 +461,12 @@ my %table=( 
     3@@ -464,6 +464,12 @@ my %table=( 
    44 "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}", 
    55 "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}", 
  • branches/chaos_calmer/package/libs/openssl/patches/150-no_engines.patch

    r47727 r48532  
    11--- a/Configure 
    22+++ b/Configure 
    3 @@ -2106,6 +2106,11 @@ EOF 
     3@@ -2103,6 +2103,11 @@ EOF 
    44        close(OUT); 
    55   } 
  • branches/chaos_calmer/package/libs/openssl/patches/160-disable_doc_tests.patch

    r47727 r48532  
    2828 LIBS=   libcrypto.a libssl.a 
    2929 SHARED_CRYPTO=libcrypto$(SHLIB_EXT) 
    30 @@ -274,7 +274,7 @@ reflect: 
     30@@ -273,7 +273,7 @@ reflect: 
    3131  
    3232 sub_all: build_all 
     
    3737 build_libs: build_libcrypto build_libssl openssl.pc 
    3838  
    39 @@ -534,7 +534,7 @@ dist: 
    40  dist_pem_h: 
    41         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
     39@@ -530,7 +530,7 @@ dist: 
     40        @$(MAKE) SDIRS='$(SDIRS)' clean 
     41        @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar 
    4242  
    4343-install: all install_docs install_sw 
     
    4848--- a/Makefile.org 
    4949+++ b/Makefile.org 
    50 @@ -532,7 +532,7 @@ dist: 
    51  dist_pem_h: 
    52         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
     50@@ -528,7 +528,7 @@ dist: 
     51        @$(MAKE) SDIRS='$(SDIRS)' clean 
     52        @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar 
    5353  
    5454-install: all install_docs install_sw 
  • branches/chaos_calmer/package/libs/openssl/patches/190-remove_timestamp_check.patch

    r47727 r48532  
    11--- a/Makefile.org 
    22+++ b/Makefile.org 
    3 @@ -185,7 +185,7 @@ WTARFILE=       $(NAME)-win.tar 
     3@@ -184,7 +184,7 @@ TARFILE=        ../$(NAME).tar 
    44 EXHEADER=       e_os2.h 
    55 HEADER=         e_os.h 
     
    1010 # as we stick to -e, CLEARENV ensures that local variables in lower 
    1111 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn 
    12 @@ -401,11 +401,6 @@ openssl.pc: Makefile 
     12@@ -400,11 +400,6 @@ openssl.pc: Makefile 
    1313            echo 'Version: '$(VERSION); \ 
    1414            echo 'Requires: libssl libcrypto' ) > openssl.pc 
  • branches/chaos_calmer/package/libs/openssl/patches/200-parallel_build.patch

    r47727 r48532  
    11--- a/Makefile.org 
    22+++ b/Makefile.org 
    3 @@ -280,17 +280,17 @@ build_libcrypto: build_crypto build_engi 
     3@@ -279,17 +279,17 @@ build_libcrypto: build_crypto build_engi 
    44 build_libssl: build_ssl libssl.pc 
    55  
     
    2525 all_testapps: build_libs build_testapps 
    2626 build_testapps: 
    27 @@ -462,7 +462,7 @@ update: errors stacks util/libeay.num ut 
     27@@ -461,7 +461,7 @@ update: errors stacks util/libeay.num ut 
    2828        @set -e; target=update; $(RECURSIVE_BUILD_CMD) 
    2929  
     
    3434 lint: 
    3535        @set -e; target=lint; $(RECURSIVE_BUILD_CMD) 
    36 @@ -527,9 +527,9 @@ dist: 
    37  dist_pem_h: 
    38         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
     36@@ -523,9 +523,9 @@ dist: 
     37        @$(MAKE) SDIRS='$(SDIRS)' clean 
     38        @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar 
    3939  
    4040-install: all install_sw 
     
    4646                $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ 
    4747                $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ 
    48 @@ -538,12 +538,19 @@ install_sw: 
     48@@ -534,12 +534,19 @@ install_sw: 
    4949                $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ 
    5050                $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ 
     
    6767        do \ 
    6868                if [ -f "$$i" ]; then \ 
    69 @@ -627,12 +634,7 @@ install_html_docs: 
     69@@ -623,12 +630,7 @@ install_html_docs: 
    7070                done; \ 
    7171        done 
Note: See TracChangeset for help on using the changeset viewer.