Package: hardening-wrapper
Version: 2.8+nmu1
Severity: important
Tags: patch

On {,hurd-,kfreebsd-}i386 hardening-wrapper diverts the i586-*ld*
symlinks rather than the actual i686-*ld* binaries.  This is due to two
mistakes in debian/rules, first the DHGT variable is set up incorrectly
and then it is not actually used when generating the maintainer scripts
from the *.in files.

Attached is a patch that works for me on i386.


-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (101, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 4.2.7-kms
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru hardening-wrapper-2.8+nmu1/debian/rules hardening-wrapper-2.8+nmu2/debian/rules
--- hardening-wrapper-2.8+nmu1/debian/rules	2015-12-13 22:12:52.000000000 +0100
+++ hardening-wrapper-2.8+nmu2/debian/rules	2015-12-14 10:08:43.000000000 +0100
@@ -4,7 +4,7 @@
 # that only hardening-wrapper's flags will be used for testing.
 export DEB_BUILD_MAINT_OPTIONS=hardening=-all
 
-export DHGT := $(subst i386,i686,$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
+export DHGT := $(subst i586,i686,$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
 
 %:
 	dh $@
@@ -12,7 +12,7 @@
 override_dh_install:
 	env
 	for f in debian/*.in; do \
-	  sed 's/@DHGT@/$(DEB_HOST_GNU_TYPE)/g' $$f > $${f%*.in}; \
+	  sed 's/@DHGT@/$(DHGT)/g' $$f > $${f%*.in}; \
 	done
 	dh_install
 

Reply via email to