From b4d7964dc956cc77aa6c4818bd807d7830a35b5f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 01:18:16 +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/SPECS/file.spec b/SPECS/file.spec
index 08b2373..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: 15%{?dist}
+Release: 16%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -64,6 +64,9 @@ 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
@@ -234,6 +237,9 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Mon Jun 22 2020 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-16
+- magic/Magdir/msooxml: Search deeper in the zip file (#1845169)
+
 * Fri May 22 2020 Kamil Dudka <kdudka@redhat.com> - 5.33-15
 - remove duplicate line in file(1) man page (#1677442)