Revision bump for bug #113201.

(Portage version: 2.0.51.22-r2)

5 files changed, 108 insertions, 1 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index f1d2950ca7e3..fbee6bdd6363 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.30 2005/12/02 09:02:20 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.31 2005/12/02 09:19:07 latexer Exp $
+
+*ipsec-tools-0.6.2-r1 (02 Dec 2005)
+
+  02 Dec 2005; Peter Johanson <latexer@gentoo.org>
+  +files/ipsec-tools-0.6.2-dos-fix.diff, +ipsec-tools-0.6.2-r1.ebuild:
+  Revision bump for bug #113201.
 
 *ipsec-tools-0.6.3 (02 Dec 2005)
 
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 8e31bf66cb40..da5fc9bdc811 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -11,6 +11,7 @@ MD5 47cb6792bf1c84666919e3f22600b7ca ipsec-tools-0.5-r2.ebuild 1683
 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 4f240c6a59e5424582f7ddfbb76eccf0 ipsec-tools-0.6.2-r1.ebuild 1656
 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
@@ -28,3 +29,5 @@ MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r2 68
 MD5 3101edbfff1f3a77e0711002dcd675ac files/digest-ipsec-tools-0.5.2 70
 MD5 832e8761ccd34bfba26e6034336521d7 files/digest-ipsec-tools-0.6.2 70
 MD5 fd1e086ca2de0f90e9784196bd70260a files/digest-ipsec-tools-0.6.3 70
+MD5 9cf4b979cffa31f0c89c46064119f4e1 files/ipsec-tools-0.6.2-dos-fix.diff 1155
+MD5 832e8761ccd34bfba26e6034336521d7 files/digest-ipsec-tools-0.6.2-r1 70
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1
new file mode 100644
index 000000000000..3cbe2cbcafae
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.6.2-r1
@@ -0,0 +1 @@
+MD5 3d94d4a13daff63c1bd57a4f1f6462d0 ipsec-tools-0.6.2.tar.bz2 663760
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff
new file mode 100644
index 000000000000..5782f1fa3c60
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.6.2-dos-fix.diff
@@ -0,0 +1,35 @@
+diff -aur ipsec-tools-0.6.2-orig/src/racoon/isakmp_agg.c ipsec-tools-0.6.2/src/racoon/isakmp_agg.c
+--- ipsec-tools-0.6.2-orig/src/racoon/isakmp_agg.c	2005-09-26 09:12:20.000000000 -0700
++++ ipsec-tools-0.6.2/src/racoon/isakmp_agg.c	2005-12-02 01:04:23.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* $Id: ipsec-tools-0.6.2-dos-fix.diff,v 1.1 2005/12/02 09:19:07 latexer Exp $ */
++/* $Id: ipsec-tools-0.6.2-dos-fix.diff,v 1.1 2005/12/02 09:19:07 latexer Exp $ */
+ 
+ /*
+  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+@@ -488,7 +488,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) {
+@@ -888,7 +892,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.6.2-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..47803d9a7c68
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.6.2-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.6.2-r1.ebuild,v 1.1 2005/12/02 09:19:07 latexer Exp $
+
+inherit eutils flag-o-matic
+
+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.bz2"
+LICENSE="BSD"
+KEYWORDS="~x86 ~amd64 ~ppc"
+SLOT="0"
+IUSE="idea ipv6 pam rc5 readline selinux"
+
+DEPEND="virtual/libc
+	>=sys-kernel/linux-headers-2.6
+	readline? ( sys-libs/readline )
+	pam? ( sys-libs/pam )
+	>=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}-dos-fix.diff
+	epunt_cxx
+}
+
+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 idea) \
+		$(use_enable rc5) \
+		$(use_enable ipv6) \
+		$(use_with readline) \
+		$(use_with pam libpam) \
+		|| 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*
+}