diff --git a/.gitignore b/.gitignore index fca2ae3..39ac6de 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ file-5.04.tar.gz /file-5.14.tar.gz /file-5.19.tar.gz /file-5.20.tar.gz +/file-5.22.tar.gz diff --git a/file-5.14-x86boot.patch b/file-5.14-x86boot.patch index 6e4603b..f896946 100644 --- a/file-5.14-x86boot.patch +++ b/file-5.14-x86boot.patch @@ -1,5 +1,5 @@ diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems -index 2d0d1ba..672728e 100644 +index 939a092..5ce1453 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -254,7 +254,7 @@ @@ -11,58 +11,12 @@ index 2d0d1ba..672728e 100644 # for sector sizes < 512 Bytes >11 uleshort <512 >>(11.s-2) uleshort 0xAA55 DOS/MBR boot sector -@@ -538,6 +538,8 @@ - >>>514 string !HdrS - # not BeOS - >>>>422 string !Be\ Boot\ Loader -+>>>>>32769 string CD001 -+>>>>>>0 use cdrom - # jump over BPB instruction implies DOS bootsector or AdvanceMAME mbr - >>>>>0 ubelong&0xFD000000 =0xE9000000 - # AdvanceMAME mbr -@@ -1360,7 +1362,7 @@ - >11 uleshort&0x001f 0 - >>11 uleshort <32769 - >>>11 uleshort >31 -->>>>21 ubyte&0xf0 0xF0 -+>>>>21 ubyte&0xf0 0xF0 x86 boot sector - >>>>>0 ubyte 0xEB - >>>>>>1 ubyte x \b, code offset 0x%x+2 - >>>>>0 ubyte 0xE9 -@@ -1913,16 +1915,7 @@ - # defect IO.SYS+MSDOS.SYS ? - #>>>>>0x162 use 2xDOS-filename - --# CDROM Filesystems --# https://en.wikipedia.org/wiki/ISO_9660 --# Modified for UDF by gerardo.cacciari@gmail.com --32769 string CD001 --# mime line at that position does not work --# to display CD-ROM (70=81-11) after MBR (113=40+72+1), partition-table (71=50+21) and before Apple Driver Map (51) --!:strength -11 --# to display CD-ROM (114=81+33) before MBR (113=40+72+1), partition-table (71=50+21) and Apple Driver Map (51) --# does not work --#!:strength +33 -+0 name cdrom - >38913 string !NSR0 ISO 9660 CD-ROM filesystem data - !:mime application/x-iso9660-image - >38913 string NSR0 UDF filesystem data -@@ -1939,6 +1932,18 @@ - !:mime application/x-iso9660-image - 32777 string CDROM High Sierra CD-ROM filesystem data - -+# CDROM Filesystems -+# https://en.wikipedia.org/wiki/ISO_9660 -+# Modified for UDF by gerardo.cacciari@gmail.com -+32769 string CD001 -+# mime line at that position does not work -+# to display CD-ROM (70=81-11) after MBR (113=40+72+1), partition-table (71=50+21) and before Apple Driver Map (51) -+!:strength -11 -+# to display CD-ROM (114=81+33) before MBR (113=40+72+1), partition-table (71=50+21) and Apple Driver Map (51) -+# does not work -+#!:strength +33 -+>0 use cdrom -+ - # .cso files - 0 string CISO Compressed ISO CD image - +@@ -266,7 +266,7 @@ + 0x1FE leshort 0xAA55 DOS/MBR boot sector + # + # to display information (50) before DOS BPB (strength=70) and after DOS floppy (120) like in old file version +-!:strength +65 ++!:strength +0 + >2 string OSBS OS/BS MBR + # added by Joerg Jenderek at Feb 2013 according to http://thestarman.pcministry.com/asm/mbr/ + # and http://en.wikipedia.org/wiki/Master_Boot_Record diff --git a/file-5.20-CVE-2014-3710.patch b/file-5.20-CVE-2014-3710.patch deleted file mode 100644 index 0fcf703..0000000 --- a/file-5.20-CVE-2014-3710.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 39c7ac1106be844a5296d3eb5971946cc09ffda0 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Fri, 17 Oct 2014 15:49:00 +0000 -Subject: [PATCH] Fix note bounds reading, Francisco Alonso / Red Hat - ---- - ChangeLog | 4 ++++ - src/readelf.c | 9 ++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 08f81f5..9ebdebd 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -477,6 +477,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size, - uint32_t namesz, descsz; - unsigned char *nbuf = CAST(unsigned char *, vbuf); - -+ if (xnh_sizeof + offset > size) { -+ /* -+ * We're out of note headers. -+ */ -+ return xnh_sizeof + offset; -+ } -+ - (void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof); - offset += xnh_sizeof; - diff --git a/file.spec b/file.spec index b776d21..b28399a 100644 --- a/file.spec +++ b/file.spec @@ -3,8 +3,8 @@ Summary: A utility for determining file types Name: file -Version: 5.20 -Release: 2%{?dist} +Version: 5.22 +Release: 1%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -19,7 +19,6 @@ Patch6: file-5.04-generic-msdos.patch Patch7: file-5.14-x86boot.patch Patch8: file-5.14-perl.patch Patch14: file-5.19-cafebabe.patch -Patch15: file-5.20-CVE-2014-3710.patch URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -89,7 +88,6 @@ file(1) command. %patch7 -p1 %patch8 -p1 %patch14 -p1 -%patch15 -p1 # Patches can generate *.orig files, which can't stay in the magic dir, # otherwise there will be problems with compiling magic file! @@ -198,6 +196,9 @@ cd %{py3dir} %endif %changelog +* Wed Feb 04 2015 Jan Kaluza - 5.22-1 +- update to new version 5.22 + * Thu Oct 23 2014 Jan Kaluza - 5.20-2 - fix CVE-2014-3710 (#1155464) diff --git a/sources b/sources index df87d3d..75324a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d5e13eb3e0e13839da869a31790faf2 file-5.20.tar.gz +8fb13e5259fe447e02c4a37bc7225add file-5.22.tar.gz