Author: qboosh Date: Sat Jul 19 20:41:49 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from file_4.25-1.diff
---- Files affected:
SOURCES:
file-debian.patch (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/file-debian.patch
diff -u SOURCES/file-debian.patch:1.20 SOURCES/file-debian.patch:1.21
--- SOURCES/file-debian.patch:1.20 Wed Apr 23 22:53:48 2008
+++ SOURCES/file-debian.patch Sat Jul 19 22:41:44 2008
@@ -1,46 +1,200 @@
+## 999-conglomeration.dpatch by Michael Piefel <[EMAIL PROTECTED]>
+##
+## DP: Needs to be broken out (FIXME).
+diff -Naurp file-4.24.orig/src/fsmagic.c file-4.24/src/fsmagic.c
+--- file-4.24.orig/src/fsmagic.c 2008-02-14 20:14:52.000000000 +0000
++++ file-4.24/src/fsmagic.c 2008-04-07 08:32:13.000000000 +0000
+@@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
+ if (file_printf(ms, "cannot open `%s' (%s)",
+ fn, strerror(errno)) == -1)
+ return -1;
+- return 1;
++ ms->haderr++;
++ return -1;
+ }
+
+ if (mime) {
+## 906-file-hurd.dpatch by Michael Casadevall <[EMAIL PROTECTED]>
+##
+## DP: Fixes a FTBFS on hurd (Closes: #433716).
+diff -Naur file-4.21.orig/src/magic.c file-4.21/src/magic.c
+--- file-4.21.orig/src/magic.c 2007-03-26 17:59:50.000000000 +0000
++++ file-4.21/src/magic.c 2007-07-19 06:25:16.000000000 +0000
+@@ -58,6 +58,11 @@
+ #include <locale.h>
+ #endif
+
++#ifndef PIPE_BUF
++// Get the PIPE_BUF from pathconf
++#define PIPE_BUF pathconf(".", _PC_PIPE_BUF)
++#endif
++
+ #include <netinet/in.h> /* for byte swapping */
+
+ #include "patchlevel.h"
#!/bin/sh /usr/share/dpatch/dpatch-run
-## 318-magic-add-par2.dpatch by Daniel van Eeden <[EMAIL PROTECTED]>
+## 903-magic-local.dpatch by Michael Piefel <[EMAIL PROTECTED]>
##
-## DP: New magic for PAR2 archive files (Closes: #294070).
+## DP: No longer includes Localstuff in /usr/share/misc/magic. Local
definitions
+## DP: should go to /etc/magic.
@DPATCH@
-diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
---- file-4.24.orig/magic/Magdir/archive 2008-02-28 18:57:34.000000000
+0000
-+++ file-4.24/magic/Magdir/archive 2008-04-07 08:05:47.000000000 +0000
-@@ -803,3 +803,6 @@
- >24 belong 1 SHA-1 checksum
- >24 belong 2 MD5 checksum
+diff -Naurp file.orig/magic/Header file/magic/Header
+--- file.orig/magic/Header 2000-08-05 17:36:46.000000000 +0000
++++ file/magic/Header 2008-07-15 13:51:04.000000000 +0000
+@@ -1,5 +1,5 @@
+-# Magic
+ # Magic data for file(1) command.
+-# Machine-generated from src/cmd/file/magdir/*; edit there only!
+-# Format is described in magic(files), where:
+-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
++# Format is described in magic(5).
++# Don't edit this file, edit /etc/magic or send your suggested inclusions to
++# this file as a wishlist bug against file (using the reportbug utility).
++
+diff -Naurp file.orig/magic/magic.local file/magic/magic.local
+--- file.orig/magic/magic.local 1970-01-01 00:00:00.000000000 +0000
++++ file/magic/magic.local 2008-07-15 13:51:04.000000000 +0000
+@@ -0,0 +1,3 @@
++# Magic local data for file(1) command.
++# Insert here your local magic data. Format is described in magic(5).
++
+diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
+--- file.orig/src/Makefile.am 2008-05-09 14:12:55.000000000 +0000
++++ file/src/Makefile.am 2008-07-15 13:51:37.000000000 +0000
+@@ -4,7 +4,7 @@ include_HEADERS = magic.h
-+# Type: Parity Archive
-+# From: Daniel van Eeden <[EMAIL PROTECTED]>
-+0 string PAR2 Parity Archive Volume Set
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 319-magic-add-pe5.dpatch by Simon Horman <[EMAIL PROTECTED]>
+ bin_PROGRAMS = file
+
+-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
++AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
+ AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
+ -Wmissing-declarations -Wredundant-decls -Wnested-externs \
+ -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
+diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
+--- file.orig/src/Makefile.in 2008-07-02 15:24:28.000000000 +0000
++++ file/src/Makefile.in 2008-07-15 13:52:00.000000000 +0000
+@@ -197,7 +197,7 @@ top_srcdir = @top_srcdir@
+ MAGIC = $(pkgdatadir)/magic
+ lib_LTLIBRARIES = libmagic.la
+ include_HEADERS = magic.h
+-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
++AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
+ AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
+ -Wmissing-declarations -Wredundant-decls -Wnested-externs \
+ -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
+## 324-magic-add-snes.dpatch by Josh Triplett <[EMAIL PROTECTED]>
##
-## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
-
[EMAIL PROTECTED]@
+## DP: New magic for SNES SPC700 sound files (Closes: #410847).
-diff -Naurp file-4.24.orig/magic/Magdir/images file-4.24/magic/Magdir/images
---- file-4.24.orig/magic/Magdir/images 2008-03-07 14:58:54.000000000 +0000
-+++ file-4.24/magic/Magdir/images 2008-04-07 08:07:42.000000000 +0000
-@@ -588,3 +588,8 @@
- 0 string \xed\xfe\xda\xbe Cytovision FLEX file
- 0 string \xed\xab\xed\xfe Cytovision FLEX file
- 0 string \xad\xfd\xea\xad Cytovision RATS file
-+
-+# Type: Ulead Photo Explorer5 (.pe5)
-+# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
-+# From: Simon Horman <[EMAIL PROTECTED]>
-+0 string IIO2H Ulead Photo Explorer5
-#!/bin/sh /usr/share/dpatch/dpatch-run
+diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
+--- file-4.21.orig/magic/Magdir/audio 2007-12-23 17:32:42.000000000 +0000
++++ file-4.21/magic/Magdir/audio 2007-12-23 17:33:57.000000000 +0000
+@@ -268,6 +268,15 @@
+ >122 byte&0x1 =1 PAL
+ >122 byte&0x1 =0 NTSC
+
++# Type: SNES SPC700 sound files
++# From: Josh Triplett <[EMAIL PROTECTED]>
++0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
++>&0 string 0.30 \b, version %s
++>>0x23 byte 0x1B \b, without
ID666 tag
++>>0x23 byte 0x1A \b, with ID666
tag
++>>>0x2E string >\0 \b, song "%.32s"
++>>>0x4E string >\0 \b, game "%.32s"
++
+ # Impulse tracker module (audio/x-it)
+ 0 string IMPM Impulse Tracker module sound data -
+ >4 string >\0 "%s"
+## 206-magic-update-bash.dpatch
+##
+## DP: Add another shebang path for bash.
+diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
+--- file.orig/magic/Magdir/commands 2008-07-15 13:31:02.000000000 +0000
++++ file/magic/Magdir/commands 2008-07-15 13:30:55.000000000 +0000
+@@ -58,6 +58,10 @@ o string/b #!\ /usr/bin/tcsh Tenex C she
+ # bash shell magic, from Peter Tobias ([EMAIL PROTECTED])
+ 0 string/b #!\ /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
+ !:mime text/x-shellscript
+
+## 339-magic-add-selinux.dpatch by Russell Coker <[EMAIL PROTECTED]>
+##
+## DP: Adds new magics for SE Linux (Closes: #485886).
+diff -Naurp file.orig/magic/Magdir/selinux file/magic/Magdir/selinux
+--- file.orig/magic/Magdir/selinux 1970-01-01 01:00:00.000000000 +0100
++++ file/magic/Magdir/selinux 2008-06-13 09:07:24.000000000 +0200
+@@ -0,0 +1,24 @@
++# Type: SE Linux policy modules *.pp reference policy
++# for Fedora 5 to 9, RHEL5, and Debian Etch and Lenny.
++# URL: http://doc.coker.com.au/computers/selinux-magic
++# From: Russell Coker <[EMAIL PROTECTED]>
++
++0 lelong 0xf97cff8f SE Linux modular policy
++>4 lelong x version %d,
++>8 lelong x %d sections,
++>>(12.l) lelong 0xf97cff8d
++>>>(12.l+27) lelong x mod version %d,
++>>>(12.l+31) lelong 0 Not MLS,
++>>>(12.l+31) lelong 1 MLS,
++>>>(12.l+23) lelong 2
++>>>>(12.l+47) string >\0 module name %s
++>>>(12.l+23) lelong 1 base
++
++1 string policy_module( SE Linux policy module source
++2 string policy_module( SE Linux policy module source
++
++0 string ##\ <summary> SE Linux policy interface source
++
++#0 search gen_context( SE Linux policy file contexts
++
++#0 search gen_sens( SE Linux policy MLS constraints source
+diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
+--- file.orig/magic/Makefile.am 2008-06-13 09:07:45.000000000 +0200
++++ file/magic/Makefile.am 2008-06-13 09:08:16.000000000 +0200
+@@ -164,6 +164,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
+ $(MAGIC_FRAGMENT_DIR)/sccs \
+ $(MAGIC_FRAGMENT_DIR)/scientific \
+ $(MAGIC_FRAGMENT_DIR)/securitycerts \
++$(MAGIC_FRAGMENT_DIR)/selinux \
+ $(MAGIC_FRAGMENT_DIR)/sendmail \
+ $(MAGIC_FRAGMENT_DIR)/sequent \
+ $(MAGIC_FRAGMENT_DIR)/sgi \
+diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
+--- file.orig/magic/Makefile.in 2008-06-13 09:07:45.000000000 +0200
++++ file/magic/Makefile.in 2008-06-13 09:08:23.000000000 +0200
+@@ -324,6 +324,7 @@ $(MAGIC_FRAGMENT_DIR)/sc \
+ $(MAGIC_FRAGMENT_DIR)/sccs \
+ $(MAGIC_FRAGMENT_DIR)/scientific \
+ $(MAGIC_FRAGMENT_DIR)/securitycerts \
++$(MAGIC_FRAGMENT_DIR)/selinux \
+ $(MAGIC_FRAGMENT_DIR)/sendmail \
+ $(MAGIC_FRAGMENT_DIR)/sequent \
+ $(MAGIC_FRAGMENT_DIR)/sgi \
+## 325-magic-add-ssl.dpatch by Nicolas Collignon <[EMAIL PROTECTED]>
+##
+## DP: New magic for OpenSSH key files (Closes: #439537).
+diff -Naur file-4.21.orig/magic/Magdir/ssh file-4.21/magic/Magdir/ssh
+--- file-4.21.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
++++ file-4.21/magic/Magdir/ssh 2007-08-26 08:25:03.000000000 +0000
+@@ -0,0 +1,8 @@
++# Type: OpenSSH key files
++# From: Nicolas Collignon <[EMAIL PROTECTED]>
++
++0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
++>28 string >\0 version %s
++
++0 string ssh-dss\ OpenSSH DSA public key
++0 string ssh-rsa\ OpenSSH RSA public key
## 320-magic-add-pmenu.dpatch by Edward Betts <[EMAIL PROTECTED]>
##
## DP: New magic for pmenu (Closes: #38543).
-
[EMAIL PROTECTED]@
-
diff -Naurp file-4.23.orig/magic/Magdir/commands
file-4.23/magic/Magdir/commands
--- file-4.23.orig/magic/Magdir/commands 2007-06-01 19:40:26.000000000
+0000
+++ file-4.23/magic/Magdir/commands 2008-01-12 17:34:41.000000000 +0000
@@ -53,77 +207,219 @@
+# URL: http://packages.debian.org/pdmenu
+# From: Edward Betts <[EMAIL PROTECTED]>
+0 string #!/usr/bin/pdmenu Pdmenu configuration file text
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 321-magic-add-powertab.dpatch by Jelmer Vernooij <[EMAIL PROTECTED]>
+## 203-magic-update-reiserfs.dpatch by Werner Fink <[EMAIL PROTECTED]>
##
-## DP: New magic for Power-Tab
-
[EMAIL PROTECTED]@
-
-diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord
---- file-4.20.orig/magic/Magdir/chord 2003-03-24 14:48:32.000000000 +0000
-+++ file-4.20/magic/Magdir/chord 2007-05-17 16:33:26.000000000 +0000
-@@ -7,3 +7,8 @@
+## DP: Updating reiserfs magic to detect ReiserFS V3.6.19.
+diff -Naurp file-4.24.orig/magic/Magdir/filesystems
file-4.24/magic/Magdir/filesystems
+--- file-4.24.orig/magic/Magdir/filesystems 2008-05-04 14:12:49.000000000
+0000
++++ file-4.24/magic/Magdir/filesystems 2008-05-21 09:43:04.000000000 +0000
+@@ -1178,6 +1178,7 @@
+ # reiserfs - [EMAIL PROTECTED]
+ 0x10034 string ReIsErFs ReiserFS V3.5
+ 0x10034 string ReIsEr2Fs ReiserFS V3.6
++0x10034 string ReIsEr3Fs ReiserFS V3.6.19
+ >0x1002c leshort x block size %d
+ >0x10032 leshort &2 (mounted or unclean)
+ >0x10000 lelong x num blocks %d
+## 210-magic-update-digifax.dpatch
+##
+## DP: Update Digifax magic.
+diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem
+--- file.orig/magic/Magdir/modem 2008-06-13 15:00:30.000000000 +0200
++++ file/magic/Magdir/modem 2008-06-13 15:25:40.000000000 +0200
+@@ -2,9 +2,9 @@
+ # modem: file(1) magic for modem programs
#
- 0 string {title Chord text file
-
-+# Type: PowerTab file format
-+# URL: http://www.power-tab.net/
-+# From: Jelmer Vernooij <[EMAIL PROTECTED]>
-+0 string ptab\003\000 Power-Tab v3 Tablature File
-+0 string ptab\004\000 Power-Tab v4 Tablature File
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 322-magic-add-scummvm.dpatch by Sven Hartge <[EMAIL PROTECTED]>
+ # From: Florian La Roche <[EMAIL PROTECTED]>
+-4 string Research, Digifax-G3-File
+->29 byte 1 , fine resolution
+->29 byte 0 , normal resolution
++1 string PC\ Research,\ Inc Digifax-G3-File
++>29 byte 1 \b, fine resolution
++>29 byte 0 \b, normal resolution
+
+ 0 short 0x0100 raw G3 data, byte-padded
+ 0 short 0x1400 raw G3 data
+## 335-magic-add-freemind.dpatch by Jamie Thompson <[EMAIL PROTECTED]>
+##
+## DP: New magic for Freemind (Closes: #472385).
+diff -Naurp file.orig/magic/Magdir/wordprocessors
file/magic/Magdir/wordprocessors
+--- file.orig/magic/Magdir/wordprocessors 2008-05-04 14:12:49.000000000
+0000
++++ file/magic/Magdir/wordprocessors 2008-05-04 14:18:38.000000000 +0000
+@@ -148,3 +148,8 @@
+ 0 string DOC
+ >43 byte 0x16 Just System Word Processor Ichitaro v6
+ !:mime application/x-ichitaro6
++
++# Type: Freemind mindmap documents
++# From: Jamie Thompson <[EMAIL PROTECTED]>
++0 string/cB \<map\ version Freemind document
++!:mime application/x-freemind
+## 211-magic-update-mono.dpatch
+##
+## DP: Update Mono magic.
+diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/msdos 2008-07-15 13:33:43.000000000 +0000
+@@ -68,6 +68,7 @@
+ >>&0 leshort 0x290 PA-RISC
+ >>&18 leshort&0x0100 >0 32-bit
+ >>&18 leshort&0x1000 >0 system file
++>>&228 lelong >0 \b, Mono/.Net assembly
+ >>&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
+## 328-magic-add-xen.dpatch by Radek Vokal <[EMAIL PROTECTED]>
##
-## DP: New magic for scummVM savegame files (Closes: #263488).
-
[EMAIL PROTECTED]@
-
-diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
---- file-4.23.orig/magic/Magdir/console 2007-09-26 20:22:31.000000000
+0000
-+++ file-4.23/magic/Magdir/console 2008-01-12 17:36:55.000000000 +0000
-@@ -252,3 +252,7 @@
- # .w3m
- 0 string HM3W Warcraft III map file
+## DP: xen patch, recognizes Xen saved domain
+diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
+--- file-4.23.orig/magic/Magdir/linux 2008-01-12 17:47:04.000000000 +0000
++++ file-4.23/magic/Magdir/linux 2008-01-12 17:46:42.000000000 +0000
+@@ -248,3 +248,9 @@
+ >72 string x %s]
+ >168 string x UUID: %s
-+# Type: scummVM savegame files
-+# From: Sven Hartge <[EMAIL PROTECTED]>
-+0 string SCVM scummVM savegame
-+>12 string >\0 "%s"
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 323-magic-add-sgf.dpatch by Eduardo Sabbatella <[EMAIL PROTECTED]>
++# Type: Xen, the virtual machine monitor
++# From: Radek Vokal <[EMAIL PROTECTED]>
++0 string LinuxGuestRecord Xen saved domain
++#>2 regex \(name\ [^)]*\) %s
++>20 search/256 (name (name
++>>&1 string x %s...)
+## 338-magic-add-cromfs.dpatch by Werner Fink <[EMAIL PROTECTED]>
##
-## DP: New magic for SGF Smart Game Format
-
[EMAIL PROTECTED]@
-
-diff -Naurp file-4.24.orig/magic/Magdir/games file-4.24/magic/Magdir/games
---- file-4.24.orig/magic/Magdir/games 2008-02-19 17:27:30.000000000 +0000
-+++ file-4.24/magic/Magdir/games 2008-04-07 08:09:12.000000000 +0000
-@@ -151,3 +151,16 @@
- >4 lelong x containing %d lumps
- 0 string =PWAD doom patch PWAD data
- >4 lelong x containing %d lumps
-+
-+# Type: SGF Smart Game Format
-+# URL: http://www.red-bean.com/sgf/
-+# From: Eduardo Sabbatella <[EMAIL PROTECTED]>
+## DP: Adds new magic for CROM filesystem.
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems 2008-07-02 13:47:23.000000000 +0000
++++ file/magic/Magdir/filesystems 2008-07-15 13:43:26.000000000 +0000
+@@ -1327,3 +1327,15 @@
+ # dvdisaster's .ecc
+ # From: "Nelson A. de Oliveira" <[EMAIL PROTECTED]>
+ 0 string *dvdisaster* dvdisaster error correction file
++
++# Type: CROM filesystem
++# From: Werner Fink <[EMAIL PROTECTED]>
++0 string CROMFS CROMFS
++>6 string >\0 \b version %2.2s,
++>8 ulequad >0 \b block data at %lld,
++>16 ulequad >0 \b fblock table at %lld,
++>24 ulequad >0 \b inode table at %lld,
++>32 ulequad >0 \b root at %lld,
++>40 ulelong >0 \b fblock size = %ld,
++>44 ulelong >0 \b block size = %ld,
++>48 ulequad >0 \b bytes = %lld
+## 205-magic-update-tcsh.dpatch
+##
+## DP: Add 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 @@
+ !:mime text/x-shellscript
+ 0 string/b #!\ /bin/tcsh Tenex C shell script text
executable
+ !:mime text/x-shellscript
++0 string/b #!\ /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
+ !:mime text/x-shellscript
+ 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text
executable
+## 326-magic-add-supercollider.dpatch by Mario Lang <[EMAIL PROTECTED]>
+##
+## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
+## DP: (Closes: #284803).
+diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
+--- file-4.23.orig/magic/Magdir/audio 2008-01-12 17:39:01.000000000 +0000
++++ file-4.23/magic/Magdir/audio 2008-01-12 17:38:49.000000000 +0000
+@@ -576,3 +576,8 @@
+ # URL: http://filext.com/detaillist.php?extdetail=AMR
+ # From: Russell Coker <[EMAIL PROTECTED]>
+ 0 string #!AMR Adaptive Multi-Rate Codec (GSM telephony)
+
-+2 regex/c \\(;.*GM\\[[0-9]{1,2}\\] Smart Game Format
-+>2 regex/c GM\\[1\\] - Go Game
-+>2 regex/c GM\\[6\\] - BackGammon Game
-+>2 regex/c GM\\[11\\] - Hex Game
-+>2 regex/c GM\\[18\\] - Amazons Game
-+>2 regex/c GM\\[19\\] - Octi Game
-+>2 regex/c GM\\[20\\] - Gess Game
-+>2 regex/c GM\\[21\\] - twix Game
-#!/bin/sh /usr/share/dpatch/dpatch-run
++# Type: SuperCollider 3 Synth Definition File Format
++# From: Mario Lang <[EMAIL PROTECTED]>
++0 string SCgf SuperCollider3 Synth Definition file,
++>4 belong x version %d
+## 204-magic-update-asf.dpatch by Daniel Baumann <[EMAIL PROTECTED]>
+##
+## DP: Add mime to asf magic.
+diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
+--- file.orig/magic/Magdir/animation 2008-05-26 23:24:27.000000000 +0200
++++ file/magic/Magdir/animation 2008-05-31 15:03:45.000000000 +0200
+@@ -686,6 +686,7 @@
+
+ # Microsoft Advanced Streaming Format (ASF) <[EMAIL PROTECTED]>
+ 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,
+## 336-magic-add-qdmb.dpatch by Benoit Sibaud <[EMAIL PROTECTED]>
+##
+## DP: New magic for QDBM Quick Database Manager (Closes: #481717).
+diff -Naurp file-4.24.orig/magic/Magdir/database
file-4.24/magic/Magdir/database
+--- file-4.24.orig/magic/Magdir/database 2008-05-04 14:12:49.000000000
+0000
++++ file-4.24/magic/Magdir/database 2008-05-21 09:07:49.000000000 +0000
+@@ -242,3 +242,8 @@
+ # URL: http://www.grc.nasa.gov/WWW/cgns/adf/
+ # From: Nicolas Chauvat <[EMAIL PROTECTED]>
+ 0 string @(#)ADF\ Database CGNS Advanced Data Format
++
++# Type: QDBM Quick Database Manager
++# From: Benoit Sibaud <[EMAIL PROTECTED]>
++0 string \\[depot\\]\n\f Quick Database Manager, little endian
++0 string \\[DEPOT\\]\n\f Quick Database Manager, big endian
+## 319-magic-add-pe5.dpatch by Simon Horman <[EMAIL PROTECTED]>
+##
+## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images 2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/images 2008-07-15 13:39:37.000000000 +0000
+@@ -600,3 +600,8 @@
+ # Wavelet Scalar Quantization format used in gray-scale fingerprint images
+ # From Tano M Fotang <[EMAIL PROTECTED]>
+ 0 string \xff\xa0\xff\xa8\x00 Wavelet Scalar Quantization image data
++
++# Type: Ulead Photo Explorer5 (.pe5)
++# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
++# From: Simon Horman <[EMAIL PROTECTED]>
++0 string IIO2H Ulead Photo Explorer5
+## 207-magic-update-real.dpatch
+##
+## DP: Update RealMedia magic.
+diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
+--- file.orig/magic/Magdir/audio 2008-05-31 22:17:03.000000000 +0200
++++ file/magic/Magdir/audio 2008-06-13 09:48:01.000000000 +0200
+@@ -116,7 +116,7 @@
+ # Real Audio (Magic .ra\0375)
+ 0 belong 0x2e7261fd RealAudio sound file
+ !:mime audio/x-pn-realaudio
+-0 string .RMF RealMedia file
++0 string .RMF\0\0\0 RealMedia file
+ !:mime application/vnd.rn-realmedia
+ #video/x-pn-realvideo
+ #video/vnd.rn-realvideo
+## 212-magic-update-pfm.dpatch
+##
+## DP: Update pfm magic.
+diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig/magic/Magdir/msdos 2008-07-02 15:16:52.000000000 +0000
++++ file/magic/Magdir/msdos 2008-07-15 13:36:26.000000000 +0000
+@@ -504,6 +504,13 @@
+ # Acroread or something files wrongly identified as G3 .pfm
+ # these have the form \000 \001 any? \002 \000 \000
+ # or \000 \001 any? \022 \000 \000
++0 belong&0xffff00ff 0x00010012 PFM data
++>4 string \000\000
++>6 string >\060 - %s
++
++0 belong&0xffff00ff 0x00010002 PFM data
++>4 string \000\000
++>6 string >\060 - %s
+ #0 string \000\001 pfm?
+ #>3 string \022\000\000Copyright\ yes
+ #>3 string \002\000\000Copyright\ yes
## 323-magic-add-sisu.dpatch by Ralph Amissah <[EMAIL PROTECTED]>
##
## DP: New magic for SiSU Markup Language.
-
[EMAIL PROTECTED]@
-
diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
--- file-4.24.orig/magic/Magdir/sisu 1970-01-01 00:00:00.000000000 +0000
+++ file-4.24/magic/Magdir/sisu 2008-04-07 08:10:25.000000000 +0000
@@ -168,135 +464,130 @@
$(MAGIC_FRAGMENT_DIR)/sketch \
$(MAGIC_FRAGMENT_DIR)/smalltalk \
$(MAGIC_FRAGMENT_DIR)/sniffer \
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 324-magic-add-snes.dpatch by Josh Triplett <[EMAIL PROTECTED]>
+## 207-magic-update-zip.dpatch
##
-## DP: New magic for SNES SPC700 sound files (Closes: #410847).
-
[EMAIL PROTECTED]@
-
-diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
---- file-4.21.orig/magic/Magdir/audio 2007-12-23 17:32:42.000000000 +0000
-+++ file-4.21/magic/Magdir/audio 2007-12-23 17:33:57.000000000 +0000
-@@ -268,6 +268,15 @@
- >122 byte&0x1 =1 PAL
- >122 byte&0x1 =0 NTSC
-
-+# Type: SNES SPC700 sound files
-+# From: Josh Triplett <[EMAIL PROTECTED]>
-+0 string SNES-SPC700\ Sound\ File\ Data\ v SNES SPC700 sound file
-+>&0 string 0.30 \b, version %s
-+>>0x23 byte 0x1B \b, without
ID666 tag
-+>>0x23 byte 0x1A \b, with ID666
tag
-+>>>0x2E string >\0 \b, song "%.32s"
-+>>>0x4E string >\0 \b, game "%.32s"
-+
- # Impulse tracker module (audio/x-it)
- 0 string IMPM Impulse Tracker module sound data -
- >4 string >\0 "%s"
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 325-magic-add-ssl.dpatch by Nicolas Collignon <[EMAIL PROTECTED]>
+## DP: Update zip magic.
+diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig/magic/Magdir/msdos 2008-05-31 22:17:03.000000000 +0200
++++ file/magic/Magdir/msdos 2008-06-13 09:44:56.000000000 +0200
+@@ -256,7 +256,7 @@
+
+ # a few unknown ZIP sfxes, no idea if they are needed or if they are
+ # already captured by the generic patterns above
+->122 string Windows\ self-extracting\ ZIP \b, ZIP
self-extracting archive
++>0x7a string Windows\ self-extracting\ ZIP \b, ZIP
self-extracting archive
+ >(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
+ #
+## 339-magic-add-scribus.dpatch by Werner Fink <[EMAIL PROTECTED]>
##
-## DP: New magic for OpenSSH key files (Closes: #439537).
-
[EMAIL PROTECTED]@
-
-diff -Naur file-4.21.orig/magic/Magdir/ssh file-4.21/magic/Magdir/ssh
---- file-4.21.orig/magic/Magdir/ssh 1970-01-01 00:00:00.000000000 +0000
-+++ file-4.21/magic/Magdir/ssh 2007-08-26 08:25:03.000000000 +0000
-@@ -0,0 +1,8 @@
-+# Type: OpenSSH key files
-+# From: Nicolas Collignon <[EMAIL PROTECTED]>
-+
-+0 string SSH\ PRIVATE\ KEY OpenSSH RSA1 private key,
-+>28 string >\0 version %s
-+
-+0 string ssh-dss\ OpenSSH DSA public key
-+0 string ssh-rsa\ OpenSSH RSA public key
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 325-magic-add-ssl.dpatch by Nicolas Collignon <[EMAIL PROTECTED]>
+## DP: Adds new magics for Scribus.
+diff -Naurp file-4.24.orig/magic/Magdir/wordprocessors
file-4.24/magic/Magdir/wordprocessors
+--- file-4.24.orig/magic/Magdir/wordprocessors 2008-05-21 09:49:43.000000000
+0000
++++ file-4.24/magic/Magdir/wordprocessors 2008-05-21 09:50:54.000000000
+0000
+@@ -153,3 +153,9 @@
+ # From: Jamie Thompson <[EMAIL PROTECTED]>
+ 0 string/cB \<map\ version Freemind document
+ !:mime application/x-freemind
++
++# Type: Scribus
++# From: Werner Fink <[EMAIL PROTECTED]>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/file-debian.patch?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
