From: tjkirch <tjkirch@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] file: update to 5.43.
Date: Sun, 09 Oct 2022 01:41:31 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39825@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 755 bytes --]
There is a new pull request by tjkirch against master on the void-packages repository
https://github.com/tjkirch/void-packages file-5.43
https://github.com/void-linux/void-packages/pull/39825
file: update to 5.43.
#### Testing the changes
- I tested the changes in this PR: **briefly** - installed the new version and ran `file` on several types of files with the expected results.
#### Local build testing
- I built this PR locally for my native architecture, x86-64 glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l
I confirmed both of the changes in the deleted patch file are in the 5.43 sources.
A patch file from https://github.com/void-linux/void-packages/pull/39825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-5.43-39825.patch --]
[-- Type: text/x-diff, Size: 4217 bytes --]
From 881295330bc4acd164bac0bec97fd804a1c6b064 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <git@halffull.org>
Date: Sat, 8 Oct 2022 16:39:19 -0700
Subject: [PATCH] file: update to 5.43.
---
.../file/patches/fix-files-from-flag.patch | 108 ------------------
srcpkgs/file/template | 6 +-
2 files changed, 3 insertions(+), 111 deletions(-)
delete mode 100644 srcpkgs/file/patches/fix-files-from-flag.patch
diff --git a/srcpkgs/file/patches/fix-files-from-flag.patch b/srcpkgs/file/patches/fix-files-from-flag.patch
deleted file mode 100644
index 574f019672c2..000000000000
--- a/srcpkgs/file/patches/fix-files-from-flag.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 19bf47777d0002ee884467e45e6ace702e40a4c1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 17:00:51 +0000
-Subject: [PATCH] PR/358: Fix width for -f - (jpalus)
-
----
- ChangeLog | 3 ++-
- 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
-@@ -32,7 +32,7 @@
- #include "file.h"
-
- #ifndef lint
--FILE_RCSID("@(#)$File: file.c,v 1.195 2022/06/02 15:45:43 christos Exp $")
-+FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $")
- #endif /* lint */
-
- #include "magic.h"
-@@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn)
- size_t llen = 0;
- int wid = 0, cwid;
- int e = 0;
-+ size_t fi = 0, fimax = 100;
-+ char **flist = malloc(sizeof(*flist) * fimax);
-
-- if (strcmp("-", fn) == 0) {
-+ if (flist == NULL)
-+out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
-+
-+ if (strcmp("-", fn) == 0)
- f = stdin;
-- wid = 1;
-- } else {
-+ else {
- if ((f = fopen(fn, "r")) == NULL) {
- file_warn("Cannot open `%s'", fn);
- return 1;
- }
--
-- while ((len = getline(&line, &llen, f)) > 0) {
-- if (line[len - 1] == '\n')
-- line[len - 1] = '\0';
-- cwid = file_mbswidth(ms, line);
-- if (cwid > wid)
-- wid = cwid;
-- }
--
-- rewind(f);
- }
-
- while ((len = getline(&line, &llen, f)) > 0) {
- if (line[len - 1] == '\n')
- line[len - 1] = '\0';
-- e |= process(ms, line, wid);
-+ if (fi >= fimax) {
-+ fimax += 100;
-+ char **nf = realloc(flist, fimax * sizeof(*flist));
-+ if (nf == NULL)
-+ goto out;
-+ }
-+ flist[fi++] = line;
-+ cwid = file_mbswidth(ms, line);
-+ if (cwid > wid)
-+ wid = cwid;
-+ line = NULL;
-+ llen = 0;
-+ }
-+
-+ fimax = fi;
-+ for (fi = 0; fi < fimax; fi++) {
-+ e |= process(ms, flist[fi], wid);
-+ free(flist[fi]);
- }
-+ free(flist);
-
-- free(line);
-- (void)fclose(f);
-+ if (f != stdin)
-+ (void)fclose(f);
- return e;
- }
-
-From be1ac8c0aa6d21921012f62582f51a9e546e4972 Mon Sep 17 00:00:00 2001
-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");
- char **nf = realloc(flist, fimax * sizeof(*flist));
- if (nf == NULL)
- goto out;
-+ flist = nf;
- }
- flist[fi++] = line;
- cwid = file_mbswidth(ms, line);
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 3687f0f63da0..859ec3a02172 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,7 +1,7 @@
# Template file for 'file'
pkgname=file
-version=5.42
-revision=2
+version=5.43
+revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="--enable-static $(vopt_enable libseccomp)"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.darwinsys.com/file/"
distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4
+checksum=8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991
build_options="libseccomp"
next reply other threads:[~2022-10-08 23:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-08 23:41 tjkirch [this message]
2022-10-08 23:56 ` tjkirch
2022-10-09 0:17 ` paper42
2022-10-09 0:48 ` tjkirch
2022-10-09 4:21 ` tjkirch
2022-10-09 5:42 ` tjkirch
2022-10-09 22:07 ` tjkirch
2022-10-09 22:07 ` [PR PATCH] [Closed]: " tjkirch
2022-10-09 22:07 ` tjkirch
2022-12-09 17:47 [PR PATCH] " mhmdanas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39825@inbox.vuxu.org \
--to=tjkirch@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).