version bumps fixing bug #279319, removed old versions

Package-Manager: portage-2.2_rc33/cvs/Linux i686

7 files changed, 32 insertions, 223 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/Manifest b/net-misc/strongswan/Manifest
index 1c0213489d09..d1045aeb7206 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1,12 +1,9 @@
 AUX ipsec 445 RMD160 9240cf2699984634fae9b0f45c813742fd05e047 SHA1 efcc1bedfbeae8a5b85f85e4926472edbca37be0 SHA256 5ba492de6d612d7def1cb7ceacadf8397e50f8433b91c4f2f09bf216eed34da6
 AUX strongswan-4.2.7-install.patch 1070 RMD160 fa5815d1de4d4bba5674832def181f139a66ae7e SHA1 4adc2f9e704553dabf744667d74d8c6ed6ae9c59 SHA256 0ea8ba27ba6ad5a4f90ad4f233fd05ec431dccdb1c08b794e2f7ee72ea4fc87a
-DIST strongswan-4.2.15.tar.bz2 2736266 RMD160 7c05eab35fd24a12b6f6120c434c75b9eaaa44e7 SHA1 2066044acf6efa3923d5e9eaa9ddb14942facd8c SHA256 83b863e98df59357f816fb68590f90ed9aaad08675ed9841af77e9fc84685084
-DIST strongswan-4.2.16.tar.bz2 2733515 RMD160 27c1d94fa57b73dacf5ef358356400e4f111c70a SHA1 3c08db6f4bfe59d8ce2120699f367311ad639290 SHA256 3a0bdc5e6faeb59641b1bf0ac330059d3cc29144c41ca144f94f44a49352e49e
-DIST strongswan-4.2.8.tar.bz2 2906030 RMD160 150b55234dddb14761382c0040aa79b0cc3b6e86 SHA1 ab0506dfd573df22ba6cd3964aa14399347668b1 SHA256 3e5a291857d55dfa530d5618e27a9fd17d0fd1e9d24023199a46466f76a6b687
-DIST strongswan-4.3.2.tar.bz2 2639343 RMD160 73d2eda5cd21d33726056586e601feb5e59a3325 SHA1 8498620e1ca39ac9970729ec937d0b31dbf51189 SHA256 d2dc584596dda758c6d3d84b292a6aa80bfb53f6178ad08aec1b59519cf9d9e9
-EBUILD strongswan-4.2.15.ebuild 2814 RMD160 90a473bd8af2379aecc3fcde030ed2d0f65c9da6 SHA1 20b87aa801ac2cf728c8ba7442220bedfa4ee63a SHA256 c0a40a657af2ef58f7d70c61eb7187b6b5626f3517ce9e359e64840a0115e850
-EBUILD strongswan-4.2.16.ebuild 2814 RMD160 548b151b33d8faab2b155b35fa28e65bddceca7a SHA1 3454c3e2d73f82161e703b9c3352f7c930cd38a0 SHA256 dff9e82628956ddb45b65b1b473f13c9bee904c9a08220ed8301bf75dba52873
-EBUILD strongswan-4.2.8.ebuild 2878 RMD160 b668bcf9c956abd2453815d006954268aef0ad5d SHA1 f2fe1db3db17eba6e440dae97c2b7c99ab2d98d9 SHA256 5301d67a5e43cdaa3ed3e718d5ecdea8d08d2ae4f8b67e8b99ce08780b08048f
-EBUILD strongswan-4.3.2.ebuild 2762 RMD160 caab152b3a3221f5572bbd38ae07e15f6e07de3c SHA1 674f3ad2cc6eb191534b6658ed1334b3e544a2fc SHA256 b62c9d45adfdf0411a5a69ef0cc43fc1261ba442b1b90ca3134ca5b2074ca9e6
-MISC ChangeLog 13087 RMD160 7dc03af8f90a96c1da34d2fd5167d3d68f2bddf8 SHA1 5256884c8af8e45ea47a89fd8d580467d83b8ae5 SHA256 627e1ee8ce71c6a08d2db31b5fb0ebd7d43e240184bde07a34a76102d5b2692d
+AUX strongswan-4.3.3-install.patch 1070 RMD160 1a9e97eba9e7e9bd4718f601754b62a7e31c48cc SHA1 eaffc515f9373513ada676799d78413aa96411cf SHA256 60d440ff105efbd45c0a11d8df3a5b2f3b733b04b91239c6d70f19b4988e31b7
+DIST strongswan-4.2.17.tar.bz2 2734072 RMD160 83237b06b8b9dcfe4338a626439749eb1c08ef02 SHA1 1d18c889f94ac6b42ea0a5aa52e3e1eb7339ff0a SHA256 cbda6e8431b4b68acb2f3cf3ce75d1aa251557bf25d82c616307cb48a82eb731
+DIST strongswan-4.3.3.tar.bz2 2666862 RMD160 cf85ffff83c51ab9f9f5a6794397ec4de3a2e527 SHA1 935c822084b332a269821edf1e4a951132f962b2 SHA256 24717a99b0af34059aad2c9ffceaaa02efedab0050278605e493cb489c5f3c73
+EBUILD strongswan-4.2.17.ebuild 2812 RMD160 29491eb031f13c780eacc38f3231d0bb476f9cbc SHA1 07d1fbb57fc2aed75a28cf5195ae799f040e4f28 SHA256 ba9672f320e7c8d8bdbf9f861522c3434006d301f45e83bb1f7b27526bc3d17d
+EBUILD strongswan-4.3.3.ebuild 2763 RMD160 26b06c589df8274c41ccc095ba9fdccfb4efb319 SHA1 0ce99ebcdb7332a1efae968868a8ca7c0e316535 SHA256 bef30e93f6ef5722749f9f3b9b841b188f80f75ed947661b9f80f25d98031967
+MISC ChangeLog 13471 RMD160 095b9426026faa9e42a20045c12e57373063d3e6 SHA1 6be0f30053d8683cb754d38056a3a062cb1cf4a7 SHA256 8ca961a6edea6f6aabf310ad5e8ee4e7ef79fb2fd2ad11ad60336fb9f59ce2a5
 MISC metadata.xml 790 RMD160 e0f60060a1dfe7281928b16c9418fbe1a8dafbe2 SHA1 ea2e94902df1eb340433f998afceff59642b3ab6 SHA256 99878b2ebdb19513074de656e8e27afd79c272fef8be6128c6af61451615e256
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
 }