1diff -u magic.orig/Magdir/images magic/Magdir/images 2--- magic.orig/Magdir/images 2020-05-31 12:34:40.000000000 +0200 3+++ magic/Magdir/images 2020-07-05 20:00:41.664783368 +0200 4@@ -1,6 +1,6 @@ 5 6 #------------------------------------------------------------------------------ 7-# $File: images,v 1.181 2020/05/30 23:49:03 christos Exp $ 8+# $File: images,v 1.183 2020/06/26 17:08:32 christos Exp $ 9 # images: file(1) magic for image formats (see also "iff", and "c-lang" for 10 # XPM bitmaps) 11 # 12@@ -32,22 +32,22 @@ 13 # Prevent conflicts with CRI ADX. 14 >(2.S-2) belong !0x28632943 15 # skip more garbage like *.iso by looking for positive image type 16->>2 ubyte >0 17+>2 ubyte >0 18 # skip some compiled terminfo like xterm+tmux by looking for image type less equal 33 19->>>2 ubyte <34 20+>>2 ubyte <34 21 # skip arches.3200 , Finder.Root , Slp.1 by looking for low pixel depth 1 8 15 16 24 32 22->>>>16 ubyte 1 23->>>>>0 use tga-image 24->>>>16 ubyte 8 25->>>>>0 use tga-image 26->>>>16 ubyte 15 27->>>>>0 use tga-image 28->>>>16 ubyte 16 29->>>>>0 use tga-image 30->>>>16 ubyte 24 31->>>>>0 use tga-image 32->>>>16 ubyte 32 33->>>>>0 use tga-image 34+>>>16 ubyte 1 35+>>>>0 use tga-image 36+>>>16 ubyte 8 37+>>>>0 use tga-image 38+>>>16 ubyte 15 39+>>>>0 use tga-image 40+>>>16 ubyte 16 41+>>>>0 use tga-image 42+>>>16 ubyte 24 43+>>>>0 use tga-image 44+>>>16 ubyte 32 45+>>>>0 use tga-image 46 # display tga bitmap image information 47 0 name tga-image 48 >2 ubyte <34 Targa image data 49@@ -615,7 +615,7 @@ 50 0 leshort 40 51 # skip bad samples like GAME by looking for valid number of color planes 52 >12 uleshort 1 Device independent bitmap graphic 53-!:mime image/bmp 54+!:mime image/x-ms-bmp 55 !:apple ????BMPp 56 !:ext dib 57 >>4 lelong x \b, %d x 58@@ -641,7 +641,7 @@ 59 >>18 leshort x \b, %d x 60 >>20 leshort x %d 61 >14 leshort 64 PC bitmap, OS/2 2.x format 62-!:mime image/bmp 63+!:mime image/x-ms-bmp 64 !:apple ????BMPp 65 !:ext bmp 66 # image width and height fields are unsigned integers for OS/2 67@@ -662,7 +662,7 @@ 68 #>>(10.l) ubequad !0 \b, bits 0x%16.16llx 69 # BITMAPV2INFOHEADER adds RGB bit masks 70 >14 leshort 52 PC bitmap, Adobe Photoshop 71-!:mime image/bmp 72+!:mime image/x-ms-bmp 73 !:apple ????BMPp 74 !:ext bmp 75 >>18 lelong x \b, %d x 76@@ -670,7 +670,7 @@ 77 >>28 leshort x %d 78 # BITMAPV3INFOHEADER adds alpha channel bit mask 79 >14 leshort 56 PC bitmap, Adobe Photoshop with alpha channel mask 80-!:mime image/bmp 81+!:mime image/x-ms-bmp 82 !:apple ????BMPp 83 !:ext bmp 84 >>18 lelong x \b, %d x 85@@ -679,7 +679,7 @@ 86 >14 leshort 40 87 # jump 4 bytes before end of file/header to skip fmt-116-signature-id-118.dib 88 >>(2.l-4) ulong x PC bitmap, Windows 3.x format 89-!:mime image/bmp 90+!:mime image/x-ms-bmp 91 !:apple ????BMPp 92 >>>18 lelong x \b, %d x 93 >>>22 lelong x %d 94diff -u magic.orig/Magdir/rpm magic/Magdir/rpm 95--- magic.orig/Magdir/rpm 2019-02-22 14:06:34.000000000 +0100 96+++ magic/Magdir/rpm 2020-07-05 19:38:02.720419674 +0200 97@@ -29,6 +29,7 @@ 98 >>8 beshort 17 SuperH 99 >>8 beshort 18 Xtensa 100 >>8 beshort 255 noarch 101+>>10 string x %s 102 103 #delta RPM Daniel Novotny (dnovotny@redhat.com) 104 0 string drpm Delta RPM 105diff -u magic.orig/Magdir/securitycerts magic/Magdir/securitycerts 106--- magic.orig/Magdir/securitycerts 2019-02-22 14:06:34.000000000 +0100 107+++ magic/Magdir/securitycerts 2020-07-05 19:38:02.720419674 +0200 108@@ -4,3 +4,5 @@ 109 0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text 110 0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text 111 0 belong 0xedfeedfe Sun 'jks' Java Keystore File data 112+ 113+0 string \0volume_key volume_key escrow packet 114
