From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 5 Jun 2016 10:16:32 +0000 (+0200)
Subject: Sync architecture specific hardening support with dpkg 1.18.7
X-Git-Tag: 0.06~6
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=a00399d7dce651ac647634b0ac6b4a6056a92f97;p=blhc%2Fblhc.git

Sync architecture specific hardening support with dpkg 1.18.7
---

diff --git a/bin/blhc b/bin/blhc
index 4be8e84..73b770d 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -996,7 +996,7 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.18.2
+        # The following was partially copied from dpkg-dev 1.18.7
         # (/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
@@ -1009,7 +1009,7 @@ foreach my $file (@ARGV) {
         if ($os !~ /^(?:linux|knetbsd|hurd)$/ or $cpu =~ /^(?:hppa|avr32)$/) {
             $harden_pie = 0;
         }
-        if ($cpu =~ /^(?:ia64|alpha|hppa)$/ or $arch eq 'arm') {
+        if ($cpu =~ /^(?:ia64|alpha|hppa|nios2)$/ or $arch eq 'arm') {
             $harden_stack = 0;
             $harden_stack_strong = 0;
         }