diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-04 09:30:14 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-04 09:34:31 +0200 |
commit | 2092ef0f30f6d179638bb305fa16fbb3777991b6 (patch) | |
tree | 6921e50a84504c69f4a487381269f8ffdf3fdff6 /patches | |
parent | b4255840d35c621c28db5643baca6b5c5e26e21b (diff) | |
download | ptxdist-2092ef0f30f6d179638bb305fa16fbb3777991b6.tar.gz ptxdist-2092ef0f30f6d179638bb305fa16fbb3777991b6.tar.xz |
openssl: version bump 1.0.2g -> 1.0.2h
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/openssl-1.0.2h/0001-ca.patch (renamed from patches/openssl-1.0.2g/0001-ca.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0002-debian-targets.patch (renamed from patches/openssl-1.0.2g/0002-debian-targets.patch) | 15 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0003-engines-path.patch (renamed from patches/openssl-1.0.2g/0003-engines-path.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0004-no-rpath.patch (renamed from patches/openssl-1.0.2g/0004-no-rpath.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0005-no-symbolic.patch (renamed from patches/openssl-1.0.2g/0005-no-symbolic.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0006-pic.patch (renamed from patches/openssl-1.0.2g/0006-pic.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0007-valgrind.patch (renamed from patches/openssl-1.0.2g/0007-valgrind.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0008-shared-lib-ext.patch (renamed from patches/openssl-1.0.2g/0008-shared-lib-ext.patch) | 8 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0009-block_diginotar.patch (renamed from patches/openssl-1.0.2g/0009-block_diginotar.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0010-block_digicert_malaysia.patch (renamed from patches/openssl-1.0.2g/0010-block_digicert_malaysia.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0011-Disable-the-freelist.patch (renamed from patches/openssl-1.0.2g/0011-Disable-the-freelist.patch) | 6 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0012-soname.patch (renamed from patches/openssl-1.0.2g/0012-soname.patch) | 6 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch (renamed from patches/openssl-1.0.2g/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch) | 6 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/0101-fix-parallel-building.patch (renamed from patches/openssl-1.0.2g/0101-fix-parallel-building.patch) | 4 | ||||
-rw-r--r-- | patches/openssl-1.0.2h/series (renamed from patches/openssl-1.0.2g/series) | 0 |
15 files changed, 41 insertions, 40 deletions
diff --git a/patches/openssl-1.0.2g/0001-ca.patch b/patches/openssl-1.0.2h/0001-ca.patch index 26b1da890..b3d7549de 100644 --- a/patches/openssl-1.0.2g/0001-ca.patch +++ b/patches/openssl-1.0.2h/0001-ca.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] ca -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0002-debian-targets.patch b/patches/openssl-1.0.2h/0002-debian-targets.patch index 3932b51e4..80b1f739c 100644 --- a/patches/openssl-1.0.2g/0002-debian-targets.patch +++ b/patches/openssl-1.0.2h/0002-debian-targets.patch @@ -1,16 +1,16 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] debian-targets -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - Configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 53 insertions(+) + Configure | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 54 insertions(+) diff --git a/Configure b/Configure -index c98107a48718..aca30583e17a 100755 +index c98107a48718..110849367256 100755 --- a/Configure +++ b/Configure @@ -131,6 +131,10 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers @@ -24,7 +24,7 @@ index c98107a48718..aca30583e17a 100755 my $strict_warnings = 0; my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; -@@ -367,6 +371,55 @@ my %table=( +@@ -367,6 +371,56 @@ my %table=( "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so", @@ -32,7 +32,7 @@ index c98107a48718..aca30583e17a 100755 +"debian-alpha","gcc:${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-alpha-ev4","gcc:${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-alpha-ev5","gcc:${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debian-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"debian-arm64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-armel","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-armhf","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-amd64", "gcc:-m64 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", @@ -56,6 +56,7 @@ index c98107a48718..aca30583e17a 100755 +"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)", ++"debian-nios2", "gcc:-DB_ENDIAN ${debian_cflags}::(unknown)::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-alpha","gcc:${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-i386", "gcc:-DL_ENDIAN ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/patches/openssl-1.0.2g/0003-engines-path.patch b/patches/openssl-1.0.2h/0003-engines-path.patch index 17efbc1b7..a33f6da1a 100644 --- a/patches/openssl-1.0.2g/0003-engines-path.patch +++ b/patches/openssl-1.0.2h/0003-engines-path.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] engines-path -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Configure b/Configure -index aca30583e17a..f7dbd724028f 100755 +index 110849367256..90d41302421d 100755 --- a/Configure +++ b/Configure -@@ -1963,7 +1963,7 @@ while (<IN>) +@@ -1964,7 +1964,7 @@ while (<IN>) } elsif (/^#define\s+ENGINESDIR/) { diff --git a/patches/openssl-1.0.2g/0004-no-rpath.patch b/patches/openssl-1.0.2h/0004-no-rpath.patch index 1133adfab..e4952fc4d 100644 --- a/patches/openssl-1.0.2g/0004-no-rpath.patch +++ b/patches/openssl-1.0.2h/0004-no-rpath.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] no-rpath -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0005-no-symbolic.patch b/patches/openssl-1.0.2h/0005-no-symbolic.patch index 66843d1b5..e36a65d99 100644 --- a/patches/openssl-1.0.2g/0005-no-symbolic.patch +++ b/patches/openssl-1.0.2h/0005-no-symbolic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] no-symbolic -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0006-pic.patch b/patches/openssl-1.0.2h/0006-pic.patch index 42d3d7d1d..a46b4efcc 100644 --- a/patches/openssl-1.0.2g/0006-pic.patch +++ b/patches/openssl-1.0.2h/0006-pic.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] pic -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0007-valgrind.patch b/patches/openssl-1.0.2h/0007-valgrind.patch index 02e3037df..119d78a52 100644 --- a/patches/openssl-1.0.2g/0007-valgrind.patch +++ b/patches/openssl-1.0.2h/0007-valgrind.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] valgrind -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0008-shared-lib-ext.patch b/patches/openssl-1.0.2h/0008-shared-lib-ext.patch index f3af12ae5..3d6b392d7 100644 --- a/patches/openssl-1.0.2g/0008-shared-lib-ext.patch +++ b/patches/openssl-1.0.2h/0008-shared-lib-ext.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] shared-lib-ext -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-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 f7dbd724028f..f9533aec8586 100755 +index 90d41302421d..974407e2d9a5 100755 --- a/Configure +++ b/Configure -@@ -1829,7 +1829,8 @@ while (<IN>) +@@ -1830,7 +1830,8 @@ while (<IN>) elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; diff --git a/patches/openssl-1.0.2g/0009-block_diginotar.patch b/patches/openssl-1.0.2h/0009-block_diginotar.patch index 0fa67964b..a08fda43c 100644 --- a/patches/openssl-1.0.2g/0009-block_diginotar.patch +++ b/patches/openssl-1.0.2h/0009-block_diginotar.patch @@ -1,11 +1,11 @@ From: Raphael Geissert <geissert@debian.org> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] block_diginotar This is not meant as final patch. -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0010-block_digicert_malaysia.patch b/patches/openssl-1.0.2h/0010-block_digicert_malaysia.patch index c2a303f34..19e5dc652 100644 --- a/patches/openssl-1.0.2g/0010-block_digicert_malaysia.patch +++ b/patches/openssl-1.0.2h/0010-block_digicert_malaysia.patch @@ -1,8 +1,8 @@ From: Raphael Geissert <geissert@debian.org> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] block_digicert_malaysia -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- diff --git a/patches/openssl-1.0.2g/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2h/0011-Disable-the-freelist.patch index b984982b0..ebf586673 100644 --- a/patches/openssl-1.0.2g/0011-Disable-the-freelist.patch +++ b/patches/openssl-1.0.2h/0011-Disable-the-freelist.patch @@ -1,5 +1,5 @@ From: Kurt Roeckx <kurt@roeckx.be> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 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.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-1.debian.tar.xz Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -28,7 +28,7 @@ index 09d0661e81f6..3429899872b8 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 f1279bbf9103..d817b0a4243f 100644 +index fd94325bb3a4..4bf657652041 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -162,6 +162,8 @@ diff --git a/patches/openssl-1.0.2g/0012-soname.patch b/patches/openssl-1.0.2h/0012-soname.patch index 150a4e029..76c842b50 100644 --- a/patches/openssl-1.0.2g/0012-soname.patch +++ b/patches/openssl-1.0.2h/0012-soname.patch @@ -1,8 +1,8 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 2 Mar 2016 07:41:48 +0100 +Date: Wed, 4 May 2016 09:27:51 +0200 Subject: [PATCH] soname -Imported from openssl_1.0.2g-1.debian.tar.xz +Imported from openssl_1.0.2h-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, 1 insertion(+), 1 deletion(-) diff --git a/crypto/opensslv.h b/crypto/opensslv.h -index 4334fd15cd87..f8d74f0e506b 100644 +index 13fe440231cd..ed092f113f1b 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -88,7 +88,7 @@ extern "C" { diff --git a/patches/openssl-1.0.2g/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2h/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch index bb3e51e58..348505b97 100644 --- a/patches/openssl-1.0.2g/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch +++ b/patches/openssl-1.0.2h/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch @@ -8,11 +8,11 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configure b/Configure -index 646194960bf0..e4ae865dbdec 100755 +index 974407e2d9a5..020f215dd1e8 100755 --- a/Configure +++ b/Configure -@@ -125,7 +125,7 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali - my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments"; +@@ -132,7 +132,7 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers + my $warn_make_depend = 0; # There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS -my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall"; diff --git a/patches/openssl-1.0.2g/0101-fix-parallel-building.patch b/patches/openssl-1.0.2h/0101-fix-parallel-building.patch index b22fa1380..80ee249df 100644 --- a/patches/openssl-1.0.2g/0101-fix-parallel-building.patch +++ b/patches/openssl-1.0.2h/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 7c6da5e78ed3..3258f13bf732 100644 +index 9aee32001139..fc86c73c76f0 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -279,18 +279,24 @@ build_libs: build_libcrypto build_libssl openssl.pc +@@ -278,18 +278,24 @@ build_libs: build_libcrypto build_libssl openssl.pc build_libcrypto: build_crypto build_engines libcrypto.pc build_libssl: build_ssl libssl.pc diff --git a/patches/openssl-1.0.2g/series b/patches/openssl-1.0.2h/series index 898c5a1e7..898c5a1e7 100644 --- a/patches/openssl-1.0.2g/series +++ b/patches/openssl-1.0.2h/series |