commit f1125fad79f73b74d01efb28d6c5e9961436e267
Author: Kacper Kornet <[email protected]>
Date: Tue Oct 7 06:27:48 2014 +0100
- allow for parameters in perl shebang
file-perl.patch | 12 ++++++++++++
file.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/file.spec b/file.spec
index 040cf2c..d8f7a80 100644
--- a/file.spec
+++ b/file.spec
@@ -30,7 +30,7 @@ Summary(zh_CN.UTF-8): 判定文件类型的工具。
Summary(zh_TW.UTF-8): 用於決定檔案類型的一個工具程式。
Name: file
Version: 5.19
-Release: 2
+Release: 3
License: distributable
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Patch0: %{name}-selinux.patch
Patch1: searchpath.patch
Patch2: automake.patch
Patch3: %{name}-CVE-2014-3587.patch
+Patch4: %{name}-perl.patch
URL: http://www.darwinsys.com/file/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -270,6 +271,7 @@ Wiązania Pythona 3 do biblioteki libmagic.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%if "%{cc_version}" < "3.4"
%{__sed} -i -e 's,-Wextra,,' configure.ac
diff --git a/file-perl.patch b/file-perl.patch
new file mode 100644
index 0000000..11d5eff
--- /dev/null
+++ b/file-perl.patch
@@ -0,0 +1,12 @@
+diff -ur file-5.19.orig/magic/Magdir/perl file-5.19/magic/Magdir/perl
+--- file-5.19.orig/magic/Magdir/perl 2014-04-28 15:01:16.000000000 +0100
++++ file-5.19/magic/Magdir/perl 2014-10-07 06:10:40.780793722 +0100
+@@ -18,7 +18,7 @@
+ 0 search/1 #!\ /usr/bin/env\ perl Perl script text executable
+ !:mime text/x-perl
+ 0 search/1 #!
+->0 regex \^#!.*/bin/perl$ Perl script text executable
++>0 regex \^#!.*/bin/perl([[:space:]].*)*$ Perl script text
executable
+ !:mime text/x-perl
+
+ # by Dmitry V. Levin and Alexey Tourbin
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/file.git/commitdiff/f1125fad79f73b74d01efb28d6c5e9961436e267
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
