diff --git a/file-5.35-netpbm-misleading.patch b/file-5.35-netpbm-misleading.patch new file mode 100644 index 0000000..0bdfd16 --- /dev/null +++ b/file-5.35-netpbm-misleading.patch @@ -0,0 +1,65 @@ +From 3938a505b79d24ad76dc42151994740159cb8d60 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Thu, 24 Jan 2019 08:36:04 +0100 +Subject: [PATCH] Fixed bug missidentifying netpbm files (#856092) + +--- + magic/Magdir/images | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/magic/Magdir/images b/magic/Magdir/images +index 5cd9fab..e16d028 100644 +--- a/magic/Magdir/images ++++ b/magic/Magdir/images +@@ -175,42 +175,42 @@ + >0 regex/4 P1[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, bitmap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-bitmap + + 0 search/1 P2 + >0 regex/4 P2[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, greymap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-greymap + + 0 search/1 P3 + >0 regex/4 P3[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, pixmap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-pixmap + + 0 string P4 + >0 regex/4 P4[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, rawbits, bitmap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-bitmap + + 0 string P5 + >0 regex/4 P5[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, rawbits, greymap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-greymap + + 0 string P6 + >0 regex/4 P6[\040\t\f\r\n] + >>0 use netpbm + >>0 string x \b, rawbits, pixmap +-!:strength + 45 ++!:strength + 65 + !:mime image/x-portable-pixmap + + 0 string P7 Netpbm PAM image file +-- +2.17.1 + diff --git a/file.spec b/file.spec index a112d37..7afb6b1 100644 --- a/file.spec +++ b/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.35 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -32,6 +32,9 @@ Patch4: file-5.34-ebpf-magic.patch # fixed bug misleading qcow2 v2 and v3 files (#1654349) Patch5: file-5.35-qcow2-misleading.patch +# fixed bug missidentifying netpbm files (#856092) +Patch6: file-5.35-netpbm-misleading.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -208,6 +211,9 @@ cd %{py3dir} %endif %changelog +* Thu Jan 24 2019 Ondrej Dubaj - 5.35-3 +- Fixed bug missidentifying netpbm files (#856092) + * Tue Dec 04 2018 Ondrej Dubaj - 5.35-2 - Fixed bug misleading qcow2 v2 and v3 files (#1654349)