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