Sync architecture specific hardening support with dpkg 1.19.5

diff --git a/NEWS b/NEWS
index ec1a84a336b2c8bb066546e99530adf9c7332ad4..c1bd2b6ebbf2d4bf638d322f9b6cfa7082e7890d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 NEWS
 ====
 
 NEWS
 ====
 

+Version 0.XX
+------------
+
+- Sync architecture specific hardening support with dpkg 1.19.5.
+
+

 Version 0.09
 ------------
 
 Version 0.09
 ------------
 

diff --git a/bin/blhc b/bin/blhc
index beb69519b35cd9bc002b3a252af85a884be1c02d..d9a3bb252b330db2ba43a90a883670b8de4e4581 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -1117,7 +1117,7 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
 
     # 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.
         # (/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(
         }
 
         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.
         );
 
         # Disable unsupported hardening options.