summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-01-17 21:56:56 +0100
committerConrad Kostecki <conikost@gentoo.org>2022-02-10 00:02:44 +0100
commit2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776 (patch)
tree469575064307d96042c4afb310f052b208a923b0 /sys-apps/file
parentapp-antivirus/clamav: remove unused patch (diff)
downloadgentoo-2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776.tar.gz
gentoo-2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776.tar.bz2
gentoo-2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776.zip
sys-apps/file: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/23847 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'sys-apps/file')
-rw-r--r--sys-apps/file/files/file-5.40-revert-char-count.patch49
-rw-r--r--sys-apps/file/files/file-5.40-seccomp-faccessat.patch34
-rw-r--r--sys-apps/file/files/file-5.40-seccomp-fstatat64.patch29
-rw-r--r--sys-apps/file/files/file-5.40-xz_magic.patch37
4 files changed, 0 insertions, 149 deletions
diff --git a/sys-apps/file/files/file-5.40-revert-char-count.patch b/sys-apps/file/files/file-5.40-revert-char-count.patch
deleted file mode 100644
index 9d6f5be60fac..000000000000
--- a/sys-apps/file/files/file-5.40-revert-char-count.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c07e242e766242a44ff720c149b1bdd4924ec247 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 27 Apr 2021 19:37:14 +0000
-Subject: [PATCH] Revert the fix for PR/180. It lead to PR/261. Using character
- count heuristics ends up with confusing behavior, the following should not be
- producing different results: echo -n xx | ./file - echo -n xy |
- ./file -
-
----
-[patch backported to 5.40 release -- ulm]
-
- src/encoding.c | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/src/encoding.c b/src/encoding.c
-index 31d4d125..3647a481 100644
---- a/src/encoding.c
-+++ b/src/encoding.c
-@@ -265,9 +265,7 @@ private int \
- looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
- size_t *ulen) \
- { \
-- size_t i, u; \
-- unsigned char dist[256]; \
-- memset(dist, 0, sizeof(dist)); \
-+ size_t i; \
- \
- *ulen = 0; \
- \
-@@ -278,16 +276,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
- return 0; \
- \
- ubuf[(*ulen)++] = buf[i]; \
-- dist[buf[i]]++; \
- } \
-- u = 0; \
-- for (i = 0; i < __arraycount(dist); i++) { \
-- if (dist[i]) \
-- u++; \
-- } \
-- if (u < 3) \
-- return 0; \
--\
- return 1; \
- }
-
---
-2.32.0
-
diff --git a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
deleted file mode 100644
index 4aeb88cfe875..000000000000
--- a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 6 Apr 2021 22:02:17 +0000
-Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall
- to the kernel. Instead it's emulated by glibc with a new faccessat() syscall.
- (Icenowy Zheng)
-
----
- src/seccomp.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 0da907ff7..81842cf5c 100644
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -27,7 +27,7 @@
- #include "file.h"
-
- #ifndef lint
--FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $")
-+FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $")
- #endif /* lint */
-
- #if HAVE_LIBSECCOMP
-@@ -171,6 +171,9 @@ enable_sandbox_full(void)
- ALLOW_RULE(dup2);
- ALLOW_RULE(exit);
- ALLOW_RULE(exit_group);
-+#ifdef __NR_faccessat
-+ ALLOW_RULE(faccessat);
-+#endif
- ALLOW_RULE(fcntl);
- ALLOW_RULE(fcntl64);
- ALLOW_RULE(fstat);
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
deleted file mode 100644
index 57d04e5f40cf..000000000000
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 23 Apr 2021 15:00:42 -0400
-Subject: [PATCH] seccomp: allow fstatat64
-
-This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux.
-
-Bug: https://bugs.gentoo.org/784857
----
- src/seccomp.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 81842cf5..43abc684 100644
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -178,6 +178,9 @@ enable_sandbox_full(void)
- ALLOW_RULE(fcntl64);
- ALLOW_RULE(fstat);
- ALLOW_RULE(fstat64);
-+#ifdef __NR_fstatat64
-+ ALLOW_RULE(fstatat64);
-+#endif
- ALLOW_RULE(futex);
- ALLOW_RULE(getdents);
- #ifdef __NR_getdents64
---
-2.31.1
-
diff --git a/sys-apps/file/files/file-5.40-xz_magic.patch b/sys-apps/file/files/file-5.40-xz_magic.patch
deleted file mode 100644
index e4fed0421f78..000000000000
--- a/sys-apps/file/files/file-5.40-xz_magic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 19 Apr 2021 17:01:45 +0000
-Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
-
----
- magic/Magdir/compress | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/magic/Magdir/compress b/magic/Magdir/compress
-index 64d11a736..41a65738f 100644
---- a/magic/Magdir/compress
-+++ b/magic/Magdir/compress
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
-+# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
- # compress: file(1) magic for pure-compression formats (no archives)
- #
- # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
-@@ -265,14 +265,13 @@
-
- # http://tukaani.org/xz/xz-file-format.txt
- 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
-+!:strength * 2
-+!:mime application/x-xz
- >7 byte&0xf 0x0 NONE
- >7 byte&0xf 0x1 CRC32
- >7 byte&0xf 0x4 CRC64
- >7 byte&0xf 0xa SHA-256
-
--!:strength * 2
--!:mime application/x-xz
--
- # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
- 0 string LRZI LRZIP compressed data
- >4 byte x - version %d