diff --git a/file-5.33-clamav.patch b/file-5.33-clamav.patch new file mode 100644 index 0000000..5cd905c --- /dev/null +++ b/file-5.33-clamav.patch @@ -0,0 +1,37 @@ +From fb1604080767501fde17eb601382e84f1c1ddca3 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 16 Jul 2018 12:30:41 +0000 +Subject: [PATCH] remember to put a space between the version and the number, + plus more version parsing (Kamil Dudka) + +Upstream-commit: 1a7f58c9f253e3b902bfb7a77afd8375b0b428b7 +Signed-off-by: Kamil Dudka +--- + magic/Magdir/fsav | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/magic/Magdir/fsav b/magic/Magdir/fsav +index 5714798..5d72ab9 100644 +--- a/magic/Magdir/fsav ++++ b/magic/Magdir/fsav +@@ -48,13 +48,15 @@ + >11 string >\0 Clam AntiVirus database %-.23s + >>34 string : + >>>35 string !: \b, version +->>>>35 string x \b%-.1s +->>>>>36 string !: ++>>>>35 string x \b %-.1s ++>>>>>36 string !: + >>>>>>36 string x \b%-.1s + >>>>>>>37 string !: + >>>>>>>>37 string x \b%-.1s + >>>>>>>>>38 string !: + >>>>>>>>>>38 string x \b%-.1s ++>>>>>>>>>>>39 string !: ++>>>>>>>>>>>>39 string x \b%-.1s + >512 string \037\213 \b, gzipped + >769 string ustar\0 \b, tarred + +-- +2.14.4 + diff --git a/file.spec b/file.spec index 76c9b96..dc9d4d0 100644 --- a/file.spec +++ b/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.33 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -36,6 +36,9 @@ Patch5: file-5.33-pie-executable-revert.patch # fix out-of-bounds read via a crafted ELF file (CVE-2018-10360) Patch6: file-5.33-CVE-2018-10360.patch +# support longer version strings for clamav database (#1539107) +Patch7: file-5.33-clamav.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -212,6 +215,9 @@ cd %{py3dir} %endif %changelog +* Tue Jul 17 2018 Kamil Dudka - 5.33-10 +- support longer version strings for clamav database (#1539107) + * Fri Jul 13 2018 Fedora Release Engineering - 5.33-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild