more debian patches from abelcheung

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index 313075c32eeb2e441301648af542e363d76f2b58..c5da229ca800875697dd6b0a4760aa72bd6d6672 100644 (file)
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -276,7 +276,7 @@
 # modified by Joerg Jenderek
 # GRR the original test are too common for many DOS files
 # so don't accept as MP3 until we've tested the rate
-0       beshort&0xFFFE
+0       beshort&0xFFFE  0xFFFA
 # rates
 >2      byte&0xF0       0x10           MPEG ADTS, layer III, v1,  32 kbps
 !:mime audio/mpeg
@@ -617,22 +617,30 @@
 #0       beshort         0x4DE1         MPEG-4 LO-EP audio stream
 #!:mime        audio/x-mp4a-latm
 
-# FLI animation format
-4      leshort         0xAF11                  FLI file
+# Summary: FLI animation format
+# Created by: Daniel Quinlan <quinlan@yggdrasil.com>
+# Modified by (1): Abel Cheung <abelcheung@gmail.com> (avoid over-generic detection)
+4      leshort         0xAF11
+# standard FLI always has 320x200 resolution and 8 bit color
+>8     leshort         320
+>>10   leshort         200
+>>>12  leshort         8                       FLI animation, 320x200x8
 !:mime video/x-fli
->6     leshort         x                       - %d frames,
->8     leshort         x                       width=%d pixels,
->10    leshort         x                       height=%d pixels,
->12    leshort         x                       depth=%d,
->16    leshort         x                       ticks/frame=%d
-# FLC animation format
-4      leshort         0xAF12                  FLC file
+>>>>6  leshort         x                       \b, %d frames
+# frame speed is multiple of 1/70s
+>>>>16 leshort         x                       \b, %d/70s per frame
+
+# Summary: FLC animation format
+# Created by: Daniel Quinlan <quinlan@yggdrasil.com>
+# Modified by (1): Abel Cheung <abelcheung@gmail.com> (avoid over-generic detection)
+4      leshort         0xAF12
+# standard FLC always use 8 bit color
+>12    leshort         8                       FLC animation
 !:mime video/x-flc
->6     leshort         x                       - %d frames
->8     leshort         x                       width=%d pixels,
->10    leshort         x                       height=%d pixels,
->12    leshort         x                       depth=%d,
->16    leshort         x                       ticks/frame=%d
+>>8    leshort         x                       \b, %d
+>>10   leshort         x                       \bx%dx8
+>>6    uleshort        x                       \b, %d frames
+>>16   uleshort        x                       \b, %dms per frame
 
 # DL animation format
 # XXX - collision with most `mips' magic

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 044d81e85c7a7d286a19e31a12ba60d65871519a..24ceaaad2e9b7a5af992e790aca21b77457f88ba 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1266,6 +1266,21 @@
 >>>2         short   2048       AXP generated)
 >>>2         short   4096       I64 generated)
 
+# Summary: Oracle Clustered Filesystem
+# Created by: Aaron Botsis <redhat@digitalmafia.org>
+8       string          OracleCFS       Oracle Clustered Filesystem,
+>4      long            x               rev %d
+>0      long            x               \b.%d,
+>560    string          x               label: %.64s,
+>136    string          x               mountpoint: %.128s
+
+# Summary: Oracle ASM tagged volume
+# Created by: Aaron Botsis <redhat@digitalmafia.org>
+32      string          ORCLDISK        Oracle ASM Volume,
+>40     string          x               Disk Name: %0.12s
+32      string          ORCLCLRD        Oracle ASM Volume (cleared),
+>40     string          x               Disk Name: %0.12s
+
 # Compaq/HP RILOE floppy image
 # From: Dirk Jagdmann <doj@cubic.org>
 0      string  CPQRFBLO        Compaq/HP RILOE floppy image

diff --git a/magic/Magdir/fsav b/magic/Magdir/fsav
index 5f6d0e6ffd72b8a3386ba6ace87e401bba43ede3..ccc6d596c21a301a48a999d55cdd510651640a05 100644 (file)
--- a/magic/Magdir/fsav
+++ b/magic/Magdir/fsav
@@ -54,8 +54,6 @@
 >>>>>>>>37     string          x       \b%-.1s
 >>>>>>>>>38    string          !:      
 >>>>>>>>>>38   string          x       \b%-.1s
->>>>512        string          \037\213        \b, gzipped
->>>>769        string          ustar\0         \b, tarred
 >512   string          \037\213        \b, gzipped
 >769   string          ustar\0         \b, tarred
 

diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index 393f79cf462ea1be468f3de73d9568139a3bc1a5..1234d78315c0e5d6469e79a274ea92bbb6e0fbff 100644 (file)
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -247,3 +247,10 @@
 >72    string  x               %s]
 >168   string  x               UUID: %s
 
+
+# Summary: Xen saved domain file
+# Created by: Radek Vokal <rvokal@redhat.com>
+0      string          LinuxGuestRecord        Xen saved domain
+>20    search/256      (name                   
+>>&1   string          x                       (name %s)
+