summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Schiffer <pschiffe@redhat.com>2013-07-23 16:20:42 +0200
committerPeter Schiffer <pschiffe@redhat.com>2013-07-23 16:20:42 +0200
commit3c4b9a30484100e18a343bc5e1af6da3b3f116db (patch)
treed02296b2b3e40b63696811e98f24d86cc60f2c44
parent5fea8c42414304a694bbdc69f56dd4b2e380d6d5 (diff)
downloadgroff-3c4b9a30484100e18a343bc5e1af6da3b3f116db.tar.gz
groff-3c4b9a30484100e18a343bc5e1af6da3b3f116db.tar.xz
groff-3c4b9a30484100e18a343bc5e1af6da3b3f116db.zip
Don't use /usr/bin/env in shebang
-rw-r--r--0004-don-t-use-usr-bin-env-in-shebang.patch59
-rw-r--r--groff.spec7
2 files changed, 65 insertions, 1 deletions
diff --git a/0004-don-t-use-usr-bin-env-in-shebang.patch b/0004-don-t-use-usr-bin-env-in-shebang.patch
new file mode 100644
index 0000000..5a949c5
--- /dev/null
+++ b/0004-don-t-use-usr-bin-env-in-shebang.patch
@@ -0,0 +1,59 @@
+From 6d28b9227823b0a6ee9650a97ea406cf4ef8160e Mon Sep 17 00:00:00 2001
+From: Peter Schiffer <pschiffe@redhat.com>
+Date: Tue, 23 Jul 2013 14:09:50 +0200
+Subject: [PATCH] don't use /usr/bin/env in shebang
+
+There might be an issue that the script is executed with unwanted version of
+<lang> if that language is provided by enabled dynamic software collection.
+
+Resolves: #987069
+---
+ contrib/chem/chem.pl | 2 +-
+ contrib/groffer/perl/groffer.pl | 2 +-
+ contrib/groffer/perl/roff2.pl | 2 +-
+ src/roff/grog/grog.pl | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
+index dacf8b4..932606a 100755
+--- a/contrib/chem/chem.pl
++++ b/contrib/chem/chem.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env perl
++#! /usr/bin/perl
+
+ # chem - a groff preprocessor for producing chemical structure diagrams
+
+diff --git a/contrib/groffer/perl/groffer.pl b/contrib/groffer/perl/groffer.pl
+index f56fbfc..d0352d0 100755
+--- a/contrib/groffer/perl/groffer.pl
++++ b/contrib/groffer/perl/groffer.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env perl
++#! /usr/bin/perl
+
+ # groffer - display groff files
+
+diff --git a/contrib/groffer/perl/roff2.pl b/contrib/groffer/perl/roff2.pl
+index cf95f95..9ba6860 100755
+--- a/contrib/groffer/perl/roff2.pl
++++ b/contrib/groffer/perl/roff2.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env perl
++#! /usr/bin/perl
+
+ # roff2* - transform roff files into other formats
+
+diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
+index 3f33d86..77adf78 100644
+--- a/src/roff/grog/grog.pl
++++ b/src/roff/grog/grog.pl
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env perl
++#! /usr/bin/perl
+ # grog - guess options for groff command
+ # Inspired by doctype script in Kernighan & Pike, Unix Programming
+ # Environment, pp 306-8.
+--
+1.7.11.7
+
diff --git a/groff.spec b/groff.spec
index d40fbf7..6b4eee6 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,7 +3,7 @@
Summary: A document formatting system
Name: groff
Version: 1.22.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+ and GFDL and BSD and MIT
Group: Applications/Publishing
URL: http://www.gnu.org/software/groff/
@@ -14,6 +14,8 @@ Patch0: 0001-missing-groff-x11-info-message-when-gxditview-not-fo.patch
Patch1: 0002-load-site-font-and-site-tmac-from-etc-groff.patch
# resolves: #709413, #720058, #720057
Patch2: 0003-various-security-fixes.patch
+# resolves: #987069
+Patch3: 0004-don-t-use-usr-bin-env-in-shebang.patch
Requires: coreutils, /sbin/install-info, groff-base = %{version}-%{release}
Requires(post): info
@@ -397,6 +399,9 @@ fi
%doc %{_docdir}/%{name}-%{version}/pdf/
%changelog
+* Tue Jul 23 2013 Peter Schiffer <pschiffe@redhat.com> 1.22.2-6
+- don't use /usr/bin/env in shebang
+
* Mon Jul 22 2013 Peter Schiffer <pschiffe@redhat.com> 1.22.2-5
- removed BSD and MIT license files - the text is already included
in the upstream tarball