Changing init script to "use logger" instead of "need logger" - fixing bug #476514 .

Adding use flags for more plugins, fixing bugs #481740 and #504942 .

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x15AE484C

5 files changed, 107 insertions, 17 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 2b46856c3282..41101882ef5b 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.144 2014/07/10 08:16:13 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.145 2014/09/13 14:17:42 gurligebis Exp $
+
+*strongswan-5.2.0-r1 (13 Sep 2014)
+
+  13 Sep 2014; <gurligebis@gentoo.org> -strongswan-5.2.0.ebuild,
+  +strongswan-5.2.0-r1.ebuild, files/ipsec, metadata.xml:
+  Changing init script to "use logger" instead of "need logger" - fixing bug
+  #476514 .
+  Adding use flags for more plugins, fixing bugs #481740 and #504942 .
 
 *strongswan-5.2.0 (10 Jul 2014)
 
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index e31a551207bb..a5f9222e5865 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ipsec 445 SHA256 5ba492de6d612d7def1cb7ceacadf8397e50f8433b91c4f2f09bf216eed34da6 SHA512 fb786be3c356b22d32b86132d11ebc2eca34414aa0961dc66374697c4cf0fc2fe57e8638b3bbd247f1a0fbf5539bd496200d4c70633a855a88591cf113a69754 WHIRLPOOL d90910b657330b84ab3e89456a1fdc49d8bd6bbae377e883cdd073cdf8e6e44f6f45e7118ac76874fa950ad7245fe2a89876ac6a8ffb3d6e4f6cf75bed39b807
+AUX ipsec 450 SHA256 c579fb596ef504b0707db0bc54a986b5f7e88d021e102478d26867434c8f8ecf SHA512 8a1b0610d4d7f1772cfa85bac4819946f3462ee063b4b1d47023a81fd650e6183a71b9a79d098d5394765cb9a6deedb91942885501af916c27fad2886226e5b9 WHIRLPOOL eb7ca1ad4f7db0bf1c41100bcacbf43235159a26be0744141531db112408875ecc93d59845f2585c23b83cc81a39d23e8374026609e7442eef6adff217cc3592
 DIST strongswan-5.1.3.tar.bz2 3807212 SHA256 84e46d5ce801e1b874e2bfba8d21dbd78b432e23b7fb1f4f2d637359e7a183a8 SHA512 05f4afbf778de54c593692a8117a5fae05c0539cdb7545bc53657deb32d09bec7e0aef07d509dc682af15d57adf569242715447bc1a87785c1f80a21076cb8cb WHIRLPOOL f808f47879504c09364ad326e404555f60754980f728121de80d41645e06bf740b2814eb39ae8a3d9239b83de68978d3281ac6f2fdfd68d1c14ac3447c9f9c6b
 DIST strongswan-5.2.0.tar.bz2 4063992 SHA256 b00c30bd2e60ff2e5fc85f54bbad54fe246585812fdf212dbe777a5258da26ce SHA512 6d92d367c96b717edce9dd2cfdfcb17c3ffadebd54ae270c0a29d8c0b9251625676f02d7a93c5fe7b42cb1822d5e532053641c4d37de443c3d560912807dfcc0 WHIRLPOOL 138aadbacd547aa9cf3c5ce10a0a192dd3c00fa44675e0859e5bff18af744b8183751d18ca99b78abc4256c697a75d9280a90c2243ca72461fe054315704653b
 EBUILD strongswan-5.1.3.ebuild 8500 SHA256 03b24aa4875a3da05b4442c44f31ebd8482647b31cf0a4f3a2ac6e697c901b29 SHA512 a7339bcb0635c223173a7982111d58bf8f0da9cf245e57f23ecc91bcddb9c0c2b31d7792778f4d48992171f95063eb2e50c5a1627019215f5e9a8ace120a1947 WHIRLPOOL fb1d2e49682bbbb7f7313a540fe7205ef6f2e7ae8ad886e42b58e3538eebd2ce1213a54be0e94cd8fb696bda29a26a66c126c24fc69f5d91877efa6cd9e9914e
-EBUILD strongswan-5.2.0.ebuild 8511 SHA256 411688c4b12c2a94805843ce60b5263130665c482bf2835d6f061364a83b69e9 SHA512 b033cd60a1b4eecf1570aa73a77a1add36119ae0875299fb2939ac38c904f1a5fac4f25c23c9ffa58e734a2e45a658bd1685ab99a4c9b7acb44f64ee3b212666 WHIRLPOOL 8388f8fd6058622e7575e40b893cf7129cb65edd4696df54b50547c873cfacc7fd7d4d6508438bca4a8318093d4fe444c96af0e003c4303a678569b8b19edd33
-MISC ChangeLog 24427 SHA256 e5c99bacb6c1ae8add5dac25b73dd9b3b684819c44a887d4dd2351ad8445adf5 SHA512 315aed49130dd457f34091f3ca076d9d85133b07e07ce830f96d4f64fcf80fb84625e611aecc333a569a4db2ba10c42ac36f5e7a887a296baef38bead062046c WHIRLPOOL 953a92e888fd30738da6ac632af0ceb7bf3d341e2332c4184be34ab23a37f09c6930c2a57827cdba8f0be8fc97fe2b81bb95e00a31938917549799c2f2dcc986
-MISC metadata.xml 2430 SHA256 385af43c591467507befc7c6b17042e355d377aec7c511fee2a50399ee41af87 SHA512 04e0fc93db680159b8a090398948a80b8720c9955267919434c3703fe3a8b404fef0d51600a5a21e58c7d0bfe94af774effd6930de1dba0d1851eac33890dd4a WHIRLPOOL bbba382932dcfe239e99ba767aca1a3dfadd312f70072041b089d6d736a46c27c4d535d93551d851fffb74a920a9a39bb8236b6ddf573cbddee5d55c2db8e09d
+EBUILD strongswan-5.2.0-r1.ebuild 9311 SHA256 bf6efeef8e303bb3e2a2eaf3078b082d0aab2f97a629b6d6fdba9d4ad35accff SHA512 af437f5486ba267a0cb8627e86524327c556a63032d29d19c05fbd5ed564cf4111afde16980077f7555bd9f6ba9885b0c33d1fd9d9cebf73a71b4d0372bc784e WHIRLPOOL 3be48cc605d75b7735abf5b6c6ab6e53378c27e5869992df156714a817f5faba215202905ab7c9f3364e5ed8a1dbfe5472e69bfb59cbfbcb1dcfb9046f411a1a
+MISC ChangeLog 24747 SHA256 1d1ed61ed4cb9e37c54647f699a27651c7d84345936681ec9d114aa8ae46d8c5 SHA512 fc3c55bb3c54a6c50c6d6665007eff75cfe3cf430c9492b97db84870f0ae7e2c97e6d7f49527cfb6a734e8a40c5cfa3a2beb59a41f929ccda8f72497a5795fb6 WHIRLPOOL c5e3ce4c43f4932b3f7a037c74fcee5b5e69e399f4719af5e2f875b8294ab5cc962d8fd8822469494b76a3b97d020908dfdd0fa5b8975c07262ffd5bc5949171
+MISC metadata.xml 4082 SHA256 c84116341eb57e8143b6aefd61d3aae6a9273ea292f3e8b10ac09f047fd09f17 SHA512 4981169950655d37b1975f77ea4aa4ce7be17a6c533605f635a8a0fe18a19fbe7df59a22db6c52bfbeddc43b94da91b03be3520408c044da5cbb3518c7db31fe WHIRLPOOL db0fe76527e8a9d6d67708735934cede289adb6d6bbff57b06bea2efbc29d4484342d0dec8720d09e33c99da1c8b41bba7f65be5a52efca8d5f3d124a93cbe46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlO+S84ACgkQsR7PQhRXYElqsQCff/iYMzjJIX/kTiIA16RRDIAM
-CRQAnReA0YOZeGAgciZSx7WZI/xK/0zQ
-=GIT3
+iEYEAREIAAYFAlQUUgcACgkQsR7PQhRXYElbNQCdGTvqnH3dY/3YIwa25Pk8p3Kl
+GwkAnR1EO+/T2YIE9lU754RQTKL2gl7I
+=iKm8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/strongswan/files/ipsec b/net-misc/strongswan/files/ipsec
index 42cde4f38d8b..d8892f30b631 100644
--- a/net-misc/strongswan/files/ipsec
+++ b/net-misc/strongswan/files/ipsec
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need logger net
+	need net
+	use logger
 }
 
 start() {
diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml
index 810e800db32c..3cad53d6d299 100644
--- a/net-misc/strongswan/metadata.xml
+++ b/net-misc/strongswan/metadata.xml
@@ -51,6 +51,57 @@
       22-24(4.4+)
       <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".
     </flag>
+    <flag name="pkcs11">
+      Enable pkcs11 support.
+    </flag>
+    <flag name="strongswan_plugins_led">
+      Enable support for the led plugin.
+    </flag>
+    <flag name="strongswan_plugins_lookip">
+      Enable support for the lookip plugin.
+    </flag>
+    <flag name="strongswan_plugins_systime-fix">
+      Enable support for the systime-fix plugin.
+    </flag>
+    <flag name="strongswan_plugins_unity">
+      Enable support for the unity plugin.
+    </flag>
+    <flag name="strongswan_plugins_vici">
+      Enable support for the vici plugin.
+    </flag>
+    <flag name="strongswan_plugins_blowfish">
+      Enable support for the blowfish plugin.
+    </flag>
+    <flag name="strongswan_plugins_ccm">
+      Enable support for the ccm plugin.
+    </flag>
+    <flag name="strongswan_plugins_ctr">
+      Enable support for the ctr plugin.
+    </flag>
+    <flag name="strongswan_plugins_gcm">
+      Enable support for the gcm plugin.
+    </flag>
+    <flag name="strongswan_plugins_ha">
+      Enable support for the ha plugin.
+    </flag>
+    <flag name="strongswan_plugins_ipseckey">
+      Enable support for the ipseckey plugin.
+    </flag>
+    <flag name="strongswan_plugins_ntru">
+      Enable support for the ntru plugin.
+    </flag>
+    <flag name="strongswan_plugins_padlock">
+      Enable support for the padlock plugin.
+    </flag>
+    <flag name="strongswan_plugins_rdrand">
+      Enable support for the rdrand plugin.
+    </flag>
+    <flag name="strongswan_plugins_unbound">
+      Enable support for the unbound plugin.
+    </flag>
+    <flag name="strongswan_plugins_whitelist">
+      Enable support for the whitelist plugin.
+    </flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
diff --git a/net-misc/strongswan/strongswan-5.2.0.ebuild b/net-misc/strongswan/strongswan-5.2.0-r1.ebuild
index 9217a356a6cc..116629254ba5 100644
--- a/net-misc/strongswan/strongswan-5.2.0.ebuild
+++ b/net-misc/strongswan/strongswan-5.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.2.0.ebuild,v 1.1 2014/07/10 08:16:13 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.2.0-r1.ebuild,v 1.1 2014/09/13 14:17:42 gurligebis Exp $
 
 EAPI=5
 inherit eutils linux-info systemd user
@@ -12,7 +12,17 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt ldap mysql networkmanager +non-root +openssl sqlite pam"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
 
 COMMON_DEPEND="!net-misc/openswan
 	>=dev-libs/gmp-4.1.5
@@ -24,7 +34,8 @@ COMMON_DEPEND="!net-misc/openswan
 	mysql? ( virtual/mysql )
 	sqlite? ( >=dev-db/sqlite-3.3.1 )
 	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )"
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound )"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	sys-kernel/linux-headers"
@@ -110,15 +121,31 @@ src_configure() {
 	else
 		myconf="${myconf} --disable-eap-gtc"
 	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
 	econf \
 		--disable-static \
 		--enable-ikev1 \
 		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
 		$(use_with caps capabilities libcap) \
 		$(use_enable curl) \
 		$(use_enable constraints) \
 		$(use_enable ldap) \
 		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
 		$(use_enable eap eap-sim) \
 		$(use_enable eap eap-sim-file) \
 		$(use_enable eap eap-simaka-sql) \
@@ -128,16 +155,19 @@ src_configure() {
 		$(use_enable eap eap-md5) \
 		$(use_enable eap eap-aka) \
 		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
 		$(use_enable eap eap-mschapv2) \
 		$(use_enable eap eap-radius) \
 		$(use_enable eap eap-tls) \
-		$(use_enable openssl) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable farp) \
 		$(use_enable gcrypt) \
 		$(use_enable mysql) \
-		$(use_enable sqlite) \
-		$(use_enable dhcp) \
-		$(use_enable farp) \
 		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
 		"$(systemd_with_unitdir)" \
 		${myconf}
 }