[arch-commits] Commit in file/repos (3 files)

[Evangelos Foutras]

    Date: Monday, May 24, 2021 @ 14:19:58
  Author: foutrelis
Revision: 416256

archrelease: copy trunk to testing-x86_64

Added:
  file/repos/testing-x86_64/
  file/repos/testing-x86_64/PKGBUILD
    (from rev 416255, file/trunk/PKGBUILD)
  file/repos/testing-x86_64/pr256.patch
    (from rev 416255, file/trunk/pr256.patch)

-------------+
 PKGBUILD    |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pr256.patch |   23 +++++++++++++++++++++
 2 files changed, 86 insertions(+)

Copied: file/repos/testing-x86_64/PKGBUILD (from rev 416255, file/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2021-05-24 14:19:58 UTC (rev 416256)
@@ -0,0 +1,63 @@
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=file
+pkgver=5.40
+pkgrel=4
+pkgdesc='File type identification utility'
+arch=('x86_64')
+license=('custom')
+groups=('base-devel')
+url='https://www.darwinsys.com/file/'
+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() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Fix linking libmagic (vfork needs libpthread)
+  CFLAGS+=" -pthread"
+
+  ./configure \
+    --prefix=/usr \
+    --datadir=/usr/share/file \
+    --enable-fsect-man5 \
+    --enable-libseccomp
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: file/repos/testing-x86_64/pr256.patch (from rev 416255, file/trunk/pr256.patch)
===================================================================
--- testing-x86_64/pr256.patch	                        (rev 0)
+++ testing-x86_64/pr256.patch	2021-05-24 14:19:58 UTC (rev 416256)
@@ -0,0 +1,23 @@
+From 749e1ecfc3d333e5ec8b1a2e639da7ccb2498c34 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos at zoulas.com>
+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; \