From nobody@FreeBSD.org  Fri Nov 23 12:48:18 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B5812B60
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 23 Nov 2012 12:48:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CBA88FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 23 Nov 2012 12:48:18 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qANCmIjU037695
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 23 Nov 2012 12:48:18 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qANCmI7V037694;
	Fri, 23 Nov 2012 12:48:18 GMT
	(envelope-from nobody)
Message-Id: <201211231248.qANCmI7V037694@red.freebsd.org>
Date: Fri, 23 Nov 2012 12:48:18 GMT
From: Riaan Kruger <riaank@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] security/strongswan 4.5.3 -> 5.0.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173860
>Category:       ports
>Synopsis:       [maintainer update] security/strongswan 4.5.3 -> 5.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tota
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 23 12:50:00 UTC 2012
>Closed-Date:    Mon Jan 07 21:06:43 UTC 2013
>Last-Modified:  Mon Jan 07 21:06:43 UTC 2013
>Originator:     Riaan Kruger
>Release:        8.3
>Organization:
Nanoteq
>Environment:
>Description:
Update security/strongswan from 4.5.3 to 5.0.1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN strongswan/Makefile port/Makefile
--- strongswan/Makefile	2012-11-23 13:36:42.000000000 +0200
+++ port/Makefile	2012-11-23 14:26:36.000000000 +0200
@@ -2,42 +2,47 @@
 # Date created:				30 May 2010
 # Whom:					<riaank@gmail.com>
 #
-# $FreeBSD: head/security/strongswan/Makefile 300897 2012-07-14 14:29:18Z beat $
+# $FreeBSD: ports/security/strongswan/Makefile,v 1.3 2011/04/29 12:24:55 culot Exp $
 
-PORTNAME=	strongswan
-PORTVERSION=	4.5.3
+PORTNAME=		strongswan
+PORTVERSION=	5.0.1
 CATEGORIES=	security
 MASTER_SITES=	http://download.strongswan.org/ \
 		http://download2.strongswan.org/
 
-MAINTAINER=	riaank@gmail.com
+MAINTAINER=	strongswan@nanoteq.com	
 COMMENT=	Open Source IKEv2 IPsec-based VPN solution
 
-OPTIONS=	SQLITE		"Enable SQLite" off \
-		MYSQL		"Enable MySQL" off \
-		CURL		"Enable CURL to fetch CRL/OCSP" off \
-		EAPAKA3GPP2	"Enable EAP AKA with 3gpp2 backend" off \
-		EAPSIMFILE	"Enable EAP SIM with filebased backend" off
+OPTIONS=	IKEv1			"Enable IKEv1 support (Experimental)" off \
+		LDAP            	"Enable LDAP" off \
+		SQLITE			"Enable SQLite" off \
+		MYSQL			"Enable MySQL" off \
+		CURL			"Enable CURL to fetch CRL/OCSP" off \
+		EAPAKA3GPP2		"Enable EAP AKA with 3gpp2 backend" off \
+		EAPSIMFILE		"Enable EAP SIM with file backend" off
 
-USE_RC_SUBR=	strongswan
+USE_RC_SUBR=	strongswan.sh
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
+LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
+
 CONFIGURE_ARGS=	--enable-kernel-pfkey \
 		--enable-kernel-pfroute  \
 		--disable-kernel-netlink  \
 		--disable-tools  \
 		--disable-scripts  \
-		--disable-pluto  \
 		--disable-gmp \
 		--enable-openssl \
 		--enable-eap-identity \
 		--enable-eap-md5 \
 		--enable-eap-tls \
 		--enable-eap-mschapv2 \
+		--enable-eap-peap \
+		--enable-eap-ttls \
 		--enable-md4 \
 		--enable-blowfish \
 		--enable-addrblock \
@@ -46,11 +51,8 @@
 		--with-lib-prefix=${PREFIX}
 
 # Man pages with default install
-MAN3=	anyaddr.3 atoaddr.3 atoasr.3 atoul.3 goodmask.3 initaddr.3 \
-	initsubnet.3 portof.3 rangetosubnet.3 sameaddr.3 subnetof.3 \
-	ttoaddr.3 ttodata.3 ttosa.3 ttoul.3
-MAN5=	ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
-MAN8=	ipsec.8 _updown.8 _updown_espmark.8
+MAN5=		ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
+MAN8=		ipsec.8
 
 .include <bsd.port.pre.mk>
 
@@ -60,6 +62,21 @@
 .endif
 
 # Extra options
+.if defined(WITH_IKEv1)
+PLIST_SUB+=	IKEv1=""
+.else
+CONFIGURE_ARGS+=	--disable-ikev1
+PLIST_SUB+=	IKEv1="@comment "
+.endif
+
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=	--enable-ldap
+PLIST_SUB+=	LDAP=""
+.else
+PLIST_SUB+=	LDAP="@comment "
+.endif
+
 .if defined(WITH_SQLITE) || defined (WITH_MYSQL)
 CONFIGURE_ARGS+=	--enable-attr-sql
 CONFIGURE_ARGS+=	--enable-sql
@@ -70,7 +87,7 @@
 
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=	--enable-sqlite
-LIB_DEPENDS += sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 PLIST_SUB+=	SQLITE=""
 .else
 PLIST_SUB+=	SQLITE="@comment "
@@ -86,7 +103,7 @@
 
 .if defined(WITH_CURL)
 CONFIGURE_ARGS+=	--enable-curl
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 PLIST_SUB+=	CURL=""
 .else
 PLIST_SUB+=	CURL="@comment "
@@ -103,11 +120,16 @@
 .if defined(WITH_EAPAKA3GPP2)
 CONFIGURE_ARGS+=	--enable-eap-aka
 CONFIGURE_ARGS+=	--enable-eap-aka-3gpp2
-CONFIGURE_ARGS+=	--enable-gmp
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 PLIST_SUB+=	EAPAKA3GPP2=""
 .else
 PLIST_SUB+=	EAPAKA3GPP2="@comment "
 .endif
 
+.if defined(WITH_EAPSIMFILE) || defined(WITH_EAPAKA3GPP2)
+PLIST_SUB+=SIMAKA=""
+.else
+PLIST_SUB+=SIMAKA="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff -ruN strongswan/distinfo port/distinfo
--- strongswan/distinfo	2012-11-23 13:36:42.000000000 +0200
+++ port/distinfo	2012-11-23 14:26:36.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (strongswan-4.5.3.tar.bz2) = a59fa0d9820fb06a3c848f4537b9256d2067265ad10e1b007b79f3b16279f1ff
-SIZE (strongswan-4.5.3.tar.bz2) = 3299522
+SHA256 (strongswan-5.0.1.tar.bz2) = 1a4dff19ef69d15e0b90b1ea80bd183235ac73b4ecd114aab58ed54de0f5c3b4
+SIZE (strongswan-5.0.1.tar.bz2) = 3146776
diff -ruN strongswan/files/patch-src__ipsec__ipsec.in port/files/patch-src__ipsec__ipsec.in
--- strongswan/files/patch-src__ipsec__ipsec.in	2012-11-23 13:36:42.000000000 +0200
+++ port/files/patch-src__ipsec__ipsec.in	1970-01-01 02:00:00.000000000 +0200
@@ -1,20 +0,0 @@
-diff -ur srcold/ipsec/ipsec.in src/ipsec/ipsec.in
---- srcold/ipsec/ipsec.in	2011-09-22 08:39:26.589952124 +0200
-+++ src/ipsec/ipsec.in	2011-09-22 08:39:44.640945476 +0200
-@@ -19,6 +19,7 @@
- export PATH
- 
- # name and version of the ipsec implementation
-+OS_NAME=`uname -s`
- IPSEC_NAME="@IPSEC_NAME@"
- IPSEC_VERSION="U@IPSEC_VERSION@/K`uname -r`"
- 
-@@ -378,7 +379,7 @@
- 	fi
- 	;;
- version|--version)
--	printf "Linux $IPSEC_NAME $IPSEC_VERSION\n"
-+	printf "$OS_NAME $IPSEC_NAME $IPSEC_VERSION\n"
- 	printf "$IPSEC_DISTRO\n"
- 	printf "See 'ipsec --copyright' for copyright information.\n"
- 	exit 0
diff -ruN strongswan/files/strongswan.in port/files/strongswan.in
--- strongswan/files/strongswan.in	2012-11-23 13:36:42.000000000 +0200
+++ port/files/strongswan.in	1970-01-01 02:00:00.000000000 +0200
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: head/security/strongswan/files/strongswan.in 300897 2012-07-14 14:29:18Z beat $
-
-# PROVIDE: strongswan
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# strongswan_enable (bool):   Set to NO by default.
-#               Set it to YES to enable strongswan.
-
-. /etc/rc.subr
-
-name="strongswan"
-rcvar=strongswan_enable
-
-command="%%PREFIX%%/sbin/ipsec"
-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 -ruN strongswan/files/strongswan.sh.in port/files/strongswan.sh.in
--- strongswan/files/strongswan.sh.in	1970-01-01 02:00:00.000000000 +0200
+++ port/files/strongswan.sh.in	2012-11-23 14:26:36.000000000 +0200
@@ -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 -ruN strongswan/pkg-plist port/pkg-plist
--- strongswan/pkg-plist	2012-11-23 13:36:42.000000000 +0200
+++ port/pkg-plist	2012-11-23 14:46:51.000000000 +0200
@@ -12,6 +12,10 @@
 lib/ipsec/libstrongswan.la
 lib/ipsec/libstrongswan.so
 lib/ipsec/libstrongswan.so.0
+lib/ipsec/libtls.a
+lib/ipsec/libtls.la
+lib/ipsec/libtls.so
+lib/ipsec/libtls.so.0
 lib/ipsec/plugins/libstrongswan-addrblock.a
 lib/ipsec/plugins/libstrongswan-addrblock.la
 lib/ipsec/plugins/libstrongswan-addrblock.so
@@ -24,6 +28,9 @@
 lib/ipsec/plugins/libstrongswan-blowfish.a
 lib/ipsec/plugins/libstrongswan-blowfish.la
 lib/ipsec/plugins/libstrongswan-blowfish.so
+lib/ipsec/plugins/libstrongswan-cmac.a
+lib/ipsec/plugins/libstrongswan-cmac.la
+lib/ipsec/plugins/libstrongswan-cmac.so
 lib/ipsec/plugins/libstrongswan-constraints.a
 lib/ipsec/plugins/libstrongswan-constraints.la
 lib/ipsec/plugins/libstrongswan-constraints.so
@@ -42,9 +49,15 @@
 lib/ipsec/plugins/libstrongswan-eap-mschapv2.a
 lib/ipsec/plugins/libstrongswan-eap-mschapv2.la
 lib/ipsec/plugins/libstrongswan-eap-mschapv2.so
+lib/ipsec/plugins/libstrongswan-eap-peap.a
+lib/ipsec/plugins/libstrongswan-eap-peap.la
+lib/ipsec/plugins/libstrongswan-eap-peap.so
 lib/ipsec/plugins/libstrongswan-eap-tls.a
 lib/ipsec/plugins/libstrongswan-eap-tls.la
 lib/ipsec/plugins/libstrongswan-eap-tls.so
+lib/ipsec/plugins/libstrongswan-eap-ttls.a
+lib/ipsec/plugins/libstrongswan-eap-ttls.la
+lib/ipsec/plugins/libstrongswan-eap-ttls.so
 lib/ipsec/plugins/libstrongswan-fips-prf.a
 lib/ipsec/plugins/libstrongswan-fips-prf.la
 lib/ipsec/plugins/libstrongswan-fips-prf.so
@@ -63,6 +76,9 @@
 lib/ipsec/plugins/libstrongswan-md5.a
 lib/ipsec/plugins/libstrongswan-md5.la
 lib/ipsec/plugins/libstrongswan-md5.so
+lib/ipsec/plugins/libstrongswan-nonce.a
+lib/ipsec/plugins/libstrongswan-nonce.la
+lib/ipsec/plugins/libstrongswan-nonce.so
 lib/ipsec/plugins/libstrongswan-openssl.a
 lib/ipsec/plugins/libstrongswan-openssl.la
 lib/ipsec/plugins/libstrongswan-openssl.so
@@ -75,6 +91,9 @@
 lib/ipsec/plugins/libstrongswan-pkcs1.a
 lib/ipsec/plugins/libstrongswan-pkcs1.la
 lib/ipsec/plugins/libstrongswan-pkcs1.so
+lib/ipsec/plugins/libstrongswan-pkcs8.a
+lib/ipsec/plugins/libstrongswan-pkcs8.la
+lib/ipsec/plugins/libstrongswan-pkcs8.so
 lib/ipsec/plugins/libstrongswan-pubkey.a
 lib/ipsec/plugins/libstrongswan-pubkey.la
 lib/ipsec/plugins/libstrongswan-pubkey.so
@@ -119,6 +138,10 @@
 libexec/ipsec/stroke
 libexec/ipsec/whitelist
 sbin/ipsec
+%%SIMAKA%%lib/ipsec/libsimaka.a
+%%SIMAKA%%lib/ipsec/libsimaka.la
+%%SIMAKA%%lib/ipsec/libsimaka.so
+%%SIMAKA%%lib/ipsec/libsimaka.so.0
 %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.a
 %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.la
 %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.so
@@ -137,6 +160,12 @@
 %%CURL%%lib/ipsec/plugins/libstrongswan-curl.a
 %%CURL%%lib/ipsec/plugins/libstrongswan-curl.la
 %%CURL%%lib/ipsec/plugins/libstrongswan-curl.so
+%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.a
+%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.la
+%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.so
+%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.a
+%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.la
+%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.so
 %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.a
 %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.la
 %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.so
@@ -162,6 +191,7 @@
 @dirrm etc/ipsec.d/acerts
 @dirrm etc/ipsec.d/aacerts
 @dirrm etc/ipsec.d
+@exec mkdir -p %D/etc/ipsec.d
 @exec mkdir -p %D/etc/ipsec.d/reqs
 @exec mkdir -p %D/etc/ipsec.d/private
 @exec mkdir -p %D/etc/ipsec.d/ocspcerts


>Release-Note:
>Audit-Trail:

From: TAKATSU Tomonari <tota@FreeBSD.org>
To: bug-followup@FreeBSD.org, riaank@gmail.com, strongswan@nanoteq.com
Cc:  
Subject: Re: ports/173860: [maintainer update] security/strongswan 4.5.3 -> 5.0.1
Date: Sun, 30 Dec 2012 19:58:14 +0900

 --0015173fe706008b7104d20fc6b2
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi,
 
 I have modified the patch.
 Please confirm it.
 
 - Trim Makefile header
 - Convert to new options framework
 - Cleanup
 
 Thanks,
 
 -- 
 TAKATSU Tomonari
 
 --0015173fe706008b7104d20fc6b2
 Content-Type: application/octet-stream; name="strongswan-5.0.1.patch"
 Content-Disposition: attachment; filename="strongswan-5.0.1.patch"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hbc2eopt0
 
 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAzMDk2NTUp
 CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMSwyOSArMSwyMiBAQAotIyBOZXcgcG9y
 dHMgY29sbGVjdGlvbiBtYWtlZmlsZSBmb3I6CXN0cm9uZ3N3YW4KLSMgRGF0ZSBjcmVhdGVkOgkJ
 CQkzMCBNYXkgMjAxMAotIyBXaG9tOgkJCQkJPHJpYWFua0BnbWFpbC5jb20+Ci0jCisjIENyZWF0
 ZWQgYnk6IFJpYWFuIEtydWdlciA8cmlhYW5rQGdtYWlsLmNvbT4KICMgJEZyZWVCU0QkCiAKIFBP
 UlROQU1FPQlzdHJvbmdzd2FuCi1QT1JUVkVSU0lPTj0JNC41LjMKK1BPUlRWRVJTSU9OPQk1LjAu
 MQogQ0FURUdPUklFUz0Jc2VjdXJpdHkKIE1BU1RFUl9TSVRFUz0JaHR0cDovL2Rvd25sb2FkLnN0
 cm9uZ3N3YW4ub3JnLyBcCiAJCWh0dHA6Ly9kb3dubG9hZDIuc3Ryb25nc3dhbi5vcmcvCiAKLU1B
 SU5UQUlORVI9CXJpYWFua0BnbWFpbC5jb20KK01BSU5UQUlORVI9CXN0cm9uZ3N3YW5AbmFub3Rl
 cS5jb20KIENPTU1FTlQ9CU9wZW4gU291cmNlIElLRXYyIElQc2VjLWJhc2VkIFZQTiBzb2x1dGlv
 bgogCi1PUFRJT05TPQlTUUxJVEUJCSJFbmFibGUgU1FMaXRlIiBvZmYgXAotCQlNWVNRTAkJIkVu
 YWJsZSBNeVNRTCIgb2ZmIFwKLQkJQ1VSTAkJIkVuYWJsZSBDVVJMIHRvIGZldGNoIENSTC9PQ1NQ
 IiBvZmYgXAotCQlFQVBBS0EzR1BQMgkiRW5hYmxlIEVBUCBBS0Egd2l0aCAzZ3BwMiBiYWNrZW5k
 IiBvZmYgXAotCQlFQVBTSU1GSUxFCSJFbmFibGUgRUFQIFNJTSB3aXRoIGZpbGViYXNlZCBiYWNr
 ZW5kIiBvZmYKK0xJQl9ERVBFTkRTPQlleGVjaW5mbzoke1BPUlRTRElSfS9kZXZlbC9saWJleGVj
 aW5mbwogCi1VU0VfUkNfU1VCUj0Jc3Ryb25nc3dhbgogVVNFX0JaSVAyPQl5ZXMKK1VTRV9PUEVO
 U1NMPQl5ZXMKIFVTRV9BVVRPVE9PTFM9CWxpYnRvb2wKK1VTRV9SQ19TVUJSPQlzdHJvbmdzd2Fu
 LnNoCiBHTlVfQ09ORklHVVJFPQl5ZXMKLVVTRV9PUEVOU1NMPQl5ZXMKIFVTRV9MRENPTkZJRz0J
 eWVzCiAKIENPTkZJR1VSRV9BUkdTPQktLWVuYWJsZS1rZXJuZWwtcGZrZXkgXApAQCAtMzEsMTMg
 KzI0LDE0IEBACiAJCS0tZGlzYWJsZS1rZXJuZWwtbmV0bGluayAgXAogCQktLWRpc2FibGUtdG9v
 bHMgIFwKIAkJLS1kaXNhYmxlLXNjcmlwdHMgIFwKLQkJLS1kaXNhYmxlLXBsdXRvICBcCiAJCS0t
 ZGlzYWJsZS1nbXAgXAogCQktLWVuYWJsZS1vcGVuc3NsIFwKIAkJLS1lbmFibGUtZWFwLWlkZW50
 aXR5IFwKIAkJLS1lbmFibGUtZWFwLW1kNSBcCiAJCS0tZW5hYmxlLWVhcC10bHMgXAogCQktLWVu
 YWJsZS1lYXAtbXNjaGFwdjIgXAorCQktLWVuYWJsZS1lYXAtcGVhcCBcCisJCS0tZW5hYmxlLWVh
 cC10dGxzIFwKIAkJLS1lbmFibGUtbWQ0IFwKIAkJLS1lbmFibGUtYmxvd2Zpc2ggXAogCQktLWVu
 YWJsZS1hZGRyYmxvY2sgXApAQCAtNDYsMzcgKzQwLDYzIEBACiAJCS0td2l0aC1saWItcHJlZml4
 PSR7UFJFRklYfQogCiAjIE1hbiBwYWdlcyB3aXRoIGRlZmF1bHQgaW5zdGFsbAotTUFOMz0JYW55
 YWRkci4zIGF0b2FkZHIuMyBhdG9hc3IuMyBhdG91bC4zIGdvb2RtYXNrLjMgaW5pdGFkZHIuMyBc
 Ci0JaW5pdHN1Ym5ldC4zIHBvcnRvZi4zIHJhbmdldG9zdWJuZXQuMyBzYW1lYWRkci4zIHN1Ym5l
 dG9mLjMgXAotCXR0b2FkZHIuMyB0dG9kYXRhLjMgdHRvc2EuMyB0dG91bC4zCiBNQU41PQlpcHNl
 Yy5jb25mLjUgaXBzZWMuc2VjcmV0cy41IHN0cm9uZ3N3YW4uY29uZi41CiBNQU44PQlpcHNlYy44
 IF91cGRvd24uOCBfdXBkb3duX2VzcG1hcmsuOAogCi0uaW5jbHVkZSA8YnNkLnBvcnQucHJlLm1r
 PgorT1BUSU9OU19ERUZJTkU9CUNVUkwgRUFQQUtBM0dQUDIgRUFQU0lNRklMRSBJS0V2MSBMREFQ
 IE1ZU1FMIFNRTElURQorQ1VSTF9ERVNDPQlFbmFibGUgQ1VSTCB0byBmZXRjaCBDUkwvT0NTUAor
 RUFQQUtBM0dQUDJfREVTQz0JRW5hYmxlIEVBUCBBS0Egd2l0aCAzZ3BwMiBiYWNrZW5kCitFQVBT
 SU1GSUxFX0RFU0M9CUVuYWJsZSBFQVAgU0lNIHdpdGggZmlsZSBiYWNrZW5kCitJS0V2MV9ERVND
 PQlFbmFibGUgSUtFdjEgc3VwcG9ydCAoRXhwZXJpbWVudGFsKQogCi0jIFJlcXVpcmVzIEZyZWVC
 U0QgOCBhbmQgYWJvdmUgdG8gd29yawotLmlmICR7T1NWRVJTSU9OfSA8IDgwMDAwMAotSUdOT1JF
 PQkJcmVxdWlyZXMgYXQgbGVhc3QgRnJlZUJTRCA4LlgKLS5lbmRpZgorLmluY2x1ZGUgPGJzZC5w
 b3J0Lm9wdGlvbnMubWs+CiAKICMgRXh0cmEgb3B0aW9ucwotLmlmIGRlZmluZWQoV0lUSF9TUUxJ
 VEUpIHx8IGRlZmluZWQgKFdJVEhfTVlTUUwpCi1DT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWF0
 dHItc3FsCi1DT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLXNxbAotUExJU1RfU1VCKz0JU1FMPSIi
 CisuaWYgJHtQT1JUX09QVElPTlM6TUNVUkx9CitDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWN1
 cmwKK0xJQl9ERVBFTkRTKz0JY3VybDoke1BPUlRTRElSfS9mdHAvY3VybAorUExJU1RfU1VCKz0J
 Q1VSTD0iIgogLmVsc2UKLVBMSVNUX1NVQis9CVNRTD0iQGNvbW1lbnQgIgorUExJU1RfU1VCKz0J
 Q1VSTD0iQGNvbW1lbnQgIgogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfU1FMSVRFKQotQ09O
 RklHVVJFX0FSR1MrPQktLWVuYWJsZS1zcWxpdGUKLUxJQl9ERVBFTkRTICs9IHNxbGl0ZTMuODok
 e1BPUlRTRElSfS9kYXRhYmFzZXMvc3FsaXRlMwotUExJU1RfU1VCKz0JU1FMSVRFPSIiCisuaWYg
 JHtQT1JUX09QVElPTlM6TUVBUFNJTUZJTEV9CitDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWVh
 cC1zaW0gLS1lbmFibGUtZWFwLXNpbS1maWxlCitQTElTVF9TVUIrPQlFQVBTSU1GSUxFPSIiCiAu
 ZWxzZQotUExJU1RfU1VCKz0JU1FMSVRFPSJAY29tbWVudCAiCitQTElTVF9TVUIrPQlFQVBTSU1G
 SUxFPSJAY29tbWVudCAiCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lUSF9NWVNRTCkKKy5pZiAk
 e1BPUlRfT1BUSU9OUzpNRUFQQUtBM0dQUDJ9CitDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWVh
 cC1ha2EgLS1lbmFibGUtZWFwLWFrYS0zZ3BwMgorTElCX0RFUEVORFMrPQlnbXA6JHtQT1JUU0RJ
 Un0vbWF0aC9nbXAKK1BMSVNUX1NVQis9CUVBUEFLQTNHUFAyPSIiCisuZWxzZQorUExJU1RfU1VC
 Kz0JRUFQQUtBM0dQUDI9IkBjb21tZW50ICIKKy5lbmRpZgorCisuaWYgJHtQT1JUX09QVElPTlM6
 TUVBUFNJTUZJTEV9IHx8ICR7UE9SVF9PUFRJT05TOk1FQVBBS0EzR1BQMn0KK1BMSVNUX1NVQis9
 U0lNQUtBPSIiCisuZWxzZQorUExJU1RfU1VCKz1TSU1BS0E9IkBjb21tZW50ICIKKy5lbmRpZgor
 CisuaWYgJHtQT1JUX09QVElPTlM6TUlLRXYxfQorUExJU1RfU1VCKz0JSUtFdjE9IiIKKy5lbHNl
 CitDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1pa2V2MQorUExJU1RfU1VCKz0JSUtFdjE9IkBj
 b21tZW50ICIKKy5lbmRpZgorCisuaWYgJHtQT1JUX09QVElPTlM6TUxEQVB9CitVU0VfT1BFTkxE
 QVA9CXllcworQ09ORklHVVJFX0FSR1MrPQktLWVuYWJsZS1sZGFwCitQTElTVF9TVUIrPQlMREFQ
 PSIiCisuZWxzZQorUExJU1RfU1VCKz0JTERBUD0iQGNvbW1lbnQgIgorLmVuZGlmCisKKy5pZiAk
 e1BPUlRfT1BUSU9OUzpNTVlTUUx9CiBDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLW15c3FsCiBV
 U0VfTVlTUUw9CXllcwogUExJU1RfU1VCKz0JTVlTUUw9IiIKQEAgLTg0LDMwICsxMDQsMjYgQEAK
 IFBMSVNUX1NVQis9CU1ZU1FMPSJAY29tbWVudCAiCiAuZW5kaWYKIAotLmlmIGRlZmluZWQoV0lU
 SF9DVVJMKQotQ09ORklHVVJFX0FSR1MrPQktLWVuYWJsZS1jdXJsCi1MSUJfREVQRU5EUys9CWN1
 cmwuNjoke1BPUlRTRElSfS9mdHAvY3VybAotUExJU1RfU1VCKz0JQ1VSTD0iIgorLmlmICR7UE9S
 VF9PUFRJT05TOk1TUUxJVEV9CitDT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLXNxbGl0ZQorTElC
 X0RFUEVORFMrPQlzcWxpdGUzOiR7UE9SVFNESVJ9L2RhdGFiYXNlcy9zcWxpdGUzCitQTElTVF9T
 VUIrPQlTUUxJVEU9IiIKIC5lbHNlCi1QTElTVF9TVUIrPQlDVVJMPSJAY29tbWVudCAiCitQTElT
 VF9TVUIrPQlTUUxJVEU9IkBjb21tZW50ICIKIC5lbmRpZgogCi0uaWYgZGVmaW5lZChXSVRIX0VB
 UFNJTUZJTEUpCi1DT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWVhcC1zaW0KLUNPTkZJR1VSRV9B
 UkdTKz0JLS1lbmFibGUtZWFwLXNpbS1maWxlCi1QTElTVF9TVUIrPQlFQVBTSU1GSUxFPSIiCisu
 aWYgJHtQT1JUX09QVElPTlM6TU1ZU1FMfSB8fCAke1BPUlRfT1BUSU9OUzpNU1FMSVRFfQorQ09O
 RklHVVJFX0FSR1MrPQktLWVuYWJsZS1hdHRyLXNxbCAtLWVuYWJsZS1zcWwKK1BMSVNUX1NVQis9
 CVNRTD0iIgogLmVsc2UKLVBMSVNUX1NVQis9CUVBUFNJTUZJTEU9IkBjb21tZW50ICIKK1BMSVNU
 X1NVQis9CVNRTD0iQGNvbW1lbnQgIgogLmVuZGlmCiAKLS5pZiBkZWZpbmVkKFdJVEhfRUFQQUtB
 M0dQUDIpCi1DT05GSUdVUkVfQVJHUys9CS0tZW5hYmxlLWVhcC1ha2EKLUNPTkZJR1VSRV9BUkdT
 Kz0JLS1lbmFibGUtZWFwLWFrYS0zZ3BwMgotQ09ORklHVVJFX0FSR1MrPQktLWVuYWJsZS1nbXAK
 LUxJQl9ERVBFTkRTKz0JZ21wLjEwOiR7UE9SVFNESVJ9L21hdGgvZ21wCi1QTElTVF9TVUIrPQlF
 QVBBS0EzR1BQMj0iIgotLmVsc2UKLVBMSVNUX1NVQis9CUVBUEFLQTNHUFAyPSJAY29tbWVudCAi
 CisuaW5jbHVkZSA8YnNkLnBvcnQucHJlLm1rPgorCisjIFJlcXVpcmVzIEZyZWVCU0QgOCBhbmQg
 YWJvdmUgdG8gd29yaworLmlmICR7T1NWRVJTSU9OfSA8IDgwMDAwMAorSUdOT1JFPQkJcmVxdWly
 ZXMgYXQgbGVhc3QgRnJlZUJTRCA4LlgKIC5lbmRpZgogCiAuaW5jbHVkZSA8YnNkLnBvcnQucG9z
 dC5taz4KSW5kZXg6IGRpc3RpbmZvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGRpc3RpbmZvCShyZXZpc2lvbiAz
 MDk2NTUpCisrKyBkaXN0aW5mbwkod29ya2luZyBjb3B5KQpAQCAtMSwyICsxLDIgQEAKLVNIQTI1
 NiAoc3Ryb25nc3dhbi00LjUuMy50YXIuYnoyKSA9IGE1OWZhMGQ5ODIwZmIwNmEzYzg0OGY0NTM3
 YjkyNTZkMjA2NzI2NWFkMTBlMWIwMDdiNzlmM2IxNjI3OWYxZmYKLVNJWkUgKHN0cm9uZ3N3YW4t
 NC41LjMudGFyLmJ6MikgPSAzMjk5NTIyCitTSEEyNTYgKHN0cm9uZ3N3YW4tNS4wLjEudGFyLmJ6
 MikgPSAxYTRkZmYxOWVmNjlkMTVlMGI5MGIxZWE4MGJkMTgzMjM1YWM3M2I0ZWNkMTE0YWFiNThl
 ZDU0ZGUwZjVjM2I0CitTSVpFIChzdHJvbmdzd2FuLTUuMC4xLnRhci5iejIpID0gMzE0Njc3NgpJ
 bmRleDogZmlsZXMvcGF0Y2gtc3JjX19pcHNlY19faXBzZWMuaW4KPT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmls
 ZXMvcGF0Y2gtc3JjX19pcHNlY19faXBzZWMuaW4JKHJldmlzaW9uIDMwOTY1NSkKKysrIGZpbGVz
 L3BhdGNoLXNyY19faXBzZWNfX2lwc2VjLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xLDIwICswLDAg
 QEAKLWRpZmYgLXVyIHNyY29sZC9pcHNlYy9pcHNlYy5pbiBzcmMvaXBzZWMvaXBzZWMuaW4KLS0t
 LSBzcmNvbGQvaXBzZWMvaXBzZWMuaW4JMjAxMS0wOS0yMiAwODozOToyNi41ODk5NTIxMjQgKzAy
 MDAKLSsrKyBzcmMvaXBzZWMvaXBzZWMuaW4JMjAxMS0wOS0yMiAwODozOTo0NC42NDA5NDU0NzYg
 KzAyMDAKLUBAIC0xOSw2ICsxOSw3IEBACi0gZXhwb3J0IFBBVEgKLSAKLSAjIG5hbWUgYW5kIHZl
 cnNpb24gb2YgdGhlIGlwc2VjIGltcGxlbWVudGF0aW9uCi0rT1NfTkFNRT1gdW5hbWUgLXNgCi0g
 SVBTRUNfTkFNRT0iQElQU0VDX05BTUVAIgotIElQU0VDX1ZFUlNJT049IlVASVBTRUNfVkVSU0lP
 TkAvS2B1bmFtZSAtcmAiCi0gCi1AQCAtMzc4LDcgKzM3OSw3IEBACi0gCWZpCi0gCTs7Ci0gdmVy
 c2lvbnwtLXZlcnNpb24pCi0tCXByaW50ZiAiTGludXggJElQU0VDX05BTUUgJElQU0VDX1ZFUlNJ
 T05cbiIKLSsJcHJpbnRmICIkT1NfTkFNRSAkSVBTRUNfTkFNRSAkSVBTRUNfVkVSU0lPTlxuIgot
 IAlwcmludGYgIiRJUFNFQ19ESVNUUk9cbiIKLSAJcHJpbnRmICJTZWUgJ2lwc2VjIC0tY29weXJp
 Z2h0JyBmb3IgY29weXJpZ2h0IGluZm9ybWF0aW9uLlxuIgotIAlleGl0IDAKSW5kZXg6IGZpbGVz
 L3N0cm9uZ3N3YW4uaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZmlsZXMvc3Ryb25nc3dhbi5pbgkocmV2aXNp
 b24gMzA5NjU1KQorKysgZmlsZXMvc3Ryb25nc3dhbi5pbgkod29ya2luZyBjb3B5KQpAQCAtMSwz
 NyArMCwwIEBACi0jIS9iaW4vc2gKLQotIyAkRnJlZUJTRCQKLQotIyBQUk9WSURFOiBzdHJvbmdz
 d2FuCi0jIFJFUVVJUkU6IExPR0lOCi0jIEtFWVdPUkQ6IHNodXRkb3duCi0KLSMgQWRkIHRoZSBm
 b2xsb3dpbmcgbGluZXMgdG8gL2V0Yy9yYy5jb25mLmxvY2FsIG9yIC9ldGMvcmMuY29uZgotIyB0
 byBlbmFibGUgdGhpcyBzZXJ2aWNlOgotIwotIyBzdHJvbmdzd2FuX2VuYWJsZSAoYm9vbCk6ICAg
 U2V0IHRvIE5PIGJ5IGRlZmF1bHQuCi0jICAgICAgICAgICAgICAgU2V0IGl0IHRvIFlFUyB0byBl
 bmFibGUgc3Ryb25nc3dhbi4KLQotLiAvZXRjL3JjLnN1YnIKLQotbmFtZT0ic3Ryb25nc3dhbiIK
 LXJjdmFyPXN0cm9uZ3N3YW5fZW5hYmxlCi0KLWNvbW1hbmQ9IiUlUFJFRklYJSUvc2Jpbi9pcHNl
 YyIKLWV4dHJhX2NvbW1hbmRzPSJyZWxvYWQgc3RhdHVzYWxsIgotCi1sb2FkX3JjX2NvbmZpZyAk
 bmFtZQotCi1zdGFydF9jbWQ9InN0cm9uZ3N3YW5fY29tbWFuZCBzdGFydCIKLXN0b3BfY21kPSJz
 dHJvbmdzd2FuX2NvbW1hbmQgc3RvcCIKLXJlc3RhcnRfY21kPSJzdHJvbmdzd2FuX2NvbW1hbmQg
 cmVzdGFydCIKLXN0YXR1c19jbWQ9InN0cm9uZ3N3YW5fY29tbWFuZCBzdGF0dXMiCi1yZWxvYWRf
 Y21kPSJzdHJvbmdzd2FuX2NvbW1hbmQgcmVsb2FkIgotc3RhdHVzYWxsX2NtZD0ic3Ryb25nc3dh
 bl9jb21tYW5kIHN0YXR1c2FsbCIKLQotc3Ryb25nc3dhbl9jb21tYW5kKCkKLXsKLQkkY29tbWFu
 ZCAke3JjX2FyZ30KLX0KLQotcnVuX3JjX2NvbW1hbmQgIiQxIgpJbmRleDogZmlsZXMvc3Ryb25n
 c3dhbi5zaC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBmaWxlcy9zdHJvbmdzd2FuLnNoLmluCSh3b3JraW5n
 IGNvcHkpCisrKyBmaWxlcy9zdHJvbmdzd2FuLnNoLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xLDIz
 ICsxLDE3IEBACiAjIS9iaW4vc2gKLQorIyBTdGFydCBvciBzdG9wIHN0cm9uZ3N3YW4KICMgJEZy
 ZWVCU0QkCiAKICMgUFJPVklERTogc3Ryb25nc3dhbgotIyBSRVFVSVJFOiBMT0dJTgorIyBSRVFV
 SVJFOiBEQUVNT04KKyMgQkVGT1JFOiBMT0dJTgogIyBLRVlXT1JEOiBzaHV0ZG93bgogCi0jIEFk
 ZCB0aGUgZm9sbG93aW5nIGxpbmVzIHRvIC9ldGMvcmMuY29uZi5sb2NhbCBvciAvZXRjL3JjLmNv
 bmYKLSMgdG8gZW5hYmxlIHRoaXMgc2VydmljZToKLSMKLSMgc3Ryb25nc3dhbl9lbmFibGUgKGJv
 b2wpOiAgIFNldCB0byBOTyBieSBkZWZhdWx0LgotIyAgICAgICAgICAgICAgIFNldCBpdCB0byBZ
 RVMgdG8gZW5hYmxlIHN0cm9uZ3N3YW4uCi0KK2NvbW1hbmQ9IiUlUFJFRklYJSUvc2Jpbi9pcHNl
 YyIKIC4gL2V0Yy9yYy5zdWJyCiAKIG5hbWU9InN0cm9uZ3N3YW4iCi1yY3Zhcj1zdHJvbmdzd2Fu
 X2VuYWJsZQotCi1jb21tYW5kPSIlJVBSRUZJWCUlL3NiaW4vaXBzZWMiCityY3Zhcj1gc2V0X3Jj
 dmFyYAogZXh0cmFfY29tbWFuZHM9InJlbG9hZCBzdGF0dXNhbGwiCiAKIGxvYWRfcmNfY29uZmln
 ICRuYW1lCkBAIC0yOSw5ICsyMywxMSBAQAogcmVsb2FkX2NtZD0ic3Ryb25nc3dhbl9jb21tYW5k
 IHJlbG9hZCIKIHN0YXR1c2FsbF9jbWQ9InN0cm9uZ3N3YW5fY29tbWFuZCBzdGF0dXNhbGwiCiAK
 Kwogc3Ryb25nc3dhbl9jb21tYW5kKCkKIHsKIAkkY29tbWFuZCAke3JjX2FyZ30KIH0KIAogcnVu
 X3JjX2NvbW1hbmQgIiQxIgorCkluZGV4OiBwa2ctcGxpc3QKPT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGtnLXBs
 aXN0CShyZXZpc2lvbiAzMDk2NTUpCisrKyBwa2ctcGxpc3QJKHdvcmtpbmcgY29weSkKQEAgLTEy
 LDYgKzEyLDEwIEBACiBsaWIvaXBzZWMvbGlic3Ryb25nc3dhbi5sYQogbGliL2lwc2VjL2xpYnN0
 cm9uZ3N3YW4uc28KIGxpYi9pcHNlYy9saWJzdHJvbmdzd2FuLnNvLjAKK2xpYi9pcHNlYy9saWJ0
 bHMuYQorbGliL2lwc2VjL2xpYnRscy5sYQorbGliL2lwc2VjL2xpYnRscy5zbworbGliL2lwc2Vj
 L2xpYnRscy5zby4wCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWFkZHJibG9jay5h
 CiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWFkZHJibG9jay5sYQogbGliL2lwc2Vj
 L3BsdWdpbnMvbGlic3Ryb25nc3dhbi1hZGRyYmxvY2suc28KQEAgLTI0LDYgKzI4LDkgQEAKIGxp
 Yi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tYmxvd2Zpc2guYQogbGliL2lwc2VjL3BsdWdp
 bnMvbGlic3Ryb25nc3dhbi1ibG93ZmlzaC5sYQogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25n
 c3dhbi1ibG93ZmlzaC5zbworbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1jbWFjLmEK
 K2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tY21hYy5sYQorbGliL2lwc2VjL3BsdWdp
 bnMvbGlic3Ryb25nc3dhbi1jbWFjLnNvCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2Fu
 LWNvbnN0cmFpbnRzLmEKIGxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tY29uc3RyYWlu
 dHMubGEKIGxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tY29uc3RyYWludHMuc28KQEAg
 LTQyLDkgKzQ5LDE1IEBACiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWVhcC1tc2No
 YXB2Mi5hCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWVhcC1tc2NoYXB2Mi5sYQog
 bGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1lYXAtbXNjaGFwdjIuc28KK2xpYi9pcHNl
 Yy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLXBlYXAuYQorbGliL2lwc2VjL3BsdWdpbnMvbGli
 c3Ryb25nc3dhbi1lYXAtcGVhcC5sYQorbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1l
 YXAtcGVhcC5zbwogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1lYXAtdGxzLmEKIGxp
 Yi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLXRscy5sYQogbGliL2lwc2VjL3BsdWdp
 bnMvbGlic3Ryb25nc3dhbi1lYXAtdGxzLnNvCitsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdz
 d2FuLWVhcC10dGxzLmEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLXR0bHMu
 bGEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLXR0bHMuc28KIGxpYi9pcHNl
 Yy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZmlwcy1wcmYuYQogbGliL2lwc2VjL3BsdWdpbnMvbGli
 c3Ryb25nc3dhbi1maXBzLXByZi5sYQogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1m
 aXBzLXByZi5zbwpAQCAtNjMsNiArNzYsOSBAQAogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25n
 c3dhbi1tZDUuYQogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1tZDUubGEKIGxpYi9p
 cHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tbWQ1LnNvCitsaWIvaXBzZWMvcGx1Z2lucy9saWJz
 dHJvbmdzd2FuLW5vbmNlLmEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tbm9uY2Uu
 bGEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tbm9uY2Uuc28KIGxpYi9pcHNlYy9w
 bHVnaW5zL2xpYnN0cm9uZ3N3YW4tb3BlbnNzbC5hCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJv
 bmdzd2FuLW9wZW5zc2wubGEKIGxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tb3BlbnNz
 bC5zbwpAQCAtNzUsNiArOTEsOSBAQAogbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1w
 a2NzMS5hCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLXBrY3MxLmxhCiBsaWIvaXBz
 ZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLXBrY3MxLnNvCitsaWIvaXBzZWMvcGx1Z2lucy9saWJz
 dHJvbmdzd2FuLXBrY3M4LmEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tcGtjczgu
 bGEKK2xpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tcGtjczguc28KIGxpYi9pcHNlYy9w
 bHVnaW5zL2xpYnN0cm9uZ3N3YW4tcHVia2V5LmEKIGxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9u
 Z3N3YW4tcHVia2V5LmxhCiBsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLXB1YmtleS5z
 bwpAQCAtMTE5LDYgKzEzOCwxMCBAQAogbGliZXhlYy9pcHNlYy9zdHJva2UKIGxpYmV4ZWMvaXBz
 ZWMvd2hpdGVsaXN0CiBzYmluL2lwc2VjCislJVNJTUFLQSUlbGliL2lwc2VjL2xpYnNpbWFrYS5h
 CislJVNJTUFLQSUlbGliL2lwc2VjL2xpYnNpbWFrYS5sYQorJSVTSU1BS0ElJWxpYi9pcHNlYy9s
 aWJzaW1ha2Euc28KKyUlU0lNQUtBJSVsaWIvaXBzZWMvbGlic2ltYWthLnNvLjAKICUlRUFQQUtB
 M0dQUDIlJWxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLWFrYS5hCiAlJUVBUEFL
 QTNHUFAyJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWVhcC1ha2EubGEKICUlRUFQ
 QUtBM0dQUDIlJWxpYi9pcHNlYy9wbHVnaW5zL2xpYnN0cm9uZ3N3YW4tZWFwLWFrYS5zbwpAQCAt
 MTM3LDYgKzE2MCwxMiBAQAogJSVDVVJMJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2Fu
 LWN1cmwuYQogJSVDVVJMJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLWN1cmwubGEK
 ICUlQ1VSTCUlbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1jdXJsLnNvCislJUlLRXYx
 JSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLXhhdXRoLWdlbmVyaWMuYQorJSVJS0V2
 MSUlbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi14YXV0aC1nZW5lcmljLmxhCislJUlL
 RXYxJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2FuLXhhdXRoLWdlbmVyaWMuc28KKyUl
 TERBUCUlbGliL2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1sZGFwLmEKKyUlTERBUCUlbGli
 L2lwc2VjL3BsdWdpbnMvbGlic3Ryb25nc3dhbi1sZGFwLmxhCislJUxEQVAlJWxpYi9pcHNlYy9w
 bHVnaW5zL2xpYnN0cm9uZ3N3YW4tbGRhcC5zbwogJSVNWVNRTCUlbGliL2lwc2VjL3BsdWdpbnMv
 bGlic3Ryb25nc3dhbi1teXNxbC5hCiAlJU1ZU1FMJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJv
 bmdzd2FuLW15c3FsLmxhCiAlJU1ZU1FMJSVsaWIvaXBzZWMvcGx1Z2lucy9saWJzdHJvbmdzd2Fu
 LW15c3FsLnNvCkBAIC0xNjIsNiArMTkxLDcgQEAKIEBkaXJybSBldGMvaXBzZWMuZC9hY2VydHMK
 IEBkaXJybSBldGMvaXBzZWMuZC9hYWNlcnRzCiBAZGlycm0gZXRjL2lwc2VjLmQKK0BleGVjIG1r
 ZGlyIC1wICVEL2V0Yy9pcHNlYy5kCiBAZXhlYyBta2RpciAtcCAlRC9ldGMvaXBzZWMuZC9yZXFz
 CiBAZXhlYyBta2RpciAtcCAlRC9ldGMvaXBzZWMuZC9wcml2YXRlCiBAZXhlYyBta2RpciAtcCAl
 RC9ldGMvaXBzZWMuZC9vY3NwY2VydHMK
 --0015173fe706008b7104d20fc6b2--

From: strongswan <strongswan@Nanoteq.com>
To: TAKATSU Tomonari <tota@FreeBSD.org>, "bug-followup@FreeBSD.org"
	<bug-followup@FreeBSD.org>
Cc: "riaank@gmail.com" <riaank@gmail.com>
Subject: RE: ports/173860: [maintainer update] security/strongswan 4.5.3 ->
 5.0.1
Date: Mon, 7 Jan 2013 13:32:52 +0200

 Hi,
 
 I checked the patch and everything seems in order.
 I can confirm that it does work.
 
 Thank You
 
 
 > -----Original Message-----
 > From: takatsu.tomonari@gmail.com [mailto:takatsu.tomonari@gmail.com]
 > On Behalf Of TAKATSU Tomonari
 > Sent: 30 December 2012 12:58 PM
 > To: bug-followup@FreeBSD.org; riaank@gmail.com; strongswan
 > Subject: Re: ports/173860: [maintainer update] security/strongswan 4.5.3 =
 ->
 > 5.0.1
 >
 > Hi,
 >
 > I have modified the patch.
 > Please confirm it.
 >
 > - Trim Makefile header
 > - Convert to new options framework
 > - Cleanup
 >
 > Thanks,
 >
 > --
 > TAKATSU Tomonari
 
 Important Notice:
 
 This e-mail and its contents are subject to the Nanoteq (Pty) Ltd e-mail le=
 gal notice available at:
 http://www.nanoteq.com/AboutUs/EmailDisclaimer.aspx
 
 
Responsible-Changed-From-To: freebsd-ports-bugs->tota 
Responsible-Changed-By: tota 
Responsible-Changed-When: Mon Jan 7 12:08:41 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173860 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173860: commit references a PR
Date: Mon,  7 Jan 2013 12:11:23 +0000 (UTC)

 Author: tota
 Date: Mon Jan  7 12:11:14 2013
 New Revision: 310039
 URL: http://svnweb.freebsd.org/changeset/ports/310039
 
 Log:
   - Update to 5.0.1
   - Change maintainer address
   - Trim Makefile header
   - Convert to new options framework
   - Cleanup
   
   PR:		ports/173860 (based on)
   Submitted by:	Riaan Kruger (maintainer)
 
 Added:
   head/security/strongswan/files/strongswan.sh.in
      - copied, changed from r309655, head/security/strongswan/files/strongswan.in
 Deleted:
   head/security/strongswan/files/patch-src__ipsec__ipsec.in
   head/security/strongswan/files/strongswan.in
 Modified:
   head/security/strongswan/Makefile
   head/security/strongswan/distinfo
   head/security/strongswan/pkg-plist
 
 Modified: head/security/strongswan/Makefile
 ==============================================================================
 --- head/security/strongswan/Makefile	Mon Jan  7 11:25:41 2013	(r310038)
 +++ head/security/strongswan/Makefile	Mon Jan  7 12:11:14 2013	(r310039)
 @@ -1,29 +1,22 @@
 -# New ports collection makefile for:	strongswan
 -# Date created:				30 May 2010
 -# Whom:					<riaank@gmail.com>
 -#
 +# Created by: Riaan Kruger <riaank@gmail.com>
  # $FreeBSD$
  
  PORTNAME=	strongswan
 -PORTVERSION=	4.5.3
 +PORTVERSION=	5.0.1
  CATEGORIES=	security
  MASTER_SITES=	http://download.strongswan.org/ \
  		http://download2.strongswan.org/
  
 -MAINTAINER=	riaank@gmail.com
 +MAINTAINER=	strongswan@nanoteq.com
  COMMENT=	Open Source IKEv2 IPsec-based VPN solution
  
 -OPTIONS=	SQLITE		"Enable SQLite" off \
 -		MYSQL		"Enable MySQL" off \
 -		CURL		"Enable CURL to fetch CRL/OCSP" off \
 -		EAPAKA3GPP2	"Enable EAP AKA with 3gpp2 backend" off \
 -		EAPSIMFILE	"Enable EAP SIM with filebased backend" off
 +LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
  
 -USE_RC_SUBR=	strongswan
  USE_BZIP2=	yes
 +USE_OPENSSL=	yes
  USE_AUTOTOOLS=	libtool
 +USE_RC_SUBR=	strongswan.sh
  GNU_CONFIGURE=	yes
 -USE_OPENSSL=	yes
  USE_LDCONFIG=	yes
  
  CONFIGURE_ARGS=	--enable-kernel-pfkey \
 @@ -31,13 +24,14 @@ CONFIGURE_ARGS=	--enable-kernel-pfkey \
  		--disable-kernel-netlink  \
  		--disable-tools  \
  		--disable-scripts  \
 -		--disable-pluto  \
  		--disable-gmp \
  		--enable-openssl \
  		--enable-eap-identity \
  		--enable-eap-md5 \
  		--enable-eap-tls \
  		--enable-eap-mschapv2 \
 +		--enable-eap-peap \
 +		--enable-eap-ttls \
  		--enable-md4 \
  		--enable-blowfish \
  		--enable-addrblock \
 @@ -46,37 +40,63 @@ CONFIGURE_ARGS=	--enable-kernel-pfkey \
  		--with-lib-prefix=${PREFIX}
  
  # Man pages with default install
 -MAN3=	anyaddr.3 atoaddr.3 atoasr.3 atoul.3 goodmask.3 initaddr.3 \
 -	initsubnet.3 portof.3 rangetosubnet.3 sameaddr.3 subnetof.3 \
 -	ttoaddr.3 ttodata.3 ttosa.3 ttoul.3
  MAN5=	ipsec.conf.5 ipsec.secrets.5 strongswan.conf.5
  MAN8=	ipsec.8 _updown.8 _updown_espmark.8
  
 -.include <bsd.port.pre.mk>
 +OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPSIMFILE IKEv1 LDAP MYSQL SQLITE
 +CURL_DESC=	Enable CURL to fetch CRL/OCSP
 +EAPAKA3GPP2_DESC=	Enable EAP AKA with 3gpp2 backend
 +EAPSIMFILE_DESC=	Enable EAP SIM with file backend
 +IKEv1_DESC=	Enable IKEv1 support (Experimental)
  
 -# Requires FreeBSD 8 and above to work
 -.if ${OSVERSION} < 800000
 -IGNORE=		requires at least FreeBSD 8.X
 -.endif
 +.include <bsd.port.options.mk>
  
  # Extra options
 -.if defined(WITH_SQLITE) || defined (WITH_MYSQL)
 -CONFIGURE_ARGS+=	--enable-attr-sql
 -CONFIGURE_ARGS+=	--enable-sql
 -PLIST_SUB+=	SQL=""
 +.if ${PORT_OPTIONS:MCURL}
 +CONFIGURE_ARGS+=	--enable-curl
 +LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 +PLIST_SUB+=	CURL=""
  .else
 -PLIST_SUB+=	SQL="@comment "
 +PLIST_SUB+=	CURL="@comment "
  .endif
  
 -.if defined(WITH_SQLITE)
 -CONFIGURE_ARGS+=	--enable-sqlite
 -LIB_DEPENDS += sqlite3.8:${PORTSDIR}/databases/sqlite3
 -PLIST_SUB+=	SQLITE=""
 +.if ${PORT_OPTIONS:MEAPSIMFILE}
 +CONFIGURE_ARGS+=	--enable-eap-sim --enable-eap-sim-file
 +PLIST_SUB+=	EAPSIMFILE=""
  .else
 -PLIST_SUB+=	SQLITE="@comment "
 +PLIST_SUB+=	EAPSIMFILE="@comment "
 +.endif
 +
 +.if ${PORT_OPTIONS:MEAPAKA3GPP2}
 +CONFIGURE_ARGS+=	--enable-eap-aka --enable-eap-aka-3gpp2
 +LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 +PLIST_SUB+=	EAPAKA3GPP2=""
 +.else
 +PLIST_SUB+=	EAPAKA3GPP2="@comment "
 +.endif
 +
 +.if ${PORT_OPTIONS:MEAPSIMFILE} || ${PORT_OPTIONS:MEAPAKA3GPP2}
 +PLIST_SUB+=SIMAKA=""
 +.else
 +PLIST_SUB+=SIMAKA="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 +.if ${PORT_OPTIONS:MIKEv1}
 +PLIST_SUB+=	IKEv1=""
 +.else
 +CONFIGURE_ARGS+=	--disable-ikev1
 +PLIST_SUB+=	IKEv1="@comment "
 +.endif
 +
 +.if ${PORT_OPTIONS:MLDAP}
 +USE_OPENLDAP=	yes
 +CONFIGURE_ARGS+=	--enable-ldap
 +PLIST_SUB+=	LDAP=""
 +.else
 +PLIST_SUB+=	LDAP="@comment "
 +.endif
 +
 +.if ${PORT_OPTIONS:MMYSQL}
  CONFIGURE_ARGS+=	--enable-mysql
  USE_MYSQL=	yes
  PLIST_SUB+=	MYSQL=""
 @@ -84,30 +104,26 @@ PLIST_SUB+=	MYSQL=""
  PLIST_SUB+=	MYSQL="@comment "
  .endif
  
 -.if defined(WITH_CURL)
 -CONFIGURE_ARGS+=	--enable-curl
 -LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 -PLIST_SUB+=	CURL=""
 +.if ${PORT_OPTIONS:MSQLITE}
 +CONFIGURE_ARGS+=	--enable-sqlite
 +LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 +PLIST_SUB+=	SQLITE=""
  .else
 -PLIST_SUB+=	CURL="@comment "
 +PLIST_SUB+=	SQLITE="@comment "
  .endif
  
 -.if defined(WITH_EAPSIMFILE)
 -CONFIGURE_ARGS+=	--enable-eap-sim
 -CONFIGURE_ARGS+=	--enable-eap-sim-file
 -PLIST_SUB+=	EAPSIMFILE=""
 +.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE}
 +CONFIGURE_ARGS+=	--enable-attr-sql --enable-sql
 +PLIST_SUB+=	SQL=""
  .else
 -PLIST_SUB+=	EAPSIMFILE="@comment "
 +PLIST_SUB+=	SQL="@comment "
  .endif
  
 -.if defined(WITH_EAPAKA3GPP2)
 -CONFIGURE_ARGS+=	--enable-eap-aka
 -CONFIGURE_ARGS+=	--enable-eap-aka-3gpp2
 -CONFIGURE_ARGS+=	--enable-gmp
 -LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 -PLIST_SUB+=	EAPAKA3GPP2=""
 -.else
 -PLIST_SUB+=	EAPAKA3GPP2="@comment "
 +.include <bsd.port.pre.mk>
 +
 +# Requires FreeBSD 8 and above to work
 +.if ${OSVERSION} < 800000
 +IGNORE=		requires at least FreeBSD 8.X
  .endif
  
  .include <bsd.port.post.mk>
 
 Modified: head/security/strongswan/distinfo
 ==============================================================================
 --- head/security/strongswan/distinfo	Mon Jan  7 11:25:41 2013	(r310038)
 +++ head/security/strongswan/distinfo	Mon Jan  7 12:11:14 2013	(r310039)
 @@ -1,2 +1,2 @@
 -SHA256 (strongswan-4.5.3.tar.bz2) = a59fa0d9820fb06a3c848f4537b9256d2067265ad10e1b007b79f3b16279f1ff
 -SIZE (strongswan-4.5.3.tar.bz2) = 3299522
 +SHA256 (strongswan-5.0.1.tar.bz2) = 1a4dff19ef69d15e0b90b1ea80bd183235ac73b4ecd114aab58ed54de0f5c3b4
 +SIZE (strongswan-5.0.1.tar.bz2) = 3146776
 
 Copied and modified: head/security/strongswan/files/strongswan.sh.in (from r309655, head/security/strongswan/files/strongswan.in)
 ==============================================================================
 --- head/security/strongswan/files/strongswan.in	Sun Dec 30 08:11:08 2012	(r309655, copy source)
 +++ head/security/strongswan/files/strongswan.sh.in	Mon Jan  7 12:11:14 2013	(r310039)
 @@ -1,23 +1,17 @@
  #!/bin/sh
 -
 +# Start or stop strongswan
  # $FreeBSD$
  
  # PROVIDE: strongswan
 -# REQUIRE: LOGIN
 +# REQUIRE: DAEMON
 +# BEFORE: LOGIN
  # KEYWORD: shutdown
  
 -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 -# to enable this service:
 -#
 -# strongswan_enable (bool):   Set to NO by default.
 -#               Set it to YES to enable strongswan.
 -
 +command="%%PREFIX%%/sbin/ipsec"
  . /etc/rc.subr
  
  name="strongswan"
 -rcvar=strongswan_enable
 -
 -command="%%PREFIX%%/sbin/ipsec"
 +rcvar=`set_rcvar`
  extra_commands="reload statusall"
  
  load_rc_config $name
 @@ -29,9 +23,11 @@ status_cmd="strongswan_command status"
  reload_cmd="strongswan_command reload"
  statusall_cmd="strongswan_command statusall"
  
 +
  strongswan_command()
  {
  	$command ${rc_arg}
  }
  
  run_rc_command "$1"
 +
 
 Modified: head/security/strongswan/pkg-plist
 ==============================================================================
 --- head/security/strongswan/pkg-plist	Mon Jan  7 11:25:41 2013	(r310038)
 +++ head/security/strongswan/pkg-plist	Mon Jan  7 12:11:14 2013	(r310039)
 @@ -12,6 +12,10 @@ lib/ipsec/libstrongswan.a
  lib/ipsec/libstrongswan.la
  lib/ipsec/libstrongswan.so
  lib/ipsec/libstrongswan.so.0
 +lib/ipsec/libtls.a
 +lib/ipsec/libtls.la
 +lib/ipsec/libtls.so
 +lib/ipsec/libtls.so.0
  lib/ipsec/plugins/libstrongswan-addrblock.a
  lib/ipsec/plugins/libstrongswan-addrblock.la
  lib/ipsec/plugins/libstrongswan-addrblock.so
 @@ -24,6 +28,9 @@ lib/ipsec/plugins/libstrongswan-attr.so
  lib/ipsec/plugins/libstrongswan-blowfish.a
  lib/ipsec/plugins/libstrongswan-blowfish.la
  lib/ipsec/plugins/libstrongswan-blowfish.so
 +lib/ipsec/plugins/libstrongswan-cmac.a
 +lib/ipsec/plugins/libstrongswan-cmac.la
 +lib/ipsec/plugins/libstrongswan-cmac.so
  lib/ipsec/plugins/libstrongswan-constraints.a
  lib/ipsec/plugins/libstrongswan-constraints.la
  lib/ipsec/plugins/libstrongswan-constraints.so
 @@ -42,9 +49,15 @@ lib/ipsec/plugins/libstrongswan-eap-md5.
  lib/ipsec/plugins/libstrongswan-eap-mschapv2.a
  lib/ipsec/plugins/libstrongswan-eap-mschapv2.la
  lib/ipsec/plugins/libstrongswan-eap-mschapv2.so
 +lib/ipsec/plugins/libstrongswan-eap-peap.a
 +lib/ipsec/plugins/libstrongswan-eap-peap.la
 +lib/ipsec/plugins/libstrongswan-eap-peap.so
  lib/ipsec/plugins/libstrongswan-eap-tls.a
  lib/ipsec/plugins/libstrongswan-eap-tls.la
  lib/ipsec/plugins/libstrongswan-eap-tls.so
 +lib/ipsec/plugins/libstrongswan-eap-ttls.a
 +lib/ipsec/plugins/libstrongswan-eap-ttls.la
 +lib/ipsec/plugins/libstrongswan-eap-ttls.so
  lib/ipsec/plugins/libstrongswan-fips-prf.a
  lib/ipsec/plugins/libstrongswan-fips-prf.la
  lib/ipsec/plugins/libstrongswan-fips-prf.so
 @@ -63,6 +76,9 @@ lib/ipsec/plugins/libstrongswan-md4.so
  lib/ipsec/plugins/libstrongswan-md5.a
  lib/ipsec/plugins/libstrongswan-md5.la
  lib/ipsec/plugins/libstrongswan-md5.so
 +lib/ipsec/plugins/libstrongswan-nonce.a
 +lib/ipsec/plugins/libstrongswan-nonce.la
 +lib/ipsec/plugins/libstrongswan-nonce.so
  lib/ipsec/plugins/libstrongswan-openssl.a
  lib/ipsec/plugins/libstrongswan-openssl.la
  lib/ipsec/plugins/libstrongswan-openssl.so
 @@ -75,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-pkcs8.a
 +lib/ipsec/plugins/libstrongswan-pkcs8.la
 +lib/ipsec/plugins/libstrongswan-pkcs8.so
  lib/ipsec/plugins/libstrongswan-pubkey.a
  lib/ipsec/plugins/libstrongswan-pubkey.la
  lib/ipsec/plugins/libstrongswan-pubkey.so
 @@ -119,6 +138,10 @@ libexec/ipsec/starter
  libexec/ipsec/stroke
  libexec/ipsec/whitelist
  sbin/ipsec
 +%%SIMAKA%%lib/ipsec/libsimaka.a
 +%%SIMAKA%%lib/ipsec/libsimaka.la
 +%%SIMAKA%%lib/ipsec/libsimaka.so
 +%%SIMAKA%%lib/ipsec/libsimaka.so.0
  %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.a
  %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.la
  %%EAPAKA3GPP2%%lib/ipsec/plugins/libstrongswan-eap-aka.so
 @@ -137,6 +160,12 @@ sbin/ipsec
  %%CURL%%lib/ipsec/plugins/libstrongswan-curl.a
  %%CURL%%lib/ipsec/plugins/libstrongswan-curl.la
  %%CURL%%lib/ipsec/plugins/libstrongswan-curl.so
 +%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.a
 +%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.la
 +%%IKEv1%%lib/ipsec/plugins/libstrongswan-xauth-generic.so
 +%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.a
 +%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.la
 +%%LDAP%%lib/ipsec/plugins/libstrongswan-ldap.so
  %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.a
  %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.la
  %%MYSQL%%lib/ipsec/plugins/libstrongswan-mysql.so
 @@ -162,6 +191,7 @@ sbin/ipsec
  @dirrm etc/ipsec.d/acerts
  @dirrm etc/ipsec.d/aacerts
  @dirrm etc/ipsec.d
 +@exec mkdir -p %D/etc/ipsec.d
  @exec mkdir -p %D/etc/ipsec.d/reqs
  @exec mkdir -p %D/etc/ipsec.d/private
  @exec mkdir -p %D/etc/ipsec.d/ocspcerts
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: tota 
State-Changed-When: Mon Jan 7 21:04:29 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173860 
>Unformatted:
