gentoo resync : 20.03.2022

5 files changed, 0 insertions, 153 deletions

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 638352fe3b73..d17709d21606 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,9 +1,5 @@
 AUX file-5.39-portage-sandbox.patch 604 BLAKE2B d755d85ae85826df5d2beb2d05f570e230af671c23f27bb1e3e811d1f2f710ae3d4f14d271f9dc4da4d1aa4e71070561d1121deaccf8781de72ff9aec059caa3 SHA512 a65368ed9225b0ca6e7341283a20b308c5d5ca38838849d5228be762d4d87de0438084af8f7cd7b6ee1a707125226940490a80cc1eafc2c817fc865a6211c890
-AUX file-5.40-revert-char-count.patch 1241 BLAKE2B 911d67cd51e6fc0a18075aed01ad79d240e4c7c556a58fb484781ba9e7bc4843f30ea008ff921a47434a8905bc04e25f3104f86a9942f80a5241f768a4de7494 SHA512 6341f85315c2f19d3714a0ef6e8cdbe3bdd1c84cbbef8d9c64597c27307c822b367298b63f313ccdebed6f84964c6f7411768ab1b578c1441e6dee4477f56175
-AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb639744f11f2fb094f0870d10071a472dc3e6036cfe6cce4a1570a0876fd6c7c3f8f7f4e1ae39aa46f7cc39ee7e49ea1c9c1b22a SHA512 a475835fac9556ef4a799a5b406acdbbdb7bd09233a5563a386f110355a8e5a4581eed69bcc968df12985f6e910ea7da0deec9f510dd891b633b369afd816ff8
 AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f49cf42420eb13444783301af5f5e380e67da932d298ed94fb64a2a1a50ca349b43d73b77d6495df090d8b3adddc2b236b7fe3a42 SHA512 b25110ca59be28ca67a972c9737315efe357c2bbb8dbae4e6ecf80283bb0e9db4184574bfef2d965087493ede4979f649a762fa9bef2415d2359db117dfdb04f
-AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
-AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
 EBUILD file-5.41.ebuild 3340 BLAKE2B bbb550c4fb782299757a2d8628e0e3ea830e5165055fe2aa78bb84846c868f6427a253ea0c8540b9b681663be20b61958093dfa9ce40d829fcb682c99d33facd SHA512 72d9d212b1d1a1a234612a7361f217e50c4172877fffdd1f60847b4ad691d9ceb8955930f28f61665cffcba06008d7957d11b765725cc2932a019deded25bfb8
 EBUILD file-9999.ebuild 3266 BLAKE2B 967412ca3e0b7dfff1e2104e0d859c5376f3221a8b27b7c270c38f76c02b57bee0b3dac01387f8fc006a19bac875afabfc08eec1773ef419ff33679cf911cbf9 SHA512 2575765252b959a63833187ced7094bda200a5c3fa2cb69f0135e5028fd71358c9c2aae2a685ad27731437e2aebacd23df9766f39d539ad232e92195c3a6b3a2
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