1 ## 999-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
3 ## DP: Needs to be broken out (FIXME).
4 diff -Naurp file-4.24.orig/src/fsmagic.c file-4.24/src/fsmagic.c
5 --- file-4.24.orig/src/fsmagic.c 2008-02-14 20:14:52.000000000 +0000
6 +++ file-4.24/src/fsmagic.c 2008-04-07 08:32:13.000000000 +0000
7 @@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
8 if (file_printf(ms, "cannot open `%s' (%s)",
9 fn, strerror(errno)) == -1)
17 ## 906-file-hurd.dpatch by Michael Casadevall <sonicmctails@gmail.com>
19 ## DP: Fixes a FTBFS on hurd (Closes: #433716).
20 diff -Naur file-4.21.orig/src/magic.c file-4.21/src/magic.c
21 --- file-4.21.orig/src/magic.c 2007-03-26 17:59:50.000000000 +0000
22 +++ file-4.21/src/magic.c 2007-07-19 06:25:16.000000000 +0000
28 +// Get the PIPE_BUF from pathconf
29 +#define PIPE_BUF pathconf(".", _PC_PIPE_BUF)
32 #include <netinet/in.h> /* for byte swapping */
34 #include "patchlevel.h"
35 #!/bin/sh /usr/share/dpatch/dpatch-run
36 ## 903-magic-local.dpatch by Michael Piefel <piefel@debian.org>
38 ## DP: No longer includes Localstuff in /usr/share/misc/magic. Local definitions
39 ## DP: should go to /etc/magic.
43 diff -Naurp file.orig/magic/Header file/magic/Header
44 --- file.orig/magic/Header 2000-08-05 17:36:46.000000000 +0000
45 +++ file/magic/Header 2008-07-15 13:51:04.000000000 +0000
48 # Magic data for file(1) command.
49 -# Machine-generated from src/cmd/file/magdir/*; edit there only!
50 -# Format is described in magic(files), where:
51 -# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
52 +# Format is described in magic(5).
53 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
54 +# this file as a wishlist bug against file (using the reportbug utility).
56 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
57 --- file.orig/magic/magic.local 1970-01-01 00:00:00.000000000 +0000
58 +++ file/magic/magic.local 2008-07-15 13:51:04.000000000 +0000
60 +# Magic local data for file(1) command.
61 +# Insert here your local magic data. Format is described in magic(5).
63 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
64 --- file.orig/src/Makefile.am 2008-05-09 14:12:55.000000000 +0000
65 +++ file/src/Makefile.am 2008-07-15 13:51:37.000000000 +0000
66 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
70 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
71 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
72 AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
73 -Wmissing-declarations -Wredundant-decls -Wnested-externs \
74 -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
75 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
76 --- file.orig/src/Makefile.in 2008-07-02 15:24:28.000000000 +0000
77 +++ file/src/Makefile.in 2008-07-15 13:52:00.000000000 +0000
78 @@ -197,7 +197,7 @@ top_srcdir = @top_srcdir@
79 MAGIC = $(pkgdatadir)/magic
80 lib_LTLIBRARIES = libmagic.la
81 include_HEADERS = magic.h
82 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
83 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
84 AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
85 -Wmissing-declarations -Wredundant-decls -Wnested-externs \
86 -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
87 ## 324-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
89 ## DP: New magic for SNES SPC700 sound files (Closes: #410847).
91 diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
92 --- file-4.21.orig/magic/Magdir/audio 2007-12-23 17:32:42.000000000 +0000
93 +++ file-4.21/magic/Magdir/audio 2007-12-23 17:33:57.000000000 +0000
98 +# Type: SNES SPC700 sound files
99 +# From: Josh Triplett <josh@freedesktop.org>
100 +0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
101 +>&0 string 0.30 \b, version %s
102 +>>0x23 byte 0x1B \b, without ID666 tag
103 +>>0x23 byte 0x1A \b, with ID666 tag
104 +>>>0x2E string >\0 \b, song "%.32s"
105 +>>>0x4E string >\0 \b, game "%.32s"
107 # Impulse tracker module (audio/x-it)
108 0 string IMPM Impulse Tracker module sound data -
110 ## 206-magic-update-bash.dpatch
112 ## DP: Add another shebang path for bash.
113 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
114 --- file.orig/magic/Magdir/commands 2008-07-15 13:31:02.000000000 +0000
115 +++ file/magic/Magdir/commands 2008-07-15 13:30:55.000000000 +0000
116 @@ -58,6 +58,10 @@ o string/b #!\ /usr/bin/tcsh Tenex C she
117 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
118 0 string/b #!\ /bin/bash Bourne-Again shell script text executable
119 !:mime text/x-shellscript
120 +0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable
121 +!:mime text/x-shellscript
122 +0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable
123 +!:mime text/x-shellscript
124 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable
125 !:mime text/x-shellscript
127 ## 339-magic-add-selinux.dpatch by Russell Coker <russell@coker.com.au>
129 ## DP: Adds new magics for SE Linux (Closes: #485886).
130 diff -Naurp file.orig/magic/Magdir/selinux file/magic/Magdir/selinux
131 --- file.orig/magic/Magdir/selinux 1970-01-01 01:00:00.000000000 +0100
132 +++ file/magic/Magdir/selinux 2008-06-13 09:07:24.000000000 +0200
134 +# Type: SE Linux policy modules *.pp reference policy
135 +# for Fedora 5 to 9, RHEL5, and Debian Etch and Lenny.
136 +# URL: http://doc.coker.com.au/computers/selinux-magic
137 +# From: Russell Coker <russell@coker.com.au>
139 +0 lelong 0xf97cff8f SE Linux modular policy
140 +>4 lelong x version %d,
141 +>8 lelong x %d sections,
142 +>>(12.l) lelong 0xf97cff8d
143 +>>>(12.l+27) lelong x mod version %d,
144 +>>>(12.l+31) lelong 0 Not MLS,
145 +>>>(12.l+31) lelong 1 MLS,
146 +>>>(12.l+23) lelong 2
147 +>>>>(12.l+47) string >\0 module name %s
148 +>>>(12.l+23) lelong 1 base
150 +1 string policy_module( SE Linux policy module source
151 +2 string policy_module( SE Linux policy module source
153 +0 string ##\ <summary> SE Linux policy interface source
155 +#0 search gen_context( SE Linux policy file contexts
157 +#0 search gen_sens( SE Linux policy MLS constraints source
158 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
159 --- file.orig/magic/Makefile.am 2008-06-13 09:07:45.000000000 +0200
160 +++ file/magic/Makefile.am 2008-06-13 09:08:16.000000000 +0200
161 @@ -164,6 +164,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
162 $(MAGIC_FRAGMENT_DIR)/sccs \
163 $(MAGIC_FRAGMENT_DIR)/scientific \
164 $(MAGIC_FRAGMENT_DIR)/securitycerts \
165 +$(MAGIC_FRAGMENT_DIR)/selinux \
166 $(MAGIC_FRAGMENT_DIR)/sendmail \
167 $(MAGIC_FRAGMENT_DIR)/sequent \
168 $(MAGIC_FRAGMENT_DIR)/sgi \
169 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
170 --- file.orig/magic/Makefile.in 2008-06-13 09:07:45.000000000 +0200
171 +++ file/magic/Makefile.in 2008-06-13 09:08:23.000000000 +0200
172 @@ -324,6 +324,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
173 $(MAGIC_FRAGMENT_DIR)/sccs \
174 $(MAGIC_FRAGMENT_DIR)/scientific \
175 $(MAGIC_FRAGMENT_DIR)/securitycerts \
176 +$(MAGIC_FRAGMENT_DIR)/selinux \
177 $(MAGIC_FRAGMENT_DIR)/sendmail \
178 $(MAGIC_FRAGMENT_DIR)/sequent \
179 $(MAGIC_FRAGMENT_DIR)/sgi \
180 ## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
182 ## DP: New magic for OpenSSH key files (Closes: #439537).
183 diff -Naur file-4.21.orig/magic/Magdir/ssh file-4.21/magic/Magdir/ssh
184 --- file-4.21.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
185 +++ file-4.21/magic/Magdir/ssh 2007-08-26 08:25:03.000000000 +0000
187 +# Type: OpenSSH key files
188 +# From: Nicolas Collignon <tsointsoin@gmail.com>
190 +0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
191 +>28 string >\0 version %s
193 +0 string ssh-dss\ OpenSSH DSA public key
194 +0 string ssh-rsa\ OpenSSH RSA public key
195 ## 320-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
197 ## DP: New magic for pmenu (Closes: #38543).
198 diff -Naurp file-4.23.orig/magic/Magdir/commands file-4.23/magic/Magdir/commands
199 --- file-4.23.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000
200 +++ file-4.23/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000
202 0 string Zend\x00 PHP script Zend Optimizer data
204 0 string $! DCL command file
207 +# URL: http://packages.debian.org/pdmenu
208 +# From: Edward Betts <edward@debian.org>
209 +0 string #!/usr/bin/pdmenu Pdmenu configuration file text
210 ## 203-magic-update-reiserfs.dpatch by Werner Fink <werner@suse.de>
212 ## DP: Updating reiserfs magic to detect ReiserFS V3.6.19.
213 diff -Naurp file-4.24.orig/magic/Magdir/filesystems file-4.24/magic/Magdir/filesystems
214 --- file-4.24.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000 +0000
215 +++ file-4.24/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000
216 @@ -1178,6 +1178,7 @@
217 # reiserfs - russell@coker.com.au
218 0x10034 string ReIsErFs ReiserFS V3.5
219 0x10034 string ReIsEr2Fs ReiserFS V3.6
220 +0x10034 string ReIsEr3Fs ReiserFS V3.6.19
221 >0x1002c leshort x block size %d
222 >0x10032 leshort &2 (mounted or unclean)
223 >0x10000 lelong x num blocks %d
224 ## 210-magic-update-digifax.dpatch
226 ## DP: Update Digifax magic.
227 diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem
228 --- file.orig/magic/Magdir/modem 2008-06-13 15:00:30.000000000 +0200
229 +++ file/magic/Magdir/modem 2008-06-13 15:25:40.000000000 +0200
231 # modem: file(1) magic for modem programs
233 # From: Florian La Roche <florian@knorke.saar.de>
234 -4 string Research, Digifax-G3-File
235 ->29 byte 1 , fine resolution
236 ->29 byte 0 , normal resolution
237 +1 string PC\ Research,\ Inc Digifax-G3-File
238 +>29 byte 1 \b, fine resolution
239 +>29 byte 0 \b, normal resolution
241 0 short 0x0100 raw G3 data, byte-padded
242 0 short 0x1400 raw G3 data
243 ## 335-magic-add-freemind.dpatch by Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
245 ## DP: New magic for Freemind (Closes: #472385).
246 diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
247 --- file.orig/magic/Magdir/wordprocessors 2008-05-04 14:12:49.000000000 +0000
248 +++ file/magic/Magdir/wordprocessors 2008-05-04 14:18:38.000000000 +0000
251 >43 byte 0x16 Just System Word Processor Ichitaro v6
252 !:mime application/x-ichitaro6
254 +# Type: Freemind mindmap documents
255 +# From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
256 +0 string/cB \<map\ version Freemind document
257 +!:mime application/x-freemind
258 ## 211-magic-update-mono.dpatch
260 ## DP: Update Mono magic.
261 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
262 --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
263 +++ file/magic/Magdir/msdos 2008-07-15 13:33:43.000000000 +0000
265 >>&0 leshort 0x290 PA-RISC
266 >>&18 leshort&0x0100 >0 32-bit
267 >>&18 leshort&0x1000 >0 system file
268 +>>&228 lelong >0 \b, Mono/.Net assembly
269 >>&0xf4 search/0x140 \x0\x40\x1\x0
270 >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
271 >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive
272 ## 328-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
274 ## DP: xen patch, recognizes Xen saved domain
275 diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
276 --- file-4.23.orig/magic/Magdir/linux 2008-01-12 17:47:04.000000000 +0000
277 +++ file-4.23/magic/Magdir/linux 2008-01-12 17:46:42.000000000 +0000
280 >168 string x UUID: %s
282 +# Type: Xen, the virtual machine monitor
283 +# From: Radek Vokal <rvokal@redhat.com>
284 +0 string LinuxGuestRecord Xen saved domain
285 +#>2 regex \(name\ [^)]*\) %s
286 +>20 search/256 (name (name
287 +>>&1 string x %s...)
288 ## 338-magic-add-cromfs.dpatch by Werner Fink <werner@suse.de>
290 ## DP: Adds new magic for CROM filesystem.
291 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
292 --- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
293 +++ file/magic/Magdir/filesystems 2008-07-15 13:43:26.000000000 +0000
294 @@ -1327,3 +1327,15 @@
296 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
297 0 string *dvdisaster* dvdisaster error correction file
299 +# Type: CROM filesystem
300 +# From: Werner Fink <werner@suse.de>
301 +0 string CROMFS CROMFS
302 +>6 string >\0 \b version %2.2s,
303 +>8 ulequad >0 \b block data at %lld,
304 +>16 ulequad >0 \b fblock table at %lld,
305 +>24 ulequad >0 \b inode table at %lld,
306 +>32 ulequad >0 \b root at %lld,
307 +>40 ulelong >0 \b fblock size = %ld,
308 +>44 ulelong >0 \b block size = %ld,
309 +>48 ulequad >0 \b bytes = %lld
310 ## 205-magic-update-tcsh.dpatch
312 ## DP: Add another shebang path for tcsh.
313 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
314 --- file.orig/magic/Magdir/commands 2008-04-16 12:28:04.000000000 +0000
315 +++ file/magic/Magdir/commands 2008-07-15 13:28:19.000000000 +0000
317 !:mime text/x-shellscript
318 0 string/b #!\ /bin/tcsh Tenex C shell script text executable
319 !:mime text/x-shellscript
320 +0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable
321 +!:mime text/x-shellscript
322 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable
323 !:mime text/x-shellscript
324 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable
325 ## 326-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
327 ## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
328 ## DP: (Closes: #284803).
329 diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
330 --- file-4.23.orig/magic/Magdir/audio 2008-01-12 17:39:01.000000000 +0000
331 +++ file-4.23/magic/Magdir/audio 2008-01-12 17:38:49.000000000 +0000
333 # URL: http://filext.com/detaillist.php?extdetail=AMR
334 # From: Russell Coker <russell@coker.com.au>
335 0 string #!AMR Adaptive Multi-Rate Codec (GSM telephony)
337 +# Type: SuperCollider 3 Synth Definition File Format
338 +# From: Mario Lang <mlang@debian.org>
339 +0 string SCgf SuperCollider3 Synth Definition file,
340 +>4 belong x version %d
341 ## 204-magic-update-asf.dpatch by Daniel Baumann <daniel@debian.org>
343 ## DP: Add mime to asf magic.
344 diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
345 --- file.orig/magic/Magdir/animation 2008-05-26 23:24:27.000000000 +0200
346 +++ file/magic/Magdir/animation 2008-05-31 15:03:45.000000000 +0200
349 # Microsoft Advanced Streaming Format (ASF) <mpruett@sgi.com>
350 0 belong 0x3026b275 Microsoft ASF
351 +!:mime video/x-ms-asf
353 # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
354 0 string \x8aMNG MNG video data,
355 ## 336-magic-add-qdmb.dpatch by Benoit Sibaud <bsibaud@april.org>
357 ## DP: New magic for QDBM Quick Database Manager (Closes: #481717).
358 diff -Naurp file-4.24.orig/magic/Magdir/database file-4.24/magic/Magdir/database
359 --- file-4.24.orig/magic/Magdir/database 2008-05-04 14:12:49.000000000 +0000
360 +++ file-4.24/magic/Magdir/database 2008-05-21 09:07:49.000000000 +0000
362 # URL: http://www.grc.nasa.gov/WWW/cgns/adf/
363 # From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
364 0 string @(#)ADF\ Database CGNS Advanced Data Format
366 +# Type: QDBM Quick Database Manager
367 +# From: Benoit Sibaud <bsibaud@april.org>
368 +0 string \\[depot\\]\n\f Quick Database Manager, little endian
369 +0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
370 ## 319-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
372 ## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
373 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
374 --- file.orig/magic/Magdir/images 2008-07-02 15:16:52.000000000 +0000
375 +++ file/magic/Magdir/images 2008-07-15 13:39:37.000000000 +0000
377 # Wavelet Scalar Quantization format used in gray-scale fingerprint images
378 # From Tano M Fotang <mfotang@quanteq.com>
379 0 string \xff\xa0\xff\xa8\x00 Wavelet Scalar Quantization image data
381 +# Type: Ulead Photo Explorer5 (.pe5)
382 +# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
383 +# From: Simon Horman <horms@debian.org>
384 +0 string IIO2H Ulead Photo Explorer5
385 ## 207-magic-update-real.dpatch
387 ## DP: Update RealMedia magic.
388 diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
389 --- file.orig/magic/Magdir/audio 2008-05-31 22:17:03.000000000 +0200
390 +++ file/magic/Magdir/audio 2008-06-13 09:48:01.000000000 +0200
392 # Real Audio (Magic .ra\0375)
393 0 belong 0x2e7261fd RealAudio sound file
394 !:mime audio/x-pn-realaudio
395 -0 string .RMF RealMedia file
396 +0 string .RMF\0\0\0 RealMedia file
397 !:mime application/vnd.rn-realmedia
398 #video/x-pn-realvideo
399 #video/vnd.rn-realvideo
400 ## 212-magic-update-pfm.dpatch
402 ## DP: Update pfm magic.
403 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
404 --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
405 +++ file/magic/Magdir/msdos 2008-07-15 13:36:26.000000000 +0000
407 # Acroread or something files wrongly identified as G3 .pfm
408 # these have the form \000 \001 any? \002 \000 \000
409 # or \000 \001 any? \022 \000 \000
410 +0 belong&0xffff00ff 0x00010012 PFM data
412 +>6 string >\060 - %s
414 +0 belong&0xffff00ff 0x00010002 PFM data
416 +>6 string >\060 - %s
417 #0 string \000\001 pfm?
418 #>3 string \022\000\000Copyright\ yes
419 #>3 string \002\000\000Copyright\ yes
420 ## 323-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
422 ## DP: New magic for SiSU Markup Language.
423 diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
424 --- file-4.24.orig/magic/Magdir/sisu 1970-01-01 00:00:00.000000000 +0000
425 +++ file-4.24/magic/Magdir/sisu 2008-04-07 08:10:25.000000000 +0000
427 +# Type: SiSU Markup Language
428 +# URL: http://www.sisudoc.org/
429 +# From: Ralph Amissah <ralph.amissah@gmail.com>
431 +0 regex \^%?[\ \t]*SiSU[\ \t]+insert SiSU text insert
434 +0 regex \^%[\ \t]+SiSU[\ \t]+master SiSU text master
437 +0 regex \^%?[\ \t]*SiSU[\ \t]+text SiSU text
440 +0 regex \^%?[\ \t]*SiSU[\ \t][0-9.]+ SiSU text
443 +0 regex \^%*[\ \t]*sisu-[0-9.]+ SiSU text
445 diff -Naurp file-4.24.orig/magic/Makefile.am file-4.24/magic/Makefile.am
446 --- file-4.24.orig/magic/Makefile.am 2008-03-22 21:41:00.000000000 +0000
447 +++ file-4.24/magic/Makefile.am 2008-04-07 08:11:04.000000000 +0000
448 @@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
449 $(MAGIC_FRAGMENT_DIR)/sgml \
450 $(MAGIC_FRAGMENT_DIR)/sharc \
451 $(MAGIC_FRAGMENT_DIR)/sinclair \
452 +$(MAGIC_FRAGMENT_DIR)/sisu \
453 $(MAGIC_FRAGMENT_DIR)/sketch \
454 $(MAGIC_FRAGMENT_DIR)/smalltalk \
455 $(MAGIC_FRAGMENT_DIR)/sniffer \
456 diff -Naurp file-4.24.orig/magic/Makefile.in file-4.24/magic/Makefile.in
457 --- file-4.24.orig/magic/Makefile.in 2008-03-22 21:41:06.000000000 +0000
458 +++ file-4.24/magic/Makefile.in 2008-04-07 08:11:10.000000000 +0000
459 @@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
460 $(MAGIC_FRAGMENT_DIR)/sgml \
461 $(MAGIC_FRAGMENT_DIR)/sharc \
462 $(MAGIC_FRAGMENT_DIR)/sinclair \
463 +$(MAGIC_FRAGMENT_DIR)/sisu \
464 $(MAGIC_FRAGMENT_DIR)/sketch \
465 $(MAGIC_FRAGMENT_DIR)/smalltalk \
466 $(MAGIC_FRAGMENT_DIR)/sniffer \
467 ## 207-magic-update-zip.dpatch
469 ## DP: Update zip magic.
470 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
471 --- file.orig/magic/Magdir/msdos 2008-05-31 22:17:03.000000000 +0200
472 +++ file/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
475 # a few unknown ZIP sfxes, no idea if they are needed or if they are
476 # already captured by the generic patterns above
477 ->122 string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
478 +>0x7a string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
479 >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP)
480 # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive
482 ## 339-magic-add-scribus.dpatch by Werner Fink <werner@suse.de>
484 ## DP: Adds new magics for Scribus.
485 diff -Naurp file-4.24.orig/magic/Magdir/wordprocessors file-4.24/magic/Magdir/wordprocessors
486 --- file-4.24.orig/magic/Magdir/wordprocessors 2008-05-21 09:49:43.000000000 +0000
487 +++ file-4.24/magic/Magdir/wordprocessors 2008-05-21 09:50:54.000000000 +0000
489 # From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
490 0 string/cB \<map\ version Freemind document
491 !:mime application/x-freemind
494 +# From: Werner Fink <werner@suse.de>
495 +0 string \<SCRIBUSUTF8\ Version Scribus Document
496 +0 string \<SCRIBUSUTF8NEW\ Version Scribus Document
497 +!:mime application/x-scribus
498 ## 209-magic-update-os2.dpatch
500 ## DP: Update OS/2 REXX magic.
501 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
502 --- file.orig/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
503 +++ file/magic/Magdir/msdos 2008-06-13 09:51:35.000000000 +0200
506 # OS/2 batch files are REXX. the second regex is a bit generic, oh well
507 # the matched commands seem to be common in REXX and uncommon elsewhere
508 -100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
509 -100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
510 +100 search/0xffff rxfuncadd
511 +>100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
512 +100 search/0xffff say
513 +>100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
515 0 leshort 0x14c MS Windows COFF Intel 80386 object file
516 #>4 ledate x stamp %s
517 ## 321-magic-add-powertab.dpatch by Jelmer Vernooij <jelmer@samba.org>
519 ## DP: New magic for Power-Tab
520 diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord
521 --- file-4.20.orig/magic/Magdir/chord 2003-03-24 14:48:32.000000000 +0000
522 +++ file-4.20/magic/Magdir/chord 2007-05-17 16:33:26.000000000 +0000
525 0 string {title Chord text file
527 +# Type: PowerTab file format
528 +# URL: http://www.power-tab.net/
529 +# From: Jelmer Vernooij <jelmer@samba.org>
530 +0 string ptab\003\000 Power-Tab v3 Tablature File
531 +0 string ptab\004\000 Power-Tab v4 Tablature File
532 ## 322-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
534 ## DP: New magic for scummVM savegame files (Closes: #263488).
535 diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
536 --- file-4.23.orig/magic/Magdir/console 2007-09-26 20:22:31.000000000 +0000
537 +++ file-4.23/magic/Magdir/console 2008-01-12 17:36:55.000000000 +0000
540 0 string HM3W Warcraft III map file
542 +# Type: scummVM savegame files
543 +# From: Sven Hartge <debian@ds9.argh.org>
544 +0 string SCVM scummVM savegame
546 ## 213-magic-update-ocaml.dpatch by Eric Cooper <ecc@cmu.edu>
548 ## DP: Update ocaml magic (Closes: #488992).
549 diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml
550 --- file.orig/magic/Magdir/ocaml 2008-07-15 14:13:20.000000000 +0000
551 +++ file/magic/Magdir/ocaml 2008-07-15 14:13:08.000000000 +0000
554 #------------------------------------------------------------------------------
555 # ocaml: file(1) magic for Objective Caml files.
556 -0 string Caml1999 Objective caml
557 +0 string Caml1999 OCaml
558 >8 string X exec file
559 >8 string I interface file (.cmi)
560 >8 string O object file (.cmo)
562 >8 string Z native library file (.cmxa)
563 >8 string M abstract syntax tree implementation file
564 >8 string N abstract syntax tree interface file
565 ->9 string >\0 (Version %3.3s).
566 +>9 string >\0 (Version %3.3s)
567 ## 323-magic-add-sgf.dpatch by Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
569 ## DP: New magic for SGF Smart Game Format
570 diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
571 --- file.orig/magic/Magdir/games 2008-04-23 19:00:59.000000000 +0000
572 +++ file/magic/Magdir/games 2008-07-15 13:41:19.000000000 +0000
574 >&0 string n\ NetImmerse game engine file
575 >>&0 regex [0-9a-z.]+ \b, version %s
577 +# Type: SGF Smart Game Format
578 +# URL: http://www.red-bean.com/sgf/
579 +# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
580 +2 regex/c \\(;.*GM\\[[0-9]{1,2}\\] Smart Game Format
581 +>2 regex/c GM\\[1\\] - Go Game
582 +>2 regex/c GM\\[6\\] - BackGammon Game
583 +>2 regex/c GM\\[11\\] - Hex Game
584 +>2 regex/c GM\\[18\\] - Amazons Game
585 +>2 regex/c GM\\[19\\] - Octi Game
586 +>2 regex/c GM\\[20\\] - Gess Game
587 +>2 regex/c GM\\[21\\] - twix Game
588 ## 331-magic-add-xcursor.dpatch by Mathias Brodala <info@noctus.net>
590 ## DP: New magic for X11 cursor files (Closes: #451246).
591 diff -Naur file-4.21.orig/magic/Magdir/images file-4.21/magic/Magdir/images
592 --- file-4.21.orig/magic/Magdir/images 2007-12-23 17:40:53.000000000 +0000
593 +++ file-4.21/magic/Magdir/images 2007-12-23 17:40:46.000000000 +0000
595 # URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
596 # From: Simon Horman <horms@debian.org>
597 0 string IIO2H Ulead Photo Explorer5
600 +# URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
601 +# From: Mathias Brodala <info@noctus.net>
602 +0 string Xcur X11 cursor
603 ## 214-magic-update-linuxswap.dpatch by Russell Coker <russell@coker.com.au>
605 ## DP: Adding volume label and UUID support for linux swap (Closes: #489865).
606 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
607 --- file.orig/magic/Magdir/linux 2008-06-04 18:02:25.000000000 +0000
608 +++ file/magic/Magdir/linux 2008-07-15 14:16:43.000000000 +0000
610 # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey@ubuntu.com>
611 4076 string SWAPSPACE2S1SUSPEND Linux/i386 swap file (new style) with SWSUSP1 image
612 # according to man page of mkswap (8) March 1999
613 -4086 string SWAPSPACE2 Linux/i386 swap file (new style)
614 ->0x400 long x %d (4K pages)
615 ->0x404 long x size %d pages
616 ->>4086 string SWAPSPACE2
617 ->>>1052 string >\0 Label %s
618 +# volume label and UUID Russell Coker
619 +# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
620 +4086 string SWAPSPACE2 Linux/i386 swap file (new style),
621 +>0x400 long x version %d (4K pages),
622 +>0x404 long x size %d pages,
623 +>1052 string \0 no label,
624 +>1052 string >\0 LABEL=%s,
625 +>0x40c belong x UUID=%x
626 +>0x410 beshort x \b-%x
627 +>0x412 beshort x \b-%x
628 +>0x414 beshort x \b-%x
629 +>0x416 belong x \b-%x
630 +>0x41a beshort x \b%x
631 # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
633 # from Erik Troan (ewt@redhat.com) examining od dumps, so this
634 ## 325-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
636 ## DP: New magic for SVN dumps (closes: #256652).
637 diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
638 --- file-4.21.orig/magic/Magdir/revision 2007-12-23 17:25:39.000000000 +0000
639 +++ file-4.21/magic/Magdir/revision 2007-12-23 17:26:34.000000000 +0000
641 0 string HG10 Mercurial bundle,
642 >4 string UN uncompressed
643 >4 string BZ bzip2 compressed
645 +# Type: Subversion (SVN) dumps
646 +# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
647 +0 string SVN-fs-dump-format-version: Subversion dumpfile
648 +>28 string >\0 (version: %s)
649 ## 341-magic-add-bzr.dpatch by Jelmer Vernooij <jelmer@samba.org>
651 ## DP: Adds new magics for bzr (Closes: #488742).
652 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
653 --- file.orig/magic/Magdir/revision 2008-07-01 15:42:16.000000000 +0200
654 +++ file/magic/Magdir/revision 2008-07-01 15:43:34.000000000 +0200
656 # From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
657 0 string SVN-fs-dump-format-version: Subversion dumpfile
658 >28 string >\0 (version: %s)
660 +# Type: Bazaar revision bundles and merge requests
661 +# URL: http://www.bazaar-vcs.org/
662 +# From: Jelmer Vernooij <jelmer@samba.org>
663 +0 string #\ Bazaar\ revision\ bundle\ v Bazaar Bundle
664 +0 string #\ Bazaar\ merge\ directive\ format Bazaar merge directive
665 ## 998-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
667 ## DP: FIXME, and #417511.
668 diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
669 --- file-4.24.orig/doc/file.man 2008-03-07 15:00:07.000000000 +0000
670 +++ file-4.24/doc/file.man 2008-04-07 08:26:06.000000000 +0000
671 @@ -51,7 +51,7 @@ meaning anything else (data is usually
673 Exceptions are well-known file formats (core files, tar archives)
674 that are known to contain binary data.
675 -When modifying magic files or the program itself, make sure to
676 +When adding local definitions to /etc/magic, make sure to
677 .Em "preserve these keywords" .
678 Users depend on knowing that all the readable files in a directory
680 @@ -95,7 +95,8 @@ The concept of a
681 has been applied by extension to data files.
682 Any file with some invariant identifier at a small fixed
683 offset into the file can usually be described in this way.
684 -The information identifying these files is read from the compiled
685 +The information identifying these files is read from /etc/magic
686 +and the the compiled
689 or the files in the directory
690 @@ -326,6 +327,11 @@ will not attempt to open
693 to the value of this variable as appropriate.
696 +has to exist in order for
699 The environment variable
701 controls (on systems that support symbolic links), whether
702 @@ -401,12 +407,6 @@ will be distributed periodically.
703 The order of entries in the magic file is significant.
704 Depending on what system you are using, the order that
705 they are put together may be incorrect.
708 -command uses a magic file,
709 -keep the old magic file around for comparison purposes
711 -.Pa __MAGIC__.orig ).
713 .Bd -literal -offset indent
714 $ file file.c file /dev/{wd0a,hda}
715 @@ -548,3 +548,5 @@ on
718 .Dv /pub/file/file-X.YZ.tar.gz
720 +This version contains a number of new magix entries from Debian.
721 ## 202-magic-update-awk.dpatch by Werner Fink <werner@suse.de>
723 ## DP: Updates (and re-enables) awk magic.
724 diff -Naurp file-4.24.orig/magic/Magdir/commands file-4.24/magic/Magdir/commands
725 --- file-4.24.orig/magic/Magdir/commands 2008-05-04 14:12:49.000000000 +0000
726 +++ file-4.24/magic/Magdir/commands 2008-05-21 09:36:15.000000000 +0000
728 # update to distinguish from *.vcf files
729 # this is broken because postscript has /EBEGIN{ for example.
730 #0 search/Bb BEGIN { awk script text
731 +0 regex =^\\s*BEGIN\\s*[{] awk script text
733 # AT&T Bell Labs' Plan 9 shell
734 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
735 ## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
737 ## DP: New magic for OpenSSL certificates/key files (Closes: #439537).
738 diff -Naur file-4.21.orig/magic/Magdir/ssl file-4.21/magic/Magdir/ssl
739 --- file-4.21.orig/magic/Magdir/ssl 1970-01-01 00:00:00.000000000 +0000
740 +++ file-4.21/magic/Magdir/ssl 2007-08-26 08:27:04.000000000 +0000
742 +# Type: OpenSSL certificates/key files
743 +# From: Nicolas Collignon <tsointsoin@gmail.com>
745 +0 string -----BEGIN\ CERTIFICATE----- PEM certificate
746 +0 string -----BEGIN\ CERTIFICATE\ REQ PEM certificate request
747 +0 string -----BEGIN\ RSA\ PRIVATE PEM RSA private key
748 +0 string -----BEGIN\ DSA\ PRIVATE PEM DSA private key
749 ## 215-magic-update-linuxext.dpatch by Russell Coker <russell@coker.com.au>
751 ## DP: Adding volume label and UUID support for linux ext (Closes: #489865).
752 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
753 --- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
754 +++ file/magic/Magdir/filesystems 2008-07-15 14:21:39.000000000 +0000
755 @@ -1027,6 +1027,8 @@
757 # ext2/ext3 filesystems - Andreas Dilger <adilger@dilger.ca>
758 # ext4 filesystem - Eric Sandeen <sandeen@sandeen.net>
759 +# volume label and UUID Russell Coker
760 +# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
761 0x438 leshort 0xEF53 Linux
762 >0x44c lelong x rev %d
763 >0x43e leshort x \b.%d
764 @@ -1042,25 +1044,32 @@
765 # else large RO_COMPAT?
766 >>>0x464 lelong >0x0000007 ext4 filesystem data
767 # else large INCOMPAT?
768 ->>0x460 lelong >0x000003f ext4 filesystem data
769 +>>0x460 lelong >0x000003f ext4 filesystem data
770 +>0x468 belong x \b, UUID=%x
771 +>0x46c beshort x \b-%x
772 +>0x46e beshort x \b-%x
773 +>0x470 beshort x \b-%x
774 +>0x472 belong x \b-%x
775 +>0x476 beshort x \b%x
776 +>0x478 string >0 \b, volume name "%s"
777 # General flags for any ext* fs
778 ->0x460 lelong &0x0000004 (needs journal recovery)
779 ->0x43a leshort &0x0000002 (errors)
780 +>0x460 lelong &0x0000004 (needs journal recovery)
781 +>0x43a leshort &0x0000002 (errors)
783 ->0x460 lelong &0x0000001 (compressed)
784 -#>0x460 lelong &0x0000002 (filetype)
785 -#>0x460 lelong &0x0000010 (meta bg)
786 ->0x460 lelong &0x0000040 (extents)
787 ->0x460 lelong &0x0000080 (64bit)
788 -#>0x460 lelong &0x0000100 (mmp)
789 -#>0x460 lelong &0x0000200 (flex bg)
790 +>0x460 lelong &0x0000001 (compressed)
791 +#>0x460 lelong &0x0000002 (filetype)
792 +#>0x460 lelong &0x0000010 (meta bg)
793 +>0x460 lelong &0x0000040 (extents)
794 +>0x460 lelong &0x0000080 (64bit)
795 +#>0x460 lelong &0x0000100 (mmp)
796 +#>0x460 lelong &0x0000200 (flex bg)
798 -#>0x464 lelong &0x0000001 (sparse super)
799 ->0x464 lelong &0x0000002 (large files)
800 ->0x464 lelong &0x0000008 (huge files)
801 -#>0x464 lelong &0x0000010 (gdt checksum)
802 -#>0x464 lelong &0x0000020 (many subdirs)
803 -#>0x463 lelong &0x0000040 (extra isize)
804 +#>0x464 lelong &0x0000001 (sparse super)
805 +>0x464 lelong &0x0000002 (large files)
806 +>0x464 lelong &0x0000008 (huge files)
807 +#>0x464 lelong &0x0000010 (gdt checksum)
808 +#>0x464 lelong &0x0000020 (many subdirs)
809 +#>0x463 lelong &0x0000040 (extra isize)
811 # SGI disk labels - Nathan Scott <nathans@debian.org>
812 0 belong 0x0BE5A941 SGI disk label (volume header)
813 ## 318-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
815 ## DP: New magic for PAR2 archive files (Closes: #294070).
816 diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
817 --- file-4.24.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000 +0000
818 +++ file-4.24/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000
820 >24 belong 1 SHA-1 checksum
821 >24 belong 2 MD5 checksum
823 +# Type: Parity Archive
824 +# From: Daniel van Eeden <daniel_e@dds.nl>
825 +0 string PAR2 Parity Archive Volume Set
826 ## 337-magic-add-tokyocabinet.dpatch by Benoit Sibaud <bsibaud@april.org>
828 ## DP: New magic for TokyoCabinet database (Closes: #481768).
829 diff -Naurp file-4.24.orig/magic/Magdir/database file-4.24/magic/Magdir/database
830 --- file-4.24.orig/magic/Magdir/database 2008-05-21 09:07:49.000000000 +0000
831 +++ file-4.24/magic/Magdir/database 2008-05-21 09:15:26.000000000 +0000
833 # From: Benoit Sibaud <bsibaud@april.org>
834 0 string \\[depot\\]\n\f Quick Database Manager, little endian
835 0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
837 +# Type: TokyoCabinet database
838 +# URL: http://tokyocabinet.sourceforge.net/
839 +# From: Benoit Sibaud <bsibaud@april.org>
840 +0 string ToKyO\ CaBiNeT\n TokyoCabinet database
841 +>14 string x (version %s)