From 766ce7c378d81e02b6cf993ba5c39f8729daf43a Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 25 Aug 2016 16:49:18 +0200
Subject: [PATCH] Sync architecture specific hardening support with dpkg
 1.18.10

---
 NEWS     | 6 ++++++
 bin/blhc | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f6fa8ce..8f6731c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Sync architecture specific hardening support with dpkg 1.18.10.
+
+
 Version 0.06
 ------------
 
diff --git a/bin/blhc b/bin/blhc
index e918ee8..838f3c3 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -1012,8 +1012,8 @@ foreach my $file (@ARGV) {
 
     # Option or auto detected.
     if ($arch) {
-        # The following was partially copied from dpkg-dev 1.18.7
-        # (/usr/share/perl5/Dpkg/Vendor/Debian.pm, add_hardening_flags()),
+        # The following was partially copied from dpkg-dev 1.18.10
+        # (/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
         # later. Keep it in sync.
@@ -1022,7 +1022,8 @@ foreach my $file (@ARGV) {
         my ($abi, $os, $cpu) = Dpkg::Arch::debarch_to_debtriplet($arch);
 
         # Disable unsupported hardening options.
-        if ($os !~ /^(?:linux|knetbsd|hurd)$/ or $cpu =~ /^(?:hppa|avr32)$/) {
+        if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/
+                or $cpu =~ /^(?:hppa|avr32)$/) {
             $harden_pie = 0;
         }
         if ($cpu =~ /^(?:ia64|alpha|hppa|nios2)$/ or $arch eq 'arm') {
-- 
2.43.2