From 0f1a49d52e94c258e444548c34903d27346d8a52 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 10 Aug 2014 15:07:47 +0200 Subject: [PATCH] sync architecture specific hardening support with dpkg 1.17.11. --- NEWS | 2 +- bin/blhc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index e943ce6..39087f5 100644 --- 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 72918fe..af644d3 100755 --- 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 , Kees Cook # , 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)$/) { -- 2.45.2