[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/

[Conrad Kostecki]

commit:     2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jan 17 20:56:56 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 23:02:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1baa98

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 <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../file/files/file-5.40-revert-char-count.patch   | 49 ----------------------
 .../file/files/file-5.40-seccomp-faccessat.patch   | 34 ---------------
 .../file/files/file-5.40-seccomp-fstatat64.patch   | 29 -------------
 sys-apps/file/files/file-5.40-xz_magic.patch       | 37 ----------------
 4 files changed, 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/

[Sam James]

commit:     0c0ecc2a92bf36517163678454555fc825c28ae9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 02:32:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 02:32:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0ecc2a

sys-apps/file: scrub patches

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../file/files/file-5.39-portage-sandbox.patch     |  9 --------
 .../files/file-5.40-seccomp-fstatat64-musl.patch   |  9 --------
 sys-apps/file/files/file-5.42-unicode-fixes.patch  | 24 ----------------------
 3 files changed, 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");

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/

[Conrad Kostecki]

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 <tka@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 <floppym@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);