[file/f20] fix #1079847 - fix potential regression in Perl detection caused

Jan Kaluža jkaluza at fedoraproject.org
Tue Mar 25 08:26:09 UTC 2014


commit 0ab13b223af0bcbc78379bcfd572c8d2fb7a04e9
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Tue Mar 25 09:26:09 2014 +0100

    fix #1079847 - fix potential regression in Perl detection caused
    
      by original patch for CVE-2013-7345

 file-5.14-CVE-2013-7345.patch |    3 ++-
 file.spec                     |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/file-5.14-CVE-2013-7345.patch b/file-5.14-CVE-2013-7345.patch
index 5a0374d..0bb1287 100644
--- a/file-5.14-CVE-2013-7345.patch
+++ b/file-5.14-CVE-2013-7345.patch
@@ -12,12 +12,13 @@ diff --git a/magic/Magdir/commands b/magic/Magdir/commands
 index 67c3eee..4a7d8dd 100644
 --- a/magic/Magdir/commands
 +++ b/magic/Magdir/commands
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,8 @@
  !:mime	text/x-awk
  0	string/wt	#!\ /usr/bin/awk	awk script text executable
  !:mime	text/x-awk
 -0	regex		=^\\s*BEGIN\\s*[{]	awk script text
 +0	regex		=^\\s{0,100}BEGIN\\s{0,100}[{]	awk script text
++!:strength - 12
  
  # AT&T Bell Labs' Plan 9 shell
  0	string/wt	#!\ /bin/rc	Plan 9 rc shell script text executable
diff --git a/file.spec b/file.spec
index 87a1f72..4340347 100644
--- a/file.spec
+++ b/file.spec
@@ -4,7 +4,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.14
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -200,6 +200,10 @@ cd %{py3dir}
 %endif
 
 %changelog
+* Tue Mar 25 2014 Jan Kaluza <jkaluza at redhat.com> - 5.14-20
+- fix #1079847 - fix potential regression in Perl detection caused
+  by original patch for CVE-2013-7345
+
 * Mon Mar 24 2014 Jan Kaluza <jkaluza at redhat.com> - 5.14-19
 - fix redefinition of OFFSET_OOB in CVE-2014-2270 patch
 


More information about the scm-commits mailing list