Import Debian version 4.17-3

debian/p

@@ -1,29 +0,0 @@
-diff -ur file-4.15.old/src/readelf.c file-4.15/src/readelf.c
---- file-4.15.old/src/readelf.c	2005-07-14 04:22:25.000000000 +0200
-+++ file-4.15/src/readelf.c	2005-11-05 11:15:12.000000000 +0100
-@@ -352,6 +352,14 @@
- 			if (file_printf(ms, "Solaris") == -1)
- 				return size;
- 			break;
-+		case GNU_OS_KFREEBSD:
-+			if (file_printf(ms, "kFreeBSD") == -1)
-+				return size;
-+			break;
-+		case GNU_OS_KNETBSD:
-+			if (file_printf(ms, "kNetBSD") == -1)
-+				return size;
-+			break;
- 		default:
- 			if (file_printf(ms, "<unknown>") == -1)
- 				return size; 
-diff -ur file-4.15.old/src/readelf.h file-4.15/src/readelf.h
---- file-4.15.old/src/readelf.h	2005-06-30 18:33:01.000000000 +0200
-+++ file-4.15/src/readelf.h	2005-11-05 11:15:41.000000000 +0100
-@@ -231,5 +231,7 @@
- #define GNU_OS_LINUX	0
- #define GNU_OS_HURD	1
- #define GNU_OS_SOLARIS	2
-+#define GNU_OS_KFREEBSD	3
-+#define GNU_OS_KNETBSD	4
- 
- #endif

debian/rules

@@ -80,6 +80,7 @@ install: build
 	$(MAKE) prefix=`pwd`/debian/tmp/usr install
 	rm libtool && mv libtool.upstream libtool
 	install -m644 -p -D magic/magic.local debian/tmp/etc/magic
+	install -m644 -p -D magic/magic.local debian/tmp/etc/magic.mime
 
 	install -m644 -D debian/bug.presubj debian/file/usr/share/bug/file/presubj
 	install -m644 -D debian/bug.control debian/libmagic1/usr/share/bug/libmagic1/control

doc/file.man

@@ -299,9 +299,14 @@ can be used to set the default magic number file name.
 If that variable is set, then
 .B file
 will not attempt to open
-.B $HOME/.magic .
+.BR $HOME/.magic .
 .B file
 adds ".mime" and/or ".mgc" to the value of this variable as appropriate.
+However,
+.B file
+has to exist in order for
+.BR file .mime
+to be considered.
 The environment variable
 .B POSIXLY_CORRECT
 controls (on systems that support symbolic links), if

magic/Magdir/commands

@@ -28,7 +28,7 @@
 0	string/b	#!\ /bin/awk		awk script text executable
 0	string/b	#!\ /usr/bin/awk	awk script text executable
 # update to distinguish from *.vcf files
-0	regex		BEGIN[[:space:]]*[{]	awk script text
+#0	regex		BEGIN[[:space:]]*[{]	awk script text
 
 # AT&T Bell Labs' Plan 9 shell
 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable

magic/Magdir/python

@@ -13,6 +13,7 @@
 0	belong		0x2ded0d0a	python 2.2 byte-compiled
 0	belong		0x3bf20d0a	python 2.3 byte-compiled
 0	belong		0x6df20d0a	python 2.4 byte-compiled
+0       belong          0x8cf20d0a      python 2.5 byte-compiled
 
 0	string/b  #!\ /usr/bin/python	python script text executable
 

magic/magic.mime

@@ -270,7 +270,7 @@
 0       string          #!/usr/bin/awk          application/x-awk
 0       string          #!\ /usr/bin/awk        application/x-awk
 # update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
-0	regex		BEGIN[[:space:]]*[{]	application/x-awk
+#0	regex		BEGIN[[:space:]]*[{]	application/x-awk
 
 # For Larry Wall's perl language.  The ``eval'' line recognizes an
 # outrageously clever hack for USG systems.
@@ -598,7 +598,7 @@
 0       belong             0x000001B3     video/mpv
 0       belong&0xFF5FFF1F  0x47400010     video/mp2t
 0       belong             0x00000001
->4      byte&1F            0x07           video/h264
+>4      byte&0x1F          0x07           video/h264
 
 # FLI animation format
 0	leshort		0xAF11				video/fli
@@ -689,8 +689,10 @@
 #------------------------------------------------------------------------------
 # Hierarchical Data Format, used to facilitate scientific data exchange
 # specifications at http://hdf.ncsa.uiuc.edu/
-0	belong		0x0e031301	Hierarchical Data Format (version 4) data
-0	string		\211HDF\r\n\032	Hierarchical Data Format (version 5) data
+#Hierarchical Data Format (version 4) data
+0	belong		0x0e031301		application/x-hdf
+#Hierarchical Data Format (version 5) data
+0	string		\211HDF\r\n\032		application/x-hdf
 
 # Adobe Photoshop
 0	string		8BPS			image/x-photoshop
@@ -760,21 +762,27 @@
 # Debian has entries for the old PGP formats:
 # pgp:  file(1) magic for Pretty Good Privacy
 # see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
-0       beshort         0x9900                  text/PGP key public ring
-0       beshort         0x9501                  text/PGP key security ring
-0       beshort         0x9500                  text/PGP key security ring
-0       beshort         0xa600                  text/PGP encrypted data
-0       string          -----BEGIN\040PGP       text/PGP armored data 
->15     string          PUBLIC\040KEY\040BLOCK- public key block
->15     string          MESSAGE-                message
->15     string          SIGNED\040MESSAGE-      signed message
->15     string          PGP\040SIGNATURE-       signature
-0       beshort         0x8501                  data
+#text/PGP key public ring
+0	beshort		0x9900			application/pgp
+#text/PGP key security ring
+0	beshort		0x9501			application/pgp
+#text/PGP key security ring
+0	beshort		0x9500			application/pgp
+#text/PGP encrypted data
+0	beshort		0xa600			application/pgp-encrypted
+#text/PGP armored data
+##public key block
+2	string	---BEGIN\ PGP\ PUBLIC\ KEY\ BLOCK-	application/pgp-keys
+0	string	-----BEGIN\040PGP\40MESSAGE-			application/pgp
+0	string	-----BEGIN\040PGP\40SIGNATURE-			application/pgp-signature
 #
 # GnuPG Magic:
 # 
-0       beshort         0x9901                  text/GnuPG key public ring
-0       beshort         0x8501                  text/OpenPGP data
+#
+#text/GnuPG key public ring
+0	beshort		0x9901			application/pgp
+#text/OpenPGP data
+0	beshort		0x8501			application/pgp-encrypted	
 
 # flash:        file(1) magic for Macromedia Flash file format
 #