version bumps fixing bug #279319, removed old versions

(Portage version: 2.2_rc33/cvs/Linux i686)

6 files changed, 26 insertions, 214 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 5a9061d0d5f7..1fff46f855a9 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.74 2009/06/28 17:12:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.75 2009/07/29 08:33:36 wschlich Exp $
+
+*strongswan-4.3.3 (29 Jul 2009)
+*strongswan-4.2.17 (29 Jul 2009)
+
+  29 Jul 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/strongswan-4.3.3-install.patch, -strongswan-4.2.8.ebuild,
+  -strongswan-4.2.15.ebuild, -strongswan-4.2.16.ebuild,
+  +strongswan-4.2.17.ebuild, -strongswan-4.3.2.ebuild,
+  +strongswan-4.3.3.ebuild:
+  version bumps fixing bug #279319, removed old versions
 
   28 Jun 2009; Patrick Lauer <patrick@gentoo.org> strongswan-4.3.2.ebuild:
   Adding missing dev-libs/libgcrypt depend. Solves #275305
diff --git a/net-misc/strongswan/files/strongswan-4.3.3-install.patch b/net-misc/strongswan/files/strongswan-4.3.3-install.patch
new file mode 100644
index 000000000000..82740a443734
--- /dev/null
+++ b/net-misc/strongswan/files/strongswan-4.3.3-install.patch
@@ -0,0 +1,12 @@
+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.2.16.ebuild b/net-misc/strongswan/strongswan-4.2.16.ebuild
deleted file mode 100644
index 139833aac39e..000000000000
--- a/net-misc/strongswan/strongswan-4.2.16.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.2.16.ebuild,v 1.1 2009/06/23 12:45:25 keytoaster Exp $
-
-EAPI=2
-inherit eutils linux-info autotools
-
-UGID="ipsec"
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA-MD2 RSA-MD5 RSA-PKCS11 DES"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="caps cisco curl debug ldap nat smartcard static xml"
-
-COMMON_DEPEND="!net-misc/openswan
-	dev-libs/gmp
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	smartcard? ( dev-libs/opensc )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-src_prepare() {
-	sed -i -e 's/getline/getline_own/g' src/libfreeswan/optionsfrom.c
-
-	epatch "${FILESDIR}"/${PN}-4.2.7-install.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	einfo "Linux kernel is version ${KV_FULL}"
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-	else
-		eerror "Sorry, no support for your kernel version ${KV_FULL}."
-		die "Install an IPsec enabled 2.6 kernel."
-	fi
-
-	# change to an unprivileged user by default
-	enewgroup ${UGID}
-	enewuser ${UGID} -1 -1 -1 ${UGID}
-}
-
-src_configure() {
-	local myconf=""
-
-	# change to an unprivileged user by default
-	myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	# strongswan enables both by default; switch to the user's wish
-	if use static; then
-		myconf="${myconf} --enable-static --disable-shared"
-	else
-		myconf="${myconf} --disable-static --enable-shared"
-	fi
-
-	# TODO: Review new configure options such as networkmanager
-	econf \
-		$(use_with caps capabilities libcap) \
-		$(use_enable curl) \
-		$(use_enable ldap) \
-		$(use_enable xml smp) \
-		$(use_enable smartcard) \
-		$(use_enable cisco cisco-quirks) \
-		$(use_enable debug leak-detective) \
-		$(use_enable nat nat-transport) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	einstall || die "einstall failed."
-
-	doinitd "${FILESDIR}"/ipsec
-
-	fowners ipsec:ipsec /etc/ipsec.conf
-}
-
-pkg_postinst() {
-	echo
-	einfo "For your own security we install strongSwan without superuser"
-	einfo "privileges.  If you use iptables, you might want to change that"
-	einfo "setting.  See http://wiki.strongswan.org/wiki/nonRoot for more"
-	einfo "information."
-	# TODO: Should we recommend this sudoers line to users?
-	# %ipsec ALL = NOPASSWD: /sbin/iptables
-	echo
-	einfo "The up-to-date configuration manual is available online at"
-	einfo "http://www.strongswan.org/docs/readme42.htm"
-	echo
-}
diff --git a/net-misc/strongswan/strongswan-4.2.15.ebuild b/net-misc/strongswan/strongswan-4.2.17.ebuild
index 3ceba08d66d3..9ca651fd9a73 100644
--- a/net-misc/strongswan/strongswan-4.2.15.ebuild
+++ b/net-misc/strongswan/strongswan-4.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.2.15.ebuild,v 1.2 2009/06/23 12:33:40 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.2.17.ebuild,v 1.1 2009/07/29 08:33:36 wschlich Exp $
 
 EAPI=2
 inherit eutils linux-info autotools
diff --git a/net-misc/strongswan/strongswan-4.2.8.ebuild b/net-misc/strongswan/strongswan-4.2.8.ebuild
deleted file mode 100644
index 21690be4f71d..000000000000
--- a/net-misc/strongswan/strongswan-4.2.8.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.2.8.ebuild,v 1.2 2009/06/23 12:53:15 keytoaster Exp $
-
-inherit eutils linux-info autotools
-
-UGID="ipsec"
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system."
-HOMEPAGE="http://www.strongswan.org/"
-SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA-MD2 RSA-MD5 RSA-PKCS11 DES"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86 ~amd64"
-IUSE="cisco curl debug ldap nat smartcard static xml"
-
-COMMON_DEPEND="!net-misc/openswan
-	dev-libs/gmp"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )
-	smartcard? ( dev-libs/opensc )
-	xml? ( dev-libs/libxml2 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e 's/getline/getline_own/g' src/libfreeswan/optionsfrom.c
-
-	epatch "${FILESDIR}"/${PN}-4.2.7-install.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	einfo "Linux kernel is version ${KV_FULL}"
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-	else
-		eerror "Sorry, no support for your kernel version ${KV_FULL}."
-		die "Install an IPsec enabled 2.6 kernel."
-	fi
-
-	# change to an unprivileged user by default
-	enewgroup ${UGID}
-	enewuser ${UGID} -1 -1 -1 ${UGID}
-}
-
-src_compile() {
-	local myconf=""
-
-	# change to an unprivileged user by default
-	#myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	# strongswan enables both by default; switch to the user's wish
-	if use static; then
-		myconf="${myconf} --enable-static --disable-shared"
-	else
-		myconf="${myconf} --disable-static --enable-shared"
-	fi
-
-	econf \
-		$(use_enable curl http) \
-		$(use_enable ldap) \
-		$(use_enable xml) \
-		$(use_enable smartcard) \
-		$(use_enable cisco cisco-quirks) \
-		$(use_enable debug leak-detective) \
-		$(use_enable nat nat-transport) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed."
-
-	doinitd "${FILESDIR}"/ipsec
-
-	fowners ipsec:ipsec /etc/ipsec.conf
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Starting with the strongswan-4 branch, the configuration files"
-	ewarn "will be installed into the default directory \"/etc/\""
-	ewarn "instead of the Gentoo-specific directory \"/etc/ipsec/\"."
-	ewarn "Please adjust your configuration!"
-	echo
-	einfo "For your own security we install strongSwan without superuser"
-	einfo "privileges.  If you use iptables, you might want to change that"
-	einfo "setting.  See http://wiki.strongswan.org/wiki/nonRoot for more"
-	einfo "information."
-	echo
-	einfo "The up-to-date configuration manual is available online at"
-	einfo "http://www.strongswan.org/docs/readme.htm"
-	echo
-}
diff --git a/net-misc/strongswan/strongswan-4.3.2.ebuild b/net-misc/strongswan/strongswan-4.3.3.ebuild
index 61f6bedcd04b..b643b8d0aae8 100644
--- a/net-misc/strongswan/strongswan-4.3.2.ebuild
+++ b/net-misc/strongswan/strongswan-4.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.3.2.ebuild,v 1.2 2009/06/28 17:12:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-4.3.3.ebuild,v 1.1 2009/07/29 08:33:36 wschlich Exp $
 
 EAPI=2
 inherit eutils linux-info autotools
@@ -32,7 +32,7 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/iproute2"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.7-install.patch
+	epatch "${FILESDIR}"/${PN}-4.3.3-install.patch
 	eautoreconf
 }