Wed Mar 12 18:35:49 2014 UTC ()
Update to 5.17, based on patch provided by Matthias
<mf+ml.pkgsrc-users@netzwerkagentursaarland.de> on pkgsrc-users.

Changes:

2014-02-12  18:21  Christos Zoulas <christos@zoulas.com>

	* Count recursion levels through indirect magic

2014-02-11  10:40  Christos Zoulas <christos@zoulas.com>

	* Prevent infinite recursion on files with indirect offsets of 0

2014-01-30  21:00  Christos Zoulas <christos@zoulas.com>

	* Add -E flag that makes file print filesystem errors to stderr
	  and exit.

2014-01-08  17:20  Christos Zoulas <christos@zoulas.com>

	* mime printing could print results from multiple magic entries
	  if there were multiple matches.
	* in some cases overflow was not detected when computing offsets
	  in softmagic.

2013-12-05  12:00  Christos Zoulas <christos@zoulas.com>

	* use strcasestr() to for cdf strings
	* reset to the "C" locale while doing regex operations, or case
	  insensitive comparisons; this is provisional

2013-11-19  20:10  Christos Zoulas <christos@zoulas.com>

	* always leave magic file loaded, don't unload for magic_check, etc.
	* fix default encoding to binary instead of unknown which broke recently
	* handle empty and one byte files, less specially so that
	  --mime-encoding does not break completely.
		`
2013-11-06  14:40  Christos Zoulas <christos@zoulas.com>

	* fix erroneous non-zero exit code from non-existant file and message

2013-10-29  14:25  Christos Zoulas <christos@zoulas.com>

	* add CDF MSI file detection (Guy Helmer)

2013-09-03  11:56  Christos Zoulas <christos@zoulas.com>

	* Don't mix errors and regular output if there was an error
	* in magic_descriptor() don't close the file and try to restore
	  its position

2013-05-30  17:25  Christos Zoulas <christos@zoulas.com>

	* Don't treat magic as an error if offset was past EOF (Christoph Biedl)

2013-05-28  17:25  Christos Zoulas <christos@zoulas.com>

	* Fix spacing issues in softmagic and elf (Jan Kaluza)

2013-05-02  18:00  Christos Zoulas <christos@zoulas.com>

	* Fix segmentation fault with multiple magic_load commands.

2013-04-22  11:20  Christos Zoulas <christos@zoulas.com>

	* The way "default" was implemented was not very useful
	  because the "if something was printed at that level"
	  was not easily controlled by the user, and the format
	  was bound to a string which is too restrictive. Add
	  a "clear" for that level keyword and make "default"
	  void. This way one can do:

		>>13	clear	x
		>>13	lelong	1	foo
		>>13	lelong	2	bar
		>>13	default	x
		>>>13	lelong	x	unknown %x

2013-03-25  13:20  Christos Zoulas <christos@zoulas.com>

	* disallow strength setting in "name" entries

2013-03-06  21:24  Christos Zoulas <christos@zoulas.com>

	* fix recursive magic separator printing

2013-02-26  19:28  Christos Zoulas <christos@zoulas.com>

	* limit recursion level for mget
	* fix pread() related breakage in cdf
	* handle offsets properly in recursive "use"

2013-02-18  10:39  Christos Zoulas <christos@zoulas.com>

	* add elf reading of debug info to determine if file is stripped
	  (Jan Kaluza)
	* use pread()

2013-01-25  18:05  Christos Zoulas <christos@zoulas.com>

	* change mime description size from 64 to 80 to accommodate OOXML.

2013-01-11  14:50  Christos Zoulas <christos@zoulas.com>

	* Warn about inconsistent continuation levels.
	* Change fsmagic to add a space after it prints.

2013-01-10  21:00  Christos Zoulas <christos@zoulas.com>

	* Make getline public so that file can link against it.
	  Perhaps it is better to rename it, or hide it differently.
	  Fixes builds on platforms that do not provide it.

2013-01-07  16:30  Christos Zoulas <christos@zoulas.com>

	* Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
	  what long, int, short, etc is (Guy Harris)

2013-01-06  11:20  Christos Zoulas <christos@zoulas.com>

	* add magic_version function and constant
	* Redo memory allocation and de-allocation.
	  (prevents double frees on non mmap platforms)
	* Fix bug with name/use having to do with passing
	  found state from the parent to the child and back.

2012-12-19   8:47  Christos Zoulas <christos@zoulas.com>

	* Only print elf capabilities for archs we know (Jan Kaluza)

2012-10-30  19:14  Christos Zoulas <christos@zoulas.com>

	* Add "name" and "use" file types in order to look
	  inside mach-o files.

2012-09-06  10:40  Christos Zoulas <christos@zoulas.com>

	* make --version exit 0 (Matthew Schultz)
	* add string/T (Jan Kaluza)

2012-08-09  2:15  Christos Zoulas <christos@zoulas.com>

	* add z and t modifiers for our own vasprintf
	* search for $HOME/.magic.mgc if it is there first
	* fix reads from a pipe, and preserve errno

2012-05-15  13:12  Christos Zoulas <christos@zoulas.com>

	* use ctime_r, asctime_r

2012-04-06  17:18  Christos Zoulas <christos@zoulas.com>

	* Fixes for indirect offsets to handle apple disk formats

2012-04-03  18:26  Christos Zoulas <christos@zoulas.com>

	* Add windows date field types
	* More info for windows shortcuts (incomplete)


(wiz)
diff -r1.28 -r1.29 pkgsrc/sysutils/file/Makefile
diff -r1.14 -r1.15 pkgsrc/sysutils/file/distinfo
diff -r1.6 -r1.7 pkgsrc/sysutils/file/patches/patch-aa

cvs diff -r1.28 -r1.29 pkgsrc/sysutils/file/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/file/Makefile 2012/10/23 19:51:01 1.28
+++ pkgsrc/sysutils/file/Makefile 2014/03/12 18:35:48 1.29
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.28 2012/10/23 19:51:01 asau Exp $ 1# $NetBSD: Makefile,v 1.29 2014/03/12 18:35:48 wiz Exp $
2 2
3DISTNAME= file-5.11 3DISTNAME= file-5.17
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ftp://ftp.astron.com/pub/file/ 5MASTER_SITES= ftp://ftp.astron.com/pub/file/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.darwinsys.com/file/ 8HOMEPAGE= http://www.darwinsys.com/file/
9COMMENT= Tool for determining file type 9COMMENT= Tool for determining file type
10LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
11 11
12USE_LIBTOOL= YES 12USE_LIBTOOL= YES
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15CONFIGURE_ARGS+= --enable-fsect-man5 15CONFIGURE_ARGS+= --enable-fsect-man5
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}

cvs diff -r1.14 -r1.15 pkgsrc/sysutils/file/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/file/distinfo 2012/03/30 03:53:54 1.14
+++ pkgsrc/sysutils/file/distinfo 2014/03/12 18:35:48 1.15
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.14 2012/03/30 03:53:54 taca Exp $ 1$NetBSD: distinfo,v 1.15 2014/03/12 18:35:48 wiz Exp $
2 2
3SHA1 (file-5.11.tar.gz) = df8ffe8759ec8cd85a98dc98e858563ea2555f64 3SHA1 (file-5.17.tar.gz) = f7e837a0d3e4f40a02ffe7da5e146b967448e0d8
4RMD160 (file-5.11.tar.gz) = 68885d838c1f3836e6fada4c4ea6c88c8699fdf2 4RMD160 (file-5.17.tar.gz) = 288210bdb07b3b8aa61affa3fb8b2d64a7e021da
5Size (file-5.11.tar.gz) = 610019 bytes 5Size (file-5.17.tar.gz) = 709991 bytes
6SHA1 (patch-aa) = 6ec37d8666176693c5ead69333cf27f10664e630 6SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc

cvs diff -r1.6 -r1.7 pkgsrc/sysutils/file/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/file/patches/patch-aa 2012/03/30 03:53:54 1.6
+++ pkgsrc/sysutils/file/patches/patch-aa 2014/03/12 18:35:49 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-aa,v 1.6 2012/03/30 03:53:54 taca Exp $ 1$NetBSD: patch-aa,v 1.7 2014/03/12 18:35:49 wiz Exp $
2 2
3Make pkgsrc file look in @sysconfdir@/magic first. 3Make pkgsrc file look in @sysconfdir@/magic first.
4 4
5--- src/Makefile.in.orig 2012-02-21 19:17:04.000000000 +0000 5--- src/Makefile.in.orig 2014-02-13 00:29:38.000000000 +0100
6+++ src/Makefile.in 6+++ src/Makefile.in 2014-03-06 20:10:48.215956295 +0100
7@@ -240,10 +240,10 @@ target_alias = @target_alias@ 7@@ -326,10 +326,10 @@
8 top_build_prefix = @top_build_prefix@ 8 top_build_prefix = @top_build_prefix@
9 top_builddir = @top_builddir@ 9 top_builddir = @top_builddir@
10 top_srcdir = @top_srcdir@ 10 top_srcdir = @top_srcdir@
11-MAGIC = $(pkgdatadir)/magic 11-MAGIC = $(pkgdatadir)/magic
12+MAGIC = @sysconfdir@/magic 12+MAGIC = @sysconfdir@/magic
13 lib_LTLIBRARIES = libmagic.la 13 lib_LTLIBRARIES = libmagic.la
14 include_HEADERS = magic.h 14 include_HEADERS = magic.h
15-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' 15-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
16+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"' 16+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
17 AM_CFLAGS = @WARNINGS@ 17 AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
18 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \ 18 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
19 encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \ 19 encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \