summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-08-16 03:32:13 +0100
committerSam James <sam@gentoo.org>2022-08-16 03:32:18 +0100
commit0c0ecc2a92bf36517163678454555fc825c28ae9 (patch)
tree8906382e5c0e7f64615aa601709146a31dc3c4d8 /sys-apps/file/files
parentsys-apps/file: backport unicode handling fixes to 5.42 (diff)
downloadgentoo-0c0ecc2a92bf36517163678454555fc825c28ae9.tar.gz
gentoo-0c0ecc2a92bf36517163678454555fc825c28ae9.tar.bz2
gentoo-0c0ecc2a92bf36517163678454555fc825c28ae9.zip
sys-apps/file: scrub patches
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/file/files')
-rw-r--r--sys-apps/file/files/file-5.39-portage-sandbox.patch9
-rw-r--r--sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch9
-rw-r--r--sys-apps/file/files/file-5.42-unicode-fixes.patch24
3 files changed, 0 insertions, 42 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
index 3ea26641671f..1880f6223c06 100644
--- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
+++ b/sys-apps/file/files/file-5.39-portage-sandbox.patch
@@ -4,12 +4,6 @@ Date: Wed, 24 Jun 2020 11:18:45 +0200
Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
Bug: https://bugs.gentoo.org/728978
----
- src/seccomp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index db9364ae..7f5d6f26 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -229,6 +229,8 @@ enable_sandbox_full(void)
@@ -21,6 +15,3 @@ index db9364ae..7f5d6f26 100644
#if 0
// needed by valgrind
---
-2.28.0
-
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
index 4cc648017860..28a278e73f07 100644
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
@@ -10,12 +10,6 @@ sys/stat.h in musl does this:
Counteract this with an #undef.
Bug: https://bugs.gentoo.org/789336
----
- src/seccomp.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 3318367c..eb8b1e57 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -179,6 +179,7 @@ enable_sandbox_full(void)
@@ -26,6 +20,3 @@ index 3318367c..eb8b1e57 100644
ALLOW_RULE(fstatat64);
#endif
ALLOW_RULE(futex);
---
-2.32.0
-
diff --git a/sys-apps/file/files/file-5.42-unicode-fixes.patch b/sys-apps/file/files/file-5.42-unicode-fixes.patch
index 91c46a358120..cc6ee7196b49 100644
--- a/sys-apps/file/files/file-5.42-unicode-fixes.patch
+++ b/sys-apps/file/files/file-5.42-unicode-fixes.patch
@@ -11,12 +11,6 @@ From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 4 Jul 2022 17:00:51 +0000
Subject: [PATCH] PR/358: Fix width for -f - (jpalus)
----
- src/file.c | 46 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 31 insertions(+), 18 deletions(-)
-
-diff --git a/src/file.c b/src/file.c
-index 5300e5af8..bb058ce1e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn)
@@ -262,12 +256,6 @@ Date: Mon, 4 Jul 2022 20:16:29 +0000
Subject: [PATCH] Handle invalid characters as octal (idea from PR/363 by
dimich)
----
- src/file.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/src/file.c b/src/file.c
-index 5e89137d7..af9be0f0c 100644
--- a/src/file.c
+++ b/src/file.c
@@ -580,8 +580,11 @@ fname_print(const char *inname)
@@ -307,12 +295,6 @@ Date: Mon, 4 Jul 2022 22:30:51 +0000
Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to
initialize the state.
----
- src/file.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/file.c b/src/file.c
-index af9be0f0c..8b4f14c2e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -575,14 +575,14 @@ fname_print(const char *inname)
@@ -395,12 +377,6 @@ From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 26 Jul 2022 15:10:05 +0000
Subject: [PATCH] Fix bug with large flist (Florian Weimer)
----
- src/file.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/file.c b/src/file.c
-index e169c08fc..c0b8aa197 100644
--- a/src/file.c
+++ b/src/file.c
@@ -535,6 +535,7 @@ out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list");