Package: keyutils
Version: 1.5.9-9.2
Followup-For: Bug #895463
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/endianness-and-PIE.patch: Adjust to work with file 5.33.
This is a follow-up to Steve's patch to make it also work with the
newer file, which reports PIE executables as 'pie executable'.
... Adam
-- System Information:
Debian Release: buster/sid
APT prefers cosmic
APT policy: (500, 'cosmic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-20-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
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 2018-04-17
22:21:12.000000000 -0600
+++ keyutils-1.5.9/debian/patches/endianness-and-PIE.patch 2018-05-07
11:43:57.000000000 -0600
@@ -1,9 +1,10 @@
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". Update our regexps to be portable.
+ "shared object" for file << 5.33 and "pie executable" for file >= 5.33.
Author: Steve Langasek <steve.langa...@ubuntu.com>
-Last-Modified: 2018-04-17
+Author: Adam Conrad <adcon...@ubuntu.com>
+Last-Modified: 2018-05-07
Index: keyutils-1.5.9/tests/toolbox.inc.sh
===================================================================
@@ -14,11 +15,11 @@
endian=`file -L /proc/$$/exe`
-if expr "$endian" : '.* MSB executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \(executable\|shared object\).*' >&/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\).*' >&/dev/null
++elif expr "$endian" : '.* LSB \(executable\|shared object\|pie
executable\).*' >&/dev/null
then
endian=LE
else
