From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 24 Feb 2019 17:03:56 +0000 (+0100)
Subject: Sync architecture specific hardening support with dpkg 1.19.5
X-Git-Tag: 0.10~11
X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=commitdiff_plain;h=5a6704713eef81b462bea15707af8e941c355bc4;ds=sidebyside

Sync architecture specific hardening support with dpkg 1.19.5
---

diff --git a/NEWS b/NEWS
index ec1a84a..c1bd2b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Sync architecture specific hardening support with dpkg 1.19.5.
+
+
 Version 0.09
 ------------
 
diff --git a/bin/blhc b/bin/blhc
index beb6951..d9a3bb2 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -1117,7 +1117,7 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.19.0.5
+        # The following was partially copied from dpkg-dev 1.19.5
         # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, _add_build_flags()),
         # copyright Raphaël Hertzog <hertzog@debian.org>, Guillem Jover
         # <guillem@debian.org>, Kees Cook <kees@debian.org>, Canonical, Ltd.
@@ -1134,8 +1134,24 @@ foreach my $file (@ARGV) {
         }
 
         my %builtin_pie_arch = map { $_ => 1 } qw(
-            amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
-            mips mipsel mips64el powerpc ppc64 ppc64el s390x sparc sparc64
+            amd64
+            arm64
+            armel
+            armhf
+            hurd-i386
+            i386
+            kfreebsd-amd64
+            kfreebsd-i386
+            mips
+            mipsel
+            mips64el
+            powerpc
+            ppc64
+            ppc64el
+            riscv64
+            s390x
+            sparc
+            sparc64
         );
 
         # Disable unsupported hardening options.