diff --git a/file-magic-filesystems.patch b/file-magic-filesystems.patch new file mode 100644 index 0000000..020a822 --- /dev/null +++ b/file-magic-filesystems.patch @@ -0,0 +1,13 @@ +diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems +index b1c8d0bf..8e91ba16 100644 +--- a/magic/Magdir/filesystems ++++ b/magic/Magdir/filesystems +@@ -1994,7 +1994,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/file.spec b/file.spec index ac7878e..9a81921 100644 --- a/file.spec +++ b/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.38 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -26,6 +26,9 @@ Patch0: file-localmagic.patch Patch1: file-4.17-rpm-name.patch Patch2: file-5.04-volume_key.patch +# fixed in upstream; increase CDROM strength to beat MBR (#1696798) +Patch3:file-magic-filesystems.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -203,6 +206,9 @@ cd %{py3dir} %endif %changelog +* Tue May 26 2020 Vincent Mihalkovič - 5.38-5 +- increase CDROM strength to beat MBR (#1696798) + * Sat May 23 2020 Miro Hrončok - 5.38-4 - Rebuilt for Python 3.9