From dac68400a36085abdf9d63554a3879695b45d8a2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2020 11:49:08 +0000 Subject: import file-5.33-16.el8 --- diff --git a/SOURCES/file-5.33-msooxml-magic.patch b/SOURCES/file-5.33-msooxml-magic.patch new file mode 100644 index 0000000..fb3cb86 --- /dev/null +++ b/SOURCES/file-5.33-msooxml-magic.patch @@ -0,0 +1,24 @@ +diff --git a/magic/Magdir/msooxml b/magic/Magdir/msooxml +index bde098e..7d0bcc7 100644 +--- a/magic/Magdir/msooxml ++++ b/magic/Magdir/msooxml +@@ -28,16 +28,16 @@ + # skip to the second local file header + # since some documents include a 520-byte extra field following the file + # header, we need to scan for the next header +->>(18.l+49) search/2000 PK\003\004 ++>>(18.l+49) search/6000 PK\003\004 + # now skip to the *third* local file header; again, we need to scan due to a + # 520-byte extra field following the file header +->>>&26 search/1000 PK\003\004 ++>>>&26 search/6000 PK\003\004 + # and check the subdirectory name to determine which type of OOXML + # file we have. Correct the mimetype with the registered ones: + # http://technet.microsoft.com/en-us/library/cc179224.aspx + >>>>&26 use msooxml + >>>>&26 default x + # OpenOffice/Libreoffice orders ZIP entry differently, so check the 4th file +->>>>>&26 search/1000 PK\003\004 ++>>>>>&26 search/6000 PK\003\004 + >>>>>>&26 use msooxml + >>>>>>&26 default x Microsoft OOXML diff --git a/SOURCES/file-5.35-man-apple.patch b/SOURCES/file-5.35-man-apple.patch index 7de07cd..78b0fdf 100644 --- a/SOURCES/file-5.35-man-apple.patch +++ b/SOURCES/file-5.35-man-apple.patch @@ -1,7 +1,7 @@ From 5bccda402a33b4b6fee13cbc910580a85f1ab73a Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Mon, 18 Feb 2019 18:59:25 +0000 -Subject: [PATCH] Mention that the apple filetype/creator is only available for +Subject: [PATCH 1/2] Mention that the apple filetype/creator is only available for entries that have it (Kamil Dudka) Upstream-commit: 642f269ef99930b44daa2236908da7d05a68eb08 @@ -27,3 +27,30 @@ index 0968321..98061ba 100644 -- 2.20.1 + +From f7f3e751c0e606592b4d377a479b40f6964705ab Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 3 Mar 2019 02:32:40 +0000 +Subject: [PATCH 2/2] remove duplicate line (chefe) + +Upstream-commit: cde5f5962ebfd057fc2e330da3b36470e6ee3724 +Signed-off-by: Kamil Dudka +--- + doc/file.man | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/doc/file.man b/doc/file.man +index 98061ba..05da3a7 100644 +--- a/doc/file.man ++++ b/doc/file.man +@@ -171,7 +171,6 @@ Causes the file command to output the file type and creator code as + used by older MacOS versions. + The code consists of eight letters, + the first describing the file type, the latter the creator. +-the first describing the file type, the latter the creator. + This option works properly only for file formats that have the + apple-style output defined. + .It Fl b , Fl Fl brief +-- +2.21.1 + diff --git a/SOURCES/file-magic-filesystems.patch b/SOURCES/file-magic-filesystems.patch new file mode 100644 index 0000000..5f87ceb --- /dev/null +++ b/SOURCES/file-magic-filesystems.patch @@ -0,0 +1,13 @@ +diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems +index eb41868f..44805a35 100644 +--- a/magic/Magdir/filesystems ++++ b/magic/Magdir/filesystems +@@ -1973,7 +1973,7 @@ + # 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) +-!:strength +34 ++!:strength +35 + >0 use cdrom + + # URL: https://en.wikipedia.org/wiki/NRG_(file_format) diff --git a/SPECS/file.spec b/SPECS/file.spec index d8490db..f536e9e 100644 --- a/SPECS/file.spec +++ b/SPECS/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.33 -Release: 13%{?dist} +Release: 16%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -61,6 +61,12 @@ Patch13: file-5.35-man-apple.patch # remove wrong magic for JFFS file system (#1773477) Patch14: file-5.37-jffs-magic.patch +# increase CDROM strength to beat MBR (#1696798) +Patch15: file-magic-filesystems.patch + +# search deeper in the zip file (#1845169) +Patch16: file-5.33-msooxml-magic.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -231,6 +237,15 @@ cd %{py3dir} %endif %changelog +* Mon Jun 22 2020 Vincent Mihalkovic - 5.33-16 +- magic/Magdir/msooxml: Search deeper in the zip file (#1845169) + +* Fri May 22 2020 Kamil Dudka - 5.33-15 +- remove duplicate line in file(1) man page (#1677442) + +* Thu May 21 2020 Vincent Mihalkovič - 5.33-14 +- increase magic/Magdir/filesystems CDROM strength to beat MBR (#1696798) + * Mon Nov 18 2019 Kamil Dudka - 5.33-13 - remove wrong magic for JFFS file system (#1773477)