From 763e5107d526fbc0dbf65992cdfe27eaf87f86cb Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 25 May 2017 20:07:23 +0000
Subject: [PATCH] fix broken numeric entries

---
 magic/Magdir/animation | 8 ++++----
 magic/Magdir/cafebabe  | 4 ++--
 magic/Magdir/compress  | 4 ++--
 magic/Magdir/flash     | 6 +++---
 magic/Magdir/yara      | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index 77a2da42..b2fcbf6a 100644
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.61 2017/04/01 18:26:03 christos Exp $
+# $File: animation,v 1.62 2017/05/25 20:07:23 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -46,9 +46,9 @@
 >>11	byte		4		\b v4 (H.263/AMR GSM 6.10)
 >>11	byte		5		\b v5 (H.263/AMR GSM 6.10)
 >>11	byte		6		\b v6 (ITU H.264/AMR GSM 6.10)
->>11	byte		a		\b C.S0050-0 V1.0
->>11	byte		b		\b C.S0050-0-A V1.0.0
->>11	byte		c		\b C.S0050-0-B V1.0
+>>11	byte		0xa		\b C.S0050-0 V1.0
+>>11	byte		0xb		\b C.S0050-0-A V1.0.0
+>>11	byte		0xc		\b C.S0050-0-B V1.0
 >8	string		3ge		\b, MPEG v4 system, 3GPP
 !:mime	video/3gpp
 >>11	byte		6		\b, Release 6 MBMS Extended Presentations
diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
index ecc550a6..6482858f 100644
--- a/magic/Magdir/cafebabe
+++ b/magic/Magdir/cafebabe
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: cafebabe,v 1.22 2017/03/17 21:35:28 christos Exp $
+# $File: cafebabe,v 1.23 2017/05/25 20:07:23 christos Exp $
 # Cafe Babes unite!
 #
 # Since Java bytecode and Mach-O universal binaries have the same magic number,
@@ -47,7 +47,7 @@
 
 0	name		mach-o		\b [
 >0	use		mach-o-cpu	\b
->(8.L)	indirect			\b:
+>(8.L)	indirect	x		\b:
 >0	belong		x		\b]
 
 0	belong		0xcafebabe
diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 1b213591..6fa8f321 100644
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.67 2017/03/17 21:35:28 christos Exp $
+# $File: compress,v 1.68 2017/05/25 20:07:23 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -223,7 +223,7 @@
 # Zstandard/LZ4 skippable frames
 # https://github.com/facebook/zstd/blob/dev/zstd_compression_format.md
 0         lelong&0xFFFFFFF0  0x184D2A50
->(4.l+8)  indirect
+>(4.l+8)  indirect	x
 
 # Zstandard Dictionary ID subroutine
 0     name        zstd-dictionary-id
diff --git a/magic/Magdir/flash b/magic/Magdir/flash
index ba5ed6a1..549c89c3 100644
--- a/magic/Magdir/flash
+++ b/magic/Magdir/flash
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: flash,v 1.11 2014/05/02 00:26:49 christos Exp $
+# $File: flash,v 1.13 2017/05/25 20:07:23 christos Exp $
 # flash:	file(1) magic for Macromedia Flash file format
 #
 # See
@@ -22,10 +22,10 @@
 >>8     byte        0x18    Macromedia Flash data
 !:mime  application/x-shockwave-flash
 >>>3    byte        x       \b, version %d
->>8     beshort&ff87 0x2000 Macromedia Flash data
+>>8     beshort&0xff87 0x2000 Macromedia Flash data
 !:mime  application/x-shockwave-flash
 >>>3    byte        x       \b, version %d
->>8     beshort&ffe0 0x3000 Macromedia Flash data
+>>8     beshort&0xffe0 0x3000 Macromedia Flash data
 !:mime  application/x-shockwave-flash
 >>>3    byte        x       \b, version %d
 >>8     byte&0x7    0
diff --git a/magic/Magdir/yara b/magic/Magdir/yara
index 471b4950..523a2d05 100644
--- a/magic/Magdir/yara
+++ b/magic/Magdir/yara
@@ -1,7 +1,7 @@
 
 
 #------------------------------------------------------------------------------
-# $File: map,v 1.4 2015/08/10 05:18:27 christos Exp $
+# $File: yara,v 1.2 2017/05/25 20:07:23 christos Exp $
 # yara:  file(1) magic for http://virustotal.github.io/yara/
 #
 
@@ -9,7 +9,7 @@
 >4	lelong	>2047
 >8	byte	<20	YARA 3.x compiled rule set
 # version
->>8	clear
+>>8	clear	x
 >>8	byte	6	created with version 3.3.0
 >>8	byte	8	created with version 3.4.0
 >>8	byte	11	created with version 3.5.0
-- 
2.40.0