Resolves: #1263875 - update to new version 5.28

2016-06-24 18:11:16 +02:00 · 2016-06-24 18:11:16 +02:00 · 85d63d0c52
commit 85d63d0c52
parent 294d1dfb99
11 changed files with 141 additions and 319 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,13 +1 @@
-file-5.04.tar.gz
-/file-5.05.tar.gz
-/file-5.07.tar.gz
-/file-5.08.tar.gz
-/file-5.09.tar.gz
-/file-5.10.tar.gz
-/file-5.11.tar.gz
-/file-5.14.tar.gz
-/file-5.19.tar.gz
-/file-5.20.tar.gz
-/file-5.22.tar.gz
-/file-5.24.tar.gz
-/file-5.25.tar.gz
+/file-5.*.tar.gz
--- a/file-5.04-generic-msdos.patch
+++ b/file-5.04-generic-msdos.patch
@ -1,8 +1,18 @@
+From 11f1d4c897c8d015f689527f85ad94804ad15307 Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <jkaluza@redhat.com>
+Date: Tue, 4 Dec 2012 12:07:36 +0100
+Subject: [PATCH] file-5.04-generic-msdos.patch
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/msdos | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
 diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
 index d1a19a6..9e89f11 100644
 --- a/magic/Magdir/msdos
 +++ b/magic/Magdir/msdos
-@@ -319,9 +319,9 @@
+@@ -333,9 +333,9 @@
 # but it isn't feasible to match all COM files since there must be at least
 # two dozen different one-byte "magics".
 # test too generic ?
@ -15,12 +25,16 @@ index d1a19a6..9e89f11 100644
 
 # DOS device driver updated by Joerg Jenderek at May 2011
 # http://maben.homeip.net/static/S100/IBM/software/DOS/DOS%20techref/CHAPTER.009
-@@ -396,28 +396,28 @@
- #>4	uleshort&0x4000			0x4000			\b,control strings-support)
- 
- # test too generic ?
-0	byte		0x8c		DOS executable (COM)
-+#0	byte		0x8c		DOS executable (COM)
+@@ -413,7 +413,7 @@
+ # GRR: line below too general as it catches also 
+ # rt.lib DYADISKS.PIC and many more
+ # start with assembler instruction MOV
+-0	ubyte		0x8c		
+#0	ubyte		0x8c		
+ # skip "AppleWorks word processor data" like ARTICLE.1 ./apple
+ >4	string			!O====	
+ # skip some unknown basic binaries like RocketRnger.SHR
+@@ -437,14 +437,14 @@
 # updated by Joerg Jenderek at Oct 2008
 0	ulelong		0xffff10eb	DR-DOS executable (COM)
 # byte 0xeb conflicts with "sequent" magic leshort 0xn2eb
@ -39,24 +53,10 @@ index d1a19a6..9e89f11 100644
 +#>>4	string		\ $ARX		DOS executable (COM), ARX self-extracting archive
 +#>>4	string		\ $LHarc	DOS executable (COM), LHarc self-extracting archive
 +#>>0x20e string		SFX\ by\ LARC	DOS executable (COM), LARC self-extracting archive
- # updated by Joerg Jenderek at Oct 2008
- #0	byte		0xb8		COM executable
-0	uleshort&0x80ff	0x00b8		
-+#0	uleshort&0x80ff	0x00b8		
- # modified by Joerg Jenderek
->1	lelong		!0x21cd4cff	COM executable for DOS
-+#>1	lelong		!0x21cd4cff	COM executable for DOS
- # http://syslinux.zytor.com/comboot.php
- # (32-bit COMBOOT) programs *.C32 contain 32-bit code and run in flat-memory 32-bit protected mode
- # start with assembler instructions mov eax,21cd4cffh
-0	uleshort&0xc0ff	0xc0b8		
->1	lelong		0x21cd4cff	COM executable (32-bit COMBOOT)
-+#0	uleshort&0xc0ff	0xc0b8		
-+#>1	lelong		0x21cd4cff	COM executable (32-bit COMBOOT)
- # syslinux:doc/comboot.txt
- # A COM32R program must start with the byte sequence B8 FE 4C CD 21 (mov
- # eax,21cd4cfeh) as a magic number.
-@@ -437,27 +437,27 @@
+ # updated by Joerg Jenderek at Oct 2008,2015
+ # following line is too general
+ 0	ubyte		0xb8		
+@@ -492,27 +492,27 @@
 # GRR search is not working
 #2	search/28	\xcd\x21	COM executable for MS-DOS
 #WHICHFAT.cOM
@ -96,3 +96,6 @@ index d1a19a6..9e89f11 100644
 # many compressed/converted COMs start with a copy loop instead of a jump
 0x6	search/0xa	\xfc\x57\xf3\xa5\xc3	COM executable for MS-DOS
 0x6	search/0xa	\xfc\x57\xf3\xa4\xc3	COM executable for DOS
+-- 
+2.5.5
+
--- a/file-5.04-man-return-code.patch
+++ b/file-5.04-man-return-code.patch
@ -1,8 +1,18 @@
+From bf25a22d163daee728f3075652b246ca1c32bd79 Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <jkaluza@redhat.com>
+Date: Tue, 4 Dec 2012 12:07:36 +0100
+Subject: [PATCH] file-5.04-man-return-code.patch
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ doc/file.man | 5 +++++
+ 1 file changed, 5 insertions(+)
+
 diff --git a/doc/file.man b/doc/file.man
 index fff7730..3a524f5 100644
 --- a/doc/file.man
 +++ b/doc/file.man
-@@ -542,6 +542,11 @@ program, and are not covered by the above license.
+@@ -583,6 +583,11 @@ program, and are not covered by the above license.
 .Sh RETURN CODE
 .Nm
 returns 0 on success, and non-zero on error.
@ -14,3 +24,6 @@ index fff7730..3a524f5 100644
 .Sh BUGS
 .Pp
 Please report bugs and send patches to the bug tracker at
+-- 
+2.5.5
+
--- a/file-5.10-strength.patch
+++ b/file-5.10-strength.patch
@ -1,8 +1,18 @@
+From 8c3f1e3f479ff35b89f4b1c699753f4f107bfa02 Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <jkaluza@redhat.com>
+Date: Thu, 16 Oct 2014 10:38:15 +0200
+Subject: [PATCH] file-5.10-strength.patch
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/python | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
 diff --git a/magic/Magdir/python b/magic/Magdir/python
 index d954ee6..52796ba 100644
 --- a/magic/Magdir/python
 +++ b/magic/Magdir/python
-@@ -37,20 +37,24 @@
+@@ -42,20 +42,24 @@
 # from module.submodule import func1, func2
 0	regex	\^from\\s+(\\w|\\.)+\\s+import.*$	Python script text executable
 !:mime text/x-python
@ -33,7 +43,7 @@ index d954ee6..52796ba 100644
 
 # try:
 # except: or finally:
-@@ -60,8 +64,10 @@
+@@ -65,8 +69,10 @@
 !:mime text/x-python
 >&0	search/4096	finally:	Python script text executable
 !:mime text/x-python
@ -46,3 +56,6 @@ index d954ee6..52796ba 100644
 +>&0	regex	\ *\\(([a-zA-Z]|,|\ )*\\):$ Python script text executable
 !:mime text/x-python
 +!:strength + 15
+-- 
+2.5.5
+
--- a/file-5.14-perl.patch
+++ b/file-5.14-perl.patch
@ -1,3 +1,13 @@
+From 75c845d20018fbfd9689c922b3e1d430da592a92 Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <jkaluza@redhat.com>
+Date: Fri, 22 Mar 2013 10:38:25 +0100
+Subject: [PATCH] file-5.14-perl.patch
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/perl | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
 diff --git a/magic/Magdir/perl b/magic/Magdir/perl
 index 127a373..7cf6434 100644
 --- a/magic/Magdir/perl
@ -31,13 +41,13 @@ index 127a373..7cf6434 100644
 0	search/1024	eval\ '(exit\ $?0)'\ &&\ eval\ 'exec	Perl script text
 !:mime	text/x-perl
 +!:strength + 1
- 0	search/1024	#!/usr/bin/env\ perl	Perl script text executable
+ 0	string	#!/usr/bin/env\ perl	Perl script text executable
 !:mime	text/x-perl
 +!:strength + 30
- 0	search/1024	#!\ /usr/bin/env\ perl	Perl script text executable
+ 0	string	#!\ /usr/bin/env\ perl	Perl script text executable
 !:mime	text/x-perl
 +!:strength + 30
- 0	search/1024	#!
+ 0	string	#!
 >0	regex	\^#!.*/bin/perl([[:space:]].*)*$	Perl script text executable
 !:mime	text/x-perl
 +!:strength + 30
@ -46,9 +56,8 @@ index 127a373..7cf6434 100644
 # check the first line
 0	search/1024	package
 >0	regex		\^package[\ \t]+[0-9A-Za-z_:]+\ *;	Perl5 module source text
-!:strength + 10
 +!:mime  text/x-perl
-+!:strength + 10
+ !:strength + 10
 # not 'p', check other lines
 0	search/1024	!p
 >0	regex		\^package[\ \t]+[0-9A-Za-z_:]+\ *;
@ -59,3 +68,6 @@ index 127a373..7cf6434 100644
 
 # Perl POD documents
 # From: Tom Hukins <tom@eborcom.com>
+-- 
+2.5.5
+
--- a/file-5.19-cafebabe.patch
+++ b/file-5.19-cafebabe.patch
@ -1,15 +1,17 @@
+From 27b4fa644c618a79f306df6b0576f5dc00672e09 Mon Sep 17 00:00:00 2001
+From: Jan Kaluza <jkaluza@redhat.com>
+Date: Wed, 3 Sep 2014 11:38:09 +0200
+Subject: [PATCH] file-5.19-cafebabe.patch
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ magic/Magdir/cafebabe | 37 +++++++++++++++++--------------------
+ 1 file changed, 17 insertions(+), 20 deletions(-)
+
 diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
 index 51e97c4..1d007b6 100644
 --- a/magic/Magdir/cafebabe
 +++ b/magic/Magdir/cafebabe
-@@ -1,6 +1,6 @@
- 
- #------------------------------------------------------------------------------
-# $File: cafebabe,v 1.20 2015/05/29 14:21:58 christos Exp $
-+# $File: cafebabe,v 1.17 2015/01/01 17:07:00 christos Exp $
- # Cafe Babes unite!
- #
- # Since Java bytecode and Mach-O universal binaries have the same magic number,
@@ -15,22 +15,6 @@
 # might add another one or two as time goes by...
 #
@ -33,36 +35,39 @@ index 51e97c4..1d007b6 100644
 0	belong		0xcafed00d	JAR compressed with pack200,
 >5	byte		x		version %d.
 >4	byte		x		\b%d
-@@ -52,18 +36,26 @@
+@@ -52,15 +36,28 @@
 
 0	belong		0xcafebabe
 >4	belong		1		Mach-O universal binary with 1 architecture:
 -!:mime application/x-mach-binary
 >>8	use		mach-o		\b
-+>4  belong      >30     compiled Java class data,
-+!:mime  application/x-java-applet
-+>>6 beshort     x           version %d.
-+>>4 beshort     x           \b%d
+0	belong		0xcafebabe
+>4	belong		>30		compiled Java class data,
+!:mime	application/x-java-applet
+>>6	beshort		x	        version %d.
+>>4	beshort		x       	\b%d
 +# Which is which?
-+#>>4    belong      0x032d      (Java 1.0)
-+#>>4    belong      0x032d      (Java 1.1)
-+>>4 belong      0x002e      (Java 1.2)
-+>>4 belong      0x002f      (Java 1.3)
-+>>4 belong      0x0030      (Java 1.4)
-+>>4 belong      0x0031      (Java 1.5)
-+>>4 belong      0x0032      (Java 1.6)
+#>>4	belong		0x032d		(Java 1.0)
+#>>4	belong		0x032d		(Java 1.1)
+>>4	belong		0x002e		(Java 1.2)
+>>4	belong		0x002f		(Java 1.3)
+>>4	belong		0x0030		(Java 1.4)
+>>4	belong		0x0031		(Java 1.5)
+>>4	belong		0x0032		(Java 1.6)
+>>4	belong		0x0033		(Java 1.7)
+>>4	belong		0x0034		(Java 1.8)
 >4	belong		>1
 >>4	belong		<20		Mach-O universal binary with %d architectures:
 -!:mime application/x-mach-binary
 >>>8	use		mach-o		\b
- >>>28	use		mach-o		\b
 ->>4	belong		2
 +>>4	belong		>2
- >>>48	use		mach-o		\b
+ >>>28	use		mach-o		\b
 ->>4	belong		3
 +>>4	belong		>3
+ >>>48	use		mach-o		\b
+ >>4	belong		4
 >>>68	use		mach-o		\b
->>4	belong		4
->>>88	use		mach-o		\b
- 
- ### MACH-O END ###
+-- 
+2.5.5
+
--- a/file-5.25-minix.patch
+++ b/file-5.25-minix.patch
@ -1,90 +0,0 @@
-diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
-index 16a6cc4..0f73021 100644
--- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -1720,44 +1720,59 @@
- # Minix filesystems - Juan Cespedes <cespedes@debian.org>
- 0x410	leshort		0x137f
- !:strength / 2
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V1, 14 char names, %d zones
->0x1e	string		minix		\b, bootable
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V1, 14 char names, %d zones
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	beshort		0x137f
- !:strength / 2
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V1 (big endian), %d zones
->0x1e	string		minix		\b, bootable
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V1 (big endian), %d zones
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	leshort		0x138f
- !:strength / 2
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V1, 30 char names, %d zones
->0x1e	string		minix		\b, bootable
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V1, 30 char names, %d zones
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	beshort		0x138f
- !:strength / 2
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V1, 30 char names (big endian), %d zones
->0x1e	string		minix		\b, bootable
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V1, 30 char names (big endian), %d zones
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	leshort		0x2468
->0x402	beshort		< 100
->>0x402	beshort		> -1		Minix filesystem, V2, 14 char names
->0x1e	string		minix		\b, bootable
-+!:strength / 2
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V2, 14 char names
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	beshort		0x2468
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V2 (big endian)
->0x1e	string		minix		\b, bootable
-+!:strength / 2
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V2 (big endian)
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	leshort		0x2478
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V2, 30 char names
->0x1e	string		minix		\b, bootable
-+!:strength / 2
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V2, 30 char names
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	leshort		0x2478
->0x402	beshort		< 100
->0x402	beshort		> -1		Minix filesystem, V2, 30 char names
->0x1e	string		minix		\b, bootable
-+!:strength / 2
-+>0x412	ubyte		< 2
-+>>0x402	beshort		< 100
-+>>>0x402	beshort		> -1		Minix filesystem, V2, 30 char names
-+>>>>0x1e	string		minix		\b, bootable
- 0x410	beshort		0x2478
->0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian)
->0x1e	string		minix		\b, bootable
-+!:strength / 2
-+>0x412	ubyte		< 2
-+>>0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian)
-+>>>0x1e	string		minix		\b, bootable
- 0x418	leshort		0x4d5a
-+!:strength / 2
- >0x402	beshort		<100
- >>0x402	beshort		> -1		Minix filesystem, V3, 60 char names
- 
--- a/file-localmagic.patch
+++ b/file-localmagic.patch
@ -1,23 +1,19 @@
 From f25107f625e88726e8ae9d4963573b5a0dda8f4c Mon Sep 17 00:00:00 2001
 From: Jan Kaluza <hanzz.k@gmail.com>
 Date: Thu, 15 Dec 2011 16:15:41 +0100
-Subject: [PATCH] localmagic
+Subject: [PATCH] file-localmagic.patch

+Upstream says it's up to distributions to add a way to support local-magic.
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
 ---
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ magic/magic.local | 3 +++
+ src/Makefile.am   | 2 +-
+ src/Makefile.in   | 2 +-
+ src/apprentice.c  | 2 +-
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+ create mode 100644 magic/magic.local

-diff --git a/src/Makefile.am b/src/Makefile.am
-index cba64ac..5e48dff 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
-MAGIC = $(pkgdatadir)/magic
-+MAGIC = /etc/magic:$(pkgdatadir)/magic
- lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
- 
 diff --git a/magic/magic.local b/magic/magic.local
 new file mode 100644
 index 0000000..283a863
@ -27,25 +23,34 @@ index 0000000..283a863
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 155aec4..0f22539 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-MAGIC = $(pkgdatadir)/magic
+MAGIC = /etc/magic:$(pkgdatadir)/magic
+ lib_LTLIBRARIES = libmagic.la
+ nodist_include_HEADERS = magic.h
 
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 39b1703..3dd92d8 100644
+index b6eeb20..78dce55 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -240,7 +240,7 @@ target_alias = @target_alias@
+@@ -337,7 +337,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = /etc/magic:$(pkgdatadir)/magic
 lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
+ nodist_include_HEADERS = magic.h
 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 diff --git a/src/apprentice.c b/src/apprentice.c
-index cd45bdc..83a2a37 100644
+index e395854..ecc1214 100644
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -419,7 +419,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
+@@ -452,7 +452,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
 #ifndef COMPILE_ONLY
 	map = apprentice_map(ms, fn);
 	if (map == NULL) {
@ -54,7 +59,6 @@ index cd45bdc..83a2a37 100644
 			file_magwarn(ms, "using regular magic file `%s'", fn);
 		map = apprentice_load(ms, fn, action);
 		if (map == NULL)
-
 -- 
-1.7.7.4
+2.5.5

--- a/file-trunk-msx-binary.patch
+++ b/file-trunk-msx-binary.patch
@ -1,128 +0,0 @@
-diff --git a/magic/Magdir/msx b/magic/Magdir/msx
-index 0eacbe5..ba5607c 100644
--- a/magic/Magdir/msx
-+++ b/magic/Magdir/msx
-@@ -7,20 +7,20 @@
- ############## MSX Music file formats ##############
- 
- # Gigamix MGSDRV music file
-0	string		MGS	MSX Gigamix MGSDRV3 music file, 
-+0	string/b		MGS	MSX Gigamix MGSDRV3 music file, 
- >6	ubeshort	0x0D0A
- >>3	byte		x	\bv%c
- >>4	byte		x	\b.%c
- >>5	byte		x	\b%c
- >>8	string		>\0	\b, title: %s
- 
-1	string		mgs2\ 	MSX Gigamix MGSDRV2 music file
-+1	string/b		mgs2\ 	MSX Gigamix MGSDRV2 music file
- >6	uleshort	0x80
- >>0x2E	uleshort	0
- >>>0x30	string		>\0	\b, title: %s
- 
- # KSS music file
-0	string		KSCC	KSS music file v1.03
-+0	string/b		KSCC	KSS music file v1.03
- >0xE	byte		0
- >>0xF	byte&0x02	0	\b, soundchips: AY-3-8910, SCC(+)
- >>0xF	byte&0x02	2	\b, soundchip(s): SN76489
-@@ -28,7 +28,7 @@
- >>0xF	byte&0x01	1	\b, YM2413
- >>0xF	byte&0x08	8	\b, Y8950
- 
-0	string		KSSX	KSS music file v1.20
-+0	string/b		KSSX	KSS music file v1.20
- >0xE	byte&0xEF	0
- >>0xF	byte&0x40	0x00	\b, 60Hz
- >>0xF	byte&0x40	0x40	\b, 50Hz
-@@ -42,11 +42,11 @@
- >>0xF	byte&0x18	0x10	\b, Majyutsushi DAC
- 
- # Moonblaster for Moonsound
-0	string		MBMS
-+0	string/b		MBMS
- >4	byte		0x10	MSX Moonblaster for MoonSound music
- 
- # Music Player K-kaz
-0	string		MPK	MSX Music Player K-kaz song
-+0	string/b		MPK	MSX Music Player K-kaz song
- >6	ubeshort	0x0D0A
- >>3	byte		x	v%c
- >>4	byte		x	\b.%c
-@@ -70,7 +70,7 @@
- >>>>>0	string		>\32		\b, title: %s
- 
- # SCMD music file
-0x8B	string		SCMD
-+0x8B	string/b		SCMD
- >0xCE	uleshort	0	MSX SCMD Music file
- #>>-2	uleshort	0x6a71	; The file must end with this value. How to code this here?
- >>0x8F	string		>\0		\b, title: %s
-@@ -100,7 +100,7 @@
- >>>3	uleshort	>0x013D		MSX Graph Saurus compressed image
- 
- # Maki-chan Graphic format
-0	string		MAKI02\ \ 	Maki-chan image,
-+0	string/b		MAKI02\ \ 	Maki-chan image,
- >8	byte		x		system ID: %c
- >9	byte		x		\b%c
- >10	byte		x		\b%c
-@@ -124,11 +124,11 @@
- >>&3	ubyte&0x01	1		\b, 2:1 dot aspect ratio
- 
- # Japanese PIC file
-0	string		PIC\x1A
-+0	string/b		PIC\x1A
- >4	lelong		0		Japanese PIC image file
- 
- # MSX G9B image file
-0	string		G9B
-+0	string/b		G9B
- >1	uleshort	11
- >>3	uleshort	>10
- >>>5	ubyte		>0		MSX G9B image, depth=%d
-@@ -147,7 +147,7 @@
- ############## Other MSX file formats ##############
- 
- # MSX ROMs
-0	string		AB
-+0	string/b		AB
- >2	uleshort	0x0010			MSX ROM
- >>2	uleshort	x			\b, init=0x%4x
- >>4	uleshort	>0			\b, stat=0x%4x
-@@ -164,7 +164,7 @@
- >>6	uleshort	>0			\b, dev=0x%04x
- >>8	uleshort	>0			\b, bas=0x%04x
- 
-0	string		AB
-+0	string/b		AB
- #>2	string		5JSuperLAYDOCK		MSX Super Laydock ROM
- #>3	string		@HYDLIDE3MSX		MSX Hydlide-3 ROM
- #>3	string		@3\x80IA862		Golvellius MSX1 ROM
-@@ -188,7 +188,7 @@
- >>>6	uleshort	0
- >>>>8	uleshort	>0			MSX BASIC program in ROM, bas=0x%04x
- 
-0x4000	string		AB
-+0x4000	string/b		AB
- >0x4002	uleshort	>0x4010
- >>0x400A	string		\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
- >>0x4002	uleshort	x			\b, init=0x%04x
-@@ -196,7 +196,7 @@
- >>0x4006	uleshort	>0			\b, dev=0x%04x
- >>0x4008	uleshort	>0			\b, bas=0x%04x
- 
-0x8000	string		AB
-+0x8000	string/b		AB
- >0x8002	uleshort	>0x4010
- >>0x800A	string		\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
- >>0x8002	uleshort	x			\b, init=0x%04x
-@@ -206,7 +206,7 @@
- 
- 
- 0x3C000	string		AB
->0x3C008	string		\0\0\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
-+>0x3C008	string/b		\0\0\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
- >>0x3C002	uleshort	x			\b, init=0x%04x
- >>0x3C004	uleshort	>0			\b, stat=0x%04x
- >>0x3C006	uleshort	>0			\b, dev=0x%04x
--- a/file.spec
+++ b/file.spec
@ -4,14 +4,16 @@

 Summary: A utility for determining file types
 Name: file
-Version: 5.25
-Release: 6%{?dist}
+Version: 5.28
+Release: 1%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
+
 # Upstream says it's up to distributions to add a way to support local-magic.
 Patch0: file-localmagic.patch
-# sent upstream - should be included in next upstream release.
+
+# sent upstream
 Patch1: file-5.10-strength.patch
 Patch3: file-4.17-rpm-name.patch
 Patch4: file-5.04-volume_key.patch
@ -22,8 +24,7 @@ Patch8: file-5.14-perl.patch
 Patch14: file-5.19-cafebabe.patch
 Patch15: file-5.22-awk-perl.patch
 Patch17: file-5.24-varied.patch
-Patch18: file-trunk-msx-binary.patch
-Patch19: file-5.25-minix.patch
+
 URL: http://www.darwinsys.com/file/
 Requires: file-libs = %{version}-%{release}
 BuildRequires: zlib-devel
@ -95,8 +96,6 @@ file(1) command.
 %patch14 -p1
 %patch15 -p1
 %patch17 -p1
-%patch18 -p1
-%patch19 -p1

 # Patches can generate *.orig files, which can't stay in the magic dir,
 # otherwise there will be problems with compiling magic file!
@ -204,6 +203,9 @@ cd %{py3dir}
 %endif

 %changelog
+* Fri Jun 24 2016 Kamil Dudka <kdudka@redhat.com> - 5.28-1
+- update to new version 5.28
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.25-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-e6a972d4e10d9e76407a432f4a63cd4c  file-5.25.tar.gz
+3f7771424aa855f32094b49571e19b33  file-5.28.tar.gz