Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/
Date: Sun, 01 Jan 2023 18:16:38
Message-Id: 1672596973.1e188b6c8248035454631203353b4bcf4e8a5f23.conikost@gentoo
1 commit: 1e188b6c8248035454631203353b4bcf4e8a5f23
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jan 1 13:39:34 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 18:16:13 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e188b6c
7
8 sys-apps/file: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/28921
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../file/files/file-5.39-portage-sandbox.patch | 17 -----------------
15 .../files/file-5.40-seccomp-fstatat64-musl.patch | 22 ----------------------
16 2 files changed, 39 deletions(-)
17
18 diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch
19 deleted file mode 100644
20 index 1880f6223c06..000000000000
21 --- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
22 +++ /dev/null
23 @@ -1,17 +0,0 @@
24 -From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001
25 -From: tka <tka@×××××.org>
26 -Date: Wed, 24 Jun 2020 11:18:45 +0200
27 -Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
28 -
29 -Bug: https://bugs.gentoo.org/728978
30 ---- a/src/seccomp.c
31 -+++ b/src/seccomp.c
32 -@@ -229,6 +229,8 @@ enable_sandbox_full(void)
33 - ALLOW_RULE(write);
34 - ALLOW_RULE(writev);
35 -
36 -+ // needed by Gentoo's portage sandbox
37 -+ ALLOW_RULE(getcwd);
38 -
39 - #if 0
40 - // needed by valgrind
41
42 diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
43 deleted file mode 100644
44 index 28a278e73f07..000000000000
45 --- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
46 +++ /dev/null
47 @@ -1,22 +0,0 @@
48 -From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
49 -From: Mike Gilbert <floppym@g.o>
50 -Date: Tue, 15 Jun 2021 16:08:22 -0400
51 -Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
52 -
53 -sys/stat.h in musl does this:
54 -
55 - #define fstatat64 fstatat
56 -
57 -Counteract this with an #undef.
58 -
59 -Bug: https://bugs.gentoo.org/789336
60 ---- a/src/seccomp.c
61 -+++ b/src/seccomp.c
62 -@@ -179,6 +179,7 @@ enable_sandbox_full(void)
63 - ALLOW_RULE(fstat);
64 - ALLOW_RULE(fstat64);
65 - #ifdef __NR_fstatat64
66 -+#undef fstatat64
67 - ALLOW_RULE(fstatat64);
68 - #endif
69 - ALLOW_RULE(futex);