[Pkg-openssl-changes] r732 - openssl/trunk/debian/patches

[Kurt Roeckx]

Author: kroeckx
Date: 2015-06-11 16:52:17 +0000 (Thu, 11 Jun 2015)
New Revision: 732

Modified:
   openssl/trunk/debian/patches/debian-targets.patch
Log:
Update patch to make it apply without fuzz


Modified: openssl/trunk/debian/patches/debian-targets.patch
===================================================================
--- openssl/trunk/debian/patches/debian-targets.patch	2015-06-11 16:29:37 UTC (rev 731)
+++ openssl/trunk/debian/patches/debian-targets.patch	2015-06-11 16:52:17 UTC (rev 732)
@@ -1,11 +1,11 @@
-Index: openssl-1.0.2/Configure
+Index: openssl-1.0.2b/Configure
 ===================================================================
---- openssl-1.0.2.orig/Configure
-+++ openssl-1.0.2/Configure
-@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic
+--- openssl-1.0.2b.orig/Configure
++++ openssl-1.0.2b/Configure
+@@ -124,6 +124,10 @@ my $clang_disabled_warnings = "-Wno-unus
+ # -Wextended-offsetof
+ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers -Wno-language-extension-token -Wno-extended-offsetof -Qunused-arguments";
  
- my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum";
- 
 +# 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";
 +$debian_cflags =~ s/\n/ /g;
@@ -13,7 +13,7 @@
  my $strict_warnings = 0;
  
  my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -343,6 +347,55 @@ my %table=(
+@@ -360,6 +364,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",