1 |
commit: 8432d9eb9a7a6521ccc92d33b830a942452607ce |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sun Jan 1 13:40:18 2023 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 18:16:14 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8432d9eb |
7 |
|
8 |
sys-apps/keyutils: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/28920 |
12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
13 |
|
14 |
.../files/keyutils-1.6-endian-check-1.patch | 32 ---------------------- |
15 |
.../files/keyutils-1.6.1-silence-rpm-check.patch | 20 -------------- |
16 |
2 files changed, 52 deletions(-) |
17 |
|
18 |
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 |
19 |
deleted file mode 100644 |
20 |
index e783ec699c34..000000000000 |
21 |
--- a/sys-apps/keyutils/files/keyutils-1.6-endian-check-1.patch |
22 |
+++ /dev/null |
23 |
@@ -1,32 +0,0 @@ |
24 |
-From 0a99778774df85448aeda0a37b85c43bc8868a9e Mon Sep 17 00:00:00 2001 |
25 |
-From: Lars Wendler <polynomial-c@g.o> |
26 |
-Date: Fri, 16 Nov 2018 12:37:29 +0100 |
27 |
-Subject: [PATCH] fix regexp match against `file /proc/$$/exe` for -fPIE bash |
28 |
- |
29 |
-Now that bash is built with PIE enabled, keyutils' check for endianness |
30 |
-fails because file no longer returns "executable", but instead returns |
31 |
-"shared object" for file << 5.33 and "pie executable" for file >= 5.33. |
32 |
---- |
33 |
- tests/toolbox.inc.sh | 4 ++-- |
34 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
35 |
- |
36 |
-diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh |
37 |
-index 0ce6db0..712c5bd 100644 |
38 |
---- a/tests/toolbox.inc.sh |
39 |
-+++ b/tests/toolbox.inc.sh |
40 |
-@@ -13,10 +13,10 @@ |
41 |
- echo === $OUTPUTFILE === |
42 |
- |
43 |
- endian=`file -L /proc/$$/exe` |
44 |
--if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null |
45 |
-+if expr "$endian" : '.* MSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null |
46 |
- then |
47 |
- endian=BE |
48 |
--elif expr "$endian" : '.* LSB \+\(executable\|shared object\).*' >&/dev/null |
49 |
-+elif expr "$endian" : '.* LSB \+\(executable\|shared object\|pie executable\).*' >&/dev/null |
50 |
- then |
51 |
- endian=LE |
52 |
- else |
53 |
--- |
54 |
-2.19.1 |
55 |
- |
56 |
|
57 |
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 |
58 |
deleted file mode 100644 |
59 |
index f68d7d111a0c..000000000000 |
60 |
--- a/sys-apps/keyutils/files/keyutils-1.6.1-silence-rpm-check.patch |
61 |
+++ /dev/null |
62 |
@@ -1,20 +0,0 @@ |
63 |
-Hide |
64 |
- |
65 |
-> grep: /etc/rpm: No such file or directory |
66 |
-> grep: /usr/lib/rpm: No such file or directory |
67 |
- |
68 |
-errors. |
69 |
- |
70 |
-Bug: https://bugs.gentoo.org/656446 |
71 |
- |
72 |
---- keyutils-1.6.1/Makefile |
73 |
-+++ keyutils-1.6.1/Makefile |
74 |
-@@ -267,7 +267,7 @@ |
75 |
- ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL) |
76 |
- |
77 |
- BUILDID := .local |
78 |
--dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm)) |
79 |
-+dist := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null)) |
80 |
- release3:= $(word 2,$(shell grep ^Release: $(SPECFILE))) |
81 |
- release2:= $(subst %{?dist},$(dist),$(release3)) |
82 |
- release1:= $(subst %{?buildid},$(BUILDID),$(release2)) |