sync architecture specific hardening support with dpkg 1.17.11.

diff --git a/NEWS b/NEWS
index e943ce605ed60f197f126926361db0e5e8048bfd..39087f5360471d5c89e9ba910a21964869dcfed0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 0.XX
 - Better handling of libtool commands (Debug bug #717598), reported by Stefan
   Fritsch.
 
-- Sync architecture specific hardening support with dpkg 1.17.1.
+- Sync architecture specific hardening support with dpkg 1.17.11.
 - Consider lines with -O0 or -Og debug builds and disable checks for -O2
   (Debian bug #714628), reported by Matthias Klose.
 

diff --git a/bin/blhc b/bin/blhc
index 72918fe5bc57e6494f42657879c3d9fc6563448f..af644d3597621d2ad04de3bac77f7d78be1b01a7 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -959,7 +959,7 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.17.1
+        # The following was partially copied from dpkg-dev 1.17.11
         # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, add_hardening_flags()),
         # copyright Raphaël Hertzog <hertzog@debian.org>, Kees Cook
         # <kees@debian.org>, Canonical, Ltd. licensed under GPL version 2 or
@@ -973,8 +973,7 @@ foreach my $file (@ARGV) {
                 $cpu =~ /^(?:hppa|mips|mipsel|avr32)$/) {
             $harden_pie = 0;
         }
-        if ($cpu =~ /^(?:ia64|alpha|mips|mipsel|hppa|arm64)$/
-                or $arch eq 'arm') {
+        if ($cpu =~ /^(?:ia64|alpha|mips|mipsel|hppa)$/ or $arch eq 'arm') {
             $harden_stack = 0;
         }
         if ($cpu =~ /^(?:ia64|hppa|avr32)$/) {