1 * 101-magic-update-awk.patch
2 Author: Werner Fink <werner@suse.de>
3 Description: Updates (and re-enables) awk magic.
5 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
6 --- file.orig/magic/Magdir/commands 2010-01-30 09:44:26.000000000 +0000
7 +++ file/magic/Magdir/commands 2010-02-01 11:51:38.000000000 +0000
9 # update to distinguish from *.vcf files
10 # this is broken because postscript has /EBEGIN{ for example.
11 #0 search/Ww BEGIN { awk script text
12 +0 regex =^\\s*BEGIN\\s*[{] awk script text
14 # AT&T Bell Labs' Plan 9 shell
15 0 string/w #!\ /bin/rc Plan 9 rc shell script text executable
16 * 102-magic-update-bash.patch
17 Author: Daniel Baumann <daniel@debian.org>
18 Description: Adding another shebang path for bash.
20 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
21 --- file.orig/magic/Magdir/commands 2010-01-30 09:44:26.000000000 +0000
22 +++ file/magic/Magdir/commands 2010-02-01 11:54:51.000000000 +0000
24 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
25 0 string/w #!\ /bin/bash Bourne-Again shell script text executable
26 !:mime text/x-shellscript
27 +0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable
28 +!:mime text/x-shellscript
29 +0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable
30 +!:mime text/x-shellscript
31 0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable
32 !:mime text/x-shellscript
34 * 103-magic-update-reiserfs.patch
35 Author: Werner Fink <werner@suse.de>
36 Description: Updating reiserfs magic to detect ReiserFS V3.6.19.
38 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
39 --- file.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000 +0000
40 +++ file/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000
42 # reiserfs - russell@coker.com.au
43 0x10034 string ReIsErFs ReiserFS V3.5
44 0x10034 string ReIsEr2Fs ReiserFS V3.6
45 +0x10034 string ReIsEr3Fs ReiserFS V3.6.19
46 >0x1002c leshort x block size %d
47 >0x10032 leshort &2 (mounted or unclean)
48 >0x10000 lelong x num blocks %d
49 * 104-magic-update-tcsh.patch
50 Author: Daniel Baumann <daniel@debian.org>
51 Description: Addding another shebang path for tcsh.
53 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
54 --- file.orig/magic/Magdir/commands 2010-01-30 09:44:26.000000000 +0000
55 +++ file/magic/Magdir/commands 2010-02-01 11:57:33.000000000 +0000
57 !:mime text/x-shellscript
58 0 string/w #!\ /bin/tcsh Tenex C shell script text executable
59 !:mime text/x-shellscript
60 +0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable
61 +!:mime text/x-shellscript
62 0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable
63 !:mime text/x-shellscript
64 0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable
65 * 105-magic-update-zip.patch
67 Description: Updating zip magic.
69 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
70 --- file.orig/magic/Magdir/msdos 2008-05-31 22:17:03.000000000 +0200
71 +++ file/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
74 # a few unknown ZIP sfxes, no idea if they are needed or if they are
75 # already captured by the generic patterns above
76 ->122 string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
77 +>0x7a string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive
78 >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP)
79 # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive
81 * 106-magic-update-real.patch
83 Description: Update RealMedia magic.
85 diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
86 --- file.orig/magic/Magdir/audio 2008-05-31 22:17:03.000000000 +0200
87 +++ file/magic/Magdir/audio 2008-06-13 09:48:01.000000000 +0200
89 # Real Audio (Magic .ra\0375)
90 0 belong 0x2e7261fd RealAudio sound file
91 !:mime audio/x-pn-realaudio
92 -0 string .RMF RealMedia file
93 +0 string .RMF\0\0\0 RealMedia file
94 !:mime application/vnd.rn-realmedia
96 #video/vnd.rn-realvideo
97 * 107-magic-update-os2.patch
99 Description: Updating OS/2 REXX magic.
101 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
102 --- file.orig/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
103 +++ file/magic/Magdir/msdos 2008-06-13 09:51:35.000000000 +0200
106 # OS/2 batch files are REXX. the second regex is a bit generic, oh well
107 # the matched commands seem to be common in REXX and uncommon elsewhere
108 -100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
109 -100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
110 +100 search/0xffff rxfuncadd
111 +>100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
112 +100 search/0xffff say
113 +>100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
115 0 leshort 0x14c MS Windows COFF Intel 80386 object file
116 #>4 ledate x stamp %s
117 * 108-magic-update-digifax.patch
119 Description: Updating Digifax magic.
121 diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem
122 --- file.orig/magic/Magdir/modem 2008-06-13 15:00:30.000000000 +0200
123 +++ file/magic/Magdir/modem 2008-06-13 15:25:40.000000000 +0200
125 # modem: file(1) magic for modem programs
127 # From: Florian La Roche <florian@knorke.saar.de>
128 -4 string Research, Digifax-G3-File
129 ->29 byte 1 , fine resolution
130 ->29 byte 0 , normal resolution
131 +1 string PC\ Research,\ Inc Digifax-G3-File
132 +>29 byte 1 \b, fine resolution
133 +>29 byte 0 \b, normal resolution
135 0 short 0x0100 raw G3 data, byte-padded
136 0 short 0x1400 raw G3 data
137 * 109-magic-update-mono.patch
139 Description: Updating Mono magic.
141 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
142 --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
143 +++ file/magic/Magdir/msdos 2008-07-15 13:33:43.000000000 +0000
145 >>&0 leshort 0x290 PA-RISC
146 >>&18 leshort&0x0100 >0 32-bit
147 >>&18 leshort&0x1000 >0 system file
148 +>>&228 lelong >0 \b, Mono/.Net assembly
149 >>&0xf4 search/0x140 \x0\x40\x1\x0
150 >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
151 >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive
152 * 110-magic-update-pfm.patch
154 Description: Updating pfm magic.
156 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
157 --- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
158 +++ file/magic/Magdir/msdos 2008-07-15 13:36:26.000000000 +0000
160 # Acroread or something files wrongly identified as G3 .pfm
161 # these have the form \000 \001 any? \002 \000 \000
162 # or \000 \001 any? \022 \000 \000
163 +0 belong&0xffff00ff 0x00010012 PFM data
165 +>6 string >\060 - %s
167 +0 belong&0xffff00ff 0x00010002 PFM data
169 +>6 string >\060 - %s
170 #0 string \000\001 pfm?
171 #>3 string \022\000\000Copyright\ yes
172 #>3 string \002\000\000Copyright\ yes
173 * 111-magic-update-ocaml.patch
174 Author: Eric Cooper <ecc@cmu.edu>
175 Description: Updating ocaml magic (Closes: #488992).
177 diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml
178 --- file.orig/magic/Magdir/ocaml 2008-07-15 14:13:20.000000000 +0000
179 +++ file/magic/Magdir/ocaml 2008-07-15 14:13:08.000000000 +0000
182 #------------------------------------------------------------------------------
183 # ocaml: file(1) magic for Objective Caml files.
184 -0 string Caml1999 Objective caml
185 +0 string Caml1999 OCaml
186 >8 string X exec file
187 >8 string I interface file (.cmi)
188 >8 string O object file (.cmo)
190 >8 string Z native library file (.cmxa)
191 >8 string M abstract syntax tree implementation file
192 >8 string N abstract syntax tree interface file
193 ->9 string >\0 (Version %3.3s).
194 +>9 string >\0 (Version %3.3s)
195 * 112-magic-update-linuxswap.patch
196 Author: Russell Coker <russell@coker.com.au>
197 Description: Adding volume label and UUID support for linux swap (Closes: #489865).
199 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
200 --- file.orig/magic/Magdir/linux 2010-01-30 09:44:26.000000000 +0000
201 +++ file/magic/Magdir/linux 2010-02-01 12:02:18.000000000 +0000
203 # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey@ubuntu.com>
204 4076 string SWAPSPACE2S1SUSPEND Linux/i386 swap file (new style) with SWSUSP1 image
205 # according to man page of mkswap (8) March 1999
206 -4086 string SWAPSPACE2 Linux/i386 swap file (new style)
207 ->0x400 long x %d (4K pages)
208 ->0x404 long x size %d pages
209 ->>4086 string SWAPSPACE2
210 ->>>1052 string >\0 Label %s
211 +# volume label and UUID Russell Coker
212 +# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
213 +4086 string SWAPSPACE2 Linux/i386 swap file (new style),
214 +>0x400 long x version %d (4K pages),
215 +>0x404 long x size %d pages,
216 +>1052 string \0 no label,
217 +>1052 string >\0 LABEL=%s,
218 +>0x40c belong x UUID=%08x
219 +>0x410 beshort x \b-%04x
220 +>0x412 beshort x \b-%04x
221 +>0x414 beshort x \b-%04x
222 +>0x416 belong x \b-%08x
223 +>0x41a beshort x \b%04x
224 # From Daniel Novotny <dnovotny@redhat.com>
225 # swap file for PowerPC
226 65526 string SWAPSPACE2 Linux/ppc swap file
227 * 113-magic-update-linuxext.patch
228 Author: Russell Coker <russell@coker.com.au>
229 Description: Adding volume label and UUID support for linux ext (Closes: #489865).
231 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
232 --- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
233 +++ file/magic/Magdir/filesystems 2008-07-15 14:21:39.000000000 +0000
234 @@ -1027,6 +1027,8 @@
236 # ext2/ext3 filesystems - Andreas Dilger <adilger@dilger.ca>
237 # ext4 filesystem - Eric Sandeen <sandeen@sandeen.net>
238 +# volume label and UUID Russell Coker
239 +# http://etbe.coker.com.au/2008/07/08/label-vs-uuid-vs-device/
240 0x438 leshort 0xEF53 Linux
241 >0x44c lelong x rev %d
242 >0x43e leshort x \b.%d
243 @@ -1042,25 +1044,32 @@
244 # else large RO_COMPAT?
245 >>>0x464 lelong >0x0000007 ext4 filesystem data
246 # else large INCOMPAT?
247 ->>0x460 lelong >0x000003f ext4 filesystem data
248 +>>0x460 lelong >0x000003f ext4 filesystem data
249 +>0x468 belong x \b, UUID=%08x
250 +>0x46c beshort x \b-%04x
251 +>0x46e beshort x \b-%04x
252 +>0x470 beshort x \b-%04x
253 +>0x472 belong x \b-%08x
254 +>0x476 beshort x \b%04x
255 +>0x478 string >0 \b, volume name "%s"
256 # General flags for any ext* fs
257 ->0x460 lelong &0x0000004 (needs journal recovery)
258 ->0x43a leshort &0x0000002 (errors)
259 +>0x460 lelong &0x0000004 (needs journal recovery)
260 +>0x43a leshort &0x0000002 (errors)
262 ->0x460 lelong &0x0000001 (compressed)
263 -#>0x460 lelong &0x0000002 (filetype)
264 -#>0x460 lelong &0x0000010 (meta bg)
265 ->0x460 lelong &0x0000040 (extents)
266 ->0x460 lelong &0x0000080 (64bit)
267 -#>0x460 lelong &0x0000100 (mmp)
268 -#>0x460 lelong &0x0000200 (flex bg)
269 +>0x460 lelong &0x0000001 (compressed)
270 +#>0x460 lelong &0x0000002 (filetype)
271 +#>0x460 lelong &0x0000010 (meta bg)
272 +>0x460 lelong &0x0000040 (extents)
273 +>0x460 lelong &0x0000080 (64bit)
274 +#>0x460 lelong &0x0000100 (mmp)
275 +#>0x460 lelong &0x0000200 (flex bg)
277 -#>0x464 lelong &0x0000001 (sparse super)
278 ->0x464 lelong &0x0000002 (large files)
279 ->0x464 lelong &0x0000008 (huge files)
280 -#>0x464 lelong &0x0000010 (gdt checksum)
281 -#>0x464 lelong &0x0000020 (many subdirs)
282 -#>0x463 lelong &0x0000040 (extra isize)
283 +#>0x464 lelong &0x0000001 (sparse super)
284 +>0x464 lelong &0x0000002 (large files)
285 +>0x464 lelong &0x0000008 (huge files)
286 +#>0x464 lelong &0x0000010 (gdt checksum)
287 +#>0x464 lelong &0x0000020 (many subdirs)
288 +#>0x463 lelong &0x0000040 (extra isize)
290 # SGI disk labels - Nathan Scott <nathans@debian.org>
291 0 belong 0x0BE5A941 SGI disk label (volume header)
292 * 114-magic-update-llvm.patch
293 Author: Toeroek Edwin <edwintorok@gmail.com>
294 Description: Updating llvm magic (Closes: #505805).
296 diff -Naurp file.orig/magic/Magdir/llvm file/magic/Magdir/llvm
297 --- file.orig/magic/Magdir/llvm 2008-10-19 14:31:15.000000000 +0000
298 +++ file/magic/Magdir/llvm 2008-11-15 19:15:51.000000000 +0000
301 #------------------------------------------------------------------------------
302 # llvm: file(1) magic for LLVM byte-codes
303 -# URL: http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
304 +# URL: http://llvm.org/docs/BitCodeFormat.html
305 # From: Al Stone <ahs3@fc.hp.com>
307 0 string llvm LLVM byte-codes, uncompressed
308 0 string llvc0 LLVM byte-codes, null compression
309 0 string llvc1 LLVM byte-codes, gzip compression
310 0 string llvc2 LLVM byte-codes, bzip2 compression
311 +0 string \xde\xc0\x17\x0b LLVM bitcode, wrapper
312 +0 string BC\xc0\xde LLVM bitcode
313 * 116-magic-update-gimp.patch
314 Author: Ori Avtalion <ori@avtalion.name>
315 Description: Adding mime entries for gimp (Closes: #501200).
317 diff -Naurp file.orig/magic/Magdir/gimp file/magic/Magdir/gimp
318 --- file.orig/magic/Magdir/gimp 2008-10-19 14:31:15.000000000 +0000
319 +++ file/magic/Magdir/gimp 2008-11-15 19:32:22.000000000 +0000
321 # ('Bucky' LaDieu, nega@vt.edu)
323 0 string gimp\ xcf GIMP XCF image data,
325 >9 string file version 0,
328 * 117-magic-update-wav.patch
329 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
330 Description: pdating wav magics (Closes: #508174).
332 diff -Naurp file.orig/magic/Magdir/riff file/magic/Magdir/riff
333 --- file.orig/magic/Magdir/riff 2008-12-05 17:28:11.000000000 -0500
334 +++ file/magic/Magdir/riff 2008-12-05 17:33:48.000000000 -0500
336 >>20 leshort 2 \b, Microsoft ADPCM
337 >>20 leshort 6 \b, ITU G.711 A-law
338 >>20 leshort 7 \b, ITU G.711 mu-law
339 +>>20 leshort 8 \b, Microsoft DTS
340 >>20 leshort 17 \b, IMA ADPCM
341 >>20 leshort 20 \b, ITU G.723 ADPCM (Yamaha)
342 >>20 leshort 49 \b, GSM 6.10
343 >>20 leshort 64 \b, ITU G.721 ADPCM
344 >>20 leshort 80 \b, MPEG
345 >>20 leshort 85 \b, MPEG Layer 3
346 +>>20 leshort 0x2001 \b, DTS
347 >>22 leshort =1 \b, mono
348 >>22 leshort =2 \b, stereo
349 >>22 leshort >2 \b, %d channels
350 * 118-magic-update-z-machine.patch
351 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
352 Description: Fixing false matches against Z-machine pattern. A particular MP3 file as well as a particular file from texlive-omega match the pattern for Z-machine games. Make the pattern a bit more restrictive to get rid of the false matches. (Closes: #499748)
354 diff -Naurp file.orig/magic/Magdir/adventure file/magic/Magdir/adventure
355 --- file.orig/magic/Magdir/adventure 2009-03-21 09:20:03.000000000 +0000
356 +++ file/magic/Magdir/adventure 2009-03-21 09:27:01.000000000 +0000
358 #------------------------------------------------------------------------------
359 # Z-machine: file(1) magic for Z-machine binaries.
361 -# This will match ${TEX_BASE}/texmf/omega/ocp/char2uni/inbig5.ocp which
362 -# appears to be a version-0 Z-machine binary.
363 +# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
365 -# The (false match) message is to correct that behavior. Perhaps it is
367 +# The first byte is the Z-machine revision; it is always between 1 and 8. We
368 +# had false matches (for instance, inbig5.ocp from the Omega TeX extension as
369 +# well as an occasional MP3 file), so we sanity-check the version number.
371 -16 belong&0xfe00f0f0 0x3030 Infocom game data
372 ->0 ubyte 0 (false match)
373 ->0 ubyte >0 (Z-machine %d,
374 ->>2 ubeshort x Release %d /
375 ->>18 string >\0 Serial %.6s)
376 +# It might be possible to sanity-check the release number as well, as it seems
377 +# (at least in classic Infocom games) to always be a relatively small number,
378 +# always under 150 or so, but as this isn't rigorous, we'll wait on that until
379 +# it becomes clear that it's needed.
383 +>>16 belong&0xfe00f0f0 0x3030 Infocom game data
384 +>>>0 ubyte x (Z-machine %d,
385 +>>>>2 ubeshort x Release %d /
386 +>>>>18 string >\0 Serial %.6s)
388 #------------------------------------------------------------------------------
389 # Glulx: file(1) magic for Glulx binaries.
390 * 119-magic-update-xwd.patch
391 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
393 The XWD magic is too simple--it just matches a single big-endian long at the
394 beginning of the file. This patch implements a few other checks
397 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
398 --- file.orig/magic/Magdir/images 2009-03-21 09:20:04.000000000 +0000
399 +++ file/magic/Magdir/images 2009-03-21 09:34:29.000000000 +0000
400 @@ -308,11 +308,20 @@
401 # As described in /usr/X11R6/include/X11/XWDFile.h
402 # used by the xwd program.
403 # Bradford Castalia, idaeim, 1/01
404 -4 belong 7 XWD X Window Dump image data
405 ->100 string >\0 \b, "%s"
406 ->16 belong x \b, %dx
409 +# updated by Adam Buchbinder, 2/09
410 +# The following assumes version 7 of the format; the first long is the length
411 +# of the header, which is at least 25 4-byte longs, and the one at offset 8
412 +# is a constant which is always either 1 or 2. Offset 12 is the pixmap depth,
413 +# which is a maximum of 32.
417 +>>>4 belong 7 XWD X Window Dump image data
418 +!:mime image/x-xwindowdump
419 +>>>>100 string >\0 \b, "%s"
420 +>>>>16 belong x \b, %dx
421 +>>>>20 belong x \b%dx
422 +>>>>12 belong x \b%d
424 # PDS - Planetary Data System
425 # These files use Parameter Value Language in the header section.
426 * 121-magic-update-utf.patch
427 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
429 UTF-32BE text is detected by the presence of the Byte Order Mark, in UTF-32BE
430 encoding. The stock version of the BOM is incorrect; it should read 00 00 FE
431 FF, according to the Unicode FAQ: http://unicode.org/faq/utf_bom.html#bom4
434 diff -Naurp file.orig/magic/Magdir/unicode file/magic/Magdir/unicode
435 --- file.orig/magic/Magdir/unicode 2009-03-21 09:20:03.000000000 +0000
436 +++ file/magic/Magdir/unicode 2009-03-21 17:02:09.000000000 +0000
438 0 string +/v+ Unicode text, UTF-7
439 0 string +/v/ Unicode text, UTF-7
440 0 string \335\163\146\163 Unicode text, UTF-8-EBCDIC
441 -0 string \376\377\000\000 Unicode text, UTF-32, big-endian
442 +0 string \000\000\376\377 Unicode text, UTF-32, big-endian
443 0 string \377\376\000\000 Unicode text, UTF-32, little-endian
444 0 string \016\376\377 Unicode text, SCSU (Standard Compression Scheme for Unicode)
445 * 122-magic-update-spectrum.patch
446 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
447 Description: Updating magic for spectrum tap files (Closes: #501589).
449 diff -Naurp file.orig/magic/Magdir/spectrum file/magic/Magdir/spectrum
450 --- file.orig/magic/Magdir/spectrum 2009-03-21 09:20:03.000000000 +0000
451 +++ file/magic/Magdir/spectrum 2009-03-21 17:24:09.000000000 +0000
453 # Tape file. This assumes the .TAP starts with a Spectrum-format header,
454 # which nearly all will.
456 -0 string \023\000\000 Spectrum .TAP data
457 ->4 string x "%-10.10s"
458 ->3 byte 0 - BASIC program
459 ->3 byte 1 - number array
460 ->3 byte 2 - character array
461 ->3 byte 3 - memory block
462 ->>14 belong 0x001B0040 (screen)
463 +# Update: Sanity-check string contents to be printable.
464 +# -Adam Buchbinder <adam.buchbinder@gmail.com>
466 +0 string \023\000\000
468 +>>4 string <\177 Spectrum .TAP data "%-10.10s"
469 +>>>3 byte 0 - BASIC program
470 +>>>3 byte 1 - number array
471 +>>>3 byte 2 - character array
472 +>>>3 byte 3 - memory block
473 +>>>>14 belong 0x001B0040 (screen)
475 # The following three blocks are from pak21-spectrum@srcf.ucam.org
477 * 123-magic-update-tgif.patch
478 Author: Hugo Graumann <graumann@ucalgary.ca>
479 Description: Updating tgif magic (Closes: #549601).
481 diff -Naurp file.orig/magic/Magdir/tgif file/magic/Magdir/tgif
482 --- file.orig/magic/Magdir/tgif 2009-10-02 12:14:27.000000000 +0000
483 +++ file/magic/Magdir/tgif 2009-10-04 21:49:54.000000000 +0000
485 #------------------------------------------------------------------------------
486 # file(1) magic for tgif(1) files
487 # From Hendrik Scholz <hendrik@scholz.net>
489 -0 string %TGIF\ x Tgif file version %s
491 +0 string %TGIF\ Tgif file version
493 * 125-magic-update-truetype-fonts.patch
494 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
495 Description: Update magic of TrueType Collections (Closes: #545709).
497 diff -Naurp file.orig/magic/Magdir/fonts file/magic/Magdir/fonts
498 --- file.orig/magic/Magdir/fonts 2009-12-05 18:26:41.000000000 +0100
499 +++ file/magic/Magdir/fonts 2009-12-05 18:26:58.000000000 +0100
501 0 string \007\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font
502 0 string \012\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font
504 +# TrueType/OpenType font collections (.ttc)
505 +# http://www.microsoft.com/typography/otspec/otff.htm
506 0 string ttcf TrueType font collection data
507 +>4 belong 0x00010000 \b, 1.0
508 +>>8 belong >0 \b, %d fonts
509 +>4 belong 0x00020000 \b, 2.0
510 +>>8 belong >0 \b, %d fonts
511 +# 0x44454947 = 'DSIG'
512 +>>>16 belong 0x44534947 \b, digitally signed
514 # Opentype font data from Avi Bercovich
515 0 string OTTO OpenType font data
516 * 126-magic-update-7zip.patch
517 Author: Daniel Baumann <daniel@debian.org>
518 Description: Adding mime type for 7-zip (Closes: #552742).
520 diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
521 --- file.orig/magic/Magdir/compress 2009-12-05 17:30:09.000000000 +0100
522 +++ file/magic/Magdir/compress 2009-12-05 18:54:52.000000000 +0100
524 0 string 7z\274\257\047\034 7-zip archive data,
527 +!:mime application/x-7z-compressed
530 # URL: http://www.7-zip.org/sdk.html
531 * 127-magic-update-lzma.patch
532 Author: Eloi Notario <entfe001@gmail.com>
533 Description: Updatng magic for lzma (Closes: #576950).
535 diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
536 --- file.orig/magic/Magdir/compress 2010-03-27 11:55:00.000000000 +0100
537 +++ file/magic/Magdir/compress 2010-07-11 00:07:23.645946357 +0200
542 -# URL: http://www.7-zip.org/sdk.html
543 -# From: Robert Millan <rmh@aybabtu.com> and Reuben Thomas <rrt@sc3d.org>
544 -# Commented out because apparently not reliable (according to Debian
546 -#0 string ]\000\000\200\000 LZMA compressed data
547 +0 lelong 0x8000005d LZMA compressed data,
548 +>5 lequad =0xffffffffffffffff streamed
549 +>5 lequad !0xffffffffffffffff non-streamed, size %lld
551 # http://tukaani.org/xz/xz-file-format.txt
552 0 ustring \xFD7zXZ\x00 xz compressed data
553 * 128-magic-update-xz.patch
554 Author: Daniel Baumann <daniel@debian.org>
555 Description: Updatng magic for xz (Closes: #541087).
557 diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
558 --- file.orig/magic/Magdir/compress 2010-07-11 02:03:39.853952057 +0200
559 +++ file/magic/Magdir/compress 2010-07-11 02:04:12.528952297 +0200
561 >5 lequad !0xffffffffffffffff non-streamed, size %lld
563 # http://tukaani.org/xz/xz-file-format.txt
564 -0 ustring \xFD7zXZ\x00 xz compressed data
565 +0 ustring \xFD7zXZ\x00 XZ compressed data
566 !:mime application/x-xz
568 # AFX compressed files (Wolfram Kleff)
569 * 129-magic-update-qemu.patch
570 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
572 Update QEMU image magic, based on some reference docs and checked against
573 actual QEMU images (Closes: #451524).
575 diff -Naurp file.orig//magic/Magdir/msdos file/magic/Magdir/msdos
576 --- file.orig//magic/Magdir/msdos 2010-07-13 17:00:52.246670740 +0200
577 +++ file/magic/Magdir/msdos 2010-07-13 17:02:50.322699548 +0200
578 @@ -639,43 +639,58 @@
579 #--------------------------------------------------------------------
580 # Qemu Emulator Images
581 # Lines written by Friedrich Schwittay (f.schwittay@yousable.de)
582 -# Made by reading sources and doing trial and error on existing
584 -0 string QFI Qemu Image, Format: Qcow
585 +# Updated by Adam Buchbinder (adam.buchbinder@gmail.com)
586 +# Made by reading sources, reading documentation, and doing trial and error
587 +# on existing QCOW files
588 +0 string QFI\xFB QEMU QCOW Image
590 # Uncomment the following line to display Magic (only used for debugging
592 #>0 string x , Magic: %s
594 -# There are currently 2 Versions: "1" and "2"
595 -# I do not use Version 2 and therefor branch here
596 -# but can assure: it works (tested on both versions)
597 -# Also my Qemu 0.9.0 which uses this Version 2 refuses
598 -# to start in its bios
599 ->0x04 belong 2 , Version: 2
600 ->0x04 belong 1 , Version: 1
601 +# There are currently 2 Versions: "1" and "2".
602 +# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
605 -# Using the existence of the Backing File Offset to Branch or not
606 +# Using the existence of the Backing File Offset to determine whether
607 # to read Backing File Information
608 ->>0xc belong >0 , Backing File( Offset: %lu
609 ->>>(0xc.L) string >\0 , Path: %s
611 -# Didn't get the trick here how qemu stores the "Size" at this Position
612 -# There is actually something stored but nothing makes sense
613 -# The header in the sources talks about it
614 -#>>>16 lelong x , Size: %lu
615 +>>12 belong >0 \b, has backing file (
616 +# Note that this isn't a null-terminated string; the length is actually
617 +# (16.L). Assuming a null-terminated string happens to work usually, but it
618 +# may spew junk until it reaches a \0 in some cases.
619 +>>>(12.L) string >\0 \bpath %s
621 # Modification time of the Backing File
622 # Really useful if you want to know if your backing
623 # file is still usable together with this image
624 ->>>20 bedate x , Mtime: %s )
625 +>>>>20 bedate >0 \b, mtime %s)
626 +>>>>20 default x \b)
628 +# Size is stored in bytes in a big-endian u64.
629 +>>24 bequad x \b, %lld bytes
631 +# 1 for AES encryption, 0 for none.
632 +>>36 belong 1 \b, AES-encrypted
634 +# http://www.gnome.org/~markmc/qcow-image-format.html
636 +# Using the existence of the Backing File Offset to determine whether
637 +# to read Backing File Information
638 +>>8 bequad >0 \b, has backing file
639 +# Note that this isn't a null-terminated string; the length is actually
640 +# (16.L). Assuming a null-terminated string happens to work usually, but it
641 +# may spew junk until it reaches a \0 in some cases. Also, since there's no
642 +# .Q modifier, we just use the bottom four bytes as an offset. Note that if
643 +# the file is over 4G, and the backing file path is stored after the first 4G,
644 +# the wrong filename will be printed. (This should be (8.Q), when that syntax
646 +>>>(12.L) string >\0 (path %s)
647 +>>24 bequad x \b, %lld bytes
648 +>>32 belong 1 \b, AES-encrypted
650 -# Don't know how to calculate in Magicfiles
651 -# Also: this Information is not reliably
652 -# stored in image-files
653 ->>24 lelong x , Disk Size could be: %d * 256 bytes
654 +>4 default x (unknown version)
656 -0 string QEVM QEMU's suspend to disk image
657 +0 string QEVM QEMU suspend to disk image
659 0 string Bochs\ Virtual\ HD\ Image Bochs disk image,
660 >32 string x type %s,
661 * 130-magic-update-psf2.patch
662 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
664 Adding detection of PSF2 fonts (Closes: #492035).
666 Linux console fonts come in two formats; PSF1 is already detected, but
667 PSF2, used for fonts which aren't 8-by-x shaped, was not. Add detection
668 of these fonts, and make the output look similar to the PSF1 output,
669 though with a different version number.
671 For more information, see:
672 http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
674 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
675 --- file.orig/magic/Magdir/linux 2010-07-13 18:21:11.561672573 +0200
676 +++ file/magic/Magdir/linux 2010-07-13 18:23:37.790780191 +0200
678 2 string LILO Linux/i386 LILO boot/chain loader
680 # PSF fonts, from H. Peter Anvin <hpa@yggdrasil.com>
681 -0 leshort 0x0436 Linux/i386 PC Screen Font data,
682 ->2 byte 0 256 characters, no directory,
683 ->2 byte 1 512 characters, no directory,
684 ->2 byte 2 256 characters, Unicode directory,
685 ->2 byte 3 512 characters, Unicode directory,
686 +# Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
687 +# See: http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
688 +0 leshort 0x0436 Linux/i386 PC Screen Font v1 data,
689 +>2 byte&0x01 0 256 characters,
690 +>2 byte&0x01 !0 512 characters,
691 +>2 byte&0x02 0 no directory,
692 +>2 byte&0x02 !0 Unicode directory,
694 +0 string \x72\xb5\x4a\x86\x00\x00 Linux/i386 PC Screen Font v2 data,
695 +>16 lelong x %d characters,
696 +>12 lelong&0x01 0 no directory,
697 +>12 lelong&0x01 !0 Unicode directory,
701 # Linux swap file, from Daniel Quinlan <quinlan@yggdrasil.com>
702 4086 string SWAP-SPACE Linux/i386 swap file
703 # From: Jeff Bailey <jbailey@ubuntu.com>
704 * 131-magic-update-dyatic.patch
705 Author: Richard Smith <busreply@broadmeadow.eu>
706 Description: Updating Dyalog APL magics (Closes: #537893).
708 diff -Naurp file.orig/magic/Magdir/dyadic file/magic/Magdir/dyadic
709 --- file.orig/magic/Magdir/dyadic 2010-07-11 00:17:48.680930074 +0200
710 +++ file/magic/Magdir/dyadic 2010-07-13 18:56:06.213685552 +0200
712 # $File: dyadic,v 1.4 2009/09/19 16:28:09 christos Exp $
713 # Dyadic: file(1) magic for Dyalog APL.
717 >1 byte <4 Dyalog APL
718 >>1 byte 0x00 incomplete workspace
719 >>1 byte 0x01 component file
721 >>1 byte 0x03 workspace
722 >>2 byte x version %d
725 +0 beshort 0xaa03 Dyalog APL
726 +>2 byte x workspace type %d
727 +>3 byte x subtype %d
728 +>7 byte&0x28 0x00 32-bit
729 +>7 byte&0x28 0x20 64-bit
730 +>7 byte&0x0c 0x00 classic
731 +>7 byte&0x0c 0x04 unicode
732 +>7 byte&0x88 0x00 big-endian
733 +>7 byte&0x88 0x80 little-endian
735 +0 byte 0xaa Dyalog APL
736 +>1 byte 0x00 aplcore
737 +>1 byte 0x01 component file 32-bit non-journaled non-checksummed
738 +>1 byte 0x02 external variable exclusive
739 +>1 byte 0x06 external variable shared
740 +>1 byte 0x07 session
741 +>1 byte 0x08 mapped file 32-bit
742 +>1 byte 0x09 component file 64-bit non-journaled non-checksummed
743 +>1 byte 0x0a mapped file 64-bit
744 +>1 byte 0x0b component file 32-bit level 1 journaled non-checksummed
745 +>1 byte 0x0c component file 64-bit level 1 journaled non-checksummed
746 +>1 byte 0x0d component file 32-bit level 1 journaled checksummed
747 +>1 byte 0x0e component file 64-bit level 1 journaled checksummed
748 +>1 byte 0x0f component file 32-bit level 2 journaled checksummed
749 +>1 byte 0x10 component file 64-bit level 2 journaled checksummed
750 +>1 byte 0x11 component file 32-bit level 3 journaled checksummed
751 +>1 byte 0x12 component file 64-bit level 3 journaled checksummed
752 +>1 byte 0x13 component file 32-bit non-journaled checksummed
753 +>1 byte 0x14 component file 64-bit non-journaled checksummed
756 +0 short 0x6060 Dyalog APL transfer
757 * 132-magic-update-bio-rad.patch
758 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
759 Description: Fix false positives in Bio-Rad PIC detection (Closes: #589056).
761 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
762 --- file.orig/magic/Magdir/images 2010-07-14 10:21:47.000000000 -0400
763 +++ file/magic/Magdir/images 2010-07-14 10:29:50.000000000 -0400
764 @@ -551,11 +551,16 @@
765 # Bio-Rad .PIC is an image format used by microscope control systems
766 # and related image processing software used by biologists.
767 # From: Vebjorn Ljosa <vebjorn@ljosa.com>
768 -54 leshort 12345 Bio-Rad .PIC Image File
771 ->4 leshort =1 1 image in file
772 ->4 leshort >1 %hd images in file
773 +# BOOL values are two-byte integers; use them to rule out false positives.
774 +# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
775 +# Samples: http://www.loci.wisc.edu/software/sample-data
778 +>>54 leshort 12345 Bio-Rad .PIC Image File
779 +>>>0 leshort >0 %hd x
780 +>>>2 leshort >0 %hd,
781 +>>>4 leshort =1 1 image in file
782 +>>>4 leshort >1 %hd images in file
784 # From Jan "Yenya" Kasprzak <kas@fi.muni.cz>
785 # The description of *.mrw format can be found at
786 * 200-magic-add-par2.patch
787 Author: Daniel van Eeden <daniel_e@dds.nl>
788 Description: New magic for PAR2 archive files (Closes: #294070).
790 diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
791 --- file.orig/magic/Magdir/archive 2010-01-30 09:44:26.000000000 +0000
792 +++ file/magic/Magdir/archive 2010-02-01 12:09:56.000000000 +0000
794 >24 belong 0 no checksum
795 >24 belong 1 SHA-1 checksum
796 >24 belong 2 MD5 checksum
798 +# Type: Parity Archive
799 +# From: Daniel van Eeden <daniel_e@dds.nl>
800 +0 string PAR2 Parity Archive Volume Set
801 * 201-magic-add-pe5.patch
802 Author: Simon Horman <horms@debian.org>
803 Description: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
805 diff -Naurp file.org/magic/Magdir/images file/magic/Magdir/images
806 --- file.org/magic/Magdir/images 2009-02-02 15:55:49.000000000 +0000
807 +++ file/magic/Magdir/images 2009-02-18 11:28:44.000000000 +0000
809 # JPEG 2000 Code Stream Bitmap
810 # From Petr Splichal <psplicha@redhat.com>
811 0 string \xFF\x4F\xFF\x51\x00 JPEG-2000 Code Stream Bitmap data
813 +# Type: Ulead Photo Explorer5 (.pe5)
814 +# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
815 +# From: Simon Horman <horms@debian.org>
816 +0 string IIO2H Ulead Photo Explorer5
817 * 202-magic-add-pmenu.patch
818 Author: Edward Betts <edward@debian.org>
819 Description: New magic for pmenu (Closes: #38543).
821 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
822 --- file.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000 +0000
823 +++ file/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000
825 0 string Zend\x00 PHP script Zend Optimizer data
827 0 string $! DCL command file
830 +# URL: http://packages.debian.org/pdmenu
831 +# From: Edward Betts <edward@debian.org>
832 +0 string #!/usr/bin/pdmenu Pdmenu configuration file text
833 * 203-magic-add-powertab.patch
834 Author: Jelmer Vernooij <jelmer@samba.org>
835 Description: New magic for Power-Tab
837 diff -Naurp file.orig/magic/Magdir/chord file/magic/Magdir/chord
838 --- file.orig/magic/Magdir/chord 2008-02-19 17:27:28.000000000 +0000
839 +++ file/magic/Magdir/chord 2009-02-18 11:42:42.000000000 +0000
842 0 string {title Chord text file
844 +# Type: PowerTab file format
845 +# URL: http://www.power-tab.net/
846 +# From: Jelmer Vernooij <jelmer@samba.org>
847 +0 string ptab\003\000 Power-Tab v3 Tablature File
848 +0 string ptab\004\000 Power-Tab v4 Tablature File
849 * 204-magic-add-scummvm.patch
850 Author: Sven Hartge <debian@ds9.argh.org>
851 Description: New magic for ScummVM savegame files (Closes: #263488).
853 diff -Naurp file.orig/magic/Magdir/console file/magic/Magdir/console
854 --- file.orig/magic/Magdir/console 2007-09-26 20:22:31.000000000 +0000
855 +++ file/magic/Magdir/console 2008-01-12 17:36:55.000000000 +0000
858 0 string HM3W Warcraft III map file
860 +# Type: scummVM savegame files
861 +# From: Sven Hartge <debian@ds9.argh.org>
862 +0 string SCVM ScummVM savegame
864 * 205-magic-add-sgf.patch
865 Author: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
866 Description: New magic for SGF Smart Game Format
868 diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
869 --- file.orig/magic/Magdir/games 2008-04-23 19:00:59.000000000 +0000
870 +++ file/magic/Magdir/games 2008-07-15 13:41:19.000000000 +0000
872 >&0 string n\ NetImmerse game engine file
873 >>&0 regex [0-9a-z.]+ \b, version %s
875 +# Type: SGF Smart Game Format
876 +# URL: http://www.red-bean.com/sgf/
877 +# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
878 +2 regex/c \\(;.*GM\\[[0-9]{1,2}\\] Smart Game Format
879 +>2 regex/c GM\\[1\\] - Go Game
880 +>2 regex/c GM\\[6\\] - BackGammon Game
881 +>2 regex/c GM\\[11\\] - Hex Game
882 +>2 regex/c GM\\[18\\] - Amazons Game
883 +>2 regex/c GM\\[19\\] - Octi Game
884 +>2 regex/c GM\\[20\\] - Gess Game
885 +>2 regex/c GM\\[21\\] - twix Game
886 * 206-magic-add-sisu.patch
887 Author: Ralph Amissah <ralph.amissah@gmail.com>
888 Description: New magic for SiSU Markup Language.
890 diff -Naurp file.orig/magic/Magdir/sisu file/magic/Magdir/sisu
891 --- file.orig/magic/Magdir/sisu 1970-01-01 00:00:00.000000000 +0000
892 +++ file/magic/Magdir/sisu 2008-04-07 08:10:25.000000000 +0000
894 +# Type: SiSU Markup Language
895 +# URL: http://www.sisudoc.org/
896 +# From: Ralph Amissah <ralph.amissah@gmail.com>
898 +0 regex \^%?[\ \t]*SiSU[\ \t]+insert SiSU text insert
901 +0 regex \^%[\ \t]+SiSU[\ \t]+master SiSU text master
904 +0 regex \^%?[\ \t]*SiSU[\ \t]+text SiSU text
907 +0 regex \^%?[\ \t]*SiSU[\ \t][0-9.]+ SiSU text
910 +0 regex \^%*[\ \t]*sisu-[0-9.]+ SiSU text
912 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
913 --- file.orig/magic/Makefile.am 2008-03-22 21:41:00.000000000 +0000
914 +++ file/magic/Makefile.am 2008-04-07 08:11:04.000000000 +0000
915 @@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
916 $(MAGIC_FRAGMENT_DIR)/sgml \
917 $(MAGIC_FRAGMENT_DIR)/sharc \
918 $(MAGIC_FRAGMENT_DIR)/sinclair \
919 +$(MAGIC_FRAGMENT_DIR)/sisu \
920 $(MAGIC_FRAGMENT_DIR)/sketch \
921 $(MAGIC_FRAGMENT_DIR)/smalltalk \
922 $(MAGIC_FRAGMENT_DIR)/sniffer \
923 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
924 --- file.orig/magic/Makefile.in 2008-03-22 21:41:06.000000000 +0000
925 +++ file/magic/Makefile.in 2008-04-07 08:11:10.000000000 +0000
926 @@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
927 $(MAGIC_FRAGMENT_DIR)/sgml \
928 $(MAGIC_FRAGMENT_DIR)/sharc \
929 $(MAGIC_FRAGMENT_DIR)/sinclair \
930 +$(MAGIC_FRAGMENT_DIR)/sisu \
931 $(MAGIC_FRAGMENT_DIR)/sketch \
932 $(MAGIC_FRAGMENT_DIR)/smalltalk \
933 $(MAGIC_FRAGMENT_DIR)/sniffer \
934 * 207-magic-add-snes.patch
935 Author: Josh Triplett <josh@freedesktop.org>
936 Description: New magic for SNES SPC700 sound files (Closes: #410847).
938 diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
939 --- file.orig/magic/Magdir/audio 2008-11-07 15:44:13.000000000 +0000
940 +++ file/magic/Magdir/audio 2009-02-18 11:43:50.000000000 +0000
943 >122 byte&0x1 =0 NTSC
945 +# Type: SNES SPC700 sound files
946 +# From: Josh Triplett <josh@freedesktop.org>
947 +0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
948 +>&0 string 0.30 \b, version %s
949 +>>0x23 byte 0x1B \b, without ID666 tag
950 +>>0x23 byte 0x1A \b, with ID666 tag
951 +>>>0x2E string >\0 \b, song "%.32s"
952 +>>>0x4E string >\0 \b, game "%.32s"
954 # Impulse tracker module (audio/x-it)
955 0 string IMPM Impulse Tracker module sound data -
957 * 208-magic-add-ssh.patch
958 Author: Nicolas Collignon <tsointsoin@gmail.com>
959 Description: New magic for OpenSSH key files (Closes: #439537).
961 diff -Naurp file.orig/magic/Magdir/ssh file/magic/Magdir/ssh
962 --- file.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
963 +++ file/magic/Magdir/ssh 2009-02-18 11:50:34.000000000 +0000
965 +# Type: OpenSSH key files
966 +# From: Nicolas Collignon <tsointsoin@gmail.com>
968 +0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
969 +>28 string >\0 version %s
971 +0 string ssh-dss\ OpenSSH DSA public key
972 +0 string ssh-rsa\ OpenSSH RSA public key
973 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
974 --- file.orig/magic/Makefile.am 2009-02-18 11:49:05.000000000 +0000
975 +++ file/magic/Makefile.am 2009-02-18 11:51:14.000000000 +0000
976 @@ -183,6 +183,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
977 $(MAGIC_FRAGMENT_DIR)/spec \
978 $(MAGIC_FRAGMENT_DIR)/spectrum \
979 $(MAGIC_FRAGMENT_DIR)/sql \
980 +$(MAGIC_FRAGMENT_DIR)/ssh \
981 $(MAGIC_FRAGMENT_DIR)/sun \
982 $(MAGIC_FRAGMENT_DIR)/sysex \
983 $(MAGIC_FRAGMENT_DIR)/teapot \
984 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
985 --- file.orig/magic/Makefile.in 2009-02-18 11:49:05.000000000 +0000
986 +++ file/magic/Makefile.in 2009-02-18 11:51:20.000000000 +0000
987 @@ -345,6 +345,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
988 $(MAGIC_FRAGMENT_DIR)/spec \
989 $(MAGIC_FRAGMENT_DIR)/spectrum \
990 $(MAGIC_FRAGMENT_DIR)/sql \
991 +$(MAGIC_FRAGMENT_DIR)/ssh \
992 $(MAGIC_FRAGMENT_DIR)/sun \
993 $(MAGIC_FRAGMENT_DIR)/sysex \
994 $(MAGIC_FRAGMENT_DIR)/teapot \
995 * 209-magic-add-ssl.patch
996 Author: Nicolas Collignon <tsointsoin@gmail.com>
997 Description: New magic for OpenSSL certificates/key files (Closes: #439537).
999 diff -Naurp file.orig/magic/Magdir/ssl file/magic/Magdir/ssl
1000 --- file.orig/magic/Magdir/ssl 1970-01-01 00:00:00.000000000 +0000
1001 +++ file/magic/Magdir/ssl 2009-02-18 11:53:12.000000000 +0000
1003 +# Type: OpenSSL certificates/key files
1004 +# From: Nicolas Collignon <tsointsoin@gmail.com>
1006 +0 string -----BEGIN\ CERTIFICATE----- PEM certificate
1007 +0 string -----BEGIN\ CERTIFICATE\ REQ PEM certificate request
1008 +0 string -----BEGIN\ RSA\ PRIVATE PEM RSA private key
1009 +0 string -----BEGIN\ DSA\ PRIVATE PEM DSA private key
1010 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
1011 --- file.orig/magic/Makefile.am 2009-02-18 11:52:50.000000000 +0000
1012 +++ file/magic/Makefile.am 2009-02-18 11:53:27.000000000 +0000
1013 @@ -184,6 +184,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
1014 $(MAGIC_FRAGMENT_DIR)/spectrum \
1015 $(MAGIC_FRAGMENT_DIR)/sql \
1016 $(MAGIC_FRAGMENT_DIR)/ssh \
1017 +$(MAGIC_FRAGMENT_DIR)/ssl \
1018 $(MAGIC_FRAGMENT_DIR)/sun \
1019 $(MAGIC_FRAGMENT_DIR)/sysex \
1020 $(MAGIC_FRAGMENT_DIR)/teapot \
1021 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
1022 --- file.orig/magic/Makefile.in 2009-02-18 11:52:50.000000000 +0000
1023 +++ file/magic/Makefile.in 2009-02-18 11:53:31.000000000 +0000
1024 @@ -346,6 +346,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
1025 $(MAGIC_FRAGMENT_DIR)/spectrum \
1026 $(MAGIC_FRAGMENT_DIR)/sql \
1027 $(MAGIC_FRAGMENT_DIR)/ssh \
1028 +$(MAGIC_FRAGMENT_DIR)/ssl \
1029 $(MAGIC_FRAGMENT_DIR)/sun \
1030 $(MAGIC_FRAGMENT_DIR)/sysex \
1031 $(MAGIC_FRAGMENT_DIR)/teapot \
1032 * 210-magic-add-subversion.patch
1033 Author: Michael Piefel <piefel@debian.org>
1034 Description: New magic for SVN dumps (closes: #256652).
1036 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
1037 --- file.orig/magic/Magdir/revision 2008-02-19 17:27:33.000000000 +0000
1038 +++ file/magic/Magdir/revision 2009-02-18 11:54:35.000000000 +0000
1040 0 string HG10 Mercurial bundle,
1041 >4 string UN uncompressed
1042 >4 string BZ bzip2 compressed
1044 +# Type: Subversion (SVN) dumps
1045 +# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
1046 +0 string SVN-fs-dump-format-version: Subversion dumpfile
1047 +>28 string >\0 (version: %s)
1048 * 211-magic-add-supercollider.patch
1049 Author: Mario Lang <mlang@debian.org>
1050 Description: Adds new magic for SuperCollider 3 Synth Definition File Format (Closes: #284803).
1052 diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
1053 --- file.orig/magic/Magdir/audio 2008-01-12 17:39:01.000000000 +0000
1054 +++ file/magic/Magdir/audio 2008-01-12 17:38:49.000000000 +0000
1056 # URL: http://filext.com/detaillist.php?extdetail=AMR
1057 # From: Russell Coker <russell@coker.com.au>
1058 0 string #!AMR Adaptive Multi-Rate Codec (GSM telephony)
1060 +# Type: SuperCollider 3 Synth Definition File Format
1061 +# From: Mario Lang <mlang@debian.org>
1062 +0 string SCgf SuperCollider3 Synth Definition file,
1063 +>4 belong x version %d
1064 * 212-magic-add-xen.patch
1065 Author: Radek Vokal <rvokal@redhat.com>
1066 Description: xen patch, recognizes Xen saved domain
1068 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
1069 --- file.orig/magic/Magdir/linux 2008-01-12 17:47:04.000000000 +0000
1070 +++ file/magic/Magdir/linux 2008-01-12 17:46:42.000000000 +0000
1073 >168 string x UUID: %s
1075 +# Type: Xen, the virtual machine monitor
1076 +# From: Radek Vokal <rvokal@redhat.com>
1077 +0 string LinuxGuestRecord Xen saved domain
1078 +#>2 regex \(name\ [^)]*\) %s
1079 +>20 search/256 (name (name
1080 +>>&1 string x %s...)
1081 * 213-magic-add-xcursor.patch
1082 Author: Mathias Brodala <info@noctus.net>
1083 Description: New magic for X11 cursor files (Closes: #451246).
1085 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1086 --- file.orig/magic/Magdir/images 2009-02-18 11:38:10.000000000 +0000
1087 +++ file/magic/Magdir/images 2009-02-18 11:39:22.000000000 +0000
1089 # URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
1090 # From: Simon Horman <horms@debian.org>
1091 0 string IIO2H Ulead Photo Explorer5
1094 +# URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
1095 +# From: Mathias Brodala <info@noctus.net>
1096 +0 string Xcur X11 cursor
1097 * 214-magic-add-freemind.patch
1098 Author: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
1099 Description: New magic for Freemind (Closes: #472385).
1101 diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
1102 --- file.orig/magic/Magdir/wordprocessors 2008-05-04 14:12:49.000000000 +0000
1103 +++ file/magic/Magdir/wordprocessors 2008-05-04 14:18:38.000000000 +0000
1106 >43 byte 0x16 Just System Word Processor Ichitaro v6
1107 !:mime application/x-ichitaro6
1109 +# Type: Freemind mindmap documents
1110 +# From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
1111 +0 string/w \<map\ version Freemind document
1112 +!:mime application/x-freemind
1113 * 215-magic-add-qdbm.patch
1114 Author: Benoit Sibaud <bsibaud@april.org>
1115 Description: New magic for QDBM Quick Database Manager (Closes: #481717).
1117 diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
1118 --- file.orig/magic/Magdir/database 2009-05-03 00:07:11.000000000 +0000
1119 +++ file/magic/Magdir/database 2009-05-03 08:21:15.000000000 +0000
1121 >40 lequad x \b, bnum=%lld
1122 >48 lequad x \b, rnum=%lld
1123 >56 lequad x \b, fsiz=%lld
1125 +# Type: QDBM Quick Database Manager
1126 +# From: Benoit Sibaud <bsibaud@april.org>
1127 +0 string \\[depot\\]\n\f Quick Database Manager, little endian
1128 +0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
1129 * 216-magic-add-tokyocabinet.patch
1130 Author: Benoit Sibaud <bsibaud@april.org>
1131 Description: New magic for TokyoCabinet database (Closes: #481768).
1133 diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
1134 --- file.orig/magic/Magdir/database 2009-05-03 08:22:43.000000000 +0000
1135 +++ file/magic/Magdir/database 2009-05-03 08:23:25.000000000 +0000
1137 # From: Benoit Sibaud <bsibaud@april.org>
1138 0 string \\[depot\\]\n\f Quick Database Manager, little endian
1139 0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
1141 +# Type: TokyoCabinet database
1142 +# URL: http://tokyocabinet.sourceforge.net/
1143 +# From: Benoit Sibaud <bsibaud@april.org>
1144 +0 string ToKyO\ CaBiNeT\n TokyoCabinet database
1145 +>14 string x (version %s)
1146 * 217-magic-add-cromfs.patch
1147 Author: Werner Fink <werner@suse.de>
1148 Description: Adds new magic for CROM filesystem.
1150 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
1151 --- file.orig/magic/Magdir/filesystems 2010-02-01 12:11:02.000000000 +0000
1152 +++ file/magic/Magdir/filesystems 2010-02-01 12:12:16.000000000 +0000
1153 @@ -1500,3 +1500,14 @@
1155 >0x200 string XFSB XFS filesystem metadump image
1157 +# Type: CROM filesystem
1158 +# From: Werner Fink <werner@suse.de>
1159 +0 string CROMFS CROMFS
1160 +>6 string >\0 \b version %2.2s,
1161 +>8 ulequad >0 \b block data at %lld,
1162 +>16 ulequad >0 \b fblock table at %lld,
1163 +>24 ulequad >0 \b inode table at %lld,
1164 +>32 ulequad >0 \b root at %lld,
1165 +>40 ulelong >0 \b fblock size = %ld,
1166 +>44 ulelong >0 \b block size = %ld,
1167 +>48 ulequad >0 \b bytes = %lld
1168 * 218-magic-add-scribus.patch
1169 Author: Werner Fink <werner@suse.de>
1170 Description: Adds new magics for Scribus.
1172 diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
1173 --- file.orig/magic/Magdir/wordprocessors 2008-05-21 09:49:43.000000000 +0000
1174 +++ file/magic/Magdir/wordprocessors 2008-05-21 09:50:54.000000000 +0000
1176 # From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
1177 0 string/cB \<map\ version Freemind document
1178 !:mime application/x-freemind
1181 +# From: Werner Fink <werner@suse.de>
1182 +0 string \<SCRIBUSUTF8\ Version Scribus Document
1183 +0 string \<SCRIBUSUTF8NEW\ Version Scribus Document
1184 +!:mime application/x-scribus
1185 * 219-magic-add-selinux.patch
1186 Author: Russell Coker <russell@coker.com.au>
1187 Description: Adds new magics for SE Linux (Closes: #485886).
1189 diff -Naurp file.orig/magic/Magdir/selinux file/magic/Magdir/selinux
1190 --- file.orig/magic/Magdir/selinux 1970-01-01 01:00:00.000000000 +0100
1191 +++ file/magic/Magdir/selinux 2008-06-13 09:07:24.000000000 +0200
1193 +# Type: SE Linux policy modules *.pp reference policy
1194 +# for Fedora 5 to 9, RHEL5, and Debian Etch and Lenny.
1195 +# URL: http://doc.coker.com.au/computers/selinux-magic
1196 +# From: Russell Coker <russell@coker.com.au>
1198 +0 lelong 0xf97cff8f SE Linux modular policy
1199 +>4 lelong x version %d,
1200 +>8 lelong x %d sections,
1201 +>>(12.l) lelong 0xf97cff8d
1202 +>>>(12.l+27) lelong x mod version %d,
1203 +>>>(12.l+31) lelong 0 Not MLS,
1204 +>>>(12.l+31) lelong 1 MLS,
1205 +>>>(12.l+23) lelong 2
1206 +>>>>(12.l+47) string >\0 module name %s
1207 +>>>(12.l+23) lelong 1 base
1209 +1 string policy_module( SE Linux policy module source
1210 +2 string policy_module( SE Linux policy module source
1212 +0 string ##\ <summary> SE Linux policy interface source
1214 +#0 search gen_context( SE Linux policy file contexts
1216 +#0 search gen_sens( SE Linux policy MLS constraints source
1217 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
1218 --- file.orig/magic/Makefile.am 2008-06-13 09:07:45.000000000 +0200
1219 +++ file/magic/Makefile.am 2008-06-13 09:08:16.000000000 +0200
1220 @@ -164,6 +164,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
1221 $(MAGIC_FRAGMENT_DIR)/sccs \
1222 $(MAGIC_FRAGMENT_DIR)/scientific \
1223 $(MAGIC_FRAGMENT_DIR)/securitycerts \
1224 +$(MAGIC_FRAGMENT_DIR)/selinux \
1225 $(MAGIC_FRAGMENT_DIR)/sendmail \
1226 $(MAGIC_FRAGMENT_DIR)/sequent \
1227 $(MAGIC_FRAGMENT_DIR)/sgi \
1228 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
1229 --- file.orig/magic/Makefile.in 2008-06-13 09:07:45.000000000 +0200
1230 +++ file/magic/Makefile.in 2008-06-13 09:08:23.000000000 +0200
1231 @@ -324,6 +324,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
1232 $(MAGIC_FRAGMENT_DIR)/sccs \
1233 $(MAGIC_FRAGMENT_DIR)/scientific \
1234 $(MAGIC_FRAGMENT_DIR)/securitycerts \
1235 +$(MAGIC_FRAGMENT_DIR)/selinux \
1236 $(MAGIC_FRAGMENT_DIR)/sendmail \
1237 $(MAGIC_FRAGMENT_DIR)/sequent \
1238 $(MAGIC_FRAGMENT_DIR)/sgi \
1239 * 220-magic-add-bzr.patch
1240 Author: Jelmer Vernooij <jelmer@samba.org>
1241 Description: Adds new magics for bzr (Closes: #488742).
1243 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
1244 --- file.orig/magic/Magdir/revision 2008-07-01 15:42:16.000000000 +0200
1245 +++ file/magic/Magdir/revision 2008-07-01 15:43:34.000000000 +0200
1247 # From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
1248 0 string SVN-fs-dump-format-version: Subversion dumpfile
1249 >28 string >\0 (version: %s)
1251 +# Type: Bazaar revision bundles and merge requests
1252 +# URL: http://www.bazaar-vcs.org/
1253 +# From: Jelmer Vernooij <jelmer@samba.org>
1254 +0 string #\ Bazaar\ revision\ bundle\ v Bazaar Bundle
1255 +0 string #\ Bazaar\ merge\ directive\ format Bazaar merge directive
1256 * 221-magic-add-git.patch
1257 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1259 Add detection for git packs and indexes, making sure it doesn't clash with id
1260 Software PACK files (Closes: #509942).
1262 diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
1263 --- file.orig/magic/Magdir/games 2009-03-21 09:20:03.000000000 +0000
1264 +++ file/magic/Magdir/games 2009-03-21 17:13:30.000000000 +0000
1268 0 string PACK Quake I or II world or extension
1269 +>8 lelong >0 \b, %d entries
1271 #0 string -1\x0a Quake I demo
1272 #>30 string x version %.4s
1273 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
1274 --- file.orig/magic/Magdir/revision 2009-03-21 09:20:03.000000000 +0000
1275 +++ file/magic/Magdir/revision 2009-03-21 17:13:30.000000000 +0000
1277 # From: Josh Triplett <josh@freedesktop.org>
1278 0 string #\ v2\ git\ bundle\n Git bundle
1281 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1282 +# The actual magic is 'PACK', but that clashes with Doom/Quake packs. However,
1283 +# those have a little-endian offset immediately following the magic 'PACK',
1284 +# the first byte of which is never 0, while the first byte of the Git pack
1285 +# version, since it's a tiny number stored in big-endian format, is always 0.
1286 +0 string PACK\0 Git pack
1287 +>4 belong >0 \b, version %d
1288 +>>8 belong >0 \b, %d objects
1290 +# Type: Git pack index
1291 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1292 +0 string \377tOc Git pack index
1293 +>4 belong =2 \b, version 2
1295 # Type: Mercurial bundles
1296 # From: Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
1297 0 string HG10 Mercurial bundle,
1298 * 222-magic-add-nut.patch
1299 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1301 Add support for NUT Container format, using the format's magic string.
1304 diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
1305 --- file.orig/magic/Magdir/animation 2009-05-11 11:39:41.000000000 +0000
1306 +++ file/magic/Magdir/animation 2009-05-11 12:41:14.000000000 +0000
1308 >>51 byte&0x20 !0 stereo
1309 #>>51 byte&0x10 0 FFT
1310 #>>51 byte&0x10 !0 DCT
1312 +# Type: NUT Container
1313 +# URL: http://wiki.multimedia.cx/index.php?title=NUT
1314 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1315 +0 string nut/multimedia\ container\0 NUT multimedia container
1316 * 223-magic-add-blcr.patch
1317 Author: Alan Woodland <ajw05@aber.ac.uk>
1318 Description: Add support for BLCR context files (Closes: #538407).
1320 diff -Naurp file.orig/magic/Magdir/blcr file/magic/Magdir/blcr
1321 --- file.orig/magic/Magdir/blcr 1970-01-01 00:00:00.000000000 +0000
1322 +++ file/magic/Magdir/blcr 2009-07-25 16:16:17.000000000 +0000
1324 +# Berkeley Lab Checkpoint Restart (BLCR) checkpoint context files
1325 +# http://ftg.lbl.gov/checkpoint
1326 +0 string C\0\0\0R\0\0\0 BLCR
1329 +>16 lelong 5 x86-64
1331 +>8 lelong x context data (little endian, version %d)
1332 +# Uncomment the following only of your "file" program supports "search"
1333 +#>0 search/1024 VMA\06 for kernel
1337 +0 string \0\0\0C\0\0\0R BLCR
1342 +>16 belong 8 SPARC64
1343 +>8 belong x context data (big endian, version %d)
1344 +# Uncomment the following only of your "file" program supports "search"
1345 +#>0 search/1024 VMA\06 for kernel
1349 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
1350 --- file.orig/magic/Makefile.am 2009-07-25 16:15:25.000000000 +0000
1351 +++ file/magic/Makefile.am 2009-07-25 16:16:54.000000000 +0000
1352 @@ -25,6 +25,7 @@ $(MAGIC_FRAGMENT_DIR)/att3b \
1353 $(MAGIC_FRAGMENT_DIR)/audio \
1354 $(MAGIC_FRAGMENT_DIR)/basis \
1355 $(MAGIC_FRAGMENT_DIR)/bflt \
1356 +$(MAGIC_FRAGMENT_DIR)/blcr \
1357 $(MAGIC_FRAGMENT_DIR)/blender \
1358 $(MAGIC_FRAGMENT_DIR)/blit \
1359 $(MAGIC_FRAGMENT_DIR)/bout \
1360 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
1361 --- file.orig/magic/Makefile.in 2009-07-25 16:15:25.000000000 +0000
1362 +++ file/magic/Makefile.in 2009-07-25 16:16:58.000000000 +0000
1363 @@ -190,6 +190,7 @@ $(MAGIC_FRAGMENT_DIR)/att3b \
1364 $(MAGIC_FRAGMENT_DIR)/audio \
1365 $(MAGIC_FRAGMENT_DIR)/basis \
1366 $(MAGIC_FRAGMENT_DIR)/bflt \
1367 +$(MAGIC_FRAGMENT_DIR)/blcr \
1368 $(MAGIC_FRAGMENT_DIR)/blender \
1369 $(MAGIC_FRAGMENT_DIR)/blit \
1370 $(MAGIC_FRAGMENT_DIR)/bout \
1371 * 224-magic-add-lyx.patch
1372 Author: Daniel Baumann <daniel@debian.org>
1373 Description: Adding new magic for Lyx (Closes: #556194).
1375 diff -Naurp file.orig/magic/Magdir/tex file/magic/Magdir/tex
1376 --- file.orig/magic/Magdir/tex 2009-10-02 14:14:27.000000000 +0200
1377 +++ file/magic/Magdir/tex 2009-11-15 11:02:53.000000000 +0100
1379 0 search/1 %\ BibTeX\ ` BibTeX custom bibliography style text file
1381 0 search/1 @c\ @mapfile{ TeX font aliases text file
1383 +0 string \#LyX LyX document text
1384 * 225-magic-add-bacula.patch
1385 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1386 Description: Add Bacula volume support (Closes: #556981).
1388 diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
1389 --- file.orig/magic/Magdir/archive 2010-02-01 12:13:41.000000000 +0000
1390 +++ file/magic/Magdir/archive 2010-02-01 12:14:07.000000000 +0000
1392 # Type: Parity Archive
1393 # From: Daniel van Eeden <daniel_e@dds.nl>
1394 0 string PAR2 Parity Archive Volume Set
1396 +# Bacula volume format. (Volumes always start with a block header.)
1397 +# URL: http://bacula.org/3.0.x-manuals/en/developers/developers/Block_Header.html
1398 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1399 +12 string BB02 Bacula volume
1400 +>20 bedate x \b, started %s
1401 * 226-magic-add-olympus.patch
1402 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1403 Description: Add Olympus ORF support (Closes: #519305).
1405 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1406 --- file.orig/magic/Magdir/images 2009-11-18 19:44:34.000000000 +0000
1407 +++ file/magic/Magdir/images 2009-11-18 19:47:35.000000000 +0000
1408 @@ -624,3 +624,13 @@
1409 # URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
1410 # From: Mathias Brodala <info@noctus.net>
1411 0 string Xcur X11 cursor
1413 +# Type: Olympus ORF raw images.
1414 +# URL: http://libopenraw.freedesktop.org/wiki/Olympus_ORF
1415 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1416 +0 string MMOR Olympus ORF raw image data, big-endian
1417 +!:mime image/x-olympus-orf
1418 +0 string IIRO Olympus ORF raw image data, little-endian
1419 +!:mime image/x-olympus-orf
1420 +0 string IIRS Olympus ORF raw image data, little-endian
1421 +!:mime image/x-olympus-orf
1422 * 227-magic-add-gstreamer.patch
1423 Author: Josh Triplett <josh@joshtriplett.org>
1425 Add new magic for gstreamer binary registry files (Closes: #559117).
1427 diff -Naurp file.orig/magic/Magdir/misctools file/magic/Magdir/misctools
1428 --- file.orig/magic/Magdir/misctools 2009-10-02 14:14:27.000000000 +0200
1429 +++ file/magic/Magdir/misctools 2009-12-05 17:28:02.000000000 +0100
1431 4 string gtktalog GNOME Catalogue (gtktalog)
1432 >13 string >\0 version %s
1434 +# Summary: GStreamer binary registry
1436 +# Submitted by: Josh Triplett <josh@joshtriplett.org>
1437 +0 belong 0xc0def00d GStreamer binary registry
1438 +>4 string x \b, version %s
1440 # Summary: Libtool library file
1442 # Submitted by: Tomasz Trojanowski <tomek@uninet.com.pl>
1443 * 228-magic-add-mdmp.patch
1444 Author: Daniel Novotny <dnovotny@redhat.com>
1445 Description: Add new magic for MDMP crash report data files.
1447 diff -Naurp file.orig/magic/Magdir/misctools file/magic/Magdir/misctools
1448 --- file.orig/magic/Magdir/misctools 2009-12-05 17:34:07.000000000 +0100
1449 +++ file/magic/Magdir/misctools 2009-12-05 17:35:01.000000000 +0100
1452 # Submitted by: Abel Cheung <abelcheung@gmail.com>
1453 0 search/80 .lo\ -\ a\ libtool\ object\ file libtool object file
1455 +# From: Daniel Novotny <dnovotny@redhat.com>
1456 +0 string MDMP\x93\xA7 MDMP crash report data
1457 * 229-magic-add-xfsdump.patch
1458 Author: Daniel Novotny <dnovotny@redhat.com>
1459 Description: Add new magic for xfs dumps.
1461 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
1462 --- file.orig/magic/Magdir/filesystems 2009-12-05 17:44:07.000000000 +0100
1463 +++ file/magic/Magdir/filesystems 2009-12-05 17:46:52.000000000 +0100
1464 @@ -1414,3 +1414,10 @@
1465 >40 ulelong >0 \b fblock size = %ld,
1466 >44 ulelong >0 \b block size = %ld,
1467 >48 ulequad >0 \b bytes = %lld
1469 +# Type: xfs metadump image
1470 +# From: Daniel Novotny <dnovotny@redhat.com>
1471 +# mb_magic XFSM at 0; superblock magic XFSB at 1 << mb_blocklog
1472 +# but can we do the << ? For now it's always 512 (0x200) anyway.
1474 +>0x200 string XFSB XFS filesystem metadump image
1475 * 231-magic-add-delta-iso.patch
1476 Author: Daniel Novotny <dnovotny@redhat.com>
1477 Description: Add new magic for delta iso files.
1479 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
1480 --- file.orig/magic/Magdir/filesystems 2009-12-05 17:53:02.000000000 +0100
1481 +++ file/magic/Magdir/filesystems 2009-12-05 17:54:22.000000000 +0100
1482 @@ -1421,3 +1421,8 @@
1483 # but can we do the << ? For now it's always 512 (0x200) anyway.
1485 >0x200 string XFSB XFS filesystem metadump image
1488 +# From: Daniel Novotny <dnovotny@redhat.com>
1489 +0 string DISO Delta ISO data,
1490 +>4 belong x version %d
1491 * 232-magic-add-delta-rpm.patch
1492 Author: Daniel Novotny <dnovotny@redhat.com>
1493 Description: Add new magic for delta rpm files.
1495 diff -Naurp file.orig/magic/Magdir/rpm file/magic/Magdir/rpm
1496 --- file.orig/magic/Magdir/rpm 2009-12-05 17:30:09.000000000 +0100
1497 +++ file/magic/Magdir/rpm 2009-12-05 17:56:35.000000000 +0100
1499 >>8 beshort 11 MIPSel
1504 +# From: Daniel Novotny (dnovotny@redhat.com)
1505 +0 string drpm Delta RPM
1506 +!:mime application/x-rpm
1508 * 233-magic-add-avchd.patch
1509 Author: Alexander Danilov <alexander.a.danilov@gmail.com>
1510 Description: Add new magic for AVCHD Clip Information files (Closes: #538847).
1512 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1513 --- file.orig/magic/Magdir/images 2009-12-05 18:09:09.000000000 +0100
1514 +++ file/magic/Magdir/images 2009-12-05 18:10:44.000000000 +0100
1516 !:mime image/x-olympus-orf
1517 0 string IIRS Olympus ORF raw image data, little-endian
1518 !:mime image/x-olympus-orf
1520 +# Type: files used in modern AVCHD camcoders to store clip information
1522 +# From: Alexander Danilov <alexander.a.danilov@gmail.com>
1523 +0 string HDMV0100 AVCHD Clip Information
1524 * 234-magic-add-chiasmus.patch
1525 Author: Daniel Baumann <daniel@debian.org>
1526 Description: Adding new magics for Chiasmus (Closes: #540368).
1528 diff -Naurp file.orig/magic/Magdir/bsi file/magic/Magdir/bsi
1529 --- file.orig/magic/Magdir/bsi 1970-01-01 01:00:00.000000000 +0100
1530 +++ file/magic/Magdir/bsi 2009-12-05 18:16:59.000000000 +0100
1532 +# Chiasmus is a encryption standard developed by the German Federal
1533 +# Office for Information Security (Bundesamt fuer Sicherheit in der
1534 +# Informationstechnik).
1537 +0 string XIA1 Chiasmus encrypted data
1540 +0 string XIS Chiasmus key
1541 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
1542 --- file.orig/magic/Makefile.am 2009-12-05 18:09:09.000000000 +0100
1543 +++ file/magic/Makefile.am 2009-12-05 18:17:20.000000000 +0100
1544 @@ -30,6 +30,7 @@ $(MAGIC_FRAGMENT_DIR)/blender \
1545 $(MAGIC_FRAGMENT_DIR)/blit \
1546 $(MAGIC_FRAGMENT_DIR)/bout \
1547 $(MAGIC_FRAGMENT_DIR)/bsdi \
1548 +$(MAGIC_FRAGMENT_DIR)/bsi \
1549 $(MAGIC_FRAGMENT_DIR)/btsnoop \
1550 $(MAGIC_FRAGMENT_DIR)/c-lang \
1551 $(MAGIC_FRAGMENT_DIR)/c64 \
1552 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
1553 --- file.orig/magic/Makefile.in 2009-12-05 18:09:09.000000000 +0100
1554 +++ file/magic/Makefile.in 2009-12-05 18:17:24.000000000 +0100
1555 @@ -195,6 +195,7 @@ $(MAGIC_FRAGMENT_DIR)/blender \
1556 $(MAGIC_FRAGMENT_DIR)/blit \
1557 $(MAGIC_FRAGMENT_DIR)/bout \
1558 $(MAGIC_FRAGMENT_DIR)/bsdi \
1559 +$(MAGIC_FRAGMENT_DIR)/bsi \
1560 $(MAGIC_FRAGMENT_DIR)/btsnoop \
1561 $(MAGIC_FRAGMENT_DIR)/c-lang \
1562 $(MAGIC_FRAGMENT_DIR)/c64 \
1563 * 235-magic-add-hdr.patch
1564 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1565 Description: Adding new magics for HDR formats (Closes: #520416).
1567 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1568 --- file.orig/magic/Magdir/images 2009-12-05 18:35:08.000000000 +0100
1569 +++ file/magic/Magdir/images 2009-12-05 18:40:05.000000000 +0100
1570 @@ -639,3 +639,19 @@
1572 # From: Alexander Danilov <alexander.a.danilov@gmail.com>
1573 0 string HDMV0100 AVCHD Clip Information
1575 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1576 +# URL: http://local.wasp.uwa.edu.au/~pbourke/dataformats/pic/
1577 +# Radiance HDR; usually has .pic or .hdr extension.
1578 +0 string #?RADIANCE\n Radiance HDR image data
1579 +#!mime image/vnd.radiance
1581 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1582 +# URL: http://www.mpi-inf.mpg.de/resources/pfstools/pfs_format_spec.pdf
1583 +# Used by the pfstools packages. The regex matches for the image size could
1584 +# probably use some work. The MIME type is made up; if there's one in
1585 +# actual common use, it should replace the one below.
1586 +0 string PFS1\x0a PFS HDR image data
1588 +>1 regex [0-9]*\ \b, %s
1589 +>>1 regex \ [0-9]{4} \bx%s
1590 * 236-magic-add-foveon-x3f.patch
1591 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1592 Description: Adding new magics for Foveon X3F (Closes: #516800).
1594 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1595 --- file.orig/magic/Magdir/images 2009-12-05 18:43:12.000000000 +0100
1596 +++ file/magic/Magdir/images 2009-12-05 18:43:37.000000000 +0100
1597 @@ -655,3 +655,15 @@
1599 >1 regex [0-9]*\ \b, %s
1600 >>1 regex \ [0-9]{4} \bx%s
1603 +# URL: http://www.photofo.com/downloads/x3f-raw-format.pdf
1604 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1605 +# Note that the MIME type isn't defined anywhere that I can find; if
1606 +# there's a canonical type for this format, it should replace this one.
1607 +0 string FOVb Foveon X3F raw image data
1609 +>6 leshort x \b, version %d.
1611 +>28 lelong x \b, %dx
1613 * 237-magic-add-paint-net.patch
1614 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1615 Description: Adding new magics for Paint.NET images (Closes: #504779).
1617 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1618 --- file.orig/magic/Magdir/images 2009-12-05 18:46:53.000000000 +0100
1619 +++ file/magic/Magdir/images 2009-12-05 18:47:27.000000000 +0100
1622 >28 lelong x \b, %dx
1626 +# From Adam Buchbinder <adam.buchbinder@gmail.com>
1627 +0 string PDN3 Paint.NET image data
1628 +!:mime image/x-paintnet
1629 * 238-magic-add-dact.patch
1631 Description: Adding new magics for DACT (Closes: #582945).
1633 diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
1634 --- file.orig/magic/Magdir/compress 2010-06-21 00:50:12.608254012 +0200
1635 +++ file/magic/Magdir/compress 2010-06-21 00:53:13.743273541 +0200
1636 @@ -219,3 +219,11 @@
1637 # URL: http://tukaani.org/xz/
1638 0 string \xfd\x37\x7a\x58\x5a\x00 XZ compressed data
1639 !:mime application/x-xz
1641 +# Type: DACT compressed files
1642 +0 long 0x444354C3 DACT compressed data
1643 +>4 byte >-1 (version %i.
1646 +>7 long >0 , original size: %i bytes
1647 +>15 long >30 , block size: %i bytes
1648 * 239-magic-add-datafork.patch
1649 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1650 Description: Add new magic for datafork fonts (Closes: #291908).
1652 diff -Naurp file.orig/magic/Magdir/macintosh file/magic/Magdir/macintosh
1653 --- file.orig/magic/Magdir/macintosh 2010-07-11 00:17:48.692930622 +0200
1654 +++ file/magic/Magdir/macintosh 2010-07-13 17:26:21.169673589 +0200
1655 @@ -376,3 +376,15 @@
1657 # From: Remi Mommsen <mommsen@slac.stanford.edu>
1658 0 string BOMStore Mac OS X bill of materials (BOM) file
1660 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1661 +# URL: http://en.wikipedia.org/wiki/Datafork_TrueType
1662 +# Derived from the 'fondu' and 'ufond' source code (fondu.sf.net). 'sfnt' is
1663 +# TrueType; 'POST' is PostScript. 'FONT' and 'NFNT' sometimes appear, but I
1664 +# don't know what they mean.
1666 +>(0x4.L+24) beshort x
1667 +>>&4 belong 0x73666e74 Mac OSX datafork font, TrueType
1668 +>>&4 belong 0x464f4e54 Mac OSX datafork font, 'FONT'
1669 +>>&4 belong 0x4e464e54 Mac OSX datafork font, 'NFNT'
1670 +>>&4 belong 0x504f5354 Mac OSX datafork font, PostScript
1671 * 240-magic-add-pdb.patch
1672 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1673 Description: Adding new magics for PDB files (Closes: #480829).
1675 diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
1676 --- file.orig/magic/Magdir/scientific 2010-07-11 00:17:48.700953291 +0200
1677 +++ file/magic/Magdir/scientific 2010-07-13 18:10:28.461677038 +0200
1679 0 string \060\000\040\000\110\000\105\000\101\000\104\000 GEDCOM data
1680 0 string \376\377\000\060\000\040\000\110\000\105\000\101\000\104 GEDCOM data
1681 0 string \377\376\060\000\040\000\110\000\105\000\101\000\104\000 GEDCOM data
1683 +# PDB: Protein Data Bank files
1684 +# Adam Buchbinder <adam.buchbinder@gmail.com>
1686 +# http://www.wwpdb.org/documentation/format32/sect2.html
1687 +# http://www.ch.ic.ac.uk/chemime/
1689 +# The PDB file format is fixed-field, 80 columns. From the spec:
1693 +# 11 - 50 String(40)
1697 +# Thus, positions 7-10, 60-62 and 67-80 are spaces. The Date must be in the
1698 +# format DD-MMM-YY, e.g., 01-JAN-70, and the IDcode consists of numbers and
1699 +# uppercase letters. However, examples have been seen without the date string,
1700 +# e.g., the example on the chemime site.
1701 +0 string HEADER\ \ \ \
1702 +>&0 regex/1 \^.{40}
1703 +>>&0 regex/1 [0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3}
1704 +>>>&0 regex/1s [A-Z0-9]{4}.{14}$
1705 +>>>>&0 regex/1 [A-Z0-9]{4} Protein Data Bank data, ID Code %s
1706 +!:mime chemical/x-pdb
1707 +>>>>0 regex/1 [0-9]{2}-[A-Z]{3}-[0-9]{2} \b, %s
1708 * 241-magic-add-canon.patch
1709 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1710 Description: Adding new magics for Canon CRW and CR2 files (Closes: #516054).
1712 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
1713 --- file.orig/magic/Magdir/images 2010-07-13 18:47:51.670671838 +0200
1714 +++ file/magic/Magdir/images 2010-07-13 18:48:12.525672541 +0200
1716 0 string IIN1 NIFF image data
1719 +# Canon RAW version 1 (CRW) files are a type of Canon Image File Format
1720 +# (CIFF) file. These are apparently all little-endian.
1721 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1722 +# URL: http://www.sno.phy.queensu.ca/~phil/exiftool/canon_raw.html
1723 +0 string II\x1a\0\0\0HEAPCCDR Canon CIFF raw image data
1724 +!:mime image/x-canon-crw
1725 +>16 leshort x \b, version %d.
1728 +# Canon RAW version 2 (CR2) files are a kind of TIFF with an extra magic
1729 +# number. Put this above the TIFF test to make sure we detect them.
1730 +# These are apparently all little-endian.
1731 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1732 +# URL: http://libopenraw.freedesktop.org/wiki/Canon_CR2
1733 +0 string II\x2a\0\x10\0\0\0CR Canon CR2 raw image data
1734 +!:mime image/x-canon-cr2
1735 +>10 byte x \b, version %d.
1738 # Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com)
1739 # The second word of TIFF files is the TIFF version number, 42, which has
1740 # never changed. The TIFF specification recommends testing for it.
1741 * 242-magic-add-gdsii.patch
1742 Author: Євгеній Мещеряков <eugen@debian.org>
1743 Description: Adding new magics for GDSII (Closes: #576462).
1745 diff -Naurp file.orig/magic/Magdir/scientific file/magic/Magdir/scientific
1746 --- file.orig/magic/Magdir/scientific 2010-07-13 19:20:16.702717178 +0200
1747 +++ file/magic/Magdir/scientific 2010-07-13 19:19:47.037693749 +0200
1749 >>>>&0 regex/1 [A-Z0-9]{4} Protein Data Bank data, ID Code %s
1750 !:mime chemical/x-pdb
1751 >>>>0 regex/1 [0-9]{2}-[A-Z]{3}-[0-9]{2} \b, %s
1753 +# Type: GDSII Stream file
1754 +0 belong 0x00060002 GDSII Stream file
1756 +>>5 byte x version %d.0
1757 +>4 byte >0x00 version %d
1759 * 243-magic-add-git-index.patch
1760 Author: Frédéric Brière <fbriere@fbriere.net>
1761 Description: Adding new magics for Git index files (Closes: #583679).
1763 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
1764 --- file.orig/magic/Magdir/revision 2010-07-13 19:28:53.070674134 +0200
1765 +++ file/magic/Magdir/revision 2010-07-13 19:28:37.817698688 +0200
1767 0 string \377tOc Git pack index
1768 >4 belong =2 \b, version 2
1770 +# Type: Git index file
1771 +# From: Frédéric Brière <fbriere@fbriere.net>
1772 +0 string DIRC Git index
1773 +>4 belong >0 \b, version %d
1774 +>>8 belong >0 \b, %d entries
1776 # Type: Mercurial bundles
1777 # From: Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
1778 0 string HG10 Mercurial bundle,
1779 * 244-magic-add-jfs.patch
1780 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1781 Description: Adding new magic for JFS filesystem images (Closes: #589067).
1783 diff -Naurp file.orig//magic/Magdir/filesystems file/magic/Magdir/filesystems
1784 --- file.orig//magic/Magdir/filesystems 2010-07-14 19:53:22.762672355 +0200
1785 +++ file/magic/Magdir/filesystems 2010-07-14 19:54:33.318672139 +0200
1786 @@ -1523,3 +1523,19 @@
1787 # From: Daniel Novotny <dnovotny@redhat.com>
1788 0 string DISO Delta ISO data,
1789 >4 belong x version %d
1791 +# JFS2 (Journaling File System) image. (Old JFS1 has superblock at 0x1000.)
1792 +# See linux/fs/jfs/jfs_superblock.h for layout; see jfs_filsys.h for flags.
1793 +# From: Adam Buchbinder <adam.buchbinder@gmail.com>
1795 +# Because it's text-only magic, check a binary value (version) to be sure.
1796 +# Should always be 2, but mkfs.jfs writes it as 1. Needs to be 2 or 1 to be
1798 +>&0 lelong <3 JFS2 filesystem image
1799 +# Label is followed by a UUID; we have to limit string length to avoid
1800 +# appending the UUID in the case of a 16-byte label.
1801 +>>&144 regex [\x20-\x7E]{1,16} (label "%s")
1802 +>>&0 lequad x \b, %lld blocks
1803 +>>&8 lelong x \b, blocksize %d
1804 +>>&32 lelong&0x00000006 >0 (dirty)
1805 +>>&36 lelong >0 (compressed)
1806 * 245-magic-add-erlang.patch
1807 Author: Nahuel Greco <ngreco@gmail.com>
1808 Description: Adding new magics for Erlang DETS files (Closes: #589723).
1810 diff -Naurp file.orig/magic/Magdir/erlang file/magic/Magdir/erlang
1811 --- file.orig/magic/Magdir/erlang 2010-07-11 00:17:48.680930074 +0200
1812 +++ file/magic/Magdir/erlang 2010-07-22 00:00:57.484882096 +0200
1814 79 string Tue\ Jan\ 22\ 14:32:44\ MET\ 1991 Erlang JAM file - version 4.2
1816 4 string 1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995 Erlang JAM file - version 4.3
1818 +0 bequad 0x0000000000ABCDEF Erlang DETS file
1819 * 901-file-localmagic.patch
1820 Author: Michael Piefel <piefel@debian.org>
1821 Description: No longer includes Localstuff in /usr/share/misc/magic. Local definitions should go to /etc/magic.
1823 diff -Naurp file.orig/magic/Header file/magic/Header
1824 --- file.orig/magic/Header 2000-08-05 17:36:46.000000000 +0000
1825 +++ file/magic/Header 2008-09-08 11:53:44.000000000 +0000
1828 # Magic data for file(1) command.
1829 -# Machine-generated from src/cmd/file/magdir/*; edit there only!
1830 -# Format is described in magic(files), where:
1831 -# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
1832 +# Format is described in magic(5).
1833 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
1834 +# this file as a wishlist bug against file (using the reportbug utility).
1836 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
1837 --- file.orig/magic/magic.local 1970-01-01 00:00:00.000000000 +0000
1838 +++ file/magic/magic.local 2008-09-08 11:53:44.000000000 +0000
1840 +# Magic local data for file(1) command.
1841 +# Insert here your local magic data. Format is described in magic(5).
1843 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
1844 --- file.orig/src/Makefile.am 2008-07-15 17:10:47.000000000 +0000
1845 +++ file/src/Makefile.am 2008-09-08 11:52:51.000000000 +0000
1846 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
1850 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
1851 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
1852 AM_CFLAGS = @WARNINGS@
1854 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
1855 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
1856 --- file.orig/src/Makefile.in 2008-08-30 10:01:42.000000000 +0000
1857 +++ file/src/Makefile.in 2008-09-08 11:53:21.000000000 +0000
1858 @@ -198,7 +198,7 @@ top_srcdir = @top_srcdir@
1859 MAGIC = $(pkgdatadir)/magic
1860 lib_LTLIBRARIES = libmagic.la
1861 include_HEADERS = magic.h
1862 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
1863 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
1864 AM_CFLAGS = @WARNINGS@
1865 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
1866 compress.c is_tar.c readelf.c print.c fsmagic.c \
1867 * 902-file-make.patch
1868 Author: Michael Piefel <piefel@debian.org>
1871 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
1872 --- file.orig/src/Makefile.in 2008-01-12 17:55:24.000000000 +0000
1873 +++ file/src/Makefile.in 2008-01-12 17:56:46.000000000 +0000
1874 @@ -300,7 +300,7 @@ clean-binPROGRAMS:
1876 file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES)
1877 @rm -f file$(EXEEXT)
1878 - $(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
1879 + $(LINK) $(file_OBJECTS) $(file_LDADD)
1881 mostlyclean-compile:
1883 * 904-doc-manpages.patch
1884 Author: Michael Piefel <piefel@debian.org>
1885 Description: FIXME, and #417511.
1887 diff -Naurp file.orig/doc/file.man file/doc/file.man
1888 --- file.orig/doc/file.man 2008-11-06 23:18:35.000000000 +0000
1889 +++ file/doc/file.man 2009-02-18 12:28:42.000000000 +0000
1890 @@ -51,7 +51,7 @@ meaning anything else (data is usually
1892 Exceptions are well-known file formats (core files, tar archives)
1893 that are known to contain binary data.
1894 -When modifying magic files or the program itself, make sure to
1895 +When adding local definitions to /etc/magic, make sure to
1896 .Em "preserve these keywords" .
1897 Users depend on knowing that all the readable files in a directory
1899 @@ -95,7 +95,8 @@ The concept of a
1900 has been applied by extension to data files.
1901 Any file with some invariant identifier at a small fixed
1902 offset into the file can usually be described in this way.
1903 -The information identifying these files is read from the compiled
1904 +The information identifying these files is read from /etc/magic
1905 +and the the compiled
1908 or the files in the directory
1909 @@ -325,6 +326,11 @@ will not attempt to open
1912 to the value of this variable as appropriate.
1915 +has to exist in order for
1918 The environment variable
1920 controls (on systems that support symbolic links), whether
1921 @@ -400,12 +406,6 @@ will be distributed periodically.
1922 The order of entries in the magic file is significant.
1923 Depending on what system you are using, the order that
1924 they are put together may be incorrect.
1927 -command uses a magic file,
1928 -keep the old magic file around for comparison purposes
1930 -.Pa __MAGIC__.orig ).
1932 .Bd -literal -offset indent
1933 $ file file.c file /dev/{wd0a,hda}
1934 @@ -547,3 +547,5 @@ on
1937 .Dv /pub/file/file-X.YZ.tar.gz
1939 +This version adds a number of new magic entries from Debian.
1940 * 905-doc-manpages-typo.patch
1941 Author: Adam Buchbinder <adam.buchbinder@gmail.com>
1943 A spacing error causes a reference to the hexdump manpage to show up as
1944 "hexdump(1,)" rather than "hexdump(1),"; this patch fixes it (Closes: #515761).
1946 diff -Naurp file.orig/doc/file.man file/doc/file.man
1947 --- file.orig/doc/file.man 2009-03-21 09:20:04.000000000 +0000
1948 +++ file/doc/file.man 2009-03-21 16:57:49.000000000 +0000
1949 @@ -341,7 +341,7 @@ options.
1950 .Xr magic __FSECTION__ ,
1956 .Sh STANDARDS CONFORMANCE
1957 This program is believed to exceed the System V Interface Definition
1958 * 906-doc-manpages-typo2.patch
1959 Author: Ori Avtalion <ori@avtalion.name>
1960 Description: Fixing typo and formating issue (Closes: #499754).
1962 diff -Naurp file.orig/doc/magic.man file/doc/magic.man
1963 --- file.orig/doc/magic.man 2010-07-11 00:17:48.664928248 +0200
1964 +++ file/doc/magic.man 2010-07-13 17:08:25.697672263 +0200
1965 @@ -283,7 +283,7 @@ then print the string), with
1968 always evaluates to true.
1971 The message to be printed if the comparison succeeds.
1972 If the string contains a
1974 @@ -348,7 +348,7 @@ If a the test on a line at level
1976 succeeds, all following tests at level
1978 -are performed, and the messages printed if the tests succeed, untile a line
1979 +are performed, and the messages printed if the tests succeed, until a line
1983 * 907-file-python.patch
1984 Author: Joerg Friedrich <Joerg.Friedrich@friedrich-kn.de>
1986 Adding support for all flags from magic.h in python-magic (Closes: #529354).
1988 diff -Naurp file.orig/python/py_magic.c file/python/py_magic.c
1989 --- file.orig/python/py_magic.c 2009-12-05 17:30:09.000000000 +0100
1990 +++ file/python/py_magic.c 2009-12-05 18:35:22.000000000 +0100
1991 @@ -303,11 +303,24 @@ static struct const_vals {
1992 { "MAGIC_SYMLINK", MAGIC_SYMLINK },
1993 { "MAGIC_COMPRESS", MAGIC_COMPRESS },
1994 { "MAGIC_DEVICES", MAGIC_DEVICES },
1995 - { "MAGIC_MIME", MAGIC_MIME },
1996 + { "MAGIC_MIME_TYPE", MAGIC_MIME_TYPE },
1997 { "MAGIC_CONTINUE", MAGIC_CONTINUE },
1998 { "MAGIC_CHECK", MAGIC_CHECK },
1999 { "MAGIC_PRESERVE_ATIME", MAGIC_PRESERVE_ATIME },
2000 + { "MAGIC_RAW", MAGIC_RAW},
2001 { "MAGIC_ERROR", MAGIC_ERROR},
2002 + { "MAGIC_MIME_ENCODING", MAGIC_MIME_ENCODING },
2003 + { "MAGIC_MIME", MAGIC_MIME },
2004 + { "MAGIC_APPLE", MAGIC_APPLE },
2005 + { "MAGIC_NO_CHECK_COMPRESS", MAGIC_NO_CHECK_COMPRESS },
2006 + { "MAGIC_NO_CHECK_TAR", MAGIC_NO_CHECK_TAR },
2007 + { "MAGIC_NO_CHECK_SOFT", MAGIC_NO_CHECK_SOFT },
2008 + { "MAGIC_NO_CHECK_APPTYPE", MAGIC_NO_CHECK_APPTYPE },
2009 + { "MAGIC_NO_CHECK_ELF", MAGIC_NO_CHECK_ELF },
2010 + { "MAGIC_NO_CHECK_TEXT", MAGIC_NO_CHECK_TEXT },
2011 + { "MAGIC_NO_CHECK_CDF", MAGIC_NO_CHECK_CDF },
2012 + { "MAGIC_NO_CHECK_TOKENS", MAGIC_NO_CHECK_TOKENS },
2013 + { "MAGIC_NO_CHECK_ENCODING", MAGIC_NO_CHECK_ENCODING },
2017 * 908-file-coredump.patch
2018 Author: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
2020 File does not always correctly report the faulty command for core files
2023 diff -Naurp file.orig/src/readelf.c file/src/readelf.c
2024 --- file.orig/src/readelf.c 2010-07-11 00:17:48.717928843 +0200
2025 +++ file/src/readelf.c 2010-07-13 16:45:37.341674011 +0200
2026 @@ -738,6 +738,25 @@ core:
2028 * Well, that worked.
2032 + * Try next offsets, in case this match is
2033 + * in the middle of a string.
2036 + for (k = i + 1 ; k < NOFFSETS ; k++) {
2037 + if (prpsoffsets(k) >= prpsoffsets(i))
2041 + for (no = doff + prpsoffsets(k);
2042 + no < doff + prpsoffsets(i); no++)
2044 + && isprint(nbuf[no]);
2049 cname = (unsigned char *)
2050 &nbuf[doff + prpsoffsets(i)];
2051 for (cp = cname; *cp && isprint(*cp); cp++)
2052 * 999-conglomeration.patch
2053 Author: Michael Piefel <piefel@debian.org>
2054 Description: Needs to be broken out (FIXME).
2056 diff -Naurp file.orig/src/fsmagic.c file/src/fsmagic.c
2057 --- file.orig/src/fsmagic.c 2008-02-14 20:14:52.000000000 +0000
2058 +++ file/src/fsmagic.c 2008-04-07 08:32:13.000000000 +0000
2059 @@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
2060 if (file_printf(ms, "cannot open `%s' (%s)",
2061 fn, strerror(errno)) == -1)
2064 + ms->event_flags |= EVENT_HAD_ERR;
projects / packages / file.git / blob