[PR PATCH] file: update to 5.43.

[PR PATCH] file: update to 5.43.

[tjkirch]

[-- 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"
 

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272415328

Comment:
x86-64 musl unit tests failed with:
```
2022-10-08T23:42:25.2927150Z Running test: ../tests/dsd64-dsf.testfile
2022-10-08T23:42:25.3031608Z ../tests/dsd64-dsf.testfile: DSD Stream File, mono, simple-rate, 1 bit, 141184 samples
2022-10-08T23:42:25.3032087Z lt-test: ERROR: result was (len 57)
2022-10-08T23:42:25.3032524Z DSD Stream File, mono, simple-rate, 1 bit, 141184 samples
2022-10-08T23:42:25.3032828Z expected (len 94)
2022-10-08T23:42:25.3033193Z DSF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.3.0
```

I haven't figured out yet how to run unit tests during a cross build with xbps-src, so I'm not sure if this is reproducible.  I don't seem to have the ability to rerun CI checks.

Re: file: update to 5.43.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272418902

Comment:
Checks only run in native builds, you can use a musl masterdir and run the build with checks there. See the -m option and the arch argument to binary-bootstrap.

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272423330

Comment:
Thanks for the tip!  I was able to do that and confirm that it fails locally as well.  I found [an upstream bug](https://bugs.astron.com/view.php?id=382) matching this failure on musl, and it says it's been fixed in the source, just not released yet.  I'll work on adding it as a patch.

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272423330

Comment:
Thanks for the tip!  I was able to do that and confirm that it fails locally as well.  I found [an upstream bug](https://bugs.astron.com/view.php?id=382) matching this failure on musl, and it says it's been fixed in the source, just not released yet.  I'll work on adding it as a patch.

[edit] I'm struggling with this; adding just the patch from the upstream bug makes little difference and it still fails.  Even building HEAD fails on a different (but similar) test.

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272461670

Comment:
I found that the test failure (or similar ones) continued through all later commits with musl, so I filed another bug upstream: https://bugs.astron.com/view.php?id=393

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272637961

Comment:
The new bug was resolved and many new commits applied to file's master branch, but the only change to the failing test was reverting the first patch I mentioned, which puts it back at the same point as 5.43 that's failing.  I believe there may be a combination of other commits that fix more general issues and may fix musl as well, but in my opinion, it's probably not worth carrying as many patches as we'd - I think it'd be better to wait for a 5.44 release.

Re: [PR PATCH] [Closed]: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

There's a closed pull request on the void-packages repository

file: update to 5.43.
https://github.com/void-linux/void-packages/pull/39825

Description:
#### 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.

Re: file: update to 5.43.

[tjkirch]

[-- Attachment #1: Type: text/plain, Size: 608 bytes --]

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39825#issuecomment-1272637961

Comment:
The new bug was resolved and many new commits applied to file's master branch, but the only change to the failing test was reverting the first patch I mentioned, which puts it back at the same point as 5.43 that's failing.  I believe there may be a combination of other commits that fix more general issues and may fix musl as well, but in my opinion, it's probably not worth carrying as many patches as we'd need - I think it'd be better to wait for a 5.44 release.

[PR PATCH] file: update to 5.43.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages file-5.43
https://github.com/void-linux/void-packages/pull/40987

file: update to 5.43.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40987.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-file-5.43-40987.patch --]
[-- Type: text/x-diff, Size: 4218 bytes --]

From be4cbe913323eff50041c878fd8f6b7f000d0a53 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 9 Dec 2022 17:46:18 +0000
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"