6 files changed, 102 insertions, 7 deletions
diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index d071d0e1ab67..f1dd412e4604 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.15 2004/09/06 20:07:53 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.16 2004/12/16 21:41:26 latexer Exp $
+
+*ipsec-tools-0.4 (16 Dec 2004)
+
+  16 Dec 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  +files/ipsec-tools-0.4-gcc34.diff, +ipsec-tools-0.4.ebuild:
+  Bump to new release. Add my self to the maintainers list.
 
   06 Sep 2004; <plasmaroo@gentoo.org> ipsec-tools-0.2.5.ebuild,
   ipsec-tools-0.3.1.ebuild, ipsec-tools-0.3.3.ebuild:
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 1e1941825333..218d1d710288 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,11 +1,14 @@
-MD5 ab2c942f0a5a1e7523f323257416fcff ChangeLog 2776
-MD5 8b0f876da8fa70f6ebcbaf281e5720d6 metadata.xml 224
-MD5 ec33941484c2e26a862c08b4763a99e5 ipsec-tools-0.3.3.ebuild 1601
-MD5 f5fa3c299dae2baa4c7a746e44157159 ipsec-tools-0.2.5.ebuild 1551
 MD5 560fc7d791f612541caf45b1af53003b ipsec-tools-0.3.1.ebuild 1603
-MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
-MD5 6ed9fbfd1bce8915be1e87a159802c46 files/digest-ipsec-tools-0.2.5 69
+MD5 3d8799afd1d7e6f3ddec11121fbc66b5 ipsec-tools-0.4.ebuild 1692
+MD5 f5fa3c299dae2baa4c7a746e44157159 ipsec-tools-0.2.5.ebuild 1551
+MD5 ec33941484c2e26a862c08b4763a99e5 ipsec-tools-0.3.3.ebuild 1601
+MD5 e94ea253159361655490e8db653a35fc ChangeLog 2994
+MD5 c58d4bbba473ea6b78a0e815b29b2aa6 metadata.xml 286
 MD5 84cffb83a2579976f872a29d42767714 files/ipsec.conf.sample 260
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
+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
diff --git a/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4 b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4
new file mode 100644
index 000000000000..0855393d1461
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/digest-ipsec-tools-0.4
@@ -0,0 +1 @@
+MD5 dceea3b72328a580cf156d74cbee6f80 ipsec-tools-0.4.tar.gz 915420
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff
new file mode 100644
index 000000000000..7f6caec6b2f0
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.4-gcc34.diff
@@ -0,0 +1,31 @@
+diff -aur ipsec-tools-0.4-orig/src/racoon/sockmisc.c ipsec-tools-0.4/src/racoon/sockmisc.c
+--- ipsec-tools-0.4-orig/src/racoon/sockmisc.c	2004-11-16 11:15:42.000000000 -0500
++++ ipsec-tools-0.4/src/racoon/sockmisc.c	2004-12-16 14:42:25.543888328 -0500
+@@ -834,7 +834,7 @@
+ 	if (saddr == NULL)
+ 		return NULL;
+ 
+-	GETNAMEINFO(saddr, addr, NULL);
++	GETNAMEINFO_NULL(saddr, addr);
+ 	snprintf(buf, sizeof(buf), "%s", addr);
+ 
+ 	return buf;
+diff -aur ipsec-tools-0.4-orig/src/racoon/var.h ipsec-tools-0.4/src/racoon/var.h
+--- ipsec-tools-0.4-orig/src/racoon/var.h	2004-06-11 12:00:17.000000000 -0400
++++ ipsec-tools-0.4/src/racoon/var.h	2004-12-16 14:42:14.983493752 -0500
+@@ -82,6 +82,15 @@
+ 	} \
+ } while (0);
+ 
++#define GETNAMEINFO_NULL(x, y) \
++do { \
++	if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \
++			NIFLAGS) != 0) { \
++		if (y) \
++			strncpy((y), "(invalid)", sizeof(y)); \
++	} \
++} while (0);
++
+ #include <sys/queue.h>
+ #ifndef LIST_FOREACH
+ #define LIST_FOREACH(elm, head, field) \
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild
new file mode 100644
index 000000000000..4dc03f4dfc9f
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/16 21:41:26 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
+}
+
+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*
+}
diff --git a/net-firewall/ipsec-tools/metadata.xml b/net-firewall/ipsec-tools/metadata.xml
index 7ba772c43ab2..a2a0643044e3 100644
--- a/net-firewall/ipsec-tools/metadata.xml
+++ b/net-firewall/ipsec-tools/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
 	<email>plasmaroo@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>latexer@gentoo.org</email>
+</maintainer>
 </pkgmetadata>