Revision bump with fix for IPV6 problem (bug #87920), and bump version (bug #92363).

Package-Manager: portage-2.0.51.22-r1

7 files changed, 159 insertions, 13 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 9b5c7c4455ec..e23b63102444 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.26 2005/04/15 13:52:42 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.27 2005/06/21 03:05:58 latexer Exp $
+
+*ipsec-tools-0.5.2 (21 Jun 2005)
+*ipsec-tools-0.5-r2 (21 Jun 2005)
+
+  21 Jun 2005; Peter Johanson <latexer@gentoo.org>
+  +files/ipsec-tools-0.5-ipv6.diff, +ipsec-tools-0.5-r2.ebuild,
+  +ipsec-tools-0.5.2.ebuild:
+  Revision bump with fix for IPV6 problem (bug #87920), and bump version (bug
+  #92363).
 
   15 Apr 2005; Joseph Jezak <josejx@gentoo.org> :
   Marked ~ppc.
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index f24cc624750a..49fa2f4529b6 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,21 +1,26 @@
-MD5 96cd55a826d58724efb47a7c9e850aaa ChangeLog 4427
 MD5 3bea640757c6791162949ac65fec1ef6 ipsec-tools-0.5.ebuild 1507
-MD5 6b45b8511b248bc6975241ad77aa11b2 ipsec-tools-0.5-r1.ebuild 1584
-MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
-MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
-MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
 MD5 8ab0f354384bf0af0ac5f036bf870678 ipsec-tools-0.3.1.ebuild 1601
 MD5 1e8b9993c9d4f8bc53955cf690469564 ipsec-tools-0.4.ebuild 1692
+MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
+MD5 6b45b8511b248bc6975241ad77aa11b2 ipsec-tools-0.5-r1.ebuild 1584
+MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
+MD5 503b0a5c553d765eefcb5f8e27f3bcf4 ChangeLog 4730
+MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
 MD5 d99501b6fa9700e3b7e8904150d8799f ipsec-tools-0.4-r1.ebuild 1743
-MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
-MD5 6ed9fbfd1bce8915be1e87a159802c46 files/digest-ipsec-tools-0.2.5 69
-MD5 0e62b8655b5b72cb0b312b710b28e471 files/ipsec-tools-0.4-gcc34.diff 1008
-MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r1 67
-MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
+MD5 8b27a4c09e2f87bfe30ceadad163d7f3 ipsec-tools-0.5-r2.ebuild 1716
+MD5 132342923ff9de774856093e9b245471 ipsec-tools-0.5.2.ebuild 1585
 MD5 84cffb83a2579976f872a29d42767714 files/ipsec.conf.sample 260
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
 MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5 68
-MD5 25ac1660a8d1d054bb9c848a21ad907a files/digest-ipsec-tools-0.3.1 69
-MD5 b847486c75c3d9d4a1bef744e05ae006 files/ipsec-tools-0.5-isakmp-underrun.diff 714
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r1 67
 MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r1 68
+MD5 6ed9fbfd1bce8915be1e87a159802c46 files/digest-ipsec-tools-0.2.5 69
+MD5 25ac1660a8d1d054bb9c848a21ad907a files/digest-ipsec-tools-0.3.1 69
 MD5 c35a69d989ddc45b7a7e30909479d91e files/digest-ipsec-tools-0.3.3 69
+MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
+MD5 0e62b8655b5b72cb0b312b710b28e471 files/ipsec-tools-0.4-gcc34.diff 1008
 MD5 fa8e82259951e612a6d684983daefc3d files/racoon.init.d 1274
+MD5 b847486c75c3d9d4a1bef744e05ae006 files/ipsec-tools-0.5-isakmp-underrun.diff 714
+MD5 bb97988702b7573a0ffdaa46d1494e77 files/ipsec-tools-0.5-ipv6.diff 307
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r2 68
+MD5 3101edbfff1f3a77e0711002dcd675ac files/digest-ipsec-tools-0.5.2 70
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5-r2 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5-r2
new file mode 100644
index 000000000000..7102f1922f21
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5-r2
@@ -0,0 +1 @@
+MD5 5447480467377ef8f7b9fda109ff2877 ipsec-tools-0.5.tar.bz2 646397
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5.2 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5.2
new file mode 100644
index 000000000000..90cd1dd809e6
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.5.2
@@ -0,0 +1 @@
+MD5 fc61f0387f25b3cbbd4fdbe548f4ba80 ipsec-tools-0.5.2.tar.bz2 648329
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff
new file mode 100644
index 000000000000..e2939f046f23
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.5-ipv6.diff
@@ -0,0 +1,10 @@
+--- configure.ac.orig   2005-04-10 21:56:50.000000000 +0900
++++ configure.ac        2005-04-10 21:56:37.000000000 +0900
+@@ -326,6 +326,7 @@
+ ))
+ 
+ if test "$ipv6" = "yes"; then
++	AC_DEFINE([INET6], [], [Support IPv6])
+	AC_MSG_CHECKING(for advanced API support)
+	AC_TRY_COMPILE([#ifndef INET6
+ #define INET6
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
new file mode 100644
index 000000000000..9b9c51fc08d1
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation."
+HOMEPAGE="http://ipsec-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="BSD"
+KEYWORDS="~x86 ~amd64 ~ppc"
+SLOT="0"
+IUSE="ipv6 selinux"
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=dev-libs/openssl-0.9.6"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
+	epatch ${FILESDIR}/${P}-isakmp-underrun.diff || die "epatch failed!"
+	epatch ${FILESDIR}/${P}-ipv6.diff || die "epatch failed!"
+	epunt_cxx
+	libtoolize --force --copy || die
+	aclocal -I . || die
+	autoconf || die
+}
+
+src_compile() {
+	# Filter the c3 flag for now. Probably a GCC problem, but we'll
+	# avoid it here for now. See bug #61025
+	filter-flags -march=c3
+
+	econf	\
+		--enable-hybrid \
+		--enable-dpd \
+		--enable-natt \
+		--enable-adminport \
+		--enable-frag \
+		$(use_enable ipv6) \
+		|| die
+		# Removed due to some problems
+		# --enable-samode-unspec \
+	emake -j1 || die
+}
+
+src_install() {
+	einstall || die
+	keepdir /var/lib/racoon
+	insinto /etc/conf.d && newins ${FILESDIR}/racoon.conf.d racoon
+	exeinto /etc/init.d && newexe ${FILESDIR}/racoon.init.d racoon
+
+	dodoc ChangeLog README NEWS
+	dodoc ${S}/src/racoon/samples/racoon.conf.sample*
+}
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
new file mode 100644
index 000000000000..7f9ddcc075d1
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+
+inherit eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation."
+HOMEPAGE="http://ipsec-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="BSD"
+KEYWORDS="~x86 ~amd64 ~ppc"
+SLOT="0"
+IUSE="ipv6 selinux"
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=dev-libs/openssl-0.9.6"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c
+	epunt_cxx
+	libtoolize --force --copy || die
+	aclocal -I . || die
+	autoconf || die
+}
+
+src_compile() {
+	# Filter the c3 flag for now. Probably a GCC problem, but we'll
+	# avoid it here for now. See bug #61025
+	filter-flags -march=c3
+
+	econf	\
+		$(use_enable ipv6) \
+		--enable-frag \
+		--enable-hybrid \
+		--enable-dpd \
+		--enable-natt \
+		--enable-adminport \
+		|| die
+		# Removed due to some problems
+		#--enable-samode-unspec \
+	emake -j1 || die
+}
+
+src_install() {
+	einstall || die
+	keepdir /var/lib/racoon
+	insinto /etc/conf.d && newins ${FILESDIR}/racoon.conf.d racoon
+	exeinto /etc/init.d && newexe ${FILESDIR}/racoon.init.d racoon
+
+	dodoc ChangeLog README NEWS
+	dodoc ${S}/src/racoon/samples/racoon.conf.sample*
+}