diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-04 16:25:15 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-04 16:25:15 +0100 |
commit | 4ec9a26a2a3feab73e9824b8549b0b4aefc13b1c (patch) | |
tree | b64d37969f943b0ff5374d0fcef4020f1a01e2cf /patches | |
parent | 87201a5110eecc2bf3abd26a68915095dab62a5b (diff) | |
download | ptxdist-4ec9a26a2a3feab73e9824b8549b0b4aefc13b1c.tar.gz ptxdist-4ec9a26a2a3feab73e9824b8549b0b4aefc13b1c.tar.xz |
openssl: version bump 1.0.2d -> 1.0.2e
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/openssl-1.0.2e/0001-ca.patch (renamed from patches/openssl-1.0.2d/0001-ca.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0002-debian-targets.patch (renamed from patches/openssl-1.0.2d/0002-debian-targets.patch) | 14 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0003-engines-path.patch (renamed from patches/openssl-1.0.2d/0003-engines-path.patch) | 38 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0004-no-rpath.patch (renamed from patches/openssl-1.0.2d/0004-no-rpath.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0005-no-symbolic.patch (renamed from patches/openssl-1.0.2d/0005-no-symbolic.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0006-pic.patch (renamed from patches/openssl-1.0.2d/0006-pic.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0007-valgrind.patch (renamed from patches/openssl-1.0.2d/0007-valgrind.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0008-shared-lib-ext.patch (renamed from patches/openssl-1.0.2d/0008-shared-lib-ext.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0009-block_diginotar.patch (renamed from patches/openssl-1.0.2d/0009-block_diginotar.patch) | 10 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch (renamed from patches/openssl-1.0.2d/0010-block_digicert_malaysia.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0011-Disable-the-freelist.patch (renamed from patches/openssl-1.0.2d/0011-Disable-the-freelist.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0012-soname.patch | 24 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch (renamed from patches/openssl-1.0.2d/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch) | 2 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/0101-fix-parallel-building.patch (renamed from patches/openssl-1.0.2d/0101-fix-parallel-building.patch) | 6 | ||||
-rw-r--r-- | patches/openssl-1.0.2e/series (renamed from patches/openssl-1.0.2d/series) | 3 |
15 files changed, 83 insertions, 58 deletions
diff --git a/patches/openssl-1.0.2d/0001-ca.patch b/patches/openssl-1.0.2e/0001-ca.patch index 68eec6b49..3da9614b7 100644 --- a/patches/openssl-1.0.2d/0001-ca.patch +++ b/patches/openssl-1.0.2e/0001-ca.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] ca -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2d/0002-debian-targets.patch b/patches/openssl-1.0.2e/0002-debian-targets.patch index b23b7faea..7c81ad250 100644 --- a/patches/openssl-1.0.2d/0002-debian-targets.patch +++ b/patches/openssl-1.0.2e/0002-debian-targets.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] debian-targets -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 53 insertions(+) diff --git a/Configure b/Configure -index d99eed7f9303..a8c5d393f699 100755 +index ac86cd6cf6a2..0119aae101a3 100755 --- a/Configure +++ b/Configure @@ -124,6 +124,10 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali @@ -49,10 +49,10 @@ index d99eed7f9303..a8c5d393f699 100755 +"debian-m68k","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-mips", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-mipsel", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mipsn32", "mips64-linux-gnuabin32-gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mipsn32el", "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mips64", "mips64-linux-gnuabi64-gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-mips64el", "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mipsn32el", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64", "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-mips64el", "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-i386", "gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-m68k", "gcc:-DB_ENDIAN ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-netbsd-sparc", "gcc:-DB_ENDIAN ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/patches/openssl-1.0.2d/0003-engines-path.patch b/patches/openssl-1.0.2e/0003-engines-path.patch index c1afaa5e8..a79760eec 100644 --- a/patches/openssl-1.0.2d/0003-engines-path.patch +++ b/patches/openssl-1.0.2e/0003-engines-path.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] engines-path -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -13,33 +13,33 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Configure b/Configure -index a8c5d393f699..37c748791db8 100755 +index 0119aae101a3..4156e27b6cff 100755 --- a/Configure +++ b/Configure -@@ -1951,7 +1951,7 @@ while (<IN>) +@@ -1954,7 +1954,7 @@ while (<IN>) } elsif (/^#define\s+ENGINESDIR/) { - my $foo = "$prefix/$libdir/engines"; -+ my $foo = "$prefix/$libdir/openssl-1.0.0/engines"; ++ my $foo = "$prefix/$libdir/openssl-1.0.2/engines"; $foo =~ s/\\/\\\\/g; print OUT "#define ENGINESDIR \"$foo\"\n"; } diff --git a/Makefile.org b/Makefile.org -index d77e26495887..f1fabdd8e94d 100644 +index 0333644415a2..7c6da5e78ed3 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -532,7 +532,7 @@ install: all install_docs install_sw +@@ -537,7 +537,7 @@ install: all install_docs install_sw install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ -+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines \ ++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines \ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ diff --git a/engines/Makefile b/engines/Makefile -index 2058ff405afe..315ef1ef780d 100644 +index 2058ff405afe..df7def6174fd 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -107,13 +107,13 @@ install: @@ -47,14 +47,14 @@ index 2058ff405afe..315ef1ef780d 100644 @if [ -n "$(SHARED_LIBS)" ]; then \ set -e; \ - $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \ -+ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines; \ ++ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines; \ for l in $(LIBNAMES); do \ ( echo installing $$l; \ pfx=lib; \ if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ sfx=".so"; \ - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ ++ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \ else \ case "$(CFLAGS)" in \ *DSO_BEOS*) sfx=".so";; \ @@ -63,17 +63,17 @@ index 2058ff405afe..315ef1ef780d 100644 *) sfx=".bad";; \ esac; \ - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ ++ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx ); \ ++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \ ++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx ); \ done; \ fi @target=install; $(RECURSIVE_MAKE) diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile -index 17e1efbdff30..186e99b83483 100644 +index 17e1efbdff30..d59a350fd50f 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -47,7 +47,7 @@ install: @@ -81,7 +81,7 @@ index 17e1efbdff30..186e99b83483 100644 if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ sfx=".so"; \ - cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \ else \ case "$(CFLAGS)" in \ *DSO_BEOS*) sfx=".so";; \ @@ -90,12 +90,12 @@ index 17e1efbdff30..186e99b83483 100644 *) sfx=".bad";; \ esac; \ - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \ fi; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx; \ ++ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \ ++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx; \ fi links: diff --git a/patches/openssl-1.0.2d/0004-no-rpath.patch b/patches/openssl-1.0.2e/0004-no-rpath.patch index bd7240906..0ed5ce767 100644 --- a/patches/openssl-1.0.2d/0004-no-rpath.patch +++ b/patches/openssl-1.0.2e/0004-no-rpath.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] no-rpath -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2d/0005-no-symbolic.patch b/patches/openssl-1.0.2e/0005-no-symbolic.patch index b8df89b2e..758ff38a6 100644 --- a/patches/openssl-1.0.2d/0005-no-symbolic.patch +++ b/patches/openssl-1.0.2e/0005-no-symbolic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] no-symbolic -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2d/0006-pic.patch b/patches/openssl-1.0.2e/0006-pic.patch index d2a0e761a..7300c1d3b 100644 --- a/patches/openssl-1.0.2d/0006-pic.patch +++ b/patches/openssl-1.0.2e/0006-pic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] pic -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2d/0007-valgrind.patch b/patches/openssl-1.0.2e/0007-valgrind.patch index aa99ab641..614ec1f28 100644 --- a/patches/openssl-1.0.2d/0007-valgrind.patch +++ b/patches/openssl-1.0.2e/0007-valgrind.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] valgrind -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2d/0008-shared-lib-ext.patch b/patches/openssl-1.0.2e/0008-shared-lib-ext.patch index 588a51122..6b3a885ef 100644 --- a/patches/openssl-1.0.2d/0008-shared-lib-ext.patch +++ b/patches/openssl-1.0.2e/0008-shared-lib-ext.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] shared-lib-ext -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configure b/Configure -index 37c748791db8..3f8c736f763a 100755 +index 4156e27b6cff..646194960bf0 100755 --- a/Configure +++ b/Configure -@@ -1817,7 +1817,8 @@ while (<IN>) +@@ -1820,7 +1820,8 @@ while (<IN>) elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; diff --git a/patches/openssl-1.0.2d/0009-block_diginotar.patch b/patches/openssl-1.0.2e/0009-block_diginotar.patch index 15c790d49..3efa42d1b 100644 --- a/patches/openssl-1.0.2d/0009-block_diginotar.patch +++ b/patches/openssl-1.0.2e/0009-block_diginotar.patch @@ -1,11 +1,11 @@ From: Raphael Geissert <geissert@debian.org> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] block_diginotar This is not meant as final patch. -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 27 insertions(+) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c -index a2f1dbefe352..c010d4a62718 100644 +index ab94948f0135..e6605ec54e5e 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *ctx); @@ -24,7 +24,7 @@ index a2f1dbefe352..c010d4a62718 100644 static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer, unsigned int *preasons, X509_CRL *crl, X509 *x); -@@ -481,6 +482,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx) +@@ -482,6 +483,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx) if (!ok) goto end; @@ -34,7 +34,7 @@ index a2f1dbefe352..c010d4a62718 100644 #ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); -@@ -981,6 +985,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) +@@ -986,6 +990,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify) return 1; } diff --git a/patches/openssl-1.0.2d/0010-block_digicert_malaysia.patch b/patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch index 9c0c53e0c..7467d60c6 100644 --- a/patches/openssl-1.0.2d/0010-block_digicert_malaysia.patch +++ b/patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch @@ -1,8 +1,8 @@ From: Raphael Geissert <geissert@debian.org> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] block_digicert_malaysia -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c -index c010d4a62718..a5f60ce1050a 100644 +index e6605ec54e5e..552aa4f3d5a6 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c -@@ -993,10 +993,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx) +@@ -998,10 +998,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx) for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) { x = sk_X509_value(ctx->chain, i); diff --git a/patches/openssl-1.0.2d/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2e/0011-Disable-the-freelist.patch index 72e0502d4..831c24f47 100644 --- a/patches/openssl-1.0.2d/0011-Disable-the-freelist.patch +++ b/patches/openssl-1.0.2e/0011-Disable-the-freelist.patch @@ -1,5 +1,5 @@ From: Kurt Roeckx <kurt@roeckx.be> -Date: Fri, 10 Jul 2015 07:03:00 +0200 +Date: Fri, 4 Dec 2015 16:20:43 +0100 Subject: [PATCH] Disable the freelist We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and @@ -7,7 +7,7 @@ would break the ABI. Instead we just do it in the .c files that try to do something with it. -Imported from openssl_1.0.2d-1.debian.tar.xz +Imported from openssl_1.0.2e-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -16,7 +16,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 2 files changed, 3 insertions(+) diff --git a/ssl/s3_both.c b/ssl/s3_both.c -index 019e21cd0274..a48d143c6e3b 100644 +index 09d0661e81f6..3429899872b8 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -573,6 +573,7 @@ int ssl_verify_alarm_type(long type) @@ -28,7 +28,7 @@ index 019e21cd0274..a48d143c6e3b 100644 /*- * On some platforms, malloc() performance is bad enough that you can't just diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c -index c0931e787728..c74985e27876 100644 +index f2071db93702..c605784474a5 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -162,6 +162,8 @@ diff --git a/patches/openssl-1.0.2e/0012-soname.patch b/patches/openssl-1.0.2e/0012-soname.patch new file mode 100644 index 000000000..6182d0283 --- /dev/null +++ b/patches/openssl-1.0.2e/0012-soname.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 4 Dec 2015 16:20:43 +0100 +Subject: [PATCH] soname + +Imported from openssl_1.0.2e-1.debian.tar.xz + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + crypto/opensslv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/opensslv.h b/crypto/opensslv.h +index abcef15b17d9..77d01b993529 100644 +--- a/crypto/opensslv.h ++++ b/crypto/opensslv.h +@@ -88,7 +88,7 @@ extern "C" { + * should only keep the versions that are binary compatible with the current. + */ + # define SHLIB_VERSION_HISTORY "" +-# define SHLIB_VERSION_NUMBER "1.0.0" ++# define SHLIB_VERSION_NUMBER "1.0.2" + + + #ifdef __cplusplus diff --git a/patches/openssl-1.0.2d/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch index ad4853e0c..bb3e51e58 100644 --- a/patches/openssl-1.0.2d/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch +++ b/patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch @@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configure b/Configure -index 3f8c736f763a..c917081dfd9d 100755 +index 646194960bf0..e4ae865dbdec 100755 --- a/Configure +++ b/Configure @@ -125,7 +125,7 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali diff --git a/patches/openssl-1.0.2d/0101-fix-parallel-building.patch b/patches/openssl-1.0.2e/0101-fix-parallel-building.patch index c4b0d368a..b22fa1380 100644 --- a/patches/openssl-1.0.2d/0101-fix-parallel-building.patch +++ b/patches/openssl-1.0.2e/0101-fix-parallel-building.patch @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Makefile.org b/Makefile.org -index f1fabdd8e94d..88415138fff5 100644 +index 7c6da5e78ed3..3258f13bf732 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -277,18 +277,24 @@ build_libs: build_libcrypto build_libssl openssl.pc +@@ -279,18 +279,24 @@ build_libs: build_libcrypto build_libssl openssl.pc build_libcrypto: build_crypto build_engines libcrypto.pc build_libssl: build_ssl libssl.pc @@ -67,7 +67,7 @@ index 7869996a9c07..76690a1c8619 100644 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o $(RANLIB) $(LIB) || echo Never mind. diff --git a/engines/Makefile b/engines/Makefile -index 315ef1ef780d..e7bc9758996c 100644 +index df7def6174fd..ec27bc24be64 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -72,7 +72,7 @@ top: diff --git a/patches/openssl-1.0.2d/series b/patches/openssl-1.0.2e/series index e3647eded..898c5a1e7 100644 --- a/patches/openssl-1.0.2d/series +++ b/patches/openssl-1.0.2e/series @@ -12,7 +12,8 @@ 0009-block_diginotar.patch 0010-block_digicert_malaysia.patch 0011-Disable-the-freelist.patch +0012-soname.patch #tag:ptx --start-number 100 0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch 0101-fix-parallel-building.patch -# 404effe638a1a2d67ac8974b9f2ea8b0 - git-ptx-patches magic +# 140047a5c07890c453b82870bc8087e3 - git-ptx-patches magic |