[file] fix #1051598 - reverse the order of shebang vs. package keyword detection
Jan Kaluža
jkaluza at fedoraproject.org
Wed Jan 15 13:21:04 UTC 2014
commit 1b637fadf4e446a5e1cc2c3b5f94805c9d021759
Author: Jan Kaluza <jkaluza at redhat.com>
Date: Wed Jan 15 14:21:14 2014 +0100
fix #1051598 - reverse the order of shebang vs. package keyword detection
in Perl by increasing strength of all Perl patterns
file-5.14-perl.patch | 39 +++++++++++++++++++++++++++++++++++----
file.spec | 6 +++++-
2 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/file-5.14-perl.patch b/file-5.14-perl.patch
index bc07102..7a52c21 100644
--- a/file-5.14-perl.patch
+++ b/file-5.14-perl.patch
@@ -1,14 +1,45 @@
diff --git a/magic/Magdir/perl b/magic/Magdir/perl
-index 1d7bd31..94536e2 100644
+index 1d7bd31..0118358 100644
--- a/magic/Magdir/perl
+++ b/magic/Magdir/perl
-@@ -33,7 +33,8 @@
+@@ -7,22 +7,31 @@
+ # Send additions to <perl5-porters at perl.org>
+ 0 search/1/w #!\ /bin/perl Perl script text executable
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 eval\ "exec\ /bin/perl Perl script text
++!:strength + 20
+ !:mime text/x-perl
+ 0 search/1/w #!\ /usr/bin/perl Perl script text executable
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 eval\ "exec\ /usr/bin/perl Perl script text
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1/w #!\ /usr/local/bin/perl Perl script text executable
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 eval\ '(exit\ $?0)'\ &&\ eval\ 'exec Perl script text
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 #!/usr/bin/env\ perl Perl script text executable
+ !:mime text/x-perl
++!:strength + 20
+ 0 search/1 #!\ /usr/bin/env\ perl Perl script text executable
+ !:mime text/x-perl
++!:strength + 25
+
+ # by Dmitry V. Levin and Alexey Tourbin
+ # check the first line
+@@ -33,7 +42,7 @@
0 search/1 !p
>0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *;
>>0 regex \^1\ *;|\^(use|sub|my)\ .*[(;{=] Perl5 module source text
-!:strength + 10
-+# Originally 12, we want at least 50
-+!:strength + 50
++!:strength + 45
# Perl POD documents
# From: Tom Hukins <tom at eborcom.com>
diff --git a/file.spec b/file.spec
index 68a5974..8054985 100644
--- a/file.spec
+++ b/file.spec
@@ -4,7 +4,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.14
-Release: 13%{?dist}
+Release: 14%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -194,6 +194,10 @@ cd %{py3dir}
%endif
%changelog
+* Wed Jan 15 2014 Jan Kaluza <jkaluza at redhat.com> - 5.14-14
+- fix #1051598 - reverse the order of shebang vs. package keyword detection
+ in Perl by increasing strength of all Perl patterns
+
* Mon Sep 09 2013 Jan Kaluza <jkaluza at redhat.com> - 5.14-13
- fix #1001689 - fix segfault when calling magic_load twice
More information about the scm-commits
mailing list