Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/
Date: Tue, 16 Aug 2022 02:32:56
Message-Id: 1660617138.0c0ecc2a92bf36517163678454555fc825c28ae9.sam@gentoo
1 commit: 0c0ecc2a92bf36517163678454555fc825c28ae9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 16 02:32:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 16 02:32:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0ecc2a
7
8 sys-apps/file: scrub patches
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../file/files/file-5.39-portage-sandbox.patch | 9 --------
13 .../files/file-5.40-seccomp-fstatat64-musl.patch | 9 --------
14 sys-apps/file/files/file-5.42-unicode-fixes.patch | 24 ----------------------
15 3 files changed, 42 deletions(-)
16
17 diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch
18 index 3ea26641671f..1880f6223c06 100644
19 --- a/sys-apps/file/files/file-5.39-portage-sandbox.patch
20 +++ b/sys-apps/file/files/file-5.39-portage-sandbox.patch
21 @@ -4,12 +4,6 @@ Date: Wed, 24 Jun 2020 11:18:45 +0200
22 Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
23
24 Bug: https://bugs.gentoo.org/728978
25 ----
26 - src/seccomp.c | 2 ++
27 - 1 file changed, 2 insertions(+)
28 -
29 -diff --git a/src/seccomp.c b/src/seccomp.c
30 -index db9364ae..7f5d6f26 100644
31 --- a/src/seccomp.c
32 +++ b/src/seccomp.c
33 @@ -229,6 +229,8 @@ enable_sandbox_full(void)
34 @@ -21,6 +15,3 @@ index db9364ae..7f5d6f26 100644
35
36 #if 0
37 // needed by valgrind
38 ---
39 -2.28.0
40 -
41
42 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
43 index 4cc648017860..28a278e73f07 100644
44 --- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
45 +++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
46 @@ -10,12 +10,6 @@ sys/stat.h in musl does this:
47 Counteract this with an #undef.
48
49 Bug: https://bugs.gentoo.org/789336
50 ----
51 - src/seccomp.c | 1 +
52 - 1 file changed, 1 insertion(+)
53 -
54 -diff --git a/src/seccomp.c b/src/seccomp.c
55 -index 3318367c..eb8b1e57 100644
56 --- a/src/seccomp.c
57 +++ b/src/seccomp.c
58 @@ -179,6 +179,7 @@ enable_sandbox_full(void)
59 @@ -26,6 +20,3 @@ index 3318367c..eb8b1e57 100644
60 ALLOW_RULE(fstatat64);
61 #endif
62 ALLOW_RULE(futex);
63 ---
64 -2.32.0
65 -
66
67 diff --git a/sys-apps/file/files/file-5.42-unicode-fixes.patch b/sys-apps/file/files/file-5.42-unicode-fixes.patch
68 index 91c46a358120..cc6ee7196b49 100644
69 --- a/sys-apps/file/files/file-5.42-unicode-fixes.patch
70 +++ b/sys-apps/file/files/file-5.42-unicode-fixes.patch
71 @@ -11,12 +11,6 @@ From: Christos Zoulas <christos@××××××.com>
72 Date: Mon, 4 Jul 2022 17:00:51 +0000
73 Subject: [PATCH] PR/358: Fix width for -f - (jpalus)
74
75 ----
76 - src/file.c | 46 +++++++++++++++++++++++++++++-----------------
77 - 2 files changed, 31 insertions(+), 18 deletions(-)
78 -
79 -diff --git a/src/file.c b/src/file.c
80 -index 5300e5af8..bb058ce1e 100644
81 --- a/src/file.c
82 +++ b/src/file.c
83 @@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn)
84 @@ -262,12 +256,6 @@ Date: Mon, 4 Jul 2022 20:16:29 +0000
85 Subject: [PATCH] Handle invalid characters as octal (idea from PR/363 by
86 dimich)
87
88 ----
89 - src/file.c | 16 +++++++++++-----
90 - 1 file changed, 11 insertions(+), 5 deletions(-)
91 -
92 -diff --git a/src/file.c b/src/file.c
93 -index 5e89137d7..af9be0f0c 100644
94 --- a/src/file.c
95 +++ b/src/file.c
96 @@ -580,8 +580,11 @@ fname_print(const char *inname)
97 @@ -307,12 +295,6 @@ Date: Mon, 4 Jul 2022 22:30:51 +0000
98 Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to
99 initialize the state.
100
101 ----
102 - src/file.c | 10 +++++-----
103 - 1 file changed, 5 insertions(+), 5 deletions(-)
104 -
105 -diff --git a/src/file.c b/src/file.c
106 -index af9be0f0c..8b4f14c2e 100644
107 --- a/src/file.c
108 +++ b/src/file.c
109 @@ -575,14 +575,14 @@ fname_print(const char *inname)
110 @@ -395,12 +377,6 @@ From: Christos Zoulas <christos@××××××.com>
111 Date: Tue, 26 Jul 2022 15:10:05 +0000
112 Subject: [PATCH] Fix bug with large flist (Florian Weimer)
113
114 ----
115 - src/file.c | 3 ++-
116 - 1 file changed, 2 insertions(+), 1 deletion(-)
117 -
118 -diff --git a/src/file.c b/src/file.c
119 -index e169c08fc..c0b8aa197 100644
120 --- a/src/file.c
121 +++ b/src/file.c
122 @@ -535,6 +535,7 @@ out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list");