1 #!/bin/sh /usr/share/dpatch/dpatch-run
2 ## 318-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
4 ## DP: New magic for PAR2 archive files (Closes: #294070).
8 diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
9 --- file-4.24.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000 +0000
10 +++ file-4.24/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000
12 >24 belong 1 SHA-1 checksum
13 >24 belong 2 MD5 checksum
15 +# Type: Parity Archive
16 +# From: Daniel van Eeden <daniel_e@dds.nl>
17 +0 string PAR2 Parity Archive Volume Set
18 #!/bin/sh /usr/share/dpatch/dpatch-run
19 ## 319-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
21 ## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
25 diff -Naurp file-4.24.orig/magic/Magdir/images file-4.24/magic/Magdir/images
26 --- file-4.24.orig/magic/Magdir/images 2008-03-07 14:58:54.000000000 +0000
27 +++ file-4.24/magic/Magdir/images 2008-04-07 08:07:42.000000000 +0000
29 0 string \xed\xfe\xda\xbe Cytovision FLEX file
30 0 string \xed\xab\xed\xfe Cytovision FLEX file
31 0 string \xad\xfd\xea\xad Cytovision RATS file
33 +# Type: Ulead Photo Explorer5 (.pe5)
34 +# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
35 +# From: Simon Horman <horms@debian.org>
36 +0 string IIO2H Ulead Photo Explorer5
37 #!/bin/sh /usr/share/dpatch/dpatch-run
38 ## 320-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
40 ## DP: New magic for pmenu (Closes: #38543).
44 diff -Naurp file-4.23.orig/magic/Magdir/commands file-4.23/magic/Magdir/commands
45 --- file-4.23.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000
46 +++ file-4.23/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000
48 0 string Zend\x00 PHP script Zend Optimizer data
50 0 string $! DCL command file
53 +# URL: http://packages.debian.org/pdmenu
54 +# From: Edward Betts <edward@debian.org>
55 +0 string #!/usr/bin/pdmenu Pdmenu configuration file text
56 #!/bin/sh /usr/share/dpatch/dpatch-run
57 ## 321-magic-add-powertab.dpatch by Jelmer Vernooij <jelmer@samba.org>
59 ## DP: New magic for Power-Tab
63 diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord
64 --- file-4.20.orig/magic/Magdir/chord 2003-03-24 14:48:32.000000000 +0000
65 +++ file-4.20/magic/Magdir/chord 2007-05-17 16:33:26.000000000 +0000
68 0 string {title Chord text file
70 +# Type: PowerTab file format
71 +# URL: http://www.power-tab.net/
72 +# From: Jelmer Vernooij <jelmer@samba.org>
73 +0 string ptab\003\000 Power-Tab v3 Tablature File
74 +0 string ptab\004\000 Power-Tab v4 Tablature File
75 #!/bin/sh /usr/share/dpatch/dpatch-run
76 ## 322-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
78 ## DP: New magic for scummVM savegame files (Closes: #263488).
82 diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
83 --- file-4.23.orig/magic/Magdir/console 2007-09-26 20:22:31.000000000 +0000
84 +++ file-4.23/magic/Magdir/console 2008-01-12 17:36:55.000000000 +0000
87 0 string HM3W Warcraft III map file
89 +# Type: scummVM savegame files
90 +# From: Sven Hartge <debian@ds9.argh.org>
91 +0 string SCVM scummVM savegame
93 #!/bin/sh /usr/share/dpatch/dpatch-run
94 ## 323-magic-add-sgf.dpatch by Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
96 ## DP: New magic for SGF Smart Game Format
100 diff -Naurp file-4.24.orig/magic/Magdir/games file-4.24/magic/Magdir/games
101 --- file-4.24.orig/magic/Magdir/games 2008-02-19 17:27:30.000000000 +0000
102 +++ file-4.24/magic/Magdir/games 2008-04-07 08:09:12.000000000 +0000
104 >4 lelong x containing %d lumps
105 0 string =PWAD doom patch PWAD data
106 >4 lelong x containing %d lumps
108 +# Type: SGF Smart Game Format
109 +# URL: http://www.red-bean.com/sgf/
110 +# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
112 +2 regex/c \\(;.*GM\\[[0-9]{1,2}\\] Smart Game Format
113 +>2 regex/c GM\\[1\\] - Go Game
114 +>2 regex/c GM\\[6\\] - BackGammon Game
115 +>2 regex/c GM\\[11\\] - Hex Game
116 +>2 regex/c GM\\[18\\] - Amazons Game
117 +>2 regex/c GM\\[19\\] - Octi Game
118 +>2 regex/c GM\\[20\\] - Gess Game
119 +>2 regex/c GM\\[21\\] - twix Game
120 #!/bin/sh /usr/share/dpatch/dpatch-run
121 ## 323-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
123 ## DP: New magic for SiSU Markup Language.
127 diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
128 --- file-4.24.orig/magic/Magdir/sisu 1970-01-01 00:00:00.000000000 +0000
129 +++ file-4.24/magic/Magdir/sisu 2008-04-07 08:10:25.000000000 +0000
131 +# Type: SiSU Markup Language
132 +# URL: http://www.sisudoc.org/
133 +# From: Ralph Amissah <ralph.amissah@gmail.com>
135 +0 regex \^%?[\ \t]*SiSU[\ \t]+insert SiSU text insert
138 +0 regex \^%[\ \t]+SiSU[\ \t]+master SiSU text master
141 +0 regex \^%?[\ \t]*SiSU[\ \t]+text SiSU text
144 +0 regex \^%?[\ \t]*SiSU[\ \t][0-9.]+ SiSU text
147 +0 regex \^%*[\ \t]*sisu-[0-9.]+ SiSU text
149 diff -Naurp file-4.24.orig/magic/Makefile.am file-4.24/magic/Makefile.am
150 --- file-4.24.orig/magic/Makefile.am 2008-03-22 21:41:00.000000000 +0000
151 +++ file-4.24/magic/Makefile.am 2008-04-07 08:11:04.000000000 +0000
152 @@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
153 $(MAGIC_FRAGMENT_DIR)/sgml \
154 $(MAGIC_FRAGMENT_DIR)/sharc \
155 $(MAGIC_FRAGMENT_DIR)/sinclair \
156 +$(MAGIC_FRAGMENT_DIR)/sisu \
157 $(MAGIC_FRAGMENT_DIR)/sketch \
158 $(MAGIC_FRAGMENT_DIR)/smalltalk \
159 $(MAGIC_FRAGMENT_DIR)/sniffer \
160 diff -Naurp file-4.24.orig/magic/Makefile.in file-4.24/magic/Makefile.in
161 --- file-4.24.orig/magic/Makefile.in 2008-03-22 21:41:06.000000000 +0000
162 +++ file-4.24/magic/Makefile.in 2008-04-07 08:11:10.000000000 +0000
163 @@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
164 $(MAGIC_FRAGMENT_DIR)/sgml \
165 $(MAGIC_FRAGMENT_DIR)/sharc \
166 $(MAGIC_FRAGMENT_DIR)/sinclair \
167 +$(MAGIC_FRAGMENT_DIR)/sisu \
168 $(MAGIC_FRAGMENT_DIR)/sketch \
169 $(MAGIC_FRAGMENT_DIR)/smalltalk \
170 $(MAGIC_FRAGMENT_DIR)/sniffer \
171 #!/bin/sh /usr/share/dpatch/dpatch-run
172 ## 324-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
174 ## DP: New magic for SNES SPC700 sound files (Closes: #410847).
178 diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
179 --- file-4.21.orig/magic/Magdir/audio 2007-12-23 17:32:42.000000000 +0000
180 +++ file-4.21/magic/Magdir/audio 2007-12-23 17:33:57.000000000 +0000
183 >122 byte&0x1 =0 NTSC
185 +# Type: SNES SPC700 sound files
186 +# From: Josh Triplett <josh@freedesktop.org>
187 +0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
188 +>&0 string 0.30 \b, version %s
189 +>>0x23 byte 0x1B \b, without ID666 tag
190 +>>0x23 byte 0x1A \b, with ID666 tag
191 +>>>0x2E string >\0 \b, song "%.32s"
192 +>>>0x4E string >\0 \b, game "%.32s"
194 # Impulse tracker module (audio/x-it)
195 0 string IMPM Impulse Tracker module sound data -
197 #!/bin/sh /usr/share/dpatch/dpatch-run
198 ## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
200 ## DP: New magic for OpenSSH key files (Closes: #439537).
204 diff -Naur file-4.21.orig/magic/Magdir/ssh file-4.21/magic/Magdir/ssh
205 --- file-4.21.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
206 +++ file-4.21/magic/Magdir/ssh 2007-08-26 08:25:03.000000000 +0000
208 +# Type: OpenSSH key files
209 +# From: Nicolas Collignon <tsointsoin@gmail.com>
211 +0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
212 +>28 string >\0 version %s
214 +0 string ssh-dss\ OpenSSH DSA public key
215 +0 string ssh-rsa\ OpenSSH RSA public key
216 #!/bin/sh /usr/share/dpatch/dpatch-run
217 ## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
219 ## DP: New magic for OpenSSL certificates/key files (Closes: #439537).
223 diff -Naur file-4.21.orig/magic/Magdir/ssl file-4.21/magic/Magdir/ssl
224 --- file-4.21.orig/magic/Magdir/ssl 1970-01-01 00:00:00.000000000 +0000
225 +++ file-4.21/magic/Magdir/ssl 2007-08-26 08:27:04.000000000 +0000
227 +# Type: OpenSSL certificates/key files
228 +# From: Nicolas Collignon <tsointsoin@gmail.com>
230 +0 string -----BEGIN\ CERTIFICATE----- PEM certificate
231 +0 string -----BEGIN\ CERTIFICATE\ REQ PEM certificate request
232 +0 string -----BEGIN\ RSA\ PRIVATE PEM RSA private key
233 +0 string -----BEGIN\ DSA\ PRIVATE PEM DSA private key
234 #!/bin/sh /usr/share/dpatch/dpatch-run
235 ## 325-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
237 ## DP: New magic for SVN dumps (closes: #256652).
241 diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
242 --- file-4.21.orig/magic/Magdir/revision 2007-12-23 17:25:39.000000000 +0000
243 +++ file-4.21/magic/Magdir/revision 2007-12-23 17:26:34.000000000 +0000
245 0 string HG10 Mercurial bundle,
246 >4 string UN uncompressed
247 >4 string BZ bzip2 compressed
249 +# Type: Subversion (SVN) dumps
250 +# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
251 +0 string SVN-fs-dump-format-version: Subversion dumpfile
252 +>28 string >\0 (version: %s)
253 #!/bin/sh /usr/share/dpatch/dpatch-run
254 ## 326-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
256 ## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
257 ## DP: (Closes: #284803).
261 diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
262 --- file-4.23.orig/magic/Magdir/audio 2008-01-12 17:39:01.000000000 +0000
263 +++ file-4.23/magic/Magdir/audio 2008-01-12 17:38:49.000000000 +0000
265 # URL: http://filext.com/detaillist.php?extdetail=AMR
266 # From: Russell Coker <russell@coker.com.au>
267 0 string #!AMR Adaptive Multi-Rate Codec (GSM telephony)
269 +# Type: SuperCollider 3 Synth Definition File Format
270 +# From: Mario Lang <mlang@debian.org>
271 +0 string SCgf SuperCollider3 Synth Definition file,
272 +>4 belong x version %d
273 #!/bin/sh /usr/share/dpatch/dpatch-run
274 ## 328-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
276 ## DP: xen patch, recognizes Xen saved domain
280 diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
281 --- file-4.23.orig/magic/Magdir/linux 2008-01-12 17:47:04.000000000 +0000
282 +++ file-4.23/magic/Magdir/linux 2008-01-12 17:46:42.000000000 +0000
285 >168 string x UUID: %s
287 +# Type: Xen, the virtual machine monitor
288 +# From: Radek Vokal <rvokal@redhat.com>
289 +0 string LinuxGuestRecord Xen saved domain
290 +#>2 regex \(name\ [^)]*\) %s
291 +>20 search/256 (name (name
292 +>>&1 string x %s...)
293 #!/bin/sh /usr/share/dpatch/dpatch-run
294 ## 331-magic-add-xcursor.dpatch by Mathias Brodala <info@noctus.net>
296 ## DP: New magic for X11 cursor files (Closes: #451246).
300 diff -Naur file-4.21.orig/magic/Magdir/images file-4.21/magic/Magdir/images
301 --- file-4.21.orig/magic/Magdir/images 2007-12-23 17:40:53.000000000 +0000
302 +++ file-4.21/magic/Magdir/images 2007-12-23 17:40:46.000000000 +0000
304 # URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
305 # From: Simon Horman <horms@debian.org>
306 0 string IIO2H Ulead Photo Explorer5
309 +# URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
310 +# From: Mathias Brodala <info@noctus.net>
311 +0 string Xcur X11 cursor
312 #!/bin/sh /usr/share/dpatch/dpatch-run
313 ## 903-magic-local.dpatch by Michael Piefel <piefel@debian.org>
315 ## DP: No longer includes Localstuff in /usr/share/misc/magic. Local definitions
316 ## DP: should go to /etc/magic.
320 diff -Naurp file-4.24.orig/magic/Header file-4.24/magic/Header
321 --- file-4.24.orig/magic/Header 2000-08-05 17:36:46.000000000 +0000
322 +++ file-4.24/magic/Header 2008-04-07 08:17:11.000000000 +0000
325 # Magic data for file(1) command.
326 -# Machine-generated from src/cmd/file/magdir/*; edit there only!
327 -# Format is described in magic(files), where:
328 -# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
329 +# Format is described in magic(5).
330 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
331 +# this file as a wishlist bug against file (using the reportbug utility).
333 diff -Naurp file-4.24.orig/magic/magic.local file-4.24/magic/magic.local
334 --- file-4.24.orig/magic/magic.local 1970-01-01 00:00:00.000000000 +0000
335 +++ file-4.24/magic/magic.local 2008-04-07 08:17:11.000000000 +0000
337 +# Magic local data for file(1) command.
338 +# Insert here your local magic data. Format is described in magic(5).
340 diff -Naurp file-4.24.orig/src/Makefile.am file-4.24/src/Makefile.am
341 --- file-4.24.orig/src/Makefile.am 2008-02-24 01:33:05.000000000 +0000
342 +++ file-4.24/src/Makefile.am 2008-04-07 08:16:39.000000000 +0000
343 @@ -5,7 +5,7 @@ EXTRA_DIST = getopt_long.c
347 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
348 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
350 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
351 compress.c is_tar.c readelf.c print.c fsmagic.c \
352 diff -Naurp file-4.24.orig/src/Makefile.in file-4.24/src/Makefile.in
353 --- file-4.24.orig/src/Makefile.in 2008-03-22 21:40:13.000000000 +0000
354 +++ file-4.24/src/Makefile.in 2008-04-07 08:16:47.000000000 +0000
355 @@ -198,7 +198,7 @@ MAGIC = $(pkgdatadir)/magic
356 lib_LTLIBRARIES = libmagic.la
357 include_HEADERS = magic.h
358 EXTRA_DIST = getopt_long.c
359 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
360 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
361 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
362 compress.c is_tar.c readelf.c print.c fsmagic.c \
363 funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \
364 #!/bin/sh /usr/share/dpatch/dpatch-run
365 ## 904-file-make.dpatch by Michael Piefel <piefel@debian.org>
371 diff -Naurp file-4.23.orig/src/Makefile.in file-4.23/src/Makefile.in
372 --- file-4.23.orig/src/Makefile.in 2008-01-12 17:55:24.000000000 +0000
373 +++ file-4.23/src/Makefile.in 2008-01-12 17:56:46.000000000 +0000
374 @@ -300,7 +300,7 @@ clean-binPROGRAMS:
376 file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES)
378 - $(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
379 + $(LINK) $(file_OBJECTS) $(file_LDADD)
383 #!/bin/sh /usr/share/dpatch/dpatch-run
384 ## 906-file-hurd.dpatch by Michael Casadevall <sonicmctails@gmail.com>
386 ## DP: Fixes a FTBFS on hurd (Closes: #433716).
390 diff -Naur file-4.21.orig/src/magic.c file-4.21/src/magic.c
391 --- file-4.21.orig/src/magic.c 2007-03-26 17:59:50.000000000 +0000
392 +++ file-4.21/src/magic.c 2007-07-19 06:25:16.000000000 +0000
398 +// Get the PIPE_BUF from pathconf
399 +#define PIPE_BUF pathconf(".", _PC_PIPE_BUF)
402 #include <netinet/in.h> /* for byte swapping */
404 #include "patchlevel.h"
405 #!/bin/sh /usr/share/dpatch/dpatch-run
406 ## 998-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
408 ## DP: FIXME, and #417511.
412 diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
413 --- file-4.24.orig/doc/file.man 2008-03-07 15:00:07.000000000 +0000
414 +++ file-4.24/doc/file.man 2008-04-07 08:26:06.000000000 +0000
415 @@ -51,7 +51,7 @@ meaning anything else (data is usually
417 Exceptions are well-known file formats (core files, tar archives)
418 that are known to contain binary data.
419 -When modifying magic files or the program itself, make sure to
420 +When adding local definitions to /etc/magic, make sure to
421 .Em "preserve these keywords" .
422 Users depend on knowing that all the readable files in a directory
424 @@ -95,7 +95,8 @@ The concept of a
425 has been applied by extension to data files.
426 Any file with some invariant identifier at a small fixed
427 offset into the file can usually be described in this way.
428 -The information identifying these files is read from the compiled
429 +The information identifying these files is read from /etc/magic
430 +and the the compiled
433 or the files in the directory
434 @@ -326,6 +327,11 @@ will not attempt to open
437 to the value of this variable as appropriate.
440 +has to exist in order for
443 The environment variable
445 controls (on systems that support symbolic links), whether
446 @@ -401,12 +407,6 @@ will be distributed periodically.
447 The order of entries in the magic file is significant.
448 Depending on what system you are using, the order that
449 they are put together may be incorrect.
452 -command uses a magic file,
453 -keep the old magic file around for comparison purposes
455 -.Pa __MAGIC__.orig ).
457 .Bd -literal -offset indent
458 $ file file.c file /dev/{wd0a,hda}
459 @@ -548,3 +548,8 @@ on
462 .Dv /pub/file/file-X.YZ.tar.gz
464 +This Debian version adds a number of new magix entries. It can be
465 +obtained from every site carrying a Debian distribution (that is
468 #!/bin/sh /usr/share/dpatch/dpatch-run
469 ## 999-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
471 ## DP: Needs to be broken out (FIXME).
475 diff -Naurp file-4.24.orig/src/fsmagic.c file-4.24/src/fsmagic.c
476 --- file-4.24.orig/src/fsmagic.c 2008-02-14 20:14:52.000000000 +0000
477 +++ file-4.24/src/fsmagic.c 2008-04-07 08:32:13.000000000 +0000
478 @@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
479 if (file_printf(ms, "cannot open `%s' (%s)",
480 fn, strerror(errno)) == -1)