fix bug #279270 + version bump

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

3 files changed, 138 insertions, 2 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 1fff46f855a9..8c5d4590c34d 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2009/07/29 08:33:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.76 2009/09/01 09:24:29 wschlich Exp $
+
+*strongswan-4.3.4 (01 Sep 2009)
+
+  01 Sep 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +strongswan-4.3.4.ebuild:
+  fix bug #279270 + version bump
 
 *strongswan-4.3.3 (29 Jul 2009)
 *strongswan-4.2.17 (29 Jul 2009)
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index d1045aeb7206..762ef4c84838 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -3,7 +3,9 @@ AUX strongswan-4.2.7-install.patch 1070 RMD160 fa5815d1de4d4bba5674832def181f139
 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
+DIST strongswan-4.3.4.tar.bz2 2680982 RMD160 4478c6860119400fe478a8fce1a985943a023c0c SHA1 4c3bd24d286c340dc43e8ff8f1f6147b35dc2767 SHA256 6073c244232f2e741233533fd4a13498421398174757c5e42a51afa4bf16600c
 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
+EBUILD strongswan-4.3.4.ebuild 3778 RMD160 ada414b771a72b7e99e6f00160a3a3729ba5f3c1 SHA1 419b372511d33598f2e7ac732023508aaa779077 SHA256 5aa145b2b61a9a13024e2ba98ef6b017af863cb3b753fc6a8f489418a6688601
+MISC ChangeLog 13619 RMD160 1822674281c04ea4cef2c63a5cfedbae3f6b97df SHA1 4d3c7aa3141401e9edd0a7db625d4ad2b777c07e SHA256 d3c7aa3a33152df2c691a8aead5a0fe45b89a70633922a3cbf27b7f5e4e5c6db
 MISC metadata.xml 790 RMD160 e0f60060a1dfe7281928b16c9418fbe1a8dafbe2 SHA1 ea2e94902df1eb340433f998afceff59642b3ab6 SHA256 99878b2ebdb19513074de656e8e27afd79c272fef8be6128c6af61451615e256
diff --git a/net-misc/strongswan/strongswan-4.3.4.ebuild b/net-misc/strongswan/strongswan-4.3.4.ebuild
new file mode 100644
index 000000000000..e7f4c837c4fe
--- /dev/null
+++ b/net-misc/strongswan/strongswan-4.3.4.ebuild
@@ -0,0 +1,128 @@
+# 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.4.ebuild,v 1.1 2009/09/01 09:24:29 wschlich 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
+	dev-libs/libgcrypt
+	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() {
+	epatch "${FILESDIR}"/${PN}-4.3.3-install.patch
+	eautoreconf
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel is version ${KV_FULL}"
+
+	if kernel_is 2 6; then
+		elog "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
+
+	if use caps; then
+		# change to an unprivileged user if libcaps support is requested
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use caps; then
+		# change to an unprivileged user if libcaps support is requested
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# 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
+
+	if use caps; then
+		fowners ipsec:ipsec /etc/ipsec.conf
+	fi
+}
+
+pkg_postinst() {
+	if use caps; then
+		echo
+		elog "strongSwan has been installed without superuser privileges as"
+		elog "requested (USE=caps). There are certain restrictions and"
+		elog "issues regarding non-root operation, so please have a look at:"
+		elog "  http://wiki.strongswan.org/wiki/nonRoot"
+		echo
+		elog "Please be aware that with dropped privileges most leftupdown and"
+		elog "rightupdown scripts will no longer run if they require root privileges."
+		elog "You might want to use sudo to allow the user \"ipsec\" to run"
+		elog "the ipsec helper script (/usr/sbin/ipsec) as root."
+		elog "Example for /etc/sudoers:"
+		elog "  Defaults:ipsec always_set_home,!env_reset"
+		elog "  ipsec ALL=(ALL) NOPASSWD: /usr/sbin/ipsec"
+		elog "Example for a connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo ipsec _updown\""
+		echo
+#		elog "And please do not forget to add CAP_NET_ADMIN capabilities to"
+#		elog "your charon and pluto binaries each time you emerge this ebuild."
+#		echo
+#		elog "setcap -v cap_net_admin=ep /usr/libexec/ipsec/pluto"
+#		elog "setcap -v cap_net_admin=ep /usr/libexec/ipsec/charon"
+#		echo
+#		elog "For more information reagrding POSIX capabilities support please"
+#		elog "have a look at http://www.friedhoff.org/posixfilecaps.html"
+#		echo
+	fi
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	echo
+}