From 00df89247e0f3f1b5abf8f5b37653a5e4958de13 Mon Sep 17 00:00:00 2001
From: ohauer <ohauer@FreeBSD.org>
Date: Fri, 3 May 2013 18:16:35 +0000
Subject: - update to version 5.0.4 which fixes CVE-2013-2944. - add entry to
 vuxml - add CVE references to jankins vuxml entry

while I'm here remove .sh from rc script

PR:		ports/178266
Submitted by:	David Shane Holden <dpejesh@yahoo.com>
Approved by:	strongswan@nanoteq.com (maintainer)
---
 security/strongswan/Makefile               |  4 ++--
 security/strongswan/distinfo               |  4 ++--
 security/strongswan/files/strongswan.in    | 33 ++++++++++++++++++++++++++++++
 security/strongswan/files/strongswan.sh.in | 33 ------------------------------
 security/strongswan/pkg-plist              |  3 +++
 5 files changed, 40 insertions(+), 37 deletions(-)
 create mode 100644 security/strongswan/files/strongswan.in
 delete mode 100644 security/strongswan/files/strongswan.sh.in

(limited to 'security/strongswan')

diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index 32a35f845546..a5e194200285 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	strongswan
-PORTVERSION=	5.0.1
+PORTVERSION=	5.0.4
 CATEGORIES=	security
 MASTER_SITES=	http://download.strongswan.org/ \
 		http://download2.strongswan.org/
@@ -15,7 +15,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool
-USE_RC_SUBR=	strongswan.sh
+USE_RC_SUBR=	strongswan
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/security/strongswan/distinfo b/security/strongswan/distinfo
index 05d53887153a..ff76032d4df9 100644
--- a/security/strongswan/distinfo
+++ b/security/strongswan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (strongswan-5.0.1.tar.bz2) = 1a4dff19ef69d15e0b90b1ea80bd183235ac73b4ecd114aab58ed54de0f5c3b4
-SIZE (strongswan-5.0.1.tar.bz2) = 3146776
+SHA256 (strongswan-5.0.4.tar.bz2) = 3ec66d64046f652ab7556b3be8f9be8981fd32ef4a11e3e461a04d658928bfe2
+SIZE (strongswan-5.0.4.tar.bz2) = 3412930
diff --git a/security/strongswan/files/strongswan.in b/security/strongswan/files/strongswan.in
new file mode 100644
index 000000000000..75544f4b67aa
--- /dev/null
+++ b/security/strongswan/files/strongswan.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Start or stop strongswan
+# $FreeBSD$
+
+# PROVIDE: strongswan
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+command="%%PREFIX%%/sbin/ipsec"
+. /etc/rc.subr
+
+name="strongswan"
+rcvar=`set_rcvar`
+extra_commands="reload statusall"
+
+load_rc_config $name
+
+start_cmd="strongswan_command start"
+stop_cmd="strongswan_command stop"
+restart_cmd="strongswan_command restart"
+status_cmd="strongswan_command status"
+reload_cmd="strongswan_command reload"
+statusall_cmd="strongswan_command statusall"
+
+
+strongswan_command()
+{
+	$command ${rc_arg}
+}
+
+run_rc_command "$1"
+
diff --git a/security/strongswan/files/strongswan.sh.in b/security/strongswan/files/strongswan.sh.in
deleted file mode 100644
index 75544f4b67aa..000000000000
--- a/security/strongswan/files/strongswan.sh.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Start or stop strongswan
-# $FreeBSD$
-
-# PROVIDE: strongswan
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-command="%%PREFIX%%/sbin/ipsec"
-. /etc/rc.subr
-
-name="strongswan"
-rcvar=`set_rcvar`
-extra_commands="reload statusall"
-
-load_rc_config $name
-
-start_cmd="strongswan_command start"
-stop_cmd="strongswan_command stop"
-restart_cmd="strongswan_command restart"
-status_cmd="strongswan_command status"
-reload_cmd="strongswan_command reload"
-statusall_cmd="strongswan_command statusall"
-
-
-strongswan_command()
-{
-	$command ${rc_arg}
-}
-
-run_rc_command "$1"
-
diff --git a/security/strongswan/pkg-plist b/security/strongswan/pkg-plist
index 645d4737a74c..170f10d7377e 100644
--- a/security/strongswan/pkg-plist
+++ b/security/strongswan/pkg-plist
@@ -91,6 +91,9 @@ lib/ipsec/plugins/libstrongswan-pgp.so
 lib/ipsec/plugins/libstrongswan-pkcs1.a
 lib/ipsec/plugins/libstrongswan-pkcs1.la
 lib/ipsec/plugins/libstrongswan-pkcs1.so
+lib/ipsec/plugins/libstrongswan-pkcs7.a
+lib/ipsec/plugins/libstrongswan-pkcs7.la
+lib/ipsec/plugins/libstrongswan-pkcs7.so
 lib/ipsec/plugins/libstrongswan-pkcs8.a
 lib/ipsec/plugins/libstrongswan-pkcs8.la
 lib/ipsec/plugins/libstrongswan-pkcs8.so
-- 
cgit