packages: file/file-debian.patch, file/file-msdos.patch, file/file.spec - u...

qboosh qboosh at pld-linux.org
Wed Aug 25 08:49:15 CEST 2010 

Author: qboosh                       Date: Wed Aug 25 06:49:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 5.04
- updated debian patch (from 5_04-5)
- updated msdos patch
- release 0.1 (needs some testing)

---- Files affected:
packages/file:
   file-debian.patch (1.25 -> 1.26) , file-msdos.patch (1.6 -> 1.7) , file.spec (1.170 -> 1.171) 

---- Diffs:

================================================================
Index: packages/file/file-debian.patch
diff -u packages/file/file-debian.patch:1.25 packages/file/file-debian.patch:1.26
--- packages/file/file-debian.patch:1.25	Sun May  3 20:18:10 2009
+++ packages/file/file-debian.patch	Wed Aug 25 08:49:09 2010
@@ -1,48 +1,37 @@
-Author: Daniel Baumann <daniel at debian.org>
-Description: Addding mime to asf magic.
-
-diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
---- file.orig/magic/Magdir/animation	2008-11-07 22:49:20.000000000 +0000
-+++ file/magic/Magdir/animation	2009-02-18 11:57:43.000000000 +0000
-@@ -697,6 +697,7 @@
- 
- # Microsoft Advanced Streaming Format (ASF) <mpruett at sgi.com>
- 0	belong			0x3026b275	Microsoft ASF
-+!:mime	video/x-ms-asf
- 
- # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
- 0	string			\x8aMNG		MNG video data,
+* 101-magic-update-awk.patch
 Author: Werner Fink <werner at suse.de>
 Description: Updates (and re-enables) awk magic.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-05-04 14:12:49.000000000 +0000
-+++ file/magic/Magdir/commands	2008-05-21 09:36:15.000000000 +0000
-@@ -49,6 +49,7 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:51:38.000000000 +0000
+@@ -50,6 +50,7 @@
  # update to distinguish from *.vcf files
  # this is broken because postscript has /EBEGIN{ for example.
- #0	search/Bb	BEGIN {			awk script text
+ #0	search/Ww	BEGIN {			awk script text
 +0	regex		=^\\s*BEGIN\\s*[{]	awk script text
  
  # AT&T Bell Labs' Plan 9 shell
- 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable
+ 0	string/w	#!\ /bin/rc	Plan 9 rc shell script text executable
+* 102-magic-update-bash.patch
 Author: Daniel Baumann <daniel at debian.org>
 Description: Adding another shebang path for bash.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-04-16 12:28:04.000000000 +0000
-+++ file/magic/Magdir/commands	2009-02-18 11:58:44.000000000 +0000
-@@ -56,6 +56,10 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:54:51.000000000 +0000
+@@ -57,6 +57,10 @@
  # bash shell magic, from Peter Tobias (tobias at server.et-inf.fho-emden.de)
- 0	string/b	#!\ /bin/bash	Bourne-Again shell script text executable
+ 0	string/w	#!\ /bin/bash	Bourne-Again shell script text executable
  !:mime	text/x-shellscript
-+0	string/b	#!\ /usr/bin/bash	Bourne-Again shell script text executable
-+!:mime text/x-shellscript
-+0	string/b	#!\ /usr/local/bash	Bourne-Again shell script text executable
-+!:mime text/x-shellscript
- 0	string/b	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
++0	string/w	#!\ /usr/bin/bash	Bourne-Again shell script text executable
++!:mime	text/x-shellscript
++0	string/w	#!\ /usr/local/bash	Bourne-Again shell script text executable
++!:mime	text/x-shellscript
+ 0	string/w	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
  !:mime	text/x-shellscript
  
+* 103-magic-update-reiserfs.patch
 Author: Werner Fink <werner at suse.de>
 Description: Updating reiserfs magic to detect ReiserFS V3.6.19.
 
@@ -57,21 +46,23 @@
  >0x1002c 	leshort	x		block size %d
  >0x10032	leshort	&2		(mounted or unclean)
  >0x10000	lelong	x		num blocks %d
+* 104-magic-update-tcsh.patch
 Author: Daniel Baumann <daniel at debian.org>
 Description: Addding another shebang path for tcsh.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-04-16 12:28:04.000000000 +0000
-+++ file/magic/Magdir/commands	2008-07-15 13:28:19.000000000 +0000
-@@ -12,6 +12,8 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:57:33.000000000 +0000
+@@ -13,6 +13,8 @@
  !:mime	text/x-shellscript
- 0	string/b 	#!\ /bin/tcsh		Tenex C shell script text executable
+ 0	string/w 	#!\ /bin/tcsh		Tenex C shell script text executable
  !:mime	text/x-shellscript
-+0	string/b	#!\ /usr/bin/tcsh	Tenex C shell script text executable
++0	string/w	#!\ /usr/bin/tcsh	Tenex C shell script text executable
 +!:mime	text/x-shellscript
- 0	string/b 	#!\ /usr/local/tcsh	Tenex C shell script text executable
+ 0	string/w 	#!\ /usr/local/tcsh	Tenex C shell script text executable
  !:mime	text/x-shellscript
- 0	string/b	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable
+ 0	string/w	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable
+* 105-magic-update-zip.patch
 Author: n/a
 Description: Updating zip magic.
 
@@ -87,6 +78,7 @@
  >(8.s*16)	search/0x20	PKSFX \b, ZIP self-extracting archive (PKZIP)
  # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive
  #
+* 106-magic-update-real.patch
 Author: n/a
 Description: Update RealMedia magic.
 
@@ -102,6 +94,7 @@
  !:mime	application/vnd.rn-realmedia
  #video/x-pn-realvideo
  #video/vnd.rn-realvideo
+* 107-magic-update-os2.patch
 Author: n/a
 Description: Updating OS/2 REXX magic.
 
@@ -121,6 +114,7 @@
  
  0	leshort		0x14c	MS Windows COFF Intel 80386 object file
  #>4	ledate		x	stamp %s
+* 108-magic-update-digifax.patch
 Author: n/a
 Description: Updating Digifax magic.
 
@@ -140,6 +134,7 @@
  
  0	short		0x0100		raw G3 data, byte-padded
  0	short		0x1400		raw G3 data
+* 109-magic-update-mono.patch
 Author: n/a
 Description: Updating Mono magic.
 
@@ -154,6 +149,7 @@
  >>&0xf4 search/0x140 \x0\x40\x1\x0
  >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive
  >30		string	Copyright\ 1989-1990\ PKWARE\ Inc.	Self-extracting PKZIP archive
+* 110-magic-update-pfm.patch
 Author: n/a
 Description: Updating pfm magic.
 
@@ -174,6 +170,7 @@
  #0	string	\000\001 pfm?
  #>3	string	\022\000\000Copyright\	yes
  #>3	string	\002\000\000Copyright\	yes
+* 111-magic-update-ocaml.patch
 Author: Eric Cooper <ecc at cmu.edu>
 Description: Updating ocaml magic (Closes: #488992).
 
@@ -195,13 +192,14 @@
  >8	string	N		abstract syntax tree interface file
 ->9	string	>\0		(Version %3.3s).
 +>9	string	>\0		(Version %3.3s)
+* 112-magic-update-linuxswap.patch
 Author: Russell Coker <russell at coker.com.au>
 Description: Adding volume label and UUID support for linux swap (Closes: #489865).
 
 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
---- file.orig/magic/Magdir/linux	2008-06-04 18:02:25.000000000 +0000
-+++ file/magic/Magdir/linux	2008-07-15 14:16:43.000000000 +0000
-@@ -56,11 +56,19 @@
+--- file.orig/magic/Magdir/linux	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/linux	2010-02-01 12:02:18.000000000 +0000
+@@ -58,11 +58,19 @@
  # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey at ubuntu.com>
  4076	string		SWAPSPACE2S1SUSPEND	Linux/i386 swap file (new style) with SWSUSP1 image
  # according to man page of mkswap (8) March 1999
@@ -223,9 +221,10 @@
 +>0x414	beshort		x		\b-%04x
 +>0x416	belong		x		\b-%08x
 +>0x41a	beshort		x		\b%04x
- # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
- #
- #	from Erik Troan (ewt at redhat.com) examining od dumps, so this
+ # From Daniel Novotny <dnovotny at redhat.com>
+ # swap file for PowerPC
+ 65526	string		SWAPSPACE2	Linux/ppc swap file
+* 113-magic-update-linuxext.patch
 Author: Russell Coker <russell at coker.com.au>
 Description: Adding volume label and UUID support for linux ext (Closes: #489865).
 
@@ -290,6 +289,7 @@
  
  # SGI disk labels - Nathan Scott <nathans at debian.org>
  0	belong		0x0BE5A941	SGI disk label (volume header)
+* 114-magic-update-llvm.patch
 Author: Toeroek Edwin <edwintorok at gmail.com>
 Description: Updating llvm magic (Closes: #505805).
 
@@ -310,23 +310,7 @@
  0	string	llvc2	LLVM byte-codes, bzip2 compression
 +0	string	\xde\xc0\x17\x0b	LLVM bitcode, wrapper
 +0       string	BC\xc0\xde	LLVM bitcode
-Author: Daniel Baumann <daniel at debian.org>
-Description: Adding mime entries for ruby (Closes: #502201).
-
-diff -Naurp file.orig/magic/Magdir/ruby file/magic/Magdir/ruby
---- file.orig/magic/Magdir/ruby	2008-10-19 14:31:15.000000000 +0000
-+++ file/magic/Magdir/ruby	2008-11-15 19:28:44.000000000 +0000
-@@ -5,6 +5,10 @@
- 
- # Ruby scripts
- 0	search/1/b	#!\ /usr/bin/ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1/b	#!\ /usr/local/bin/ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1	#!/usr/bin/env\ ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1	#!\ /usr/bin/env\ ruby	Ruby script text executable
-+!:mime	application/x-ruby
+* 116-magic-update-gimp.patch
 Author: Ori Avtalion <ori at avtalion.name>
 Description: Adding mime entries for gimp (Closes: #501200).
 
@@ -341,6 +325,7 @@
  >9	string		file		version 0,
  >9	string		v		version
  >>10	string		>\0		%s,
+* 117-magic-update-wav.patch
 Author: Adam Buchbinder <adam.buchbinder at gmail.com>
 Description: pdating wav magics (Closes: #508174).
 
@@ -362,6 +347,7 @@
  >>22	leshort		=1		\b, mono
  >>22	leshort		=2		\b, stereo
  >>22	leshort		>2		\b, %d channels
+* 118-magic-update-z-machine.patch
 Author: Adam Buchbinder <adam.buchbinder at gmail.com>
 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)
 
@@ -401,6 +387,7 @@
  
  #------------------------------------------------------------------------------
  # Glulx:  file(1) magic for Glulx binaries.
+* 119-magic-update-xwd.patch
 Author: Adam Buchbinder <adam.buchbinder at gmail.com>
 Description:
  The XWD magic is too simple--it just matches a single big-endian long at the
@@ -436,6 +423,7 @@
  
  # PDS - Planetary Data System
  #   These files use Parameter Value Language in the header section.
+* 121-magic-update-utf.patch
 Author: Adam Buchbinder <adam.buchbinder at gmail.com>
 Description:
  UTF-32BE text is detected by the presence of the Byte Order Mark, in UTF-32BE
@@ -454,6 +442,7 @@
 +0	string	\000\000\376\377	Unicode text, UTF-32, big-endian
  0	string	\377\376\000\000	Unicode text, UTF-32, little-endian
  0	string	\016\376\377		Unicode text, SCSU (Standard Compression Scheme for Unicode)
+* 122-magic-update-spectrum.patch
 Author: Adam Buchbinder <adam.buchbinder at gmail.com>
 Description: Updating magic for spectrum tap files (Closes: #501589).
 
@@ -485,19 +474,331 @@
  
  # The following three blocks are from pak21-spectrum at srcf.ucam.org
  # TZX tape images
+* 123-magic-update-tgif.patch
+Author: Hugo Graumann <graumann at ucalgary.ca>
+Description: Updating tgif magic (Closes: #549601).
+
+diff -Naurp file.orig/magic/Magdir/tgif file/magic/Magdir/tgif
+--- file.orig/magic/Magdir/tgif	2009-10-02 12:14:27.000000000 +0000
++++ file/magic/Magdir/tgif	2009-10-04 21:49:54.000000000 +0000
+@@ -1,6 +1,5 @@
+ #------------------------------------------------------------------------------
+ # file(1) magic for tgif(1) files
+ # From Hendrik Scholz <hendrik at scholz.net>
+-
+-0	string	%TGIF\ x 		Tgif file version %s
+-
++0	string	%TGIF\			Tgif file version
++>6	string	x			%s
+* 125-magic-update-truetype-fonts.patch
+Author: Adam Buchbinder <adam.buchbinder at gmail.com>
+Description: Update magic of TrueType Collections (Closes: #545709).
+
+diff -Naurp file.orig/magic/Magdir/fonts file/magic/Magdir/fonts
+--- file.orig/magic/Magdir/fonts	2009-12-05 18:26:41.000000000 +0100
++++ file/magic/Magdir/fonts	2009-12-05 18:26:58.000000000 +0100
+@@ -58,7 +58,15 @@
+ 0	string		\007\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
+ 0	string		\012\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
+ 
++# TrueType/OpenType font collections (.ttc)
++# http://www.microsoft.com/typography/otspec/otff.htm
+ 0	string		ttcf		TrueType font collection data
++>4	belong		0x00010000	\b, 1.0
++>>8	belong		>0		\b, %d fonts
++>4	belong		0x00020000	\b, 2.0
++>>8	belong		>0		\b, %d fonts
++# 0x44454947 = 'DSIG'
++>>>16	belong		0x44534947	\b, digitally signed
+ 
+ # Opentype font data from Avi Bercovich
+ 0	string		OTTO		OpenType font data
+* 126-magic-update-7zip.patch
+Author: Daniel Baumann <daniel at debian.org>
+Description: Adding mime type for 7-zip (Closes: #552742).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2009-12-05 17:30:09.000000000 +0100
++++ file/magic/Magdir/compress	2009-12-05 18:54:52.000000000 +0100
+@@ -187,6 +187,7 @@
+ 0	string		7z\274\257\047\034	7-zip archive data,
+ >6	byte		x			version %d
+ >7	byte		x			\b.%d
++!:mime	application/x-7z-compressed
+ 
+ # Type: LZMA
+ # URL:  http://www.7-zip.org/sdk.html
+* 127-magic-update-lzma.patch
+Author: Eloi Notario <entfe001 at gmail.com>
+Description: Updatng magic for lzma (Closes: #576950).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2010-03-27 11:55:00.000000000 +0100
++++ file/magic/Magdir/compress	2010-07-11 00:07:23.645946357 +0200
+@@ -190,11 +190,9 @@
+ >7	byte		x			\b.%d
+ 
+ # Type: LZMA
+-# URL:  http://www.7-zip.org/sdk.html
+-# From: Robert Millan <rmh at aybabtu.com> and Reuben Thomas <rrt at sc3d.org>
+-# Commented out because apparently not reliable (according to Debian
+-# bug #364260)
+-#0	string		]\000\000\200\000	LZMA compressed data
++0	lelong		0x8000005d		LZMA compressed data,
++>5	lequad		=0xffffffffffffffff	streamed
++>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0	ustring		\xFD7zXZ\x00		xz compressed data
+* 128-magic-update-xz.patch
+Author: Daniel Baumann <daniel at debian.org>
+Description: Updatng magic for xz (Closes: #541087).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2010-07-11 02:03:39.853952057 +0200
++++ file/magic/Magdir/compress	2010-07-11 02:04:12.528952297 +0200
+@@ -196,7 +196,7 @@
+ >5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+-0	ustring		\xFD7zXZ\x00		xz compressed data
++0	ustring		\xFD7zXZ\x00		XZ compressed data
+ !:mime	application/x-xz
+ 
+ # AFX compressed files (Wolfram Kleff)
+* 129-magic-update-qemu.patch
+Author: Adam Buchbinder <adam.buchbinder at gmail.com>
+Description:
+ Update QEMU image magic, based on some reference docs and checked against
+ actual QEMU images (Closes: #451524).
+
+diff -Naurp file.orig//magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig//magic/Magdir/msdos	2010-07-13 17:00:52.246670740 +0200
++++ file/magic/Magdir/msdos	2010-07-13 17:02:50.322699548 +0200
+@@ -639,43 +639,58 @@
+ #--------------------------------------------------------------------
+ # Qemu Emulator Images
+ # Lines written by Friedrich Schwittay (f.schwittay at yousable.de)
+-# Made by reading sources and doing trial and error on existing
+-# qcow files
+-0	string	QFI	Qemu Image, Format: Qcow
++# Updated by Adam Buchbinder (adam.buchbinder at gmail.com)
++# Made by reading sources, reading documentation, and doing trial and error
++# on existing QCOW files
++0	string	QFI\xFB	QEMU QCOW Image
+ 
+ # Uncomment the following line to display Magic (only used for debugging
+ # this magic number)
+ #>0	string	x	, Magic: %s
+ 
+-# There are currently 2 Versions: "1" and "2"
+-# I do not use Version 2 and therefor branch here
+-# but can assure: it works (tested on both versions)
+-# Also my Qemu 0.9.0 which uses this Version 2 refuses
+-# to start in its bios
+->0x04	belong	2	, Version: 2
+->0x04	belong	1	, Version: 1
++# There are currently 2 Versions: "1" and "2".
++# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
++>4	belong	1	(v1)
+ 
+-# Using the existence of the Backing File Offset to Branch or not
++# Using the existence of the Backing File Offset to determine whether
+ # to read Backing File Information
+->>0xc	 belong	 >0	 , Backing File( Offset: %lu
+->>>(0xc.L)	 string >\0	, Path: %s
+-
+-# Didn't get the trick here how qemu stores the "Size" at this Position
+-# There is actually something stored but nothing makes sense
+-# The header in the sources talks about it
+-#>>>16	 lelong	 x	 , Size: %lu
++>>12	belong	 >0	 \b, has backing file (
++# Note that this isn't a null-terminated string; the length is actually
++# (16.L). Assuming a null-terminated string happens to work usually, but it
++# may spew junk until it reaches a \0 in some cases.
++>>>(12.L)	 string >\0	\bpath %s
+ 
+ # Modification time of the Backing File
+ # Really useful if you want to know if your backing
+ # file is still usable together with this image
+->>>20	 bedate x	, Mtime: %s )
++>>>>20	bedate >0	\b, mtime %s)
++>>>>20	default x	\b)
++
++# Size is stored in bytes in a big-endian u64.
++>>24	bequad	x	 \b, %lld bytes
++
++# 1 for AES encryption, 0 for none.
++>>36	belong	1	\b, AES-encrypted
++
++# http://www.gnome.org/~markmc/qcow-image-format.html
++>4	belong	2	(v2)
++# Using the existence of the Backing File Offset to determine whether
++# to read Backing File Information
++>>8	bequad  >0	 \b, has backing file
++# Note that this isn't a null-terminated string; the length is actually
++# (16.L). Assuming a null-terminated string happens to work usually, but it
++# may spew junk until it reaches a \0 in some cases. Also, since there's no
++# .Q modifier, we just use the bottom four bytes as an offset. Note that if
++# the file is over 4G, and the backing file path is stored after the first 4G,
++# the wrong filename will be printed. (This should be (8.Q), when that syntax
++# is introduced.)
++>>>(12.L)	 string >\0	(path %s)
++>>24	bequad	x	\b, %lld bytes
++>>32	belong	1	\b, AES-encrypted
+ 
+-# Don't know how to calculate in Magicfiles
+-# Also: this Information is not reliably
+-#	stored in image-files
+->>24	 lelong	 x	 , Disk Size could be: %d * 256 bytes
++>4	default x	(unknown version)
+ 
+-0	string	QEVM		QEMU's suspend to disk image
++0	string	QEVM		QEMU suspend to disk image
+ 
+ 0	string	Bochs\ Virtual\ HD\ Image	Bochs disk image,
+ >32	string	x				type %s,
+* 130-magic-update-psf2.patch
+Author: Adam Buchbinder <adam.buchbinder at gmail.com>
+Description:
+ Adding detection of PSF2 fonts (Closes: #492035).
+ .
+ Linux console fonts come in two formats; PSF1 is already detected, but
+ PSF2, used for fonts which aren't 8-by-x shaped, was not. Add detection
+ of these fonts, and make the output look similar to the PSF1 output,
+ though with a different version number.
+ .
+ For more information, see:
+ http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux	2010-07-13 18:21:11.561672573 +0200
++++ file/magic/Magdir/linux	2010-07-13 18:23:37.790780191 +0200
+@@ -46,12 +46,21 @@
+ 2	string		LILO		Linux/i386 LILO boot/chain loader
+ #
+ # PSF fonts, from H. Peter Anvin <hpa at yggdrasil.com>
+-0	leshort		0x0436		Linux/i386 PC Screen Font data,
+->2	byte		0		256 characters, no directory,
+->2	byte		1		512 characters, no directory,
+->2	byte		2		256 characters, Unicode directory,
+->2	byte		3		512 characters, Unicode directory,
++# Updated by Adam Buchbinder <adam.buchbinder at gmail.com>
++# See: http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html
++0	leshort		0x0436		Linux/i386 PC Screen Font v1 data,
++>2	byte&0x01	0		256 characters,
++>2	byte&0x01	!0		512 characters,
++>2	byte&0x02	0		no directory,
++>2	byte&0x02	!0		Unicode directory,
+ >3	byte		>0		8x%d
++0	string		\x72\xb5\x4a\x86\x00\x00 Linux/i386 PC Screen Font v2 data,
++>16	lelong		x		%d characters,
++>12	lelong&0x01	0		no directory,
++>12	lelong&0x01	!0		Unicode directory,
++>24	lelong		x		%d
++>28	lelong		x		\bx%d
++
+ # Linux swap file, from Daniel Quinlan <quinlan at yggdrasil.com>
+ 4086	string		SWAP-SPACE	Linux/i386 swap file
+ # From: Jeff Bailey <jbailey at ubuntu.com>
+* 131-magic-update-dyatic.patch
+Author: Richard Smith <busreply at broadmeadow.eu>
+Description: Updating Dyalog APL magics (Closes: #537893).
+
+diff -Naurp file.orig/magic/Magdir/dyadic file/magic/Magdir/dyadic
+--- file.orig/magic/Magdir/dyadic	2010-07-11 00:17:48.680930074 +0200
++++ file/magic/Magdir/dyadic	2010-07-13 18:56:06.213685552 +0200
+@@ -3,7 +3,7 @@
+ # $File: dyadic,v 1.4 2009/09/19 16:28:09 christos Exp $
+ # Dyadic: file(1) magic for Dyalog APL.
+ #
+-0 	byte	0xaa
++0	byte	0xaa
+ >1	byte	<4		Dyalog APL
+ >>1	byte	0x00		incomplete workspace
+ >>1	byte	0x01		component file
+@@ -11,3 +11,36 @@
+ >>1	byte	0x03		workspace
+ >>2	byte	x		version %d
+ >>3	byte	x		.%d
++
++0	beshort		0xaa03		Dyalog APL
++>2	byte		x		workspace type %d
++>3	byte		x		subtype %d
++>7	byte&0x28	0x00		32-bit
++>7	byte&0x28	0x20		64-bit
++>7	byte&0x0c	0x00		classic
++>7	byte&0x0c	0x04		unicode
++>7	byte&0x88	0x00		big-endian
++>7	byte&0x88	0x80		little-endian
++
++0	byte		0xaa		Dyalog APL
++>1	byte		0x00		aplcore
++>1	byte		0x01		component file 32-bit non-journaled non-checksummed
++>1	byte		0x02		external variable exclusive
++>1	byte		0x06		external variable shared
++>1	byte		0x07		session
++>1	byte		0x08		mapped file 32-bit
++>1	byte		0x09		component file 64-bit non-journaled non-checksummed
++>1	byte		0x0a		mapped file 64-bit
++>1	byte		0x0b		component file 32-bit level 1 journaled non-checksummed
++>1	byte		0x0c		component file 64-bit level 1 journaled non-checksummed
++>1	byte		0x0d		component file 32-bit level 1 journaled checksummed
++>1	byte		0x0e		component file 64-bit level 1 journaled checksummed
++>1	byte		0x0f		component file 32-bit level 2 journaled checksummed
++>1	byte		0x10		component file 64-bit level 2 journaled checksummed
++>1	byte		0x11		component file 32-bit level 3 journaled checksummed
++>1	byte		0x12		component file 64-bit level 3 journaled checksummed
++>1	byte		0x13		component file 32-bit non-journaled checksummed
++>1	byte		0x14		component file 64-bit non-journaled checksummed
++>1	byte		0x80		DDB
++
++0	short		0x6060		Dyalog APL transfer
+* 132-magic-update-bio-rad.patch
+Author: Adam Buchbinder <adam.buchbinder at gmail.com>
+Description: Fix false positives in Bio-Rad PIC detection (Closes: #589056).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2010-07-14 10:21:47.000000000 -0400
++++ file/magic/Magdir/images	2010-07-14 10:29:50.000000000 -0400
+@@ -551,11 +551,16 @@
+ # Bio-Rad .PIC is an image format used by microscope control systems
+ # and related image processing software used by biologists.
+ # From: Vebjorn Ljosa <vebjorn at ljosa.com>
+-54	leshort 12345		Bio-Rad .PIC Image File
+->0	leshort >0		%hd x
+->2	leshort >0		%hd,
+->4	leshort =1		1 image in file
+->4	leshort >1		%hd images in file
++# BOOL values are two-byte integers; use them to rule out false positives.
++# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
++# Samples: http://www.loci.wisc.edu/software/sample-data
++14	leshort <2
++>62	leshort <2
++>>54	leshort 12345		Bio-Rad .PIC Image File
++>>>0	leshort >0		%hd x
++>>>2	leshort >0		%hd,
++>>>4	leshort =1		1 image in file
++>>>4	leshort >1		%hd images in file
+ 
+ # From Jan "Yenya" Kasprzak <kas at fi.muni.cz>
+ # The description of *.mrw format can be found at
+* 200-magic-add-par2.patch
 Author: Daniel van Eeden <daniel_e at dds.nl>
 Description: New magic for PAR2 archive files (Closes: #294070).
 
 diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
---- file.orig/magic/Magdir/archive	2008-02-28 18:57:34.000000000 +0000
-+++ file/magic/Magdir/archive	2008-04-07 08:05:47.000000000 +0000
-@@ -803,3 +803,6 @@
+--- file.orig/magic/Magdir/archive	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/archive	2010-02-01 12:09:56.000000000 +0000
+@@ -830,3 +830,7 @@
+ >24	belong	0		no checksum
  >24	belong	1		SHA-1 checksum
  >24	belong	2		MD5 checksum
- 
++
 +# Type: Parity Archive
 +# From: Daniel van Eeden <daniel_e at dds.nl>
-+0	string	 PAR2		Parity Archive Volume Set
++0	string	PAR2		Parity Archive Volume Set
+* 201-magic-add-pe5.patch
 Author: Simon Horman <horms at debian.org>
 Description: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
 
@@ -513,6 +814,7 @@
 +# URL:	http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
 +# From:	Simon Horman <horms at debian.org>
 +0	string	IIO2H			Ulead Photo Explorer5
+* 202-magic-add-pmenu.patch
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file-debian.patch?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file-msdos.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/file/file.spec?r1=1.170&r2=1.171&f=u

More information about the pld-cvs-commit mailing list