Bumping to 4.5.2 and removing old versions and unused patches.

(Portage version: 2.2.0_alpha30/cvs/Linux i686)

5 files changed, 23 insertions, 278 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 17d16331958c..c023e9884adc 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.87 2011/02/12 16:08:59 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.88 2011/05/19 08:14:20 gurligebis Exp $
+
+*strongswan-4.5.2 (19 May 2011)
+
+  19 May 2011; <gurligebis@gentoo.org> -files/strongswan-4.2.7-install.patch,
+  -files/strongswan-4.3.3-install.patch, -strongswan-4.3.7.ebuild,
+  -strongswan-4.4.1.ebuild, +strongswan-4.5.2.ebuild:
+  Bumping to 4.5.2 and removing old versions and unused patches.
 
 *strongswan-4.5.1 (12 Feb 2011)
 
diff --git a/net-misc/strongswan/files/strongswan-4.2.7-install.patch b/net-misc/strongswan/files/strongswan-4.2.7-install.patch
deleted file mode 100644
index d72d12971df3..000000000000
--- a/net-misc/strongswan/files/strongswan-4.2.7-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar strongswan-4.2.7.orig/src/starter/Makefile.am strongswan-4.2.7/src/starter/Makefile.am
---- strongswan-4.2.7.orig/src/starter/Makefile.am	2008-09-17 14:10:31.000000000 -0700
-+++ strongswan-4.2.7/src/starter/Makefile.am	2008-09-23 19:28:49.085627647 -0700
-@@ -31,7 +31,7 @@
- 		$(COMPILE) -c -o $@ $<
- 
- install-exec-local :	
--		test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -o ${ipsecuser} -g ${ipsecgroup} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true
-+		test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -D -o ${ipsecuser} -g ${ipsecgroup} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/cacerts" || $(INSTALL) -o ${ipsecuser} -g ${ipsecgroup} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/cacerts" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/ocspcerts" || $(INSTALL) -o ${ipsecuser} -g ${ipsecgroup} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/ocspcerts" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/certs" || $(INSTALL) -o ${ipsecuser} -g ${ipsecgroup} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/certs" || true
diff --git a/net-misc/strongswan/files/strongswan-4.3.3-install.patch b/net-misc/strongswan/files/strongswan-4.3.3-install.patch
deleted file mode 100644
index 82740a443734..000000000000
--- a/net-misc/strongswan/files/strongswan-4.3.3-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN strongswan-4.3.3.orig/src/starter/Makefile.am strongswan-4.3.3/src/starter/Makefile.am
---- strongswan-4.3.3.orig/src/starter/Makefile.am	2009-07-21 14:35:28.000000000 +0200
-+++ strongswan-4.3.3/src/starter/Makefile.am	2009-07-29 09:44:03.340524851 +0200
-@@ -52,7 +52,7 @@
- 		$(COMPILE) -c -o $@ $(PLUTODIR)/defs.c
- 
- install-exec-local :	
--		test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true
-+		test -e "$(DESTDIR)${sysconfdir}/ipsec.d" || $(INSTALL) -D -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/cacerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/cacerts" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/ocspcerts" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/ocspcerts" || true
- 		test -e "$(DESTDIR)${sysconfdir}/ipsec.d/certs" || $(INSTALL) -o ${ipsecuid} -g ${ipsecgid} -d "$(DESTDIR)$(sysconfdir)/ipsec.d/certs" || true
diff --git a/net-misc/strongswan/strongswan-4.3.7.ebuild b/net-misc/strongswan/strongswan-4.3.7.ebuild
deleted file mode 100644
index 6c71a07f616b..000000000000
--- a/net-misc/strongswan/strongswan-4.3.7.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.3.7.ebuild,v 1.1 2010/08/03 08:10:36 hwoarang Exp $
-
-EAPI=2
-inherit eutils linux-info
-
-DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA-MD5 RSA-PKCS11 DES"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+caps cisco curl debug gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root +openssl smartcard sqlite"
-
-COMMON_DEPEND="!net-misc/openswan
-	>=dev-libs/gmp-4.1.5
-	gcrypt? ( dev-libs/libgcrypt )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	smartcard? ( dev-libs/opensc )
-	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
-	mysql? ( virtual/mysql )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-		die "Please install a recent 2.6 kernel."
-	fi
-
-	if use nat-transport; then
-		ewarn
-		ewarn "You have enabled NAT Traversal for transport mode with the IKEv1"
-		ewarn "protocol. Please double check if you really require this feature"
-		ewarn "as it is potentially insecure and usually only required in certain"
-		ewarn "situations when interoperating with Windows using L2TP/IPsec."
-		ewarn
-	fi
-
-	if kernel_is -lt 2 6 33; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-	fi
-
-	if use non-root; then
-		enewgroup ${UGID}
-		enewuser ${UGID} -1 -1 -1 ${UGID}
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	econf \
-		--disable-static \
-		$(use_with caps capabilities libcap) \
-		$(use_enable curl) \
-		$(use_enable ldap) \
-		$(use_enable smartcard) \
-		$(use_enable cisco cisco-quirks) \
-		$(use_enable debug leak-detective) \
-		$(use_enable nat-transport) \
-		$(use_enable openssl) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable sqlite) \
-		$(use_enable ikev1 pluto) \
-		$(use_enable ikev2 charon) \
-		${myconf}
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/ipsec.secrets \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc CREDITS NEWS README TODO || die
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-misc/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
-		elog "but also a few to the IKEv2 daemon 'charon'."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
-		elog
-		elog "pluto uses a helper script by default to insert/remove routing and"
-		elog "policy rules upon connection start/stop which requires superuser"
-		elog "privileges. charon in contrast does this internally and can do so"
-		elog "even with reduced (user) privileges."
-		elog
-		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
-		elog "script to pluto or charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  Defaults:ipsec always_set_home,!env_reset"
-		elog "  ipsec ALL=(ALL) NOPASSWD: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo ipsec _updown\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  http://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-misc/strongswan/strongswan-4.4.1.ebuild b/net-misc/strongswan/strongswan-4.5.2.ebuild
index 2d56e8c16f5f..f188bbd7d59d 100644
--- a/net-misc/strongswan/strongswan-4.4.1.ebuild
+++ b/net-misc/strongswan/strongswan-4.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.4.1.ebuild,v 1.1 2010/08/03 08:10:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.5.2.ebuild,v 1.1 2011/05/19 08:14:20 gurligebis Exp $
 
 EAPI=2
 inherit eutils linux-info
@@ -12,7 +12,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
 LICENSE="GPL-2 RSA-MD5 RSA-PKCS11 DES"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+caps cisco curl debug dhcp farp gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root +openssl smartcard sqlite"
+IUSE="+caps cisco curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql nat-transport +non-root +openssl smartcard sqlite"
 
 COMMON_DEPEND="!net-misc/openswan
 	>=dev-libs/gmp-4.1.5
@@ -117,6 +117,18 @@ src_configure() {
 		$(use_enable smartcard) \
 		$(use_enable cisco cisco-quirks) \
 		$(use_enable debug leak-detective) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-gtc) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
 		$(use_enable nat-transport) \
 		$(use_enable openssl) \
 		$(use_enable gcrypt) \