main/file: upgrade to 5.45

main/file/APKBUILD

@@ -1,17 +1,15 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=file
-pkgver=5.44
-pkgrel=5
+pkgver=5.45
+pkgrel=0
 pkgdesc="File type identification utility"
 url="https://www.darwinsys.com/file/"
 arch="all"
 license="BSD-2-Clause"
 makedepends="autoconf libtool automake"
 subpackages="libmagic-static $pkgname-dev $pkgname-doc libmagic"
-source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
-	fix-decomp.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz"
 builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
 
 # secfixes:
@@ -50,6 +48,5 @@ libmagic() {
 }
 
 sha512sums="
-547429f30105a1c96604b67440cbd1c52f684d8ce6b26e2413dd54ede8aadb2ffb489b52e67bfab9ff5a48133f0aa0589873e58dc7c6c0a10a59571cf9850b95  file-5.44.tar.gz
-a441a9638bd1b8c00049b5b0b7fdac22c237c655545d8c0eb5cd0d8bce1e5bfa03ab1b790aed270cf6ae2832944ae5a79509cbe01a1dbe94b40d1eba6fa4e029  fix-decomp.patch
+fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea  file-5.45.tar.gz
 "

main/file/fix-decomp.patch

@@ -1,140 +0,0 @@
-Patch-Source: https://github.com/file/file/commit/1dd21dd360472d7b830825df8e40a06cdc1cbbcf
---
-From 1dd21dd360472d7b830825df8e40a06cdc1cbbcf Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 8 Jan 2023 18:09:16 +0000
-Subject: [PATCH] fix decompression always returning empty.
-
----
- ChangeLog      |  4 ++++
- src/compress.c | 21 +++++++++++++++++----
- 2 files changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/src/compress.c b/src/compress.c
-index 282f2a3..58ed481 100644
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -35,7 +35,7 @@
- #include "file.h"
- 
- #ifndef lint
--FILE_RCSID("@(#)$File: compress.c,v 1.154 2022/12/26 17:35:45 christos Exp $")
-+FILE_RCSID("@(#)$File: compress.c,v 1.156 2023/01/08 18:09:16 christos Exp $")
- #endif
- 
- #include "magic.h"
-@@ -609,6 +609,7 @@ uncompresszlib(const unsigned char *old, unsigned char **newch,
- 	int rc;
- 	z_stream z;
- 
-+	DPRINTF("builtin zlib decompression\n");
- 	z.next_in = CCAST(Bytef *, old);
- 	z.avail_in = CAST(uint32_t, *n);
- 	z.next_out = *newch;
-@@ -650,6 +651,7 @@ uncompressbzlib(const unsigned char *old, unsigned char **newch,
- 	int rc;
- 	bz_stream bz;
- 
-+	DPRINTF("builtin bzlib decompression\n");
- 	memset(&bz, 0, sizeof(bz));
- 	rc = BZ2_bzDecompressInit(&bz, 0, 0);
- 	if (rc != BZ_OK)
-@@ -690,6 +692,7 @@ uncompressxzlib(const unsigned char *old, unsigned char **newch,
- 	int rc;
- 	lzma_stream xz;
- 
-+	DPRINTF("builtin xzlib decompression\n");
- 	memset(&xz, 0, sizeof(xz));
- 	rc = lzma_auto_decoder(&xz, UINT64_MAX, 0);
- 	if (rc != LZMA_OK)
-@@ -729,6 +732,7 @@ uncompresszstd(const unsigned char *old, unsigned char **newch,
- 	ZSTD_inBuffer in;
- 	ZSTD_outBuffer out;
- 
-+	DPRINTF("builtin zstd decompression\n");
- 	if ((zstd = ZSTD_createDStream()) == NULL) {
- 		return makeerror(newch, n, "No ZSTD decompression stream, %s",
- 		    strerror(errno));
-@@ -777,6 +781,7 @@ uncompresslzlib(const unsigned char *old, unsigned char **newch,
- 
- 	bufp = *newch;
- 
-+	DPRINTF("builtin lzlib decompression\n");
- 	dec = LZ_decompress_open();
- 	if (!dec) {
- 		return makeerror(newch, n, "unable to allocate LZ_Decoder");
-@@ -833,11 +838,13 @@ makeerror(unsigned char **buf, size_t *len, const char *fmt, ...)
- 	va_list ap;
- 	int rv;
- 
-+	DPRINTF("Makeerror %s\n", fmt);
- 	free(*buf);
- 	va_start(ap, fmt);
- 	rv = vasprintf(&msg, fmt, ap);
- 	va_end(ap);
- 	if (rv < 0) {
-+		DPRINTF("Makeerror failed");
- 		*buf = NULL;
- 		*len = 0;
- 		return NODATA;
-@@ -1048,7 +1055,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 	pid_t pid;
- 	pid_t writepid = -1;
- 	size_t i;
--	ssize_t r;
-+	ssize_t r, re;
- 	char *const *args;
- #ifdef HAVE_POSIX_SPAWNP
- 	posix_spawn_file_actions_t fa;
-@@ -1103,6 +1110,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 
- 	handledesc(&fa, fd, fdp);
- 
-+	DPRINTF("Executing %s\n", compr[method].argv[0]);
- 	status = posix_spawnp(&pid, compr[method].argv[0], &fa, NULL,
- 	    args, NULL);
- 
-@@ -1128,6 +1136,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 		 * do not modify fdp[i][j].
- 		 */
- 		handledesc(NULL, fd, fdp);
-+		DPRINTF("Executing %s\n", compr[method].argv[0]);
- 
- 		(void)execvp(compr[method].argv[0], args);
- 		dprintf(STDERR_FILENO, "exec `%s' failed, %s",
-@@ -1146,6 +1155,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 		if (writepid == (pid_t)-1) {
- 			rv = makeerror(newch, n, "Write to child failed, %s",
- 			    strerror(errno));
-+			DPRINTF("Write to child failed\n");
- 			goto err;
- 		}
- 		closefd(fdp[STDIN_FILENO], 1);
-@@ -1153,6 +1163,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 
- 	rv = OKDATA;
- 	r = sread(fdp[STDOUT_FILENO][0], *newch, bytes_max, 0);
-+	DPRINTF("read got %zd\n", r);
- 	if (r < 0) {
- 		rv = ERRDATA;
- 		DPRINTF("Read stdout failed %d (%s)\n", fdp[STDOUT_FILENO][0],
-@@ -1165,15 +1176,17 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- 		 * errors, otherwise we risk the child blocking and never
- 		 * exiting.
- 		 */
-+		DPRINTF("Closing stdout for bytes_max\n");
- 		closefd(fdp[STDOUT_FILENO], 0);
- 		goto ok;
- 	}
--	if ((r = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) {
-+	if ((re = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) {
-+		DPRINTF("Got stuff from stderr %s\n", *newch);
- 		rv = ERRDATA;
- 		r = filter_error(*newch, r);
- 		goto ok;
- 	}
--	if  (r == 0)
-+	if  (re == 0)
- 		goto ok;
- 	rv = makeerror(newch, n, "Read stderr failed, %s",
- 	    strerror(errno));