diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
| commit | 3f71901f8c228f4de570abed1831ce3ee425343e (patch) | |
| tree | a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /sys-apps/keyutils/files | |
| parent | 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff) | |
gentoo resync 08.09.2018
Diffstat (limited to 'sys-apps/keyutils/files')
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch | 20 | ||||
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch new file mode 100644 index 000000000000..99cf23fbb21f --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.10-endian-check-1.patch @@ -0,0 +1,20 @@ +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. + +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -13,10 +13,10 @@ + echo === $OUTPUTFILE === + + endian=`file -L /proc/$$/exe` +-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\|shared object\).*' >&/dev/null ++elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null + then + endian=LE + else diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch new file mode 100644 index 000000000000..dafd7de8dd91 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch @@ -0,0 +1,20 @@ +Hide + +> grep: /etc/rpm: No such file or directory +> grep: /usr/lib/rpm: No such file or directory + +errors. + +Bug: https://bugs.gentoo.org/656446 + +--- a/Makefile ++++ b/Makefile +@@ -245,7 +245,7 @@ SRCBALL := rpmbuild/SOURCES/$(TARBALL) + ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) + + BUILDID := .local +-dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm)) ++dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null)) + release := $(word 2,$(shell grep ^Release: $(SPECFILE))) + release := $(subst %{?dist},$(dist),$(release)) + release := $(subst %{?buildid},$(BUILDID),$(release)) |