aboutsummaryrefslogtreecommitdiff
path: root/security/racoon2
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2016-07-19 00:14:07 +0000
committerCy Schubert <cy@FreeBSD.org>2016-07-19 00:14:07 +0000
commitdeeb8d55b68d477e5d8916136c619d3110795e32 (patch)
tree907c88d9f8ee359f11b52f035f4beefac4fe68ee /security/racoon2
parentf11aee7fd1c37831cb938671750ba938af2b9472 (diff)
downloadports-deeb8d55b68d477e5d8916136c619d3110795e32.tar.gz
ports-deeb8d55b68d477e5d8916136c619d3110795e32.zip
Fix ancient getopts invocation in pskgen.
PR: 211178
Notes
Notes: svn path=/head/; revision=418757
Diffstat (limited to 'security/racoon2')
-rw-r--r--security/racoon2/Makefile2
-rw-r--r--security/racoon2/files/patch-pskgen-pskgen.in13
2 files changed, 5 insertions, 10 deletions
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index a3ef3f81074d..94da9077c234 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= racoon2
PORTVERSION= 20100526a
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security net ipv6
MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
diff --git a/security/racoon2/files/patch-pskgen-pskgen.in b/security/racoon2/files/patch-pskgen-pskgen.in
index bb6ff6077b22..4326c9fdd20d 100644
--- a/security/racoon2/files/patch-pskgen-pskgen.in
+++ b/security/racoon2/files/patch-pskgen-pskgen.in
@@ -1,18 +1,13 @@
--- pskgen/pskgen.in.orig 2005-09-15 23:52:20.000000000 -0700
-+++ pskgen/pskgen.in 2012-10-19 22:21:12.364329713 -0700
-@@ -59,8 +59,13 @@
++++ pskgen/pskgen.in 2016-07-18 12:59:05.207263000 -0700
+@@ -59,8 +59,8 @@
exit 0;
}
-require 'getopts.pl';
-do Getopts('rs:o:di:he:d');
-+if ($] > 5.014002) {
-+ use Getopt::Std;
-+ getopts('rs:o:di:he:d');
-+} else {
-+ require 'getopts.pl';
-+ do Getopts('rs:o:di:he:d');
-+}
++use Getopt::Std;
++getopts('rs:o:di:he:d') or &usage;
$output = '-';
$output = $opt_o if ($opt_o);