1 magic/Magdir/animation | 47 +++++++++++++++++++--------------------------- 2 magic/Magdir/images | 28 +++++++++++++-------------- 3 magic/Magdir/rpm | 1 + 4 magic/Magdir/securitycerts | 2 ++ 5 4 files changed, 36 insertions(+), 42 deletions(-) 6 7diff --git a/magic/Magdir/animation b/magic/Magdir/animation 8index aaf32dd4..5c9ee1d9 100644 9--- a/magic/Magdir/animation 10+++ b/magic/Magdir/animation 11@@ -1,6 +1,6 @@ 12 13 #------------------------------------------------------------------------------ 14-# $File: animation,v 1.71 2019/04/19 00:42:27 christos Exp $ 15+# $File: animation,v 1.73 2019/07/05 19:20:38 christos Exp $ 16 # animation: file(1) magic for animation/movie formats 17 # 18 # animation formats 19@@ -445,36 +445,27 @@ 20 # modified by Joerg Jenderek 21 # GRR the original test are too common for many DOS files 22 # so don't accept as MP3 until we've tested the rate 23+# But also beat GEMDOS fonts 24 0 beshort&0xFFFE 0xFFFA 25 # rates 26->2 byte&0xF0 0x10 MPEG ADTS, layer III, v1, 32 kbps 27-!:mime audio/mpeg 28->2 byte&0xF0 0x20 MPEG ADTS, layer III, v1, 40 kbps 29-!:mime audio/mpeg 30->2 byte&0xF0 0x30 MPEG ADTS, layer III, v1, 48 kbps 31-!:mime audio/mpeg 32->2 byte&0xF0 0x40 MPEG ADTS, layer III, v1, 56 kbps 33-!:mime audio/mpeg 34->2 byte&0xF0 0x50 MPEG ADTS, layer III, v1, 64 kbps 35-!:mime audio/mpeg 36->2 byte&0xF0 0x60 MPEG ADTS, layer III, v1, 80 kbps 37-!:mime audio/mpeg 38->2 byte&0xF0 0x70 MPEG ADTS, layer III, v1, 96 kbps 39-!:mime audio/mpeg 40->2 byte&0xF0 0x80 MPEG ADTS, layer III, v1, 112 kbps 41-!:mime audio/mpeg 42->2 byte&0xF0 0x90 MPEG ADTS, layer III, v1, 128 kbps 43-!:mime audio/mpeg 44->2 byte&0xF0 0xA0 MPEG ADTS, layer III, v1, 160 kbps 45-!:mime audio/mpeg 46->2 byte&0xF0 0xB0 MPEG ADTS, layer III, v1, 192 kbps 47-!:mime audio/mpeg 48->2 byte&0xF0 0xC0 MPEG ADTS, layer III, v1, 224 kbps 49-!:mime audio/mpeg 50->2 byte&0xF0 0xD0 MPEG ADTS, layer III, v1, 256 kbps 51-!:mime audio/mpeg 52->2 byte&0xF0 0xE0 MPEG ADTS, layer III, v1, 320 kbps 53+>2 byte&0xF0 !0 54+>>2 byte&0xF0 !0xF0 MPEG ADTS, layer III, v1 55+!:strength +20 56 !:mime audio/mpeg 57+>2 byte&0xF0 0x10 \b, 32 kbps 58+>2 byte&0xF0 0x20 \b, 40 kbps 59+>2 byte&0xF0 0x30 \b, 48 kbps 60+>2 byte&0xF0 0x40 \b, 56 kbps 61+>2 byte&0xF0 0x50 \b, 64 kbps 62+>2 byte&0xF0 0x60 \b, 80 kbps 63+>2 byte&0xF0 0x70 \b, 96 kbps 64+>2 byte&0xF0 0x80 \b, 112 kbps 65+>2 byte&0xF0 0x90 \b, 128 kbps 66+>2 byte&0xF0 0xA0 \b, 160 kbps 67+>2 byte&0xF0 0xB0 \b, 192 kbps 68+>2 byte&0xF0 0xC0 \b, 224 kbps 69+>2 byte&0xF0 0xD0 \b, 256 kbps 70+>2 byte&0xF0 0xE0 \b, 320 kbps 71 # timing 72 >2 byte&0x0C 0x00 \b, 44.1 kHz 73 >2 byte&0x0C 0x04 \b, 48 kHz 74diff --git a/magic/Magdir/images b/magic/Magdir/images 75index 0e314ade..edf647d7 100644 76--- a/magic/Magdir/images 77+++ b/magic/Magdir/images 78@@ -30,22 +30,22 @@ 79 # Prevent conflicts with CRI ADX. 80 >(2.S-2) belong !0x28632943 81 # skip more garbage like *.iso by looking for positive image type 82->>2 ubyte >0 83+>2 ubyte >0 84 # skip some compiled terminfo like xterm+tmux by looking for image type less equal 33 85->>>2 ubyte <34 86+>>2 ubyte <34 87 # skip arches.3200 , Finder.Root , Slp.1 by looking for low pixel depth 1 8 15 16 24 32 88->>>>16 ubyte 1 89->>>>>0 use tga-image 90->>>>16 ubyte 8 91->>>>>0 use tga-image 92->>>>16 ubyte 15 93->>>>>0 use tga-image 94->>>>16 ubyte 16 95->>>>>0 use tga-image 96->>>>16 ubyte 24 97->>>>>0 use tga-image 98->>>>16 ubyte 32 99->>>>>0 use tga-image 100+>>>16 ubyte 1 101+>>>>0 use tga-image 102+>>>16 ubyte 8 103+>>>>0 use tga-image 104+>>>16 ubyte 15 105+>>>>0 use tga-image 106+>>>16 ubyte 16 107+>>>>0 use tga-image 108+>>>16 ubyte 24 109+>>>>0 use tga-image 110+>>>16 ubyte 32 111+>>>>0 use tga-image 112 # display tga bitmap image information 113 0 name tga-image 114 >2 ubyte <34 Targa image data 115diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm 116index fa336c07..00bda501 100644 117--- a/magic/Magdir/rpm 118+++ b/magic/Magdir/rpm 119@@ -29,6 +29,7 @@ 120 >>8 beshort 17 SuperH 121 >>8 beshort 18 Xtensa 122 >>8 beshort 255 noarch 123+>>10 string x %s 124 125 #delta RPM Daniel Novotny (dnovotny@redhat.com) 126 0 string drpm Delta RPM 127diff --git a/magic/Magdir/securitycerts b/magic/Magdir/securitycerts 128index d315a157..301d3c3d 100644 129--- a/magic/Magdir/securitycerts 130+++ b/magic/Magdir/securitycerts 131@@ -4,3 +4,5 @@ 132 0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text 133 0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text 134 0 belong 0xedfeedfe Sun 'jks' Java Keystore File data 135+ 136+0 string \0volume_key volume_key escrow packet 137
