summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-01-31 23:47:03 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-02-01 18:37:38 +0100
commita780bf29d452053c640e67898d22a81d6bfbd2da (patch)
tree99cb403ff5a132d2f6427b57accfcba705b7710b /patches
parent87f46650923fc0880461d077b21a96053032af5a (diff)
downloadptxdist-a780bf29d452053c640e67898d22a81d6bfbd2da.tar.gz
ptxdist-a780bf29d452053c640e67898d22a81d6bfbd2da.tar.xz
openssl: version bump 1.0.2e -> 1.0.2f
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/openssl-1.0.2f/0001-ca.patch (renamed from patches/openssl-1.0.2e/0001-ca.patch)4
-rw-r--r--patches/openssl-1.0.2f/0002-debian-targets.patch (renamed from patches/openssl-1.0.2e/0002-debian-targets.patch)14
-rw-r--r--patches/openssl-1.0.2f/0003-engines-path.patch (renamed from patches/openssl-1.0.2e/0003-engines-path.patch)12
-rw-r--r--patches/openssl-1.0.2f/0004-no-rpath.patch (renamed from patches/openssl-1.0.2e/0004-no-rpath.patch)4
-rw-r--r--patches/openssl-1.0.2f/0005-no-symbolic.patch (renamed from patches/openssl-1.0.2e/0005-no-symbolic.patch)4
-rw-r--r--patches/openssl-1.0.2f/0006-pic.patch (renamed from patches/openssl-1.0.2e/0006-pic.patch)4
-rw-r--r--patches/openssl-1.0.2f/0007-valgrind.patch (renamed from patches/openssl-1.0.2e/0007-valgrind.patch)4
-rw-r--r--patches/openssl-1.0.2f/0008-shared-lib-ext.patch (renamed from patches/openssl-1.0.2e/0008-shared-lib-ext.patch)8
-rw-r--r--patches/openssl-1.0.2f/0009-block_diginotar.patch (renamed from patches/openssl-1.0.2e/0009-block_diginotar.patch)6
-rw-r--r--patches/openssl-1.0.2f/0010-block_digicert_malaysia.patch (renamed from patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch)6
-rw-r--r--patches/openssl-1.0.2f/0011-Disable-the-freelist.patch (renamed from patches/openssl-1.0.2e/0011-Disable-the-freelist.patch)6
-rw-r--r--patches/openssl-1.0.2f/0012-soname.patch (renamed from patches/openssl-1.0.2e/0012-soname.patch)6
-rw-r--r--patches/openssl-1.0.2f/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch (renamed from patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch)0
-rw-r--r--patches/openssl-1.0.2f/0101-fix-parallel-building.patch (renamed from patches/openssl-1.0.2e/0101-fix-parallel-building.patch)0
-rw-r--r--patches/openssl-1.0.2f/series (renamed from patches/openssl-1.0.2e/series)0
15 files changed, 39 insertions, 39 deletions
diff --git a/patches/openssl-1.0.2e/0001-ca.patch b/patches/openssl-1.0.2f/0001-ca.patch
index 3da9614b7..ee9d014b5 100644
--- a/patches/openssl-1.0.2e/0001-ca.patch
+++ b/patches/openssl-1.0.2f/0001-ca.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] ca
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.0.2e/0002-debian-targets.patch b/patches/openssl-1.0.2f/0002-debian-targets.patch
index 7c81ad250..2fe22e94a 100644
--- a/patches/openssl-1.0.2e/0002-debian-targets.patch
+++ b/patches/openssl-1.0.2f/0002-debian-targets.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] debian-targets
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
@@ -10,12 +10,12 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 53 insertions(+)
diff --git a/Configure b/Configure
-index ac86cd6cf6a2..0119aae101a3 100755
+index 4a715dc43732..bbdd2f99ec82 100755
--- a/Configure
+++ b/Configure
-@@ -124,6 +124,10 @@ my $clang_disabled_warnings = "-Wno-unused-parameter -Wno-missing-field-initiali
- # -Wextended-offsetof
- my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments";
+@@ -127,6 +127,10 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
+ # Warn that "make depend" should be run?
+ 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";
@@ -24,7 +24,7 @@ index ac86cd6cf6a2..0119aae101a3 100755
my $strict_warnings = 0;
my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -360,6 +364,55 @@ my %table=(
+@@ -363,6 +367,55 @@ 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",
diff --git a/patches/openssl-1.0.2e/0003-engines-path.patch b/patches/openssl-1.0.2f/0003-engines-path.patch
index a79760eec..587ff5dc1 100644
--- a/patches/openssl-1.0.2e/0003-engines-path.patch
+++ b/patches/openssl-1.0.2f/0003-engines-path.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] engines-path
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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 0119aae101a3..4156e27b6cff 100755
+index bbdd2f99ec82..64951a663d3f 100755
--- a/Configure
+++ b/Configure
-@@ -1954,7 +1954,7 @@ while (<IN>)
+@@ -1957,7 +1957,7 @@ while (<IN>)
}
elsif (/^#define\s+ENGINESDIR/)
{
@@ -26,10 +26,10 @@ index 0119aae101a3..4156e27b6cff 100755
print OUT "#define ENGINESDIR \"$foo\"\n";
}
diff --git a/Makefile.org b/Makefile.org
-index 0333644415a2..7c6da5e78ed3 100644
+index 76fdbdf6ac5c..9aee32001139 100644
--- a/Makefile.org
+++ b/Makefile.org
-@@ -537,7 +537,7 @@ install: all install_docs install_sw
+@@ -533,7 +533,7 @@ install: all install_docs install_sw
install_sw:
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
diff --git a/patches/openssl-1.0.2e/0004-no-rpath.patch b/patches/openssl-1.0.2f/0004-no-rpath.patch
index 0ed5ce767..0d61d9d37 100644
--- a/patches/openssl-1.0.2e/0004-no-rpath.patch
+++ b/patches/openssl-1.0.2f/0004-no-rpath.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] no-rpath
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.0.2e/0005-no-symbolic.patch b/patches/openssl-1.0.2f/0005-no-symbolic.patch
index 758ff38a6..5cdc87de4 100644
--- a/patches/openssl-1.0.2e/0005-no-symbolic.patch
+++ b/patches/openssl-1.0.2f/0005-no-symbolic.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] no-symbolic
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.0.2e/0006-pic.patch b/patches/openssl-1.0.2f/0006-pic.patch
index 7300c1d3b..fae5921dd 100644
--- a/patches/openssl-1.0.2e/0006-pic.patch
+++ b/patches/openssl-1.0.2f/0006-pic.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] pic
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.0.2e/0007-valgrind.patch b/patches/openssl-1.0.2f/0007-valgrind.patch
index 614ec1f28..1c9c7644b 100644
--- a/patches/openssl-1.0.2e/0007-valgrind.patch
+++ b/patches/openssl-1.0.2f/0007-valgrind.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] valgrind
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.debian.tar.xz
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
diff --git a/patches/openssl-1.0.2e/0008-shared-lib-ext.patch b/patches/openssl-1.0.2f/0008-shared-lib-ext.patch
index 6b3a885ef..0141b3066 100644
--- a/patches/openssl-1.0.2e/0008-shared-lib-ext.patch
+++ b/patches/openssl-1.0.2f/0008-shared-lib-ext.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] shared-lib-ext
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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 4156e27b6cff..646194960bf0 100755
+index 64951a663d3f..b1a935ac84ec 100755
--- a/Configure
+++ b/Configure
-@@ -1820,7 +1820,8 @@ while (<IN>)
+@@ -1823,7 +1823,8 @@ while (<IN>)
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
{
my $sotmp = $1;
diff --git a/patches/openssl-1.0.2e/0009-block_diginotar.patch b/patches/openssl-1.0.2f/0009-block_diginotar.patch
index 3efa42d1b..2ec0d4755 100644
--- a/patches/openssl-1.0.2e/0009-block_diginotar.patch
+++ b/patches/openssl-1.0.2f/0009-block_diginotar.patch
@@ -1,11 +1,11 @@
From: Raphael Geissert <geissert@debian.org>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] block_diginotar
This is not meant as final patch.
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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 ab94948f0135..e6605ec54e5e 100644
+index 0429767032fd..b5db0b63063b 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);
diff --git a/patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch b/patches/openssl-1.0.2f/0010-block_digicert_malaysia.patch
index 7467d60c6..90c3ea8b4 100644
--- a/patches/openssl-1.0.2e/0010-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.2f/0010-block_digicert_malaysia.patch
@@ -1,8 +1,8 @@
From: Raphael Geissert <geissert@debian.org>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] block_digicert_malaysia
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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, 4 insertions(+), 3 deletions(-)
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
-index e6605ec54e5e..552aa4f3d5a6 100644
+index b5db0b63063b..ab9302513de2 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -998,10 +998,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx)
diff --git a/patches/openssl-1.0.2e/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2f/0011-Disable-the-freelist.patch
index 831c24f47..4d0ee9ee1 100644
--- a/patches/openssl-1.0.2e/0011-Disable-the-freelist.patch
+++ b/patches/openssl-1.0.2f/0011-Disable-the-freelist.patch
@@ -1,5 +1,5 @@
From: Kurt Roeckx <kurt@roeckx.be>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +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.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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 f2071db93702..c605784474a5 100644
+index 2744be8ad8ce..5ab43c68c2fb 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.2f/0012-soname.patch
index 6182d0283..ea21a2417 100644
--- a/patches/openssl-1.0.2e/0012-soname.patch
+++ b/patches/openssl-1.0.2f/0012-soname.patch
@@ -1,8 +1,8 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 4 Dec 2015 16:20:43 +0100
+Date: Sun, 31 Jan 2016 23:41:30 +0100
Subject: [PATCH] soname
-Imported from openssl_1.0.2e-1.debian.tar.xz
+Imported from openssl_1.0.2f-2.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 abcef15b17d9..77d01b993529 100644
+index 03b8c4843784..8f57c71483e4 100644
--- a/crypto/opensslv.h
+++ b/crypto/opensslv.h
@@ -88,7 +88,7 @@ extern "C" {
diff --git a/patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2f/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
index bb3e51e58..bb3e51e58 100644
--- a/patches/openssl-1.0.2e/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+++ b/patches/openssl-1.0.2f/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
diff --git a/patches/openssl-1.0.2e/0101-fix-parallel-building.patch b/patches/openssl-1.0.2f/0101-fix-parallel-building.patch
index b22fa1380..b22fa1380 100644
--- a/patches/openssl-1.0.2e/0101-fix-parallel-building.patch
+++ b/patches/openssl-1.0.2f/0101-fix-parallel-building.patch
diff --git a/patches/openssl-1.0.2e/series b/patches/openssl-1.0.2f/series
index 898c5a1e7..898c5a1e7 100644
--- a/patches/openssl-1.0.2e/series
+++ b/patches/openssl-1.0.2f/series