Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 19 Jul 2016 00:14:08 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418757 - in head/security/racoon2: . files
Message-ID:  <201607190014.u6J0E8sB097501@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: cy
Date: Tue Jul 19 00:14:07 2016
New Revision: 418757
URL: https://svnweb.freebsd.org/changeset/ports/418757

Log:
  Fix ancient getopts invocation in pskgen.
  
  PR:		211178

Modified:
  head/security/racoon2/Makefile
  head/security/racoon2/files/patch-pskgen-pskgen.in

Modified: head/security/racoon2/Makefile
==============================================================================
--- head/security/racoon2/Makefile	Mon Jul 18 23:36:42 2016	(r418756)
+++ head/security/racoon2/Makefile	Tue Jul 19 00:14:07 2016	(r418757)
@@ -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/
 

Modified: head/security/racoon2/files/patch-pskgen-pskgen.in
==============================================================================
--- head/security/racoon2/files/patch-pskgen-pskgen.in	Mon Jul 18 23:36:42 2016	(r418756)
+++ head/security/racoon2/files/patch-pskgen-pskgen.in	Tue Jul 19 00:14:07 2016	(r418757)
@@ -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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607190014.u6J0E8sB097501>