sync architecture specific hardening support with dpkg 1.18.2

diff --git a/NEWS b/NEWS
index 1fd8e324394a923b05040819e9c635a90ccebf1f..9245c13093ce06e37ddf3fe708b813bd572169db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 NEWS
 ====
 
+Version 0.XX
+------------
+
+- Sync architecture specific hardening support with dpkg 1.18.2.
+
+
 Version 0.05
 ------------
 

diff --git a/bin/blhc b/bin/blhc
index 53480d48b32a4210e749716d3806373daf09e484..7cfadd158fe25b6ffefd0230dd3bad8e8e8926a8 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -992,11 +992,10 @@ 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|mips|mipsel|avr32)$/) {
+        if ($os !~ /^(?:linux|knetbsd|hurd)$/ or $cpu =~ /^(?:hppa|avr32)$/) {
             $harden_pie = 0;
         }
-        if ($cpu =~ /^(?:ia64|alpha|mips|mipsel|hppa)$/ or $arch eq 'arm') {
+        if ($cpu =~ /^(?:ia64|alpha|hppa)$/ or $arch eq 'arm') {
             $harden_stack = 0;
             $harden_stack_strong = 0;
         }

diff --git a/t/logs/buildd-architecture b/t/logs/buildd-architecture
index 7f1b342ac1e026b28968fc0166a5459da6151710..c06536dda4cee6a4e84c4b79a980097f82775960 100644 (file)
--- a/t/logs/buildd-architecture
+++ b/t/logs/buildd-architecture
@@ -1,4 +1,4 @@
-Build Architecture: mipsel
+Build Architecture: arm
 dpkg-buildpackage: source package test
 
 gcc -g -O2 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test.c

diff --git a/t/logs/buildd-architecture-old b/t/logs/buildd-architecture-old
index 9cd5ba6a0ce9f443a74f42aa3e3d4a81578f319b..5b99f63ce67d8f75eb430b9bda1652aa75eb368e 100644 (file)
--- a/t/logs/buildd-architecture-old
+++ b/t/logs/buildd-architecture-old
@@ -1,6 +1,6 @@
 # Old logs used Architecture instead of Build Architecture (sbuild <<
 # 0.63.0-1).
-Architecture: mipsel
+Architecture: arm
 dpkg-buildpackage: source package test
 
 gcc -g -O2 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test.c

diff --git a/t/tests.t b/t/tests.t
index 6e546edff0f408125fa0211ebe26e08a7a3b7b56..673ed008fbda503a177870dd0750271f34f3c5da 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 218;
+use Test::More tests => 216;
 
 
 sub is_blhc {
@@ -834,11 +834,6 @@ LDFLAGS missing (-pie): gcc -fPIE -o test test.o
 is_blhc 'arch-ia64', '', 8,
         $arch_ia64;
 
-is_blhc 'arch-mipsel', '', 8,
-        'CFLAGS missing (-Werror=format-security): gcc -D_FORTIFY_SOURCE=2 -g -O2 -Wformat -Wformat-security -Wall -c test.c
-LDFLAGS missing (-Wl,-z,relro): gcc -Wl,-z,now -o test test.o
-';
-
 is_blhc 'arch-ia64', '--arch i386', 8,
         'CFLAGS missing (-fstack-protector-strong): gcc -D_FORTIFY_SOURCE=2 -g -O2 -fPIE -Wformat -Wformat-security -Werror=format-security -Wall -c test.c
 LDFLAGS missing (-Wl,-z,relro): gcc -fPIE -pie -o test test.o