[packages/file.git] / file-debian.patch

--- file-4.15/doc/file.man.orig	2005-08-18 17:18:22.000000000 +0200
+++ file-4.15/doc/file.man	2005-08-28 22:16:00.615271312 +0200
@@ -1,4 +1,4 @@
-.TH FILE __CSECTION__ "Copyright but distributable"
+.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable"
 .\" $Id$
 .SH NAME
 file
@@ -56,10 +56,9 @@
 meaning anything else (data is usually `binary' or non-printable).
 Exceptions are well-known file formats (core files, tar archives)
 that are known to contain binary data.
-When modifying the file
-.I __MAGIC__
-or the program itself, 
-.B "preserve these keywords" .
+When adding local definitions to
+.IR /etc/magic ,
+.BR "preserve these keywords" .
 People depend on knowing that all the readable files in a directory
 have the word ``text'' printed.
 Don't do as Berkeley did and change ``shell commands text''
@@ -98,7 +97,9 @@
 The concept of `magic number' has been applied by extension to data files.
 Any file with some invariant identifier at a small fixed
 offset into the file can usually be described in this way.
-The information identifying these files is read from the compiled
+The information identifying these files is read from
+.I /etc/magic
+and the compiled
 magic file
 .I __MAGIC__.mgc ,
 or 
@@ -368,12 +369,6 @@
 The order of entries in the magic file is significant.
 Depending on what system you are using, the order that
 they are put together may be incorrect.
-If your old
-.B file
-command uses a magic file,
-keep the old magic file around for comparison purposes
-(rename it to 
-.IR __MAGIC__.orig ).
 .SH EXAMPLES
 .nf
 $ file file.c file /dev/{wd0a,hda}
@@ -527,3 +522,7 @@
 .B ftp.astron.com
 in the directory
 .I /pub/file/file-X.YZ.tar.gz
+.PP
+This version contains some extensions from
+.B Debian
+(mainly new magic entries).
--- file-4.07.orig/src/Makefile.am
+++ file-4.07/src/Makefile.am
@@ -4,7 +4,7 @@
 
 bin_PROGRAMS = file
 
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 	compress.c is_tar.c readelf.c print.c fsmagic.c \
--- file-4.07.orig/magic/Header
+++ file-4.07/magic/Header
@@ -1,5 +1,5 @@
-# Magic
 # Magic data for file(1) command.
-# Machine-generated from src/cmd/file/magdir/*; edit there only!
-# Format is described in magic(files), where:
-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
+# Format is described in magic(5).
+# Don't edit this file, edit /etc/magic or send your suggested inclusions to
+# this file as a wishlist bug against file (using the reportbug utility).
+
--- file-4.14/magic/magic.mime.orig	2005-06-25 17:39:18.000000000 +0200
+++ file-4.14/magic/magic.mime	2005-07-18 22:02:05.196917536 +0200
@@ -195,7 +195,7 @@
 0       beshort         0x4DE1          audio/MP4A-LATM
 
 # MPEG Layer 3 sound files
-0       beshort		&0xffe0		audio/mpeg
+0       beshort&0xfffe  =0xfffa         audio/mpeg
 #MP3 with ID3 tag
 0	string		ID3		audio/mpeg
 # Ogg/Vorbis
@@ -294,10 +294,10 @@
 # because it tries to uncompress it to figure out what's inside.
 
 # standard unix compress
-0	string		\037\235	application/x-compress
+#0	string		\037\235	application/x-compress
 
 # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
-0       string          \037\213        application/x-gzip
+#0       string          \037\213        application/x-gzip
 
 0		string			PK\003\004		application/x-zip
 
@@ -398,19 +398,14 @@
 #
 # from Daniel Quinlan <quinlan@yggdrasil.com>
 #
-0	string		\<HEAD	text/html
-0	string		\<head	text/html
-0	string		\<TITLE	text/html
-0	string		\<title	text/html
-0       string          \<html	text/html
-0       string          \<HTML	text/html
+0	string/cB	\<!DOCTYPE\ html	text/html
+0	string/cb	\<head	text/html
+0	string/cb	\<title	text/html
+0       string/bc	\<html	text/html
 0	string		\<!--	text/html
-0	string		\<h1	text/html
-0	string		\<H1	text/html
-0	string		\<!doctype\ HTML	text/html
-0	string		\<!DOCTYPE\ HTML	text/html
-0	string		\<!doctype\ html	text/html
-0	string		\<!doctype\ HTML	text/html
+0	string/c	\<h1	text/html
+
+0	string		\<?xml			text/xml
 
 #------------------------------------------------------------------------------
 # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
@@ -473,7 +468,7 @@
 0	beshort		0xffd8		image/jpeg
 
 # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
-0	string		BM		image/bmp
+0	string		BM		image/x-ms-bmp
 #>14	byte		12		(OS/2 1.x format)
 #>14	byte		64		(OS/2 2.x format)
 #>14	byte		40		(Windows 3.x format)
@@ -788,6 +783,7 @@
 #
 0	string		FWS             
 >3	byte		x			application/x-shockwave-flash
+0	string		CWS			application/x-shockwave-flash
 
 # The following paramaters are created for Namazu.
 # <http://www.namazu.org/>
@@ -919,3 +915,8 @@
 # EET archive
 # From: Tilman Sauerbeck <tilman@code-monkey.de>
 0	belong	0x1ee7ff00	application/x-eet
+
+# Gnumeric spreadsheet
+# This entry is only semi-helpful, as Gnumeric compresses its files, so
+# they will ordinarily reported as "compressed", but at least -z helps
+39      string          =<gmr:Workbook           application/x-gnumeric
--- file-4.07.orig/magic/magic.local
+++ file-4.07/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).
+
--- file-4.14/src/magic.c.debian	2005-06-25 17:52:14.000000000 +0200
+++ file-4.14/src/magic.c	2005-07-14 09:43:18.000000000 +0200
@@ -213,7 +213,7 @@
 	int	fd = 0;
 	int	rv = -1;
 	unsigned char *buf;
-	struct stat	sb;
+	struct stat	sb, *st = &sb;
 	ssize_t nbytes = 0;	/* number of bytes read from a datafile */
 
 	/*
@@ -227,7 +227,7 @@
 	if (file_reset(ms) == -1)
 		goto done;
 
-	switch (file_fsmagic(ms, inname, &sb)) {
+	switch (file_fsmagic(ms, inname, st)) {
 	case -1:
 		goto done;
 	case 0:
Commit	Line	Data
141eef60 JB	1	--- file-4.15/doc/file.man.orig 2005-08-18 17:18:22.000000000 +0200
141eef60 JB	2	+++ file-4.15/doc/file.man 2005-08-28 22:16:00.615271312 +0200
f8c6f9ed AM	3	@@ -1,4 +1,4 @@
f8c6f9ed AM	4	-.TH FILE __CSECTION__ "Copyright but distributable"
141eef60	5	+.TH FILE __CSECTION__ "August 2005" "Copyrighted but distributable"
f8c6f9ed AM	6	.\" $Id$
	7	.SH NAME
	8	file
	9	@@ -56,10 +56,9 @@
	10	meaning anything else (data is usually `binary' or non-printable).
	11	Exceptions are well-known file formats (core files, tar archives)
	12	that are known to contain binary data.
	13	-When modifying the file
	14	-.I __MAGIC__
	15	-or the program itself,
	16	-.B "preserve these keywords" .
	17	+When adding local definitions to
	18	+.IR /etc/magic ,
	19	+.BR "preserve these keywords" .
	20	People depend on knowing that all the readable files in a directory
	21	have the word ``text'' printed.
	22	Don't do as Berkeley did and change ``shell commands text''
	23	@@ -98,7 +97,9 @@
	24	The concept of `magic number' has been applied by extension to data files.
	25	Any file with some invariant identifier at a small fixed
	26	offset into the file can usually be described in this way.
	27	-The information identifying these files is read from the compiled
	28	+The information identifying these files is read from
	29	+.I /etc/magic
	30	+and the compiled
	31	magic file
	32	.I __MAGIC__.mgc ,
	33	or
141eef60	34	@@ -368,12 +369,6 @@
f8c6f9ed AM	35	The order of entries in the magic file is significant.
	36	Depending on what system you are using, the order that
	37	they are put together may be incorrect.
	38	-If your old
	39	-.B file
	40	-command uses a magic file,
	41	-keep the old magic file around for comparison purposes
	42	-(rename it to
	43	-.IR __MAGIC__.orig ).
	44	.SH EXAMPLES
	45	.nf
	46	$ file file.c file /dev/{wd0a,hda}
141eef60	47	@@ -527,3 +522,7 @@
f8c6f9ed AM	48	.B ftp.astron.com
	49	in the directory
	50	.I /pub/file/file-X.YZ.tar.gz
	51	+.PP
cc7e8ae4	52	+This version contains some extensions from
f8c6f9ed	53	+.B Debian
cc7e8ae4	54	+(mainly new magic entries).
9ccb4ffe JB	55	--- file-4.07.orig/src/Makefile.am
9ccb4ffe JB	56	+++ file-4.07/src/Makefile.am
f8c6f9ed AM	57	@@ -4,7 +4,7 @@
	58
	59	bin_PROGRAMS = file
	60
	61	-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
	62	+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
	63
	64	libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
	65	compress.c is_tar.c readelf.c print.c fsmagic.c \
9ccb4ffe JB	66	--- file-4.07.orig/magic/Header
9ccb4ffe JB	67	+++ file-4.07/magic/Header
f8c6f9ed AM	68	@@ -1,5 +1,5 @@
	69	-# Magic
	70	# Magic data for file(1) command.
	71	-# Machine-generated from src/cmd/file/magdir/*; edit there only!
	72	-# Format is described in magic(files), where:
	73	-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
	74	+# Format is described in magic(5).
	75	+# Don't edit this file, edit /etc/magic or send your suggested inclusions to
	76	+# this file as a wishlist bug against file (using the reportbug utility).
	77	+
7cbf251c JB	78	--- file-4.14/magic/magic.mime.orig 2005-06-25 17:39:18.000000000 +0200
	79	+++ file-4.14/magic/magic.mime 2005-07-18 22:02:05.196917536 +0200
	80	@@ -195,7 +195,7 @@
	81	0 beshort 0x4DE1 audio/MP4A-LATM
bc7258b3	82
9ccb4ffe JB	83	# MPEG Layer 3 sound files
	84	-0 beshort &0xffe0 audio/mpeg
	85	+0 beshort&0xfffe =0xfffa audio/mpeg
	86	#MP3 with ID3 tag
	87	0 string ID3 audio/mpeg
	88	# Ogg/Vorbis
7cbf251c	89	@@ -294,10 +294,10 @@
f8c6f9ed AM	90	# because it tries to uncompress it to figure out what's inside.
	91
	92	# standard unix compress
	93	-0 string \037\235 application/x-compress
	94	+#0 string \037\235 application/x-compress
	95
	96	# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
	97	-0 string \037\213 application/x-gzip
	98	+#0 string \037\213 application/x-gzip
	99
	100	0 string PK\003\004 application/x-zip
	101
7cbf251c	102	@@ -398,19 +398,14 @@
9ccb4ffe JB	103	#
	104	# from Daniel Quinlan <quinlan@yggdrasil.com>
	105	#
	106	-0 string \<HEAD text/html
	107	-0 string \<head text/html
	108	-0 string \<TITLE text/html
	109	-0 string \<title text/html
	110	-0 string \<html text/html
	111	-0 string \<HTML text/html
	112	+0 string/cB \<!DOCTYPE\ html text/html
	113	+0 string/cb \<head text/html
	114	+0 string/cb \<title text/html
	115	+0 string/bc \<html text/html
	116	0 string \<!-- text/html
	117	-0 string \<h1 text/html
	118	-0 string \<H1 text/html
	119	-0 string \<!doctype\ HTML text/html
	120	-0 string \<!DOCTYPE\ HTML text/html
	121	-0 string \<!doctype\ html text/html
	122	-0 string \<!doctype\ HTML text/html
	123	+0 string/c \<h1 text/html
	124	+
	125	+0 string \<?xml text/xml
f8c6f9ed	126
f8c6f9ed AM	127	#------------------------------------------------------------------------------
f8c6f9ed AM	128	# images: file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
7cbf251c	129	@@ -473,7 +468,7 @@
f8c6f9ed AM	130	0 beshort 0xffd8 image/jpeg
	131
	132	# PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu)
	133	-0 string BM image/bmp
	134	+0 string BM image/x-ms-bmp
	135	#>14 byte 12 (OS/2 1.x format)
	136	#>14 byte 64 (OS/2 2.x format)
	137	#>14 byte 40 (Windows 3.x format)
7cbf251c	138	@@ -788,6 +783,7 @@
de676a81 JB	139	#
	140	0 string FWS
	141	>3 byte x application/x-shockwave-flash
	142	+0 string CWS application/x-shockwave-flash
9ccb4ffe	143
de676a81 JB	144	# The following paramaters are created for Namazu.
de676a81 JB	145	# <http://www.namazu.org/>
7cbf251c JB	146	@@ -919,3 +915,8 @@
	147	# EET archive
	148	# From: Tilman Sauerbeck <tilman@code-monkey.de>
	149	0 belong 0x1ee7ff00 application/x-eet
	150	+
f8c6f9ed AM	151	+# Gnumeric spreadsheet
	152	+# This entry is only semi-helpful, as Gnumeric compresses its files, so
	153	+# they will ordinarily reported as "compressed", but at least -z helps
	154	+39 string =<gmr:Workbook application/x-gnumeric
9ccb4ffe JB	155	--- file-4.07.orig/magic/magic.local
9ccb4ffe JB	156	+++ file-4.07/magic/magic.local
f8c6f9ed AM	157	@@ -0,0 +1,3 @@
	158	+# Magic local data for file(1) command.
	159	+# Insert here your local magic data. Format is described in magic(5).
	160	+
7ec63bd1 AM	161	--- file-4.14/src/magic.c.debian 2005-06-25 17:52:14.000000000 +0200
	162	+++ file-4.14/src/magic.c 2005-07-14 09:43:18.000000000 +0200
	163	@@ -213,7 +213,7 @@
	164	int fd = 0;
	165	int rv = -1;
	166	unsigned char *buf;
	167	- struct stat sb;
	168	+ struct stat sb, *st = &sb;
	169	ssize_t nbytes = 0; /* number of bytes read from a datafile */
	170
	171	/*
	172	@@ -227,7 +227,7 @@
	173	if (file_reset(ms) == -1)
	174	goto done;
	175
	176	- switch (file_fsmagic(ms, inname, &sb)) {
	177	+ switch (file_fsmagic(ms, inname, st)) {
	178	case -1:
	179	goto done;
	180	case 0: