Date: Monday, May 24, 2021 @ 14:19:54 Author: foutrelis Revision: 416255
upgpkg: file 5.40-4: fix binary detection that breaks subversion tests https://bugs.astron.com/view.php?id=261 https://bugs.astron.com/view.php?id=256 Added: file/trunk/pr256.patch Modified: file/trunk/PKGBUILD -------------+ PKGBUILD | 4 +++- pr256.patch | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-24 13:32:57 UTC (rev 416254) +++ PKGBUILD 2021-05-24 14:19:54 UTC (rev 416255) @@ -4,7 +4,7 @@ pkgname=file pkgver=5.40 -pkgrel=3 +pkgrel=4 pkgdesc='File type identification utility' arch=('x86_64') license=('custom') @@ -13,10 +13,12 @@ depends=('glibc' 'zlib' 'xz' 'bzip2' 'libseccomp' 'libseccomp.so') provides=('libmagic.so') source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc} + "pr256.patch" # fix binary detection that breaks subversion tests "https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch";) validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas sha256sums=('167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57' 'SKIP' + 'a418ec70c6086702e8a5bf62b15fc1f7d42ebe7dfedb649dfc465a25f063aff0' 'f5d9c964233b75d6b5ac1b95fe4cc23143fbc6070d3b136e91b542021959e7dd') prepare() { Added: pr256.patch =================================================================== --- pr256.patch (rev 0) +++ pr256.patch 2021-05-24 14:19:54 UTC (rev 416255) @@ -0,0 +1,23 @@ +From 749e1ecfc3d333e5ec8b1a2e639da7ccb2498c34 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <[email protected]> +Date: Mon, 19 Apr 2021 18:38:04 +0000 +Subject: [PATCH] PR/256: mutableVoid: If the file is less than 3 bytes, use + the file length to determine type + +--- + src/encoding.c | 4 ++-- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/encoding.c b/src/encoding.c +index 0fb1f47b..31d4d125 100644 +--- a/src/encoding.c ++++ b/src/encoding.c +@@ -285,7 +285,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \ + if (dist[i]) \ + u++; \ + } \ +- if (u < 3) \ ++ if (u < MIN(nbytes, 3)) \ + return 0; \ + \ + return 1; \
