diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-01 20:22:33 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-01 20:22:33 +0000 |
| commit | 5b7c114c09d07eecd00e6f7fb829563aae3597b9 (patch) | |
| tree | db84e97d92f22634a22ce461f4ca00a294a21b24 /sys-apps/keyutils/files | |
| parent | ad1d34add08caaf8d68c79e40f0a61c733fd68b8 (diff) | |
gentoo auto-resync : 01:01:2023 - 20:22:32
Diffstat (limited to 'sys-apps/keyutils/files')
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch | 32 | ||||
| -rw-r--r-- | sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch | 20 |
2 files changed, 0 insertions, 52 deletions
diff --git a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch b/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch deleted file mode 100644 index e783ec699c34..000000000000 --- a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Fri, 16 Nov 2018 12:37:29 +0100 -Subject: [PATCH] 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. ---- - tests/toolbox.inc.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh -index 0ce6db0..712c5bd 100644 ---- 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 --- -2.19.1 - diff --git a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch deleted file mode 100644 index f68d7d111a0c..000000000000 --- a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 - ---- keyutils-1.6.1/Makefile -+++ keyutils-1.6.1/Makefile -@@ -267,7 +267,7 @@ - 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)) - release3:= $(word 2,$(shell grep ^Release: $(SPECFILE))) - release2:= $(subst %{?dist},$(dist),$(release3)) - release1:= $(subst %{?buildid},$(BUILDID),$(release2)) |