summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2016-03-05 15:44:36 +0000
committerbsiegert <bsiegert@pkgsrc.org>2016-03-05 15:44:36 +0000
commitb21c29b5a76e080ea578ae19a86f8ab1801c9e60 (patch)
tree7eb563d253b8bc6378b7e0d32f1c276e3c7b1b92 /sysutils
parent43a2d60a0f47f002a481633cf8b5f508a4dbbed3 (diff)
downloadpkgsrc-b21c29b5a76e080ea578ae19a86f8ab1801c9e60.tar.gz
Update file to 5.25.
2015-09-16 9:50 Christos Zoulas <christos@zoulas.com> * release 5.25 2015-09-11 13:25 Christos Zoulas <christos@zoulas.com> * add a limit to the length of regex searches 2015-09-08 9:50 Christos Zoulas <christos@zoulas.com> * fix problems with --parameter (Christoph Biedl) 2015-07-11 10:35 Christos Zoulas <christos@zoulas.com> * Windows fixes PR#466 (Jason Hood) 2015-07-09 10:35 Christos Zoulas <christos@zoulas.com> * release 5.24 2015-06-11 8:52 Christos Zoulas <christos@zoulas.com> * redo long option encoding to fix off-by-one in 5.23 2015-06-10 13:50 Christos Zoulas <christos@zoulas.com> * release 5.23 2015-06-09 16:10 Christos Zoulas <christos@zoulas.com> * Fix issue with regex range for magic with offset * Always return true from mget with USE (success to mget not match indication). Fixes mime evaluation after USE magic * PR#459: Don't insert magic entries to the list if there are parsing errors for them. 2015-06-03 16:00 Christos Zoulas <christos@zoulas.com> * PR#455: Add utf-7 encoding 2015-06-03 14:30 Christos Zoulas <christos@zoulas.com> * PR#455: Implement -Z, look inside, but don't report on compression * PR#454: Fix allocation error on bad magic. 2015-05-29 10:30 Christos Zoulas <christos@zoulas.com> * handle MAGIC_CONTINUE everywhere, not just in softmagic 2015-05-21 14:30 Christos Zoulas <christos@zoulas.com> * don't print descriptions for NAME types when mime. 2015-04-09 15:59 Christos Zoulas <christos@zoulas.com> * Add --extension to list the known extensions for this file type Idea by Andrew J Roazen 2015-02-14 12:23 Christos Zoulas <christos@zoulas.com> * Bump file search buffer size to 1M. 2015-01-09 14:35 Christos Zoulas <christos@zoulas.com> * Fix multiple issues with date formats reported by Christoph Biedl: - T_LOCAL meaning was reversed - Arithmetic did not work Also stop adjusting daylight savings for gmt printing. 2015-01-05 13:00 Christos Zoulas <christos@zoulas.com> * PR#411: Fix memory corruption from corrupt cdf file.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/file/Makefile5
-rw-r--r--sysutils/file/distinfo11
-rw-r--r--sysutils/file/patches/patch-src_softmagic.c20
3 files changed, 7 insertions, 29 deletions
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 006de4dc866..611e9f3dfe9 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2016/02/26 10:24:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2016/03/05 15:44:36 bsiegert Exp $
-DISTNAME= file-5.22
-PKGREVISION= 1
+DISTNAME= file-5.25
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.astron.com/pub/file/
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 1cdd64ce4cc..e804218880e 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.24 2015/11/04 01:32:13 agc Exp $
+$NetBSD: distinfo,v 1.25 2016/03/05 15:44:36 bsiegert Exp $
-SHA1 (file-5.22.tar.gz) = 20fa06592291555f2b478ea2fb70b53e9e8d1f7c
-RMD160 (file-5.22.tar.gz) = 73b5e5c128a6ecb2b870590728cc9013fe0c9dbb
-SHA512 (file-5.22.tar.gz) = e9f1648c3b490bac642a2a9e01d31a8bd49c3e2a1feea1b25869aa1d5e37aa99bbf3fdc5d301618a8b97aec046f10e400a57f8a1d0dd61d3583830aaf3fcbda8
-Size (file-5.22.tar.gz) = 732556 bytes
+SHA1 (file-5.25.tar.gz) = fea78106dd0b7a09a61714cdbe545135563e84bd
+RMD160 (file-5.25.tar.gz) = 94c14b8a76e65ad52349b9b3f3da835f97b642a3
+SHA512 (file-5.25.tar.gz) = 4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf92ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402
+Size (file-5.25.tar.gz) = 739485 bytes
SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc
SHA1 (patch-src_compress.c) = 63407a3103bb1e77a5c8f1a5e859eb884ad55b3a
SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
-SHA1 (patch-src_softmagic.c) = 5952a49b75b1a6968179cd61f28e7731caeb3e17
diff --git a/sysutils/file/patches/patch-src_softmagic.c b/sysutils/file/patches/patch-src_softmagic.c
deleted file mode 100644
index 531dfc265b2..00000000000
--- a/sysutils/file/patches/patch-src_softmagic.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_softmagic.c,v 1.1 2015/05/23 13:11:07 bsiegert Exp $
-
-contains fix from
-https://github.com/file/file/commit/3046c231e1a2fcdd5033bea0603c23f435a00bd7
-
---- src/softmagic.c.orig 2015-01-01 17:07:34.000000000 +0000
-+++ src/softmagic.c
-@@ -1116,10 +1116,8 @@ mcopy(struct magic_set *ms, union VALUET
- bytecnt = m->str_range;
- }
-
-- if (bytecnt == 0)
-- bytecnt = 8192;
-- if (bytecnt > nbytes)
-- bytecnt = nbytes;
-+ if (bytecnt == 0 || bytecnt > nbytes - offset)
-+ bytecnt = nbytes - offset;
-
- buf = RCAST(const char *, s) + offset;
- end = last = RCAST(const char *, s) + bytecnt;