[racoon2] #995743 - avoid recently added dependency

Pavel Šimerda pavlix at fedoraproject.org
Thu Mar 13 11:45:31 UTC 2014


commit 636224d3a77b3ed76c78f8f3c895029154653b60
Author: Pavel Šimerda <psimerda at redhat.com>
Date:   Thu Mar 13 12:44:51 2014 +0100

    #995743 - avoid recently added dependency

 racoon2-getopt.patch |   14 ++++++++++++++
 racoon2.spec         |    8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/racoon2-getopt.patch b/racoon2-getopt.patch
new file mode 100644
index 0000000..d51bd7e
--- /dev/null
+++ b/racoon2-getopt.patch
@@ -0,0 +1,14 @@
+--- /pskgen/pskgen.in	2014-02-19 12:57:34.000000000 +0100
++++ /pskgen/pskgen.in	2014-03-08 11:00:10.215965859 +0100
+@@ -59,8 +59,9 @@ 
+ 	exit 0;
+ }
+ 
+-require 'getopts.pl';
+-do Getopts('rs:o:di:he:d');
++use Getopt::Std;
++
++getopts('rs:o:di:he:d') or exit 1;
+ $output = '-';
+ $output = $opt_o if ($opt_o);
+ 
diff --git a/racoon2.spec b/racoon2.spec
index 5cdb5d1..50207c2 100644
--- a/racoon2.spec
+++ b/racoon2.spec
@@ -2,7 +2,7 @@
 
 Name:           racoon2
 Version:        20100526a
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        An implementation of key management system for IPsec
 Group:          System Environment/Daemons
 License:        BSD
@@ -12,10 +12,10 @@ Patch0:         %{name}-autotools.patch
 Patch1:         %{name}-init.patch
 Patch2:         %{name}-functions-shebang.patch
 Patch3:         %{name}-configfiles.patch
+Patch4:         %{name}-getopt.patch
 BuildRequires:  byacc
 BuildRequires:  flex
 BuildRequires:  openssl-devel
-Requires: perl-Getopt-Simple
 Requires(post): pwgen
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 BuildRequires:  systemd-units
@@ -39,6 +39,7 @@ and KINK protocols. It works on FreeBSD, NetBSD, Linux, and Mac OS X.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 sed -i '/yyget_leng/d' lib/cftoken.l
 
@@ -144,6 +145,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 13 2014 Pavel Šimerda <psimerda at redhat.com> - 20100526a-28
+- #995743 - avoid recently added dependency
+
 * Wed Feb 19 2014 Pavel Šimerda <psimerda at redhat.com> - 20100526a-27
 - #995745 - /etc/racoon2/psk and /etc/racoon2/cert references in vals.conf are not created
 - #995743 - racoon2-genpsk missing dependancies


More information about the scm-commits mailing list