commit:     1e188b6c8248035454631203353b4bcf4e8a5f23
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan  1 13:39:34 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 18:16:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e188b6c

sys-apps/file: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28921
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../file/files/file-5.39-portage-sandbox.patch     | 17 -----------------
 .../files/file-5.40-seccomp-fstatat64-musl.patch   | 22 ----------------------
 2 files changed, 39 deletions(-)

diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch 
b/sys-apps/file/files/file-5.39-portage-sandbox.patch
deleted file mode 100644
index 1880f6223c06..000000000000
--- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001
-From: tka <t...@kamph.org>
-Date: Wed, 24 Jun 2020 11:18:45 +0200
-Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
-
-Bug: https://bugs.gentoo.org/728978
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -229,6 +229,8 @@ enable_sandbox_full(void)
-       ALLOW_RULE(write);
-       ALLOW_RULE(writev);
- 
-+      // needed by Gentoo's portage sandbox
-+      ALLOW_RULE(getcwd);
- 
- #if 0
-       // needed by valgrind

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
deleted file mode 100644
index 28a278e73f07..000000000000
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <flop...@gentoo.org>
-Date: Tue, 15 Jun 2021 16:08:22 -0400
-Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
-
-sys/stat.h in musl does this:
-
-  #define fstatat64 fstatat
-
-Counteract this with an #undef.
-
-Bug: https://bugs.gentoo.org/789336
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -179,6 +179,7 @@ enable_sandbox_full(void)
-       ALLOW_RULE(fstat);
-       ALLOW_RULE(fstat64);
- #ifdef __NR_fstatat64
-+#undef fstatat64
-       ALLOW_RULE(fstatat64);
- #endif
-       ALLOW_RULE(futex);

Reply via email to