From 69cfcf3d64cc1b261357bafb1776a7c84595df13 Mon Sep 17 00:00:00 2001 From: nia Date: Sat, 7 Sep 2019 10:47:20 +0000 Subject: file: Update to 5.37 2019-05-09 22:27 Christos Zoulas * Make sure that continuation separators are printed with -k within softmagic 2019-05-06 22:27 Christos Zoulas * Change SIGPIPE saving and restoring during compression to use sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko) * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko) 2019-05-06 17:25 Christos Zoulas * PR/77: Handle --mime-type and -k correctly. 2019-05-03 15:26 Christos Zoulas * Switch decompression code to use vfork() because tools like rpmdiff and rpmbuild call libmagic with large process footprints (Denys Vlasenko) 2019-04-07 14:05 Christos Zoulas * PR/75: --enable-zlib, did not work. 2019-02-27 11:54 Christos Zoulas * Improve regex efficiency (Michael Schroeder) by: 1. Prefixing regex searches with regular search for keywords where possible 2. Using memmem(3) where available --- sysutils/file/Makefile | 4 ++-- sysutils/file/distinfo | 10 +++++----- sysutils/file/patches/patch-src_softmagic.c | 16 ---------------- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 sysutils/file/patches/patch-src_softmagic.c diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile index 79fa8a19331..168f62717b6 100644 --- a/sysutils/file/Makefile +++ b/sysutils/file/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.44 2019/03/16 10:50:31 leot Exp $ +# $NetBSD: Makefile,v 1.45 2019/09/07 10:47:20 nia Exp $ -DISTNAME= file-5.36 +DISTNAME= file-5.37 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.astron.com/pub/file/ diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo index d7e16756230..e4013941bc9 100644 --- a/sysutils/file/distinfo +++ b/sysutils/file/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.33 2019/03/16 10:50:31 leot Exp $ +$NetBSD: distinfo,v 1.34 2019/09/07 10:47:20 nia Exp $ -SHA1 (file-5.36.tar.gz) = 473e0a2fb4f091031d449ed4d7ea912741f0c7e9 -RMD160 (file-5.36.tar.gz) = bd7c9b60ddba58fc18a4ec07904ed7a12e142b27 -SHA512 (file-5.36.tar.gz) = 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751 -Size (file-5.36.tar.gz) = 875792 bytes +SHA1 (file-5.37.tar.gz) = 891176efa3006eff222bd364cd96135aad171941 +RMD160 (file-5.37.tar.gz) = e01826cca438ffc467b169a8f4fd760f9843f5fc +SHA512 (file-5.37.tar.gz) = bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d +Size (file-5.37.tar.gz) = 887682 bytes SHA1 (patch-aa) = 3da534bbbf61dadc1881b9b2827c0c425e908fc9 SHA1 (patch-src_fsmagic.c) = f862c5335bc3c6b0d39dfcdfd79e2d99407e40f5 SHA1 (patch-src_softmagic.c) = 82fe71f32508ad6dec04ccba794ec5f055000846 diff --git a/sysutils/file/patches/patch-src_softmagic.c b/sysutils/file/patches/patch-src_softmagic.c deleted file mode 100644 index 137cb7e7c1d..00000000000 --- a/sysutils/file/patches/patch-src_softmagic.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_softmagic.c,v 1.5 2019/03/16 10:50:31 leot Exp $ - -Fix functionality under NetBSD-current after format check change -https://mail-index.netbsd.org/source-changes/2017/12/11/msg090400.html - ---- src/softmagic.c.orig 2019-02-20 02:35:27.000000000 +0000 -+++ src/softmagic.c -@@ -147,6 +147,8 @@ private const char * __attribute__((__fo - file_fmtcheck(struct magic_set *ms, const char *desc, const char *def, - const char *file, size_t line) - { -+ if (strchr(desc, '%') == NULL) -+ return desc; - const char *ptr = fmtcheck(desc, def); - if (ptr == def) - file_magerror(ms, -- cgit v1.2.3