Update sysutils/file to 5.28.

Fix unbalanced regex (fixes build with some sed flavors).

file 5.28
* PR/555: Avoid overflow for offset > nbytes
* PR/550: Segv on DER parsing:
    - use the correct variable for length
    - set offset to 0 on failure.

5 files changed, 30 insertions, 31 deletions

diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index aaa92a6dbb0..a1802f668ce 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2016/06/05 13:57:37 mef Exp $
+# $NetBSD: Makefile,v 1.39 2016/06/16 15:27:49 fhajny Exp $
 
-DISTNAME=		file-5.27
+DISTNAME=		file-5.28
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.astron.com/pub/file/
 
@@ -28,7 +28,7 @@ BUILDLINK_TRANSFORM+=	opt:-Wextra:-W
 .endif
 # gcc<3 does not know -Wunused-parameter
 .if !empty(CC_VERSION:Mgcc-2*)
-BUILDLINK_TRANSFORM+=  rm:-Wunused-parameter
+BUILDLINK_TRANSFORM+=	rm:-Wunused-parameter
 .endif
 
 CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index b7bd2b1fae7..507c404556b 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2016/06/05 13:57:37 mef Exp $
+$NetBSD: distinfo,v 1.27 2016/06/16 15:27:49 fhajny Exp $
 
-SHA1 (file-5.27.tar.gz) = 5476e4b98b37f2bd1009c2f38d65063fd1170d4f
-RMD160 (file-5.27.tar.gz) = 5851b5014e4731ce85cf70a29066e50e0cab6a17
-SHA512 (file-5.27.tar.gz) = fcf607d367d85b8a971a62793efc79f7e548e029dd7bb41f95bf992c271c514d70cd4bb5c2ca577e470e0ff1df9dca31beaaf19a5fd4e3f617b36061eff46195
-Size (file-5.27.tar.gz) = 774063 bytes
-SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc
-SHA1 (patch-src_compress.c) = 1745daee386b069ebc3b9e63e0973d4f2ab348f4
+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 (patch-aa) = dc787ea0d77d7ba88bcb1e17d38b26b13153a1c5
+SHA1 (patch-magic_Magdir_bioinformatics) = 1c240af5521b564c903e0ceb4a6d9af122554be7
 SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
index 379a0b68f67..e7d2d3f7712 100644
--- a/sysutils/file/patches/patch-aa
+++ b/sysutils/file/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2014/03/12 18:35:49 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2016/06/16 15:27:49 fhajny Exp $
 
 Make pkgsrc file look in @sysconfdir@/magic first.
 
---- src/Makefile.in.orig	2014-02-13 00:29:38.000000000 +0100
-+++ src/Makefile.in	2014-03-06 20:10:48.215956295 +0100
-@@ -326,10 +326,10 @@
+--- src/Makefile.in.orig	2016-06-13 23:44:06.000000000 +0000
++++ src/Makefile.in
+@@ -337,10 +337,10 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = @sysconfdir@/magic
  lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
+ nodist_include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
diff --git a/sysutils/file/patches/patch-magic_Magdir_bioinformatics b/sysutils/file/patches/patch-magic_Magdir_bioinformatics
new file mode 100644
index 00000000000..6ac1d9632c7
--- /dev/null
+++ b/sysutils/file/patches/patch-magic_Magdir_bioinformatics
@@ -0,0 +1,15 @@
+$NetBSD: patch-magic_Magdir_bioinformatics,v 1.1 2016/06/16 15:27:49 fhajny Exp $
+
+Fix unbalanced parantheses in regex.
+
+--- 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
diff --git a/sysutils/file/patches/patch-src_compress.c b/sysutils/file/patches/patch-src_compress.c
deleted file mode 100644
index e5ae3d3b5d6..00000000000
--- a/sysutils/file/patches/patch-src_compress.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_compress.c,v 1.2 2016/06/05 13:57:37 mef Exp $
-sig_t is not defined by default on SunOS
-
---- src/compress.c.orig	2016-04-20 09:00:26.000000000 +0900
-+++ src/compress.c	2016-06-05 22:54:06.000000000 +0900
-@@ -67,6 +67,10 @@ typedef void (*sig_t)(int);
- #include <zlib.h>
- #define ZLIBSUPPORT
- #endif
-+/* sig_t is not defined by default on SunOS */
-+#ifdef __sun
-+typedef void (*sig_t)(int);
-+#endif
- #ifdef DEBUG
- int tty = -1;
- #define DPRINTF(...)	do { \