Bump the 0.4 release with the fix for bug #113201.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 94 insertions, 2 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index f5916e300558..1e73c57931a3 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2005/12/03 19:23:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.33 2005/12/03 19:34:28 latexer Exp $
+
+*ipsec-tools-0.4-r2 (03 Dec 2005)
+
+  03 Dec 2005; Peter Johanson <latexer@gentoo.org>
+  +files/ipsec-tools-0.4-dos-fix.diff, +ipsec-tools-0.4-r2.ebuild:
+  Bump the 0.4 release with the fix for bug #113201.
 
   03 Dec 2005; Peter Johanson <latexer@gentoo.org>
   files/ipsec-tools-0.6.2-dos-fix.diff:
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index e83d09036b2f..9d3d318ca6f0 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -4,7 +4,7 @@ MD5 1e8b9993c9d4f8bc53955cf690469564 ipsec-tools-0.4.ebuild 1692
 MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
 MD5 ef740a7e16a969008e0ed2bdf22019a8 ipsec-tools-0.5-r1.ebuild 1552
 MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
-MD5 c183028cf668f268144ee60c54337b7b ChangeLog 5514
+MD5 f3c7509858e86f353b1a85db8d6d6033 ChangeLog 5721
 MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
 MD5 d99501b6fa9700e3b7e8904150d8799f ipsec-tools-0.4-r1.ebuild 1743
 MD5 47cb6792bf1c84666919e3f22600b7ca ipsec-tools-0.5-r2.ebuild 1683
@@ -12,6 +12,7 @@ MD5 228ff7a8380ec6efeedd68194846e678 ipsec-tools-0.5.2.ebuild 1552
 MD5 cc182cf7948e409898ffe2ca4b51b9cf ipsec-tools-0.6.2.ebuild 1618
 MD5 71e5a46f6d8c40e40c89f4242cf287b3 ipsec-tools-0.6.3.ebuild 1618
 MD5 41f7f09abdc4e6b62e341962d010d9c4 ipsec-tools-0.6.2-r1.ebuild 1659
+MD5 41a885bcaa4b561b1c4a0efbc17dadef ipsec-tools-0.4-r2.ebuild 1784
 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
@@ -31,3 +32,5 @@ MD5 832e8761ccd34bfba26e6034336521d7 files/digest-ipsec-tools-0.6.2 70
 MD5 fd1e086ca2de0f90e9784196bd70260a files/digest-ipsec-tools-0.6.3 70
 MD5 2f42994decfddca5c1bbeff79b507219 files/ipsec-tools-0.6.2-dos-fix.diff 936
 MD5 832e8761ccd34bfba26e6034336521d7 files/digest-ipsec-tools-0.6.2-r1 70
+MD5 4aec5a5d3271ba50190518f901f83f7f files/ipsec-tools-0.4-dos-fix.diff 928
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r2 67
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2
new file mode 100644
index 000000000000..0855393d1461
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4-r2
@@ -0,0 +1 @@
+MD5 dceea3b72328a580cf156d74cbee6f80 ipsec-tools-0.4.tar.gz 915420
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff
new file mode 100644
index 000000000000..a7b44c268897
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-dos-fix.diff
@@ -0,0 +1,29 @@
+diff -aur ipsec-tools-0.4-orig/src/racoon/isakmp_agg.c ipsec-tools-0.4/src/racoon/isakmp_agg.c
+--- ipsec-tools-0.4-orig/src/racoon/isakmp_agg.c	2004-03-23 04:50:27.000000000 -0800
++++ ipsec-tools-0.4/src/racoon/isakmp_agg.c	2005-12-03 11:25:10.000000000 -0800
+@@ -400,7 +400,11 @@
+ 	}
+ 
+ 	/* payload existency check */
+-	/* XXX to be checked each authentication method. */
++	if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
++		plog(LLV_ERROR, LOCATION, iph1->remote,
++			"few isakmp message received.\n");
++		goto end;
++	}
+ 
+ 	/* verify identifier */
+ 	if (ipsecdoi_checkid1(iph1) != 0) {
+@@ -755,7 +759,11 @@
+ 	}
+ 
+ 	/* payload existency check */
+-	/* XXX to be checked each authentication method. */
++	if (iph1->dhpub_p == NULL || iph1->nonce_p == NULL) {
++		plog(LLV_ERROR, LOCATION, iph1->remote,
++			"few isakmp message received.\n");
++		goto end;
++	}
+ 
+ 	/* verify identifier */
+ 	if (ipsecdoi_checkid1(iph1) != 0) {
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.4-r2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.4-r2.ebuild
new file mode 100644
index 000000000000..4c0d86a8f45e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.4-r2.ebuild
@@ -0,0 +1,53 @@
+# 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.4-r2.ebuild,v 1.1 2005/12/03 19:34:28 latexer Exp $
+
+inherit eutils
+
+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}/${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~x86 ~amd64 ~sparc"
+SLOT="0"
+IUSE="selinux"
+DEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
+
+pkg_setup() {
+	my_KV=`echo ${KV} | cut -f-2 -d "."`
+	if [ ${my_KV} != "2.6" ] ; then
+		echo; eerror "You need a 2.6.x kernel to use the ipsec tools!"; die "You need a 2.6 kernel to use ipsec-tools!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.diff
+	epatch ${FILESDIR}/${PN}-0.5-isakmp-underrun.diff
+	epatch ${FILESDIR}/${P}-dos-fix.diff
+}
+
+src_compile() {
+	unset CC
+	./configure --prefix=/usr --sysconfdir=/etc --with-kernel-headers=/usr/src/linux/include || die
+	sed -e 's:AM_CFLAGS = :AM_CFLAGS = -include /usr/src/linux/include/linux/compiler.h :' -i src/setkey/Makefile || die
+	sed -e 's:CPPFLAGS=:CPPFLAGS = -include /usr/src/linux/include/linux/compiler.h :' -i src/racoon/Makefile || die
+	sed -e 's:va_copy:__va_copy:g' -i src/racoon/plog.c || die # GCC 2 Fix
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	rm ${D}/usr/bin
+	dosbin src/racoon/racoon
+	insinto /etc && doins ${FILESDIR}/ipsec.conf.sample
+	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*
+}