summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-09-04 12:13:28 +0000
committerwiz <wiz@pkgsrc.org>2017-09-04 12:13:28 +0000
commit75996c06a1a725cead3ff032ddb642d3f97e80bf (patch)
treec069baf98a745047dad8e2db2535a5608f338737
parent154767e4d8ced715d27c6df23dabdaedb758e938 (diff)
downloadpkgsrc-75996c06a1a725cead3ff032ddb642d3f97e80bf.tar.gz
Updated file to 5.32.
* release 5.32 * Always reset state in {file,buffer}_apprentice (Krzysztof Wilczynski) * Fix always true condition (Thomas Jarosch) * pickier parsing of numeric values in magic files. * PR/615 add magic_getflags() * release 5.31 * remove trailing spaces from magic files * refactor is_tar * better bounds checks for cdf * release 5.30 * If we exceeded the offset in a search return no match (Christoph Biedl) * Be more lenient on corrupt CDF files (Christoph Biedl) * pacify ubsan sign extension (oss-fuzz/524) * off by one in cdf parsing (PR/593) * report debugging sections in elf (PR/591) * Allow @@@ in extensions * Add missing overflow check in der magic (Jonas Wagner) * release 5.29 * der getlength overflow (Jonas Wagner) * multiple magic file load failure (Christoph Biedl) * CDF parsing improvements (Guy Helmer) * Add support for signed indirect offsets * cat /dev/null | file - should print empty (Christoph Biedl) * Bump string size from 64 to 96. * PR/556: Fix separators on annotations.
-rw-r--r--sysutils/file/Makefile10
-rw-r--r--sysutils/file/distinfo11
-rw-r--r--sysutils/file/patches/patch-magic_Magdir_bioinformatics17
3 files changed, 9 insertions, 29 deletions
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index a1802f668ce..44c36620ae9 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2016/06/16 15:27:49 fhajny Exp $
+# $NetBSD: Makefile,v 1.40 2017/09/04 12:13:28 wiz Exp $
-DISTNAME= file-5.28
+DISTNAME= file-5.32
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.astron.com/pub/file/
@@ -9,9 +9,8 @@ HOMEPAGE= http://www.darwinsys.com/file/
COMMENT= Tool for determining file type
LICENSE= 2-clause-bsd
-USE_LIBTOOL= YES
-
-GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-fsect-man5
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -34,5 +33,4 @@ BUILDLINK_TRANSFORM+= rm:-Wunused-parameter
CFLAGS.AIX+= -D_LINUX_SOURCE_COMPAT
.include "../../devel/zlib/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index a76d52a177f..4fb28dbb77c 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.28 2016/06/16 16:16:44 fhajny Exp $
+$NetBSD: distinfo,v 1.29 2017/09/04 12:13:28 wiz Exp $
-SHA1 (file-5.28.tar.gz) = 1b789a93bea54da3119d98986468cd90b1e571bf
-RMD160 (file-5.28.tar.gz) = ea054e34e1aa73ffe386f5401dfabbc9bda29a44
-SHA512 (file-5.28.tar.gz) = 42136505e21b14396e3af4e0d3f349687176cf0771d2dc9fed3599a30c7bab59184459f1e51033bce2d6ee0e292eba034bdfda727decca1219c1b3419e6bbfdc
-Size (file-5.28.tar.gz) = 777859 bytes
+SHA1 (file-5.32.tar.gz) = c2858a8043387d1229d8768ad42762a803d017db
+RMD160 (file-5.32.tar.gz) = b7d41a4c6b2c28d9f202d740e353416e2036c1ef
+SHA512 (file-5.32.tar.gz) = 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
+Size (file-5.32.tar.gz) = 797025 bytes
SHA1 (patch-aa) = dc787ea0d77d7ba88bcb1e17d38b26b13153a1c5
-SHA1 (patch-magic_Magdir_bioinformatics) = 6a12477ff915911abe409782877a810ad1725d26
SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
diff --git a/sysutils/file/patches/patch-magic_Magdir_bioinformatics b/sysutils/file/patches/patch-magic_Magdir_bioinformatics
deleted file mode 100644
index 7fab37adcf0..00000000000
--- a/sysutils/file/patches/patch-magic_Magdir_bioinformatics
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-magic_Magdir_bioinformatics,v 1.2 2016/06/16 16:16:45 fhajny Exp $
-
-Fix unbalanced parantheses in regex.
-
-Upstream bug reported: http://bugs.gw.com/view.php?id=558
-
---- magic/Magdir/bioinformatics.orig 2016-02-14 15:53:53.000000000 +0000
-+++ magic/Magdir/bioinformatics
-@@ -163,7 +163,7 @@
- # SAM Alignment MAPQ
- >>>>0 regex =^([^\t]+\t){4}[0-9]{1,3}\t
- # SAM Alignment CIGAR
-->>>>>0 regex =\t\\*|([0-9]+[MIDNSHPX=])+)\t
-+>>>>>0 regex =\t(\\*|([0-9]+[MIDNSHPX=])+)\t
- # SAM Alignment RNEXT
- >>>>>>0 regex =\t(\\*|=|[!-()+->?-~][!-~]*)\t
- # SAM Alignment PNEXT