Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/plocate/files/
Date: Sun, 01 Jan 2023 13:59:39
Message-Id: 1672581547.8a7a2361ce115ffa3e2e9200ab13d40959404bcc.flow@gentoo
1 commit: 8a7a2361ce115ffa3e2e9200ab13d40959404bcc
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jan 1 13:41:23 2023 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 13:59:07 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7a2361
7
8 sys-apps/plocate: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/28919
12 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
13
14 ...plocate-1.1.16-error-to-fprintf-exit-musl.patch | 337 ---------------------
15 .../plocate-1.1.16-include-linux-stat_h-musl.patch | 30 --
16 2 files changed, 367 deletions(-)
17
18 diff --git a/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch b/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch
19 deleted file mode 100644
20 index 6d108501307f..000000000000
21 --- a/sys-apps/plocate/files/plocate-1.1.16-error-to-fprintf-exit-musl.patch
22 +++ /dev/null
23 @@ -1,337 +0,0 @@
24 -https://bugs.gentoo.org/829580
25 -https://git.sesse.net/?p=plocate;a=commit;h=fd6198891d6fd9642effc0843fef6f23b991af3e
26 -
27 -From fd6198891d6fd9642effc0843fef6f23b991af3e Mon Sep 17 00:00:00 2001
28 -From: "Steinar H. Gunderson" <steinar+git@×××××××××.no>
29 -Date: Wed, 13 Jul 2022 22:31:54 +0200
30 -Subject: [PATCH 2/2] Remove dependency on non-POSIX header error.h.
31 -
32 -This helps compatibility with certain configurations of musl libc.
33 -Note that the output format on updatedb.conf errors will change somewhat,
34 -and only the first one will be reported followed by immediate exit
35 -(unlike earlier, where all updatedb.conf errors would be output before exit).
36 -
37 -Based on a patch by Alfred Persson Forsberg.
38 ----
39 - conf.cpp | 178 +++++++++++++++++++++++++++++--------------------------
40 - 1 file changed, 94 insertions(+), 84 deletions(-)
41 -
42 -diff --git a/conf.cpp b/conf.cpp
43 -index 1055fd7..60dd93f 100644
44 ---- a/conf.cpp
45 -+++ b/conf.cpp
46 -@@ -22,7 +22,6 @@ any later version.
47 -
48 - #include "conf.h"
49 -
50 --#include "error.h"
51 - #include "lib.h"
52 -
53 - #include <algorithm>
54 -@@ -167,11 +166,6 @@ uc_lex(void)
55 - /* Fall through */
56 - case '\n':
57 - uc_current_line++;
58 -- if (uc_current_line == 0) {
59 -- error_at_line(0, 0, UPDATEDB_CONF, uc_current_line - 1,
60 -- _("warning: Line number overflow"));
61 -- error_message_count--; /* Don't count as an error */
62 -- }
63 - return UCT_EOL;
64 -
65 - case '=':
66 -@@ -180,10 +174,9 @@ uc_lex(void)
67 - case '"': {
68 - while ((c = getc_unlocked(uc_file)) != '"') {
69 - if (c == EOF || c == '\n') {
70 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
71 -- _("missing closing `\"'"));
72 -- ungetc(c, uc_file);
73 -- break;
74 -+ fprintf(stderr, "%s:%u: missing closing `\"'\n",
75 -+ UPDATEDB_CONF, uc_line);
76 -+ exit(EXIT_FAILURE);
77 - }
78 - uc_lex_buf.push_back(c);
79 - }
80 -@@ -215,21 +208,18 @@ uc_lex(void)
81 - static void
82 - parse_updatedb_conf(void)
83 - {
84 -- int old_error_one_per_line;
85 -- unsigned old_error_message_count;
86 - bool had_prune_bind_mounts, had_prunefs, had_prunenames, had_prunepaths;
87 -
88 - uc_file = fopen(UPDATEDB_CONF, "r");
89 - if (uc_file == NULL) {
90 -- if (errno != ENOENT)
91 -- error(EXIT_FAILURE, errno, _("can not open `%s'"), UPDATEDB_CONF);
92 -- goto err;
93 -+ if (errno != ENOENT) {
94 -+ perror(UPDATEDB_CONF);
95 -+ exit(EXIT_FAILURE);
96 -+ }
97 -+ return;
98 - }
99 - flockfile(uc_file);
100 - uc_current_line = 1;
101 -- old_error_message_count = error_message_count;
102 -- old_error_one_per_line = error_one_per_line;
103 -- error_one_per_line = 1;
104 - had_prune_bind_mounts = false;
105 - had_prunefs = false;
106 - had_prunenames = false;
107 -@@ -263,40 +253,39 @@ parse_updatedb_conf(void)
108 - break;
109 -
110 - case UCT_IDENTIFIER:
111 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
112 -- _("unknown variable `%s'"), uc_lex_buf.c_str());
113 -- goto skip_to_eol;
114 -+ fprintf(stderr, "%s:%u: unknown variable: `%s'\n",
115 -+ UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
116 -+ exit(EXIT_FAILURE);
117 -
118 - default:
119 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
120 -- _("variable name expected"));
121 -- goto skip_to_eol;
122 -+ fprintf(stderr, "%s:%u: variable name expected\n",
123 -+ UPDATEDB_CONF, uc_line);
124 -+ exit(EXIT_FAILURE);
125 - }
126 - if (*had_var != false) {
127 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
128 -- _("variable `%s' was already defined"), uc_lex_buf.c_str());
129 -- goto skip_to_eol;
130 -+ fprintf(stderr, "%s:%u: variable `%s' was already defined\n",
131 -+ UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
132 -+ exit(EXIT_FAILURE);
133 - }
134 - *had_var = true;
135 - var_token = token;
136 - token = uc_lex();
137 - if (token != UCT_EQUAL) {
138 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
139 -- _("`=' expected after variable name"));
140 -- goto skip_to_eol;
141 -+ fprintf(stderr, "%s:%u: `=' expected after variable name\n",
142 -+ UPDATEDB_CONF, uc_line);
143 -+ exit(EXIT_FAILURE);
144 - }
145 - token = uc_lex();
146 - if (token != UCT_QUOTED) {
147 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
148 -- _("value in quotes expected after `='"));
149 -- goto skip_to_eol;
150 -+ fprintf(stderr, "%s:%u: value in quotes expected after `='\n",
151 -+ UPDATEDB_CONF, uc_line);
152 -+ exit(EXIT_FAILURE);
153 - }
154 - if (var_token == UCT_PRUNE_BIND_MOUNTS) {
155 - if (parse_bool(&conf_prune_bind_mounts, uc_lex_buf.c_str()) != 0) {
156 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
157 -- _("invalid value `%s' of PRUNE_BIND_MOUNTS"),
158 -- uc_lex_buf.c_str());
159 -- goto skip_to_eol;
160 -+ fprintf(stderr, "%s:%u: invalid value `%s' of PRUNE_BIND_MOUNTS\n",
161 -+ UPDATEDB_CONF, uc_line, uc_lex_buf.c_str());
162 -+ exit(EXIT_FAILURE);
163 - }
164 - } else if (var_token == UCT_PRUNEFS)
165 - var_add_values(&conf_prunefs, uc_lex_buf.c_str());
166 -@@ -308,12 +297,11 @@ parse_updatedb_conf(void)
167 - abort();
168 - token = uc_lex();
169 - if (token != UCT_EOL && token != UCT_EOF) {
170 -- error_at_line(0, 0, UPDATEDB_CONF, uc_line,
171 -- _("unexpected data after variable value"));
172 -- goto skip_to_eol;
173 -+ fprintf(stderr, "%s:%u: unexpected data after variable value\n",
174 -+ UPDATEDB_CONF, uc_line);
175 -+ exit(EXIT_FAILURE);
176 - }
177 - /* Fall through */
178 -- skip_to_eol:
179 - while (token != UCT_EOL) {
180 - if (token == UCT_EOF)
181 - goto eof;
182 -@@ -321,14 +309,12 @@ parse_updatedb_conf(void)
183 - }
184 - }
185 - eof:
186 -- if (ferror(uc_file))
187 -- error(EXIT_FAILURE, 0, _("I/O error reading `%s'"), UPDATEDB_CONF);
188 -- error_one_per_line = old_error_one_per_line;
189 -+ if (ferror(uc_file)) {
190 -+ perror(UPDATEDB_CONF);
191 -+ exit(EXIT_FAILURE);
192 -+ }
193 - funlockfile(uc_file);
194 - fclose(uc_file);
195 -- if (error_message_count != old_error_message_count)
196 -- exit(EXIT_FAILURE);
197 --err:;
198 - }
199 -
200 - /* Command-line argument parsing */
201 -@@ -384,8 +370,11 @@ prepend_cwd(const string &path)
202 - do
203 - buf.resize(buf.size() * 1.5);
204 - while ((res = getcwd(buf.data(), buf.size())) == NULL && errno == ERANGE);
205 -- if (res == NULL)
206 -- error(EXIT_FAILURE, errno, _("can not get current working directory"));
207 -+ if (res == NULL) {
208 -+ fprintf(stderr, "%s: %s: can not get current working directory\n",
209 -+ program_invocation_name, strerror(errno));
210 -+ exit(EXIT_FAILURE);
211 -+ }
212 - buf.resize(strlen(buf.data()));
213 - return buf + '/' + path;
214 - }
215 -@@ -438,54 +427,64 @@ parse_arguments(int argc, char *argv[])
216 - exit(EXIT_FAILURE);
217 -
218 - case 'B':
219 -- if (got_prune_bind_mounts != false)
220 -- error(EXIT_FAILURE, 0,
221 -- _("--%s would override earlier command-line argument"),
222 -- "prune-bind-mounts");
223 -+ if (got_prune_bind_mounts != false) {
224 -+ fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
225 -+ program_invocation_name, "prune-bind-mounts");
226 -+ exit(EXIT_FAILURE);
227 -+ }
228 - got_prune_bind_mounts = true;
229 -- if (parse_bool(&conf_prune_bind_mounts, optarg) != 0)
230 -- error(EXIT_FAILURE, 0, _("invalid value `%s' of --%s"), optarg,
231 -- "prune-bind-mounts");
232 -+ if (parse_bool(&conf_prune_bind_mounts, optarg) != 0) {
233 -+ fprintf(stderr, "%s: invalid value %s of --%s\n",
234 -+ program_invocation_name, optarg, "prune-bind-mounts");
235 -+ exit(EXIT_FAILURE);
236 -+ }
237 - break;
238 -
239 - case 'F':
240 -- if (prunefs_changed != false)
241 -- error(EXIT_FAILURE, 0,
242 -- _("--%s would override earlier command-line argument"),
243 -- "prunefs");
244 -+ if (prunefs_changed != false) {
245 -+ fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
246 -+ program_invocation_name, "prunefs");
247 -+ exit(EXIT_FAILURE);
248 -+ }
249 - prunefs_changed = true;
250 - conf_prunefs.clear();
251 - var_add_values(&conf_prunefs, optarg);
252 - break;
253 -
254 - case 'N':
255 -- if (prunenames_changed != false)
256 -- error(EXIT_FAILURE, 0,
257 -- _("--%s would override earlier command-line argument"),
258 -- "prunenames");
259 -+ if (prunenames_changed != false) {
260 -+ fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
261 -+ program_invocation_name, "prunenames");
262 -+ exit(EXIT_FAILURE);
263 -+ }
264 - prunenames_changed = true;
265 - conf_prunenames.clear();
266 - var_add_values(&conf_prunenames, optarg);
267 - break;
268 -
269 - case 'P':
270 -- if (prunepaths_changed != false)
271 -- error(EXIT_FAILURE, 0,
272 -- _("--%s would override earlier command-line argument"),
273 -- "prunepaths");
274 -+ if (prunepaths_changed != false) {
275 -+ fprintf(stderr, "%s: --%s would override earlier command-line argument\n",
276 -+ program_invocation_name, "prunepaths");
277 -+ exit(EXIT_FAILURE);
278 -+ }
279 - prunepaths_changed = true;
280 - conf_prunepaths.clear();
281 - var_add_values(&conf_prunepaths, optarg);
282 - break;
283 -
284 - case 'U':
285 -- if (conf_scan_root != NULL)
286 -- error(EXIT_FAILURE, 0, _("--%s specified twice"),
287 -- "database-root");
288 -+ if (conf_scan_root != NULL) {
289 -+ fprintf(stderr, "%s: --%s specified twice\n",
290 -+ program_invocation_name, "database-root");
291 -+ exit(EXIT_FAILURE);
292 -+ }
293 - conf_scan_root = realpath(optarg, nullptr);
294 -- if (conf_scan_root == NULL)
295 -- error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg,
296 -- "database-root");
297 -+ if (conf_scan_root == NULL) {
298 -+ fprintf(stderr, "%s: %s: invalid value `%s' of --%s\n",
299 -+ program_invocation_name, strerror(errno), optarg, "database-root");
300 -+ exit(EXIT_FAILURE);
301 -+ }
302 - break;
303 -
304 - case 'V':
305 -@@ -517,13 +516,18 @@ parse_arguments(int argc, char *argv[])
306 - exit(EXIT_SUCCESS);
307 -
308 - case 'l':
309 -- if (got_visibility != false)
310 -- error(EXIT_FAILURE, 0, _("--%s specified twice"),
311 -- "require-visibility");
312 -+ if (got_visibility != false) {
313 -+ fprintf(stderr, "%s: --%s specified twice\n",
314 -+ program_invocation_name, "require-visibility");
315 -+ exit(EXIT_FAILURE);
316 -+ }
317 -+
318 - got_visibility = true;
319 -- if (parse_bool(&conf_check_visibility, optarg) != 0)
320 -- error(EXIT_FAILURE, 0, _("invalid value `%s' of --%s"), optarg,
321 -- "require-visibility");
322 -+ if (parse_bool(&conf_check_visibility, optarg) != 0) {
323 -+ fprintf(stderr, "%s: invalid value `%s' of --%s",
324 -+ program_invocation_name, optarg, "require-visibility");
325 -+ exit(EXIT_FAILURE);
326 -+ }
327 - break;
328 -
329 - case 'n':
330 -@@ -532,8 +536,11 @@ parse_arguments(int argc, char *argv[])
331 - break;
332 -
333 - case 'o':
334 -- if (!conf_output.empty())
335 -- error(EXIT_FAILURE, 0, _("--%s specified twice"), "output");
336 -+ if (!conf_output.empty()) {
337 -+ fprintf(stderr, "%s: --%s specified twice",
338 -+ program_invocation_name, "output");
339 -+ exit(EXIT_FAILURE);
340 -+ }
341 - conf_output = optarg;
342 - break;
343 -
344 -@@ -558,8 +565,11 @@ parse_arguments(int argc, char *argv[])
345 - }
346 - }
347 - options_done:
348 -- if (optind != argc)
349 -- error(EXIT_FAILURE, 0, _("unexpected operand on command line"));
350 -+ if (optind != argc) {
351 -+ fprintf(stderr, "%s: unexpected operand on command line",
352 -+ program_invocation_name);
353 -+ exit(EXIT_FAILURE);
354 -+ }
355 - if (conf_scan_root == NULL) {
356 - static char root[] = "/";
357 -
358 ---
359 -2.35.1
360 -
361
362 diff --git a/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch b/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch
363 deleted file mode 100644
364 index a4b9fe4d1bc6..000000000000
365 --- a/sys-apps/plocate/files/plocate-1.1.16-include-linux-stat_h-musl.patch
366 +++ /dev/null
367 @@ -1,30 +0,0 @@
368 -https://git.sesse.net/?p=plocate;a=commit;h=0125004cd28c5f9124632b594e51dde73af1691c
369 -https://git.alpinelinux.org/aports/tree/community/plocate/include-statx.patch
370 -https://bugs.gentoo.org/853769
371 -
372 -From 0125004cd28c5f9124632b594e51dde73af1691c Mon Sep 17 00:00:00 2001
373 -From: "Steinar H. Gunderson" <steinar+git@×××××××××.no>
374 -Date: Sat, 25 Jun 2022 10:01:49 +0200
375 -Subject: [PATCH 1/2] Add a missing #include.
376 -
377 -Taken from the Alpine Linux packaging; seems to be for statx()
378 -(presumably on musl libc).
379 ----
380 - io_uring_engine.h | 1 +
381 - 1 file changed, 1 insertion(+)
382 -
383 -diff --git a/io_uring_engine.h b/io_uring_engine.h
384 -index 688a6ae..bcb1058 100644
385 ---- a/io_uring_engine.h
386 -+++ b/io_uring_engine.h
387 -@@ -7,6 +7,7 @@
388 - #include <string_view>
389 - #include <sys/socket.h>
390 - #include <sys/types.h>
391 -+#include <linux/stat.h>
392 -
393 - struct io_uring_sqe;
394 - #ifndef WITHOUT_URING
395 ---
396 -2.35.1
397 -
Report Message
Find on MARC Find on Google Groups