Version bump (currently masked due to compile problems on a stable system)

and a patch for newer linux-headers; bug #162811.
(Portage version: 2.1.2-r1)

6 files changed, 179 insertions, 5 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index bbf439bc2fde..fbd9e3d00871 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.48 2007/01/18 19:25:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.49 2007/01/20 00:20:38 pylon Exp $
+
+*strongswan-2.8.1 (20 Jan 2007)
+
+  20 Jan 2007; Lars Weiler <pylon@gentoo.org>
+  +files/linux-headers-2.6.18.patch, files/ipsec-path.patch.bz2,
+  strongswan-2.8.0.ebuild, +strongswan-2.8.1.ebuild:
+  Version bump (currently masked due to compile problems on a stable system)
+  and a patch for newer linux-headers; bug #162811.
 
   18 Jan 2007; Raúl Porcel <armin76@gentoo.org> strongswan-2.8.0.ebuild:
   x86 stable wrt bug 162649
diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.1 b/net-misc/strongswan/files/digest-strongswan-2.8.1
new file mode 100644
index 000000000000..e7f86b493b7b
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.8.1
@@ -0,0 +1,3 @@
+MD5 6a87edfa33d207ef03ccb844087e26cf strongswan-2.8.1.tar.bz2 2531451
+RMD160 d7026b78498b4febd6ad06e26c7e5521a3fcef17 strongswan-2.8.1.tar.bz2 2531451
+SHA256 e8e5c1a42f50d0f03956b41bf1c59ba561b1b34b46407fe8f71b1df6c0b23d6b strongswan-2.8.1.tar.bz2 2531451
diff --git a/net-misc/strongswan/files/ipsec-path.patch.bz2 b/net-misc/strongswan/files/ipsec-path.patch.bz2
index 755071de96dc..364f4bb7f9ba 100644
--- a/net-misc/strongswan/files/ipsec-path.patch.bz2
+++ b/net-misc/strongswan/files/ipsec-path.patch.bz2
diff --git a/net-misc/strongswan/files/linux-headers-2.6.18.patch b/net-misc/strongswan/files/linux-headers-2.6.18.patch
new file mode 100644
index 000000000000..2676160449d2
--- /dev/null
+++ b/net-misc/strongswan/files/linux-headers-2.6.18.patch
@@ -0,0 +1,11 @@
+diff -Naur strongswan-2.8.1-vanilla/programs/starter/starterwhack.c strongswan-2.8.1-incfix/programs/starter/starterwhack.c
+--- strongswan-2.8.1-vanilla/programs/starter/starterwhack.c    2006-10-19 18:02:46.000000000 +0300
++++ strongswan-2.8.1-incfix/programs/starter/starterwhack.c     2007-01-18 09:57:07.000000000 +0200
+@@ -17,7 +17,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <linux/stddef.h>
++#include <stddef.h>
+ #include <unistd.h>
+ #include <errno.h>
diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild
index 6ca1a2ec9291..b02bbc031cf0 100644
--- a/net-misc/strongswan/strongswan-2.8.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.6 2007/01/18 19:25:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.7 2007/01/20 00:20:38 pylon Exp $
 
 inherit eutils linux-info
 
@@ -55,6 +55,11 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ipsec-path.patch.bz2
 
+	# Fix for newer sys-kernel/linux-headers; bug #162811
+	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
+		epatch ${FILESDIR}/linux-headers-2.6.18.patch
+	fi
+
 	if use curl ; then
 		ebegin "Curl support requested. Enabling curl support"
 		sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die
@@ -67,11 +72,13 @@ src_unpack() {
 		eend $?
 	fi
 
-	if  use smartcard ; then
+	if use smartcard ; then
 		ebegin "Smartcard support requested. Enabling opensc support"
 		sed -i -e 's:\(USE_SMARTCARD?=\)false:\1true:g' Makefile.inc || die
-		sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' Makefile.inc || die
-		sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' Makefile.inc || die
+		sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' \
+			Makefile.inc || die
+		sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' \
+			Makefile.inc || die
 		eend $?
 	fi
 
diff --git a/net-misc/strongswan/strongswan-2.8.1.ebuild b/net-misc/strongswan/strongswan-2.8.1.ebuild
new file mode 100644
index 000000000000..214b2303f0fc
--- /dev/null
+++ b/net-misc/strongswan/strongswan-2.8.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.1.ebuild,v 1.1 2007/01/20 00:20:38 pylon Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="IPsec-based VPN Solution for Linux"
+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="~amd64 ~ppc ~sparc ~x86"
+IUSE="curl ldap nat smartcard"
+
+COMMON_DEPEND="!net-misc/openswan
+	dev-libs/gmp"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	smartcard? ( dev-libs/opensc )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is 2 6; then
+		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
+		einfo "KLIPS will not be compiled/installed."
+		MYMAKE="programs"
+
+	elif kernel_is 2 4; then
+		if ! [ -d /usr/src/linux/net/ipsec ]; then
+			eerror "You need to have an IPsec enabled 2.4.x kernel."
+			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
+			die
+		fi
+
+		einfo "Using patched-in IPsec code for kernel 2.4."
+		einfo "Your kernel only supports KLIPS for kernel level IPsec."
+		MYMAKE="confcheck programs"
+
+	else
+		eerror "Sorry, no support for your kernel version ${KV_FULL}."
+		die "Install an IPsec enabled 2.4 or 2.6 kernel."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/ipsec-path.patch.bz2
+
+	# Fix for newer sys-kernel/linux-headers; bug #162811
+	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
+		epatch ${FILESDIR}/linux-headers-2.6.18.patch
+	fi
+
+	if use curl ; then
+		ebegin "Curl support requested. Enabling curl support"
+		sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die
+		eend $?
+	fi
+
+	if use ldap ; then
+		ebegin "LDAP support requested. Enabling LDAPv3 support"
+		sed -i -e 's:\(USE_LDAP?=\)false:\1true:g' Makefile.inc || die
+		eend $?
+	fi
+
+	if use nat ; then
+		ebegin "Enabling NAT-Traversal on Transport mode (insecure)"
+		sed -i -e 's:\(USE_NAT_TRAVERSAL_TRANSPORT_MODE?=\)false:\1true:g' \
+			Makefile.inc || die
+		eend $?
+	fi
+
+	if use smartcard ; then
+		ebegin "Smartcard support requested. Enabling opensc support"
+		sed -i -e 's:\(USE_SMARTCARD?=\)false:\1true:g' Makefile.inc || die
+		sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' \
+			Makefile.inc || die
+		sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' \
+			Makefile.inc || die
+		eend $?
+	fi
+
+	# patch broken check-rule
+	sed -i -e 's#check:	uml#check:	programs checkprograms#' Makefile
+
+}
+
+src_compile() {
+	make \
+		DESTDIR="${D}" \
+		USERCOMPILE="${CFLAGS}" \
+		FINALCONFDIR=/etc/ipsec \
+		INC_RCDEFAULT=/etc/init.d \
+		INC_USRLOCAL=/usr \
+		INC_MANDIR=share/man \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		FINALDOCDIR=/usr/share/doc/${P} \
+		${MYMAKE} || die "make failed"
+}
+
+src_install() {
+	# make install wants this directory
+	dodir /etc/init.d
+
+	make \
+		DESTDIR="${D}" \
+		USERCOMPILE="${CFLAGS}" \
+		FINALCONFDIR=/etc/ipsec \
+		INC_RCDEFAULT=/etc/init.d \
+		INC_USRLOCAL=/usr \
+		INC_MANDIR=share/man \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		FINALDOCDIR=/usr/share/doc/${P} \
+		install || die "make install failed"
+
+	dohtml doc/*html
+	rm -f ${S}/doc/*.html
+	dodoc CHANGES COPYING CREDITS INSTALL LICENSE README doc/*
+
+	doinitd "${FILESDIR}"/ipsec
+
+	fperms -R a-X /etc/ipsec /usr/share
+	keepdir /var/run/pluto
+
+	einfo "Configuration files are installed into /etc/ipsec/"
+}
+
+pkg_postinst() {
+	if kernel_is 2 6; then
+		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
+		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
+		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
+		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
+		check_extra_config
+	fi
+}