Import Debian version 1:5.13-2

debian/control

@@ -3,14 +3,11 @@ Section: utils
 Priority: standard
 Maintainer: Luk Claes <luk@debian.org>
 Build-Depends:
- debhelper (>= 9), autotools-dev, python, python-all-dev,
- python-all-dbg, zlib1g-dev
+ debhelper (>= 9), autotools-dev, python-all-dev, python3-all-dev, zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: http://www.darwinsys.com/file/
 
 Package: file
-Section: utils
-Priority: standard
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version})
@@ -20,9 +17,22 @@ Description: Determines file type using "magic" numbers
  language tests. The first test that succeeds causes the file type to be
  printed.
 
+Package: file-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version})
+Description: Determines file type using "magic" numbers (debug)
+ File tests each argument in an attempt to classify it. There are three sets of
+ tests, performed in this order: filesystem tests, magic number tests, and
+ language tests. The first test that succeeds causes the file type to be
+ printed.
+ .
+ This package contains the debugging symbols.
+
 Package: libmagic1
 Section: libs
-Priority: standard
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -47,7 +57,7 @@ Description: File type determination library using "magic" numbers (development)
 
 Package: python-magic
 Section: python
-Priority: extra
+Priority: optional
 Architecture: any
 Depends:
  ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
@@ -58,3 +68,16 @@ Description: File type determination library using "magic" numbers (Python bindi
  implements the core functionality of the file command.
  .
  This package contains the Python bindings.
+
+Package: python3-magic
+Section: python
+Priority: optional
+Architecture: all
+Depends:
+ ${misc:Depends}, ${python3:Depends}, libmagic1 (>= ${binary:Version})
+Provides: ${python3:Provides}
+Description: File type determination library using "magic" numbers (Python 3 bindings)
+ This library can be used to classify files according to magic number tests. It
+ implements the core functionality of the file command.
+ .
+ This package contains the Python 3 bindings.

debian/copyright

@@ -5,18 +5,14 @@ Source: ftp://ftp.astron.com/pub/file/
 
 Files: *
 Copyright: 1985-1995 Ian F. Darwin
-           1994-2011 Christos Zoulas <christos@zoulas.com>
-License: BSD (2 Clause)
-
-Files: magic/Magdir/os9
-Copyright: 1996 Ignatios Souvatzis
-License: BSD (4 Clause)
+           1994-2013 Christos Zoulas <christos@zoulas.com>
+License: BSD
 
 Files: debian/*
-Copyright: 2007-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
-License: BSD (2 Clause)
+Copyright: 2007-2013 Daniel Baumann <mail@daniel-baumann.ch>
+License: BSD
 
-License: BSD (2 Clause)
+License: BSD
  This software is not subject to any export provision of the United States
  Department of Commerce, and may be exported to any country or planet.
  .
@@ -43,34 +39,3 @@ License: BSD (2 Clause)
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
-
-License: BSD (4 Clause)
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    This product includes software developed by Ignatios Souvatzis for
-    the NetBSD project.
- .
- 4. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian/file.README.Debian

@@ -23,4 +23,4 @@ How package maintainers can inject their own magics for profit:
 
   4. profit.
 
- -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Sat, 27 Mar 2010 11:22:58 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 27 Mar 2010 11:22:58 +0100

debian/libmagic1.symbols

@@ -0,0 +1,15 @@
+libmagic.so.1 libmagic1 #MINVER#
+ magic_buffer@Base 5.12
+ magic_check@Base 5.12
+ magic_close@Base 5.12
+ magic_compile@Base 5.12
+ magic_descriptor@Base 5.12
+ magic_errno@Base 5.12
+ magic_error@Base 5.12
+ magic_file@Base 5.12
+ magic_getpath@Base 5.12
+ magic_list@Base 5.12
+ magic_load@Base 5.12
+ magic_open@Base 5.12
+ magic_setflags@Base 5.12
+ magic_version@Base 5.13

debian/patches/01-file-localmagic.patch

@@ -6,8 +6,8 @@ Description:
  should go to /etc/magic.
 
 diff -Naurp file.orig/magic/Header file/magic/Header
---- file.orig/magic/Header	2011-09-08 17:23:06.845387845 +0200
-+++ file/magic/Header	2011-09-08 17:33:03.984889688 +0200
+--- file.orig/magic/Header
++++ file/magic/Header
 @@ -1,5 +1,6 @@
  # Magic data for file(1) command.
 -# Format is described in magic(files), where:
@@ -19,33 +19,45 @@ diff -Naurp file.orig/magic/Header file/magic/Header
 +# or send your suggested inclusions
 +# as a wishlist bug against file (using the reportbug utility).
 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
---- file.orig/magic/magic.local	1970-01-01 01:00:00.000000000 +0100
-+++ file/magic/magic.local	2011-09-08 17:38:44.420889203 +0200
+--- file.orig/magic/magic.local
++++ file/magic/magic.local
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
+diff -Naurp file.orig/src/apprentice.c file/src/apprentice.c
+--- file.orig/src/apprentice.c
++++ file/src/apprentice.c
+@@ -419,7 +419,7 @@ apprentice_1(struct magic_set *ms, const
+ #ifndef COMPILE_ONLY
+ 	map = apprentice_map(ms, fn);
+ 	if (map == NULL) {
+-		if (ms->flags & MAGIC_CHECK)
++		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
+ 			file_magwarn(ms, "using regular magic file `%s'", fn);
+ 		map = apprentice_load(ms, fn, action);
+ 		if (map == NULL)
 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
---- file.orig/src/Makefile.am	2011-09-08 17:23:06.884893668 +0200
-+++ file/src/Makefile.am	2011-09-08 17:33:03.988392256 +0200
+--- file.orig/src/Makefile.am
++++ file/src/Makefile.am
 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
  
  bin_PROGRAMS = file
  
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = @WARNINGS@
+ AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in	2011-09-08 17:23:06.884893668 +0200
-+++ file/src/Makefile.in	2011-09-08 17:33:03.988392256 +0200
-@@ -243,7 +243,7 @@ top_srcdir = @top_srcdir@
+--- file.orig/src/Makefile.in
++++ file/src/Makefile.in
+@@ -247,7 +247,7 @@ top_srcdir = @top_srcdir@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = @WARNINGS@
+ AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \

debian/patches/02-file-make.patch

@@ -2,8 +2,8 @@ Author: Michael Piefel <piefel@debian.org>
 Description: n/a
 
 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in	2011-09-08 17:51:11.289392945 +0200
-+++ file/src/Makefile.in	2011-09-08 17:58:24.985388126 +0200
+--- file.orig/src/Makefile.in
++++ file/src/Makefile.in
 @@ -368,7 +368,7 @@ clean-binPROGRAMS:
  	rm -f $$list
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 

debian/patches/0003-file-usage.patch

@@ -0,0 +1,17 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Adding POSIXLY_CORRECT reference in usage message (Closes: #576679).
+
+diff -Naurp file.orig/src/file_opts.h file/src/file_opts.h
+--- file.orig/src/file_opts.h
++++ file/src/file_opts.h
+@@ -34,8 +34,8 @@ OPT_LONGONLY("mime-encoding", 0, "
+ OPT('k', "keep-going", 0, "           don't stop at the first match\n")
+ #ifdef S_IFLNK
+ OPT('l', "list", 0, "                 list magic strength\n")
+-OPT('L', "dereference", 0, "          follow symlinks (default)\n")
+-OPT('h', "no-dereference", 0, "       don't follow symlinks\n")
++OPT('L', "dereference", 0, "          follow symlinks (default if POSIXLY_CORRECT is set)\n")
++OPT('h', "no-dereference", 0, "       don't follow symlinks (default if POSIXLY_CORRECT is not set)\n")
+ #endif
+ OPT('n', "no-buffer", 0, "            do not buffer output\n")
+ OPT('N', "no-pad", 0, "               do not pad output\n")

debian/patches/03-doc-manpages.patch

@@ -2,8 +2,8 @@ Author: Michael Piefel <piefel@debian.org>
 Description: FIXME, and #417511.
 
 diff -Naurp file.orig/doc/file.man file/doc/file.man
---- file.orig/doc/file.man	2011-09-08 17:23:06.837388190 +0200
-+++ file/doc/file.man	2011-09-08 17:35:51.108887922 +0200
+--- file.orig/doc/file.man
++++ file/doc/file.man
 @@ -55,7 +55,7 @@ meaning anything else (data is usually
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)

debian/patches/0005-python3.3.patch

@@ -0,0 +1,16 @@
+Author: Jakub Wilk <jwilk@debian.org>
+Description:
+ Make file recognize byte-compiled files generated by Python 3.3
+ (Closes: #697110).
+
+diff -Naurp file.orig/magic/Magdir/python file/magic/Magdir/python
+--- file.orig/magic/Magdir/python
++++ file/magic/Magdir/python
+@@ -22,6 +22,7 @@
+ 0	belong		0x3b0c0d0a	python 3.0 byte-compiled
+ 0	belong		0x4f0c0d0a	python 3.1 byte-compiled
+ 0	belong		0x6c0c0d0a	python 3.2 byte-compiled
++0	belong		0x9e0c0d0a	python 3.3 byte-compiled
+ 
+ 0	search/1/w	#!\ /usr/bin/python	Python script text executable
+ !:mime text/x-python

debian/patches/0006-gzip.patch

@@ -0,0 +1,15 @@
+Author: Daniel Baumann <mail@daniel-baumann.ch>
+Description: Updating gzip mime (Closes: #688886).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress
++++ file/magic/Magdir/compress
+@@ -21,7 +21,7 @@
+ #	* Produce shorter output - notably, only report compression methods
+ #         other than 8 ("deflate", the only method defined in RFC 1952).
+ 0       string          \037\213        gzip compressed data
+-!:mime	application/x-gzip
++!:mime	application/gzip
+ >2	byte		<8		\b, reserved method
+ >2	byte		>8		\b, unknown method
+ >3	byte		&0x01		\b, ASCII

debian/patches/0007-c64-tap.patch

@@ -0,0 +1,16 @@
+Author: Esa Hyytiä <esa@netlab.tkk.fi>
+Description: Adding new magics for Commodore raw tape files (Closes: #699777).
+
+diff -Naurp file.orig/magic/Magdir/c64 file/magic/Magdir/c64
+--- file.orig/magic/Magdir/c64
++++ file/magic/Magdir/c64
+@@ -41,3 +41,9 @@
+ >32	leshort		x		Version:0x%x
+ >36	leshort		!0		Entries:%i
+ >40	string		x		Name:%.24s
++
++# Raw tape file format (.tap files)
++# Esa Hyytiä <esa@netlab.tkk.fi>
++0	string		C64-TAPE-RAW	C64 Raw Tape File (.tap),
++>0x0c	byte		x		Version:%u,
++>0x10   lelong		x		Length:%lu cycles

debian/patches/0008-aol-art.patch

@@ -0,0 +1,13 @@
+Author: Bastien Roucaries <roucaries.bastien@gmail.com>
+Description: Adding updated magics for AOL ART images (Closes: #681304).
+
+diff -Naurp file.orig/magic/Magdir/netscape file/magic/Magdir/netscape
+--- file.orig/magic/Magdir/netscape
++++ file/magic/Magdir/netscape
+@@ -22,4 +22,5 @@
+ 
+ #
+ #This is files ending in .art, FIXME add more rules
+-0       string          JG\004\016\0\0\0\0      ART
++0	string	JG\004\016\0\0\0\0	AOL ART image
++0	string	JG\003\016\0\0\0\0	AOL ART image

debian/patches/0009-ms-html-help.patch

@@ -0,0 +1,15 @@
+Author: Paul Wise <pabs@debian.org>
+Description: Updating MS Windows HtmlHelp Data magics (Closes: #653911).
+
+diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig/magic/Magdir/msdos
++++ file/magic/Magdir/msdos
+@@ -720,7 +720,7 @@
+ 0	ulequad	0x3a000000024e4c	MS Advisor help file
+ 
+ # HtmlHelp files (.chm)
+-0	string/b	ITSF\003\000\000\000\x60\000\000\000\001\000\000\000	MS Windows HtmlHelp Data
++0	string/b	ITSF\003\000\000\000\x60\000\000\000	MS Windows HtmlHelp Data
+ 
+ # GFA-BASIC (Wolfram Kleff)
+ 2	string/b	GFA-BASIC3	GFA-BASIC 3 data

debian/patches/0010-mdadm.patch

@@ -0,0 +1,32 @@
+Author: Russell Coker <russell@coker.com.au>
+Description: Adding new magics for Linux Software RAID (Closes: #663454).
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux
++++ file/magic/Magdir/linux
+@@ -344,3 +344,25 @@
+ #>2	regex		\(name\ [^)]*\)		%s
+ >20	search/256	(name			(name
+ >>&1	string		x			%s...)
++
++# Linux Software RAID (mdadm)
++# Russell Coker <russell@coker.com.au>
++4096	lelong	0xa92b4efc	Linux Software RAID
++>4100	lelong	x		version 1.2 (%d)
++>4112	belong	x		UUID=%8x:
++>4116	belong	x		\b%8x:
++>4120	belong	x		\b%8x:
++>4124	belong	x		\b%8x
++>4128	string	x		name=%s
++>4168	lelong	x		level=%d
++>4188	lelong	x		disks=%d
++
++0	lelong	0xa92b4efc	Linux Software RAID
++>4	lelong	x		version 1.1 (%d)
++>16	belong	x		UUID=%8x:
++>20	belong	x		\b%8x:
++>24	belong	x		\b%8x:
++>28	belong	x		\b%8x
++>32	string	x		name=%s
++>72	lelong	x		level=%d
++>92	lelong	x		disks=%d

debian/patches/0011-btrfs.patch

@@ -0,0 +1,34 @@
+Author: Russell Coker <russell@coker.com.au>
+Description: Adding updated magics for BTRFS (Closes: #663454).
+
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2013-03-13 16:54:43.588452886 +0100
++++ file/magic/Magdir/filesystems	2013-03-13 17:15:59.659044842 +0100
+@@ -1883,12 +1883,21 @@
+ >>0x10060        string          >\0             lockproto %s)
+ 
+ # BTRFS
+-0x10040         string          _BHRfS_M        BTRFS Filesystem
+->0x1012b        string          >\0             (label "%s",
+->0x10090        lelong          x               sectorsize %d,
+->0x10094        lelong          x               nodesize %d,
+->0x10098        lelong          x               leafsize %d)
+-
++# Russell Coker <russell@coker.com.au>
++0x10040	string	_BHRfS_M	BTRFS Filesystem
++>0x1012b	string	>\0		label "%s",
++>0x10090	lelong	x		sectorsize %d,
++>0x10094	lelong	x		nodesize %d,
++>0x10098	lelong	x		leafsize %d,
++>0x10020	belong	x		UUID=%8x-
++>0x10024	beshort	x		\b%4x-
++>0x10026	beshort	x		\b%4x-
++>0x10028	beshort	x		\b%4x-
++>0x1002a	beshort	x		\b%4x
++>0x1002c	belong	x		\b%8x,
++>0x10078	lequad	x		%lld/
++>0x10070	lequad	x		\b%lld bytes used,
++>0x10088	lequad	x		%lld devices
+ 
+ # dvdisaster's .ecc
+ # From: "Nelson A. de Oliveira" <naoliv@gmail.com>

debian/patches/0012-lxt.patch

@@ -0,0 +1,15 @@
+Author: chrysn <chrysn@fsfe.org>
+Description: Adding new magics for LXT (Closes: #647412).
+
+diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
+--- file.orig/magic/Magdir/scientific
++++ file/magic/Magdir/scientific
+@@ -104,3 +104,8 @@
+ >>5	byte	x		version %d.0
+ >4	byte	>0x00		version %d
+ >>5	byte	x		\b.%d
++
++# Type: LXT (interLaced eXtensible Trace)
++# chrysn <chrysn@fsfe.org>
++0	beshort	0x0138	interLaced eXtensible Trace (LXT) file
++>2	beshort	>0	(Version %u)

debian/patches/series

@@ -1,3 +1,12 @@
-01-file-localmagic.patch
-02-file-make.patch
-03-doc-manpages.patch
+0001-file-localmagic.patch
+0002-file-make.patch
+0003-file-usage.patch
+0004-doc-manpages.patch
+0005-python3.3.patch
+0006-gzip.patch
+0007-c64-tap.patch
+0008-aol-art.patch
+0009-ms-html-help.patch
+0010-mdadm.patch
+0011-btrfs.patch
+0012-lxt.patch

debian/python3-magic.examples

@@ -0,0 +1 @@
+python/example.py

debian/rules

@@ -18,14 +18,17 @@ endif
 CFLAGS += -DHOWMANY=0x18000
 
 PYTHON_VERSIONS=$(shell pyversions -r debian/control)
+PYTHON3_VERSIONS=$(shell py3versions -r debian/control)
 
 %:
-	dh ${@} --with autotools_dev,python2
+	dh ${@} --with autotools_dev,python2,python3
 
 override_dh_auto_clean:
 	dh_auto_clean
 
 	rm -rf python/build
+	rm -rf python/__pycache__
+	rm -f python/*.pyc
 
 override_dh_auto_build:
 	dh_auto_build
@@ -36,12 +39,14 @@ override_dh_auto_build:
 			-L$(CURDIR)/src/.libs); \
 	done
 
-	for python in $(PYTHON_VERSIONS); do \
-		(cd python && $$python-dbg setup.py build_ext -L$(CURDIR)/src/.libs); \
+	for python in $(PYTHON3_VERSIONS); \
+	do \
+		(cd python && $$python setup.py build_ext \
+			-L$(CURDIR)/src/.libs); \
 	done
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)"
+	dh_auto_configure -- $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 --enable-static --disable-silent-rules CFLAGS="$(CFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install
@@ -57,6 +62,12 @@ override_dh_auto_install:
 			--root=$(CURDIR)/debian/python-magic $(py_setup_install_args)); \
 	done
 
+	for python in $(PYTHON3_VERSIONS); \
+	do \
+		(cd python && $$python setup.py install --no-compile \
+			--root=$(CURDIR)/debian/python3-magic $(py_setup_install_args)); \
+	done
+
 	# Installing additional headers
 	mkdir -p debian/libmagic-dev/usr/include/file
 	cp src/file.h debian/libmagic-dev/usr/include/file
@@ -65,10 +76,13 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/lib/*/*.la
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
 
 override_dh_install:
 	dh_install --fail-missing
 
 override_dh_shlibdeps:
 	dh_shlibdeps -Llibmagic1 -ldebian/libmagic1/usr/lib
+
+override_dh_strip:
+	dh_strip --dbg-package=file-dbg

debian/source/options

@@ -1,2 +1 @@
 compression = xz
-compression-level = 9