Control: tags -1 pending Hi,
I've uploaded the attached debdiff which fixes this bug. While I was preparing the upload, I also migrated the git repository from alioth to salsa. James
diff -Nru keyutils-1.5.9/debian/changelog keyutils-1.5.9/debian/changelog --- keyutils-1.5.9/debian/changelog 2017-11-16 12:19:11.000000000 +0000 +++ keyutils-1.5.9/debian/changelog 2018-07-16 09:53:06.000000000 +0100 @@ -1,3 +1,12 @@ +keyutils (1.5.9-9.3) unstable; urgency=medium + + * Non-maintainer upload. + * d/control: Migrate Vcs repository to salsa.d.o. + * d/patches: Add endianness-and-PIE.patch to fix FTBFS. + Thanks to Steve Langasek and Adam Conrad (Closes: #895463) + + -- James Cowgill <jcowg...@debian.org> Mon, 16 Jul 2018 09:53:06 +0100 + keyutils (1.5.9-9.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru keyutils-1.5.9/debian/control keyutils-1.5.9/debian/control --- keyutils-1.5.9/debian/control 2017-09-28 13:12:55.000000000 +0100 +++ keyutils-1.5.9/debian/control 2018-07-16 09:52:48.000000000 +0100 @@ -7,8 +7,8 @@ lsb-release, Standards-Version: 3.9.8 Homepage: http://people.redhat.com/~dhowells/keyutils/ -Vcs-Git: https://anonscm.debian.org/git/collab-maint/keyutils.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/keyutils.git +Vcs-Git: https://salsa.debian.org/debian/keyutils.git +Vcs-Browser: https://salsa.debian.org/debian/keyutils Package: keyutils Architecture: linux-any diff -Nru keyutils-1.5.9/debian/patches/endianness-and-PIE.patch keyutils-1.5.9/debian/patches/endianness-and-PIE.patch --- keyutils-1.5.9/debian/patches/endianness-and-PIE.patch 1970-01-01 01:00:00.000000000 +0100 +++ keyutils-1.5.9/debian/patches/endianness-and-PIE.patch 2018-07-16 09:51:51.000000000 +0100 @@ -0,0 +1,23 @@ +Description: fix regexp match against `file /proc/$$/exe` for -fPIE bash + Now that bash is built with PIE enabled, keyutils' check for endianness + fails because file no longer returns "executable", but instead returns + "shared object" for file << 5.33 and "pie executable" for file >= 5.33. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Author: Adam Conrad <adcon...@ubuntu.com> +Last-Modified: 2018-05-07 + +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -19,10 +19,10 @@ includes=${includes%/*}/ + echo === $OUTPUTFILE === + + endian=`file -L /proc/$$/exe` +-if expr "$endian" : '.* MSB executable.*' >&/dev/null ++if expr "$endian" : '.* MSB \(executable\|shared object\|pie executable\).*' >&/dev/null + then + endian=BE +-elif expr "$endian" : '.* LSB executable.*' >&/dev/null ++elif expr "$endian" : '.* LSB \(executable\|shared object\|pie executable\).*' >&/dev/null + then + endian=LE + else diff -Nru keyutils-1.5.9/debian/patches/series keyutils-1.5.9/debian/patches/series --- keyutils-1.5.9/debian/patches/series 2017-09-28 13:12:55.000000000 +0100 +++ keyutils-1.5.9/debian/patches/series 2018-07-16 09:51:51.000000000 +0100 @@ -16,3 +16,4 @@ Make-build-reproducible.patch Drop-tests-requiring-CONFIG_BIG_KEYS.patch Adjust-tests-for-3.18-kernel-change.patch +endianness-and-PIE.patch
signature.asc
Description: OpenPGP digital signature