openssl: don't ask dpkg-buildflags for extra flags

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

16 files changed, 55 insertions, 27 deletions

diff --git a/patches/openssl-1.0.1i/0001-ca.patch b/patches/openssl-1.0.1i/0001-ca.patch
index 177a08770..a2e37a6f9 100644
--- a/patches/openssl-1.0.1i/0001-ca.patch
+++ b/patches/openssl-1.0.1i/0001-ca.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+)
 
 diff --git a/apps/CA.pl.in b/apps/CA.pl.in
-index c783a6e..fa665b7 100644
+index c783a6e6a541..fa665b7b385f 100644
 --- a/apps/CA.pl.in
 +++ b/apps/CA.pl.in
 @@ -65,6 +65,7 @@ $RET = 0;
diff --git a/patches/openssl-1.0.1i/0002-debian-targets.patch b/patches/openssl-1.0.1i/0002-debian-targets.patch
index e47205915..db65895a6 100644
--- a/patches/openssl-1.0.1i/0002-debian-targets.patch
+++ b/patches/openssl-1.0.1i/0002-debian-targets.patch
@@ -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 36844b7..4c5cc04 100755
+index 36844b7b2f7a..4c5cc040724e 100755
 --- a/Configure
 +++ b/Configure
 @@ -105,6 +105,10 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
diff --git a/patches/openssl-1.0.1i/0003-engines-path.patch b/patches/openssl-1.0.1i/0003-engines-path.patch
index b5e1d50ea..7954954cb 100644
--- a/patches/openssl-1.0.1i/0003-engines-path.patch
+++ b/patches/openssl-1.0.1i/0003-engines-path.patch
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Configure b/Configure
-index 4c5cc04..c4444b9 100755
+index 4c5cc040724e..c4444b9ed25b 100755
 --- a/Configure
 +++ b/Configure
 @@ -1858,7 +1858,7 @@ while (<IN>)
@@ -26,7 +26,7 @@ index 4c5cc04..c4444b9 100755
  		print OUT "#define ENGINESDIR \"$foo\"\n";
  		}
 diff --git a/Makefile.org b/Makefile.org
-index c92806f..5117a0e 100644
+index c92806f9201f..5117a0ef9c0b 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -543,7 +543,7 @@ install: all install_docs install_sw
@@ -39,7 +39,7 @@ index c92806f..5117a0e 100644
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 diff --git a/engines/Makefile b/engines/Makefile
-index 2fa9534..58e0281 100644
+index 2fa9534401b1..58e028131786 100644
 --- a/engines/Makefile
 +++ b/engines/Makefile
 @@ -107,7 +107,7 @@ install:
@@ -70,7 +70,7 @@ index 2fa9534..58e0281 100644
  	fi
  	@target=install; $(RECURSIVE_MAKE)
 diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
-index d661c10..3e593b1 100644
+index d661c1082851..3e593b1e3e03 100644
 --- a/engines/ccgost/Makefile
 +++ b/engines/ccgost/Makefile
 @@ -53,13 +53,13 @@ install:
diff --git a/patches/openssl-1.0.1i/0004-no-rpath.patch b/patches/openssl-1.0.1i/0004-no-rpath.patch
index f46e5ba5c..ef2721ef2 100644
--- a/patches/openssl-1.0.1i/0004-no-rpath.patch
+++ b/patches/openssl-1.0.1i/0004-no-rpath.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
-index e753f44..6e3f886 100644
+index e753f44e18fd..6e3f886980bf 100644
 --- a/Makefile.shared
 +++ b/Makefile.shared
 @@ -153,7 +153,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
diff --git a/patches/openssl-1.0.1i/0005-no-symbolic.patch b/patches/openssl-1.0.1i/0005-no-symbolic.patch
index 4c608d065..ea267b1a7 100644
--- a/patches/openssl-1.0.1i/0005-no-symbolic.patch
+++ b/patches/openssl-1.0.1i/0005-no-symbolic.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
-index 6e3f886..44e3d9c 100644
+index 6e3f886980bf..44e3d9c48440 100644
 --- a/Makefile.shared
 +++ b/Makefile.shared
 @@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
diff --git a/patches/openssl-1.0.1i/0006-pic.patch b/patches/openssl-1.0.1i/0006-pic.patch
index 59fc9321f..5e68f4675 100644
--- a/patches/openssl-1.0.1i/0006-pic.patch
+++ b/patches/openssl-1.0.1i/0006-pic.patch
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 55 insertions(+), 12 deletions(-)
 
 diff --git a/crypto/des/asm/desboth.pl b/crypto/des/asm/desboth.pl
-index eec0088..ab6f524 100644
+index eec00886e4c6..ab6f52452bf3 100644
 --- a/crypto/des/asm/desboth.pl
 +++ b/crypto/des/asm/desboth.pl
 @@ -16,6 +16,11 @@ sub DES_encrypt3
@@ -54,7 +54,7 @@ index eec0088..ab6f524 100644
  	&stack_pop(3);
  	&mov($L,&DWP(0,"ebx","",0));
 diff --git a/crypto/perlasm/cbc.pl b/crypto/perlasm/cbc.pl
-index 24561e7..269fb0b 100644
+index 24561e759aba..269fb0b0c69f 100644
 --- a/crypto/perlasm/cbc.pl
 +++ b/crypto/perlasm/cbc.pl
 @@ -122,7 +122,11 @@ sub cbc
@@ -110,7 +110,7 @@ index 24561e7..269fb0b 100644
  	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
  	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
 diff --git a/crypto/perlasm/x86gas.pl b/crypto/perlasm/x86gas.pl
-index 682a3a3..9d4662c 100644
+index 682a3a3163e2..9d4662cb9624 100644
 --- a/crypto/perlasm/x86gas.pl
 +++ b/crypto/perlasm/x86gas.pl
 @@ -161,6 +161,7 @@ sub ::file_end
@@ -146,7 +146,7 @@ index 682a3a3..9d4662c 100644
      elsif ($::coff)
      {   $initseg.=<<___;	# applies to both Cygwin and Mingw
 diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
-index b270b44..c01ba83 100644
+index b270b44337d1..c01ba8383401 100644
 --- a/crypto/x86cpuid.pl
 +++ b/crypto/x86cpuid.pl
 @@ -8,6 +8,8 @@ require "x86asm.pl";
diff --git a/patches/openssl-1.0.1i/0007-valgrind.patch b/patches/openssl-1.0.1i/0007-valgrind.patch
index 875b1e3ad..247f60da9 100644
--- a/patches/openssl-1.0.1i/0007-valgrind.patch
+++ b/patches/openssl-1.0.1i/0007-valgrind.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+)
 
 diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
-index 888b4eb..90ec463 100644
+index 888b4eb8dd0b..90ec46315f4d 100644
 --- a/crypto/rand/md_rand.c
 +++ b/crypto/rand/md_rand.c
 @@ -482,6 +482,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
diff --git a/patches/openssl-1.0.1i/0008-rehash-crt.patch b/patches/openssl-1.0.1i/0008-rehash-crt.patch
index 662d6b4ce..16b746b94 100644
--- a/patches/openssl-1.0.1i/0008-rehash-crt.patch
+++ b/patches/openssl-1.0.1i/0008-rehash-crt.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index bfc4a69..4958e3d 100644
+index bfc4a69ed4bc..4958e3dd05a7 100644
 --- a/tools/c_rehash.in
 +++ b/tools/c_rehash.in
 @@ -75,12 +75,15 @@ sub hash_dir {
diff --git a/patches/openssl-1.0.1i/0009-shared-lib-ext.patch b/patches/openssl-1.0.1i/0009-shared-lib-ext.patch
index 12dc5d395..34c8c9f9f 100644
--- a/patches/openssl-1.0.1i/0009-shared-lib-ext.patch
+++ b/patches/openssl-1.0.1i/0009-shared-lib-ext.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index c4444b9..d76552f 100755
+index c4444b9ed25b..d76552f4771e 100755
 --- a/Configure
 +++ b/Configure
 @@ -1728,7 +1728,8 @@ while (<IN>)
diff --git a/patches/openssl-1.0.1i/0010-stddef.patch b/patches/openssl-1.0.1i/0010-stddef.patch
index 62006064c..5b33d6dec 100644
--- a/patches/openssl-1.0.1i/0010-stddef.patch
+++ b/patches/openssl-1.0.1i/0010-stddef.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+)
 
 diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
-index 8a6bf4b..734b40a 100644
+index 8a6bf4bbbb1d..734b40ac2da3 100644
 --- a/crypto/sha/sha.h
 +++ b/crypto/sha/sha.h
 @@ -59,6 +59,7 @@
diff --git a/patches/openssl-1.0.1i/0011-block_diginotar.patch b/patches/openssl-1.0.1i/0011-block_diginotar.patch
index 949c053fa..db99a5a21 100644
--- a/patches/openssl-1.0.1i/0011-block_diginotar.patch
+++ b/patches/openssl-1.0.1i/0011-block_diginotar.patch
@@ -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 920066a..5b1a0aa 100644
+index 920066aeba3b..5b1a0aa054be 100644
 --- a/crypto/x509/x509_vfy.c
 +++ b/crypto/x509/x509_vfy.c
 @@ -117,6 +117,7 @@ static int check_trust(X509_STORE_CTX *ctx);
diff --git a/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch b/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch
index 8cecc3688..81d652dce 100644
--- a/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch
@@ -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 5b1a0aa..696f8d6 100644
+index 5b1a0aa054be..696f8d63a5b1 100644
 --- a/crypto/x509/x509_vfy.c
 +++ b/crypto/x509/x509_vfy.c
 @@ -839,10 +839,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx)
diff --git a/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch b/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch
index c9b26363d..a0f974866 100644
--- a/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch
+++ b/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch
@@ -17,7 +17,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  8 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/apps/dhparam.c b/apps/dhparam.c
-index 1297d6f..b0c05be 100644
+index 1297d6fb5ec9..b0c05befc8bb 100644
 --- a/apps/dhparam.c
 +++ b/apps/dhparam.c
 @@ -130,7 +130,7 @@
@@ -39,7 +39,7 @@ index 1297d6f..b0c05be 100644
  		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
  #endif
 diff --git a/apps/gendh.c b/apps/gendh.c
-index 4ec776b..8df8c62 100644
+index 4ec776ba9399..8df8c62f8aa3 100644
 --- a/apps/gendh.c
 +++ b/apps/gendh.c
 @@ -78,7 +78,7 @@
@@ -52,7 +52,7 @@ index 4ec776b..8df8c62 100644
  #define PROG gendh_main
  
 diff --git a/apps/genrsa.c b/apps/genrsa.c
-index ece114c..7a8c6c5 100644
+index ece114c876a6..7a8c6c58ad62 100644
 --- a/apps/genrsa.c
 +++ b/apps/genrsa.c
 @@ -78,7 +78,7 @@
@@ -65,7 +65,7 @@ index ece114c..7a8c6c5 100644
  #define PROG genrsa_main
  
 diff --git a/apps/openssl.cnf b/apps/openssl.cnf
-index 18760c6..1eb86c4 100644
+index 18760c6e673d..1eb86c401263 100644
 --- a/apps/openssl.cnf
 +++ b/apps/openssl.cnf
 @@ -103,7 +103,7 @@ emailAddress		= optional
@@ -78,7 +78,7 @@ index 18760c6..1eb86c4 100644
  distinguished_name	= req_distinguished_name
  attributes		= req_attributes
 diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
-index 376156e..13318d7 100644
+index 376156ec5ef3..13318d70aa6e 100644
 --- a/crypto/dsa/dsa_ameth.c
 +++ b/crypto/dsa/dsa_ameth.c
 @@ -628,7 +628,7 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
@@ -91,7 +91,7 @@ index 376156e..13318d7 100644
  
  		default:
 diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
-index f715a23..e91f8d6 100644
+index f715a238a6fc..e91f8d621c8e 100644
 --- a/crypto/ec/ec_ameth.c
 +++ b/crypto/ec/ec_ameth.c
 @@ -616,7 +616,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
@@ -104,7 +104,7 @@ index f715a23..e91f8d6 100644
  
  		default:
 diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c
-index e03f24a..9fe6505 100644
+index e03f24aedab9..9fe6505bd5a0 100644
 --- a/crypto/hmac/hm_ameth.c
 +++ b/crypto/hmac/hm_ameth.c
 @@ -89,7 +89,7 @@ static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
@@ -117,7 +117,7 @@ index e03f24a..9fe6505 100644
  
  		default:
 diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
-index 4c8ecd9..92cc15c 100644
+index 4c8ecd9233e1..92cc15c2c730 100644
 --- a/crypto/rsa/rsa_ameth.c
 +++ b/crypto/rsa/rsa_ameth.c
 @@ -435,7 +435,7 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
diff --git a/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch b/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch
index caf465a6d..1305eb90d 100644
--- a/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch
+++ b/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
-index acb0b40..acd76ce 100644
+index acb0b401181e..acd76cee2f74 100644
 --- a/crypto/bn/asm/x86_64-gcc.c
 +++ b/crypto/bn/asm/x86_64-gcc.c
 @@ -55,7 +55,7 @@
diff --git a/patches/openssl-1.0.1i/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.1i/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
new file mode 100644
index 000000000..4d0951b10
--- /dev/null
+++ b/patches/openssl-1.0.1i/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 11 Aug 2014 12:28:49 +0200
+Subject: [PATCH] Configure: don't ask dpkg-buildflags for more flags
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configure b/Configure
+index d76552f4771e..f58e7874caa3 100755
+--- a/Configure
++++ b/Configure
+@@ -106,7 +106,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
+ my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
+ 
+ # 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";
++my $debian_cflags = "-g -O2 -Wformat -Werror=format-security " . "-Wa,--noexecstack -Wall";
+ $debian_cflags =~ s/\n/ /g;
+ 
+ my $strict_warnings = 0;
diff --git a/patches/openssl-1.0.1i/series b/patches/openssl-1.0.1i/series
index de4066ef7..ad425bbb6 100644
--- a/patches/openssl-1.0.1i/series
+++ b/patches/openssl-1.0.1i/series
@@ -1,3 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:debian --start-number 1
 0001-ca.patch
 0002-debian-targets.patch
 0003-engines-path.patch
@@ -12,3 +15,6 @@
 0012-block_digicert_malaysia.patch
 0013-Change-default-bit-size-and-digest.patch
 0014-openssl_fix_for_x32.patch
+#tag:ptx --start-number 100
+0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+# b3f0cb7915424a88c4a3ff5ca4461972  - git-ptx-patches magic