ver bump to fix #38774

5 files changed, 138 insertions, 1 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 63797c07a3fb..812e7532d7d9 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/iputils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.22 2004/03/23 15:58:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.23 2004/04/07 06:34:43 vapier Exp $
+
+*iputils-021109-r2 (07 Apr 2004)
+
+  07 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Clean up src_unpack and src_compile steps and add flex/openssl to DEPEND #38774.
 
   23 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> iputils-021109-r1.ebuild:
   Closing #44555.
diff --git a/net-misc/iputils/files/021109-no-pfkey-search.patch b/net-misc/iputils/files/021109-no-pfkey-search.patch
new file mode 100644
index 000000000000..836040cc92a5
--- /dev/null
+++ b/net-misc/iputils/files/021109-no-pfkey-search.patch
@@ -0,0 +1,8 @@
+--- Makefile.orig	2004-04-07 02:07:14.361973576 -0400
++++ Makefile	2004-04-07 02:07:21.243927360 -0400
+@@ -20,5 +19,0 @@
+-ifeq ($(KERNEL_INCLUDE)/linux/pfkeyv2.h,$(wildcard $(KERNEL_INCLUDE)/linux/pfkeyv2.h))
+-  SUBDIRS=libipsec setkey
+-  LDLIBS+=-Llibipsec -lipsec
+-  IPSECDEF=-DDO_IPSEC -Ilibipsec
+-endif
diff --git a/net-misc/iputils/files/021109-racoon-getifaddrs-fix.patch b/net-misc/iputils/files/021109-racoon-getifaddrs-fix.patch
new file mode 100644
index 000000000000..1882abf33d26
--- /dev/null
+++ b/net-misc/iputils/files/021109-racoon-getifaddrs-fix.patch
@@ -0,0 +1,14 @@
+--- racoon/grabmyaddr.c.orig	2004-04-07 02:08:50.522354976 -0400
++++ racoon/grabmyaddr.c	2004-04-07 02:09:30.272312064 -0400
+@@ -50,3 +50,3 @@
+ #include <netdb.h>
+-#ifdef HAVE_GETIFADDRS
++#ifndef HAVE_GETIFADDRS
+ #include <ifaddrs.h>
+@@ -67,6 +67,2 @@
+ 
+-#ifdef __linux__
+-#define HAVE_GETIFADDRS
+-#endif
+-
+ #ifndef HAVE_GETIFADDRS
diff --git a/net-misc/iputils/files/digest-iputils-021109-r2 b/net-misc/iputils/files/digest-iputils-021109-r2
new file mode 100644
index 000000000000..ea769a132e46
--- /dev/null
+++ b/net-misc/iputils/files/digest-iputils-021109-r2
@@ -0,0 +1 @@
+MD5 dd10ef3d76480990a2174d2bb0daddaf iputils-ss021109-try.tar.bz2 428335
diff --git a/net-misc/iputils/iputils-021109-r2.ebuild b/net-misc/iputils/iputils-021109-r2.ebuild
new file mode 100644
index 000000000000..9a56e6c00a8e
--- /dev/null
+++ b/net-misc/iputils/iputils-021109-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r2.ebuild,v 1.1 2004/04/07 06:34:43 vapier Exp $
+
+inherit flag-o-matic gcc gnuconfig eutils
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing"
+SRC_URI="ftp://ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2
+	http://ftp.iasi.roedu.net/mirrors/ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="static ipv6" #doc
+
+DEPEND="virtual/glibc
+	virtual/os-headers
+	dev-util/yacc
+	sys-devel/flex
+	dev-libs/openssl
+	sys-devel/autoconf"
+# docs are broken #23156
+#	doc? ( app-text/openjade
+#		dev-perl/SGMLSpm
+#		app-text/docbook-sgml-dtd
+#		app-text/docbook-sgml-utils )
+RDEPEND="virtual/glibc"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/iputils-021109-pfkey.patch include-glibc/net/pfkeyv2.h
+	use static && append-ldflags -static
+
+	epatch ${FILESDIR}/${PV}-no-pfkey-search.patch
+	sed -i \
+		-e "/^CCOPT=/s:-O2:${CFLAGS}:" \
+		-e "/^CC=/s:gcc:$(gcc-getCC):" \
+		Makefile \
+		|| die "sed Makefile opts failed"
+	sed -i \
+		-e "s:/usr/src/linux/include:${ROOT}/usr/include:" \
+		Makefile libipsec/Makefile setkey/Makefile \
+		|| die "sed /usr/include failed"
+	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
+
+	sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
+
+	cd racoon
+	epatch ${FILESDIR}/${PV}-racoon-getifaddrs-fix.patch
+	sed -i '2323i\LIBS="$LIBS -lfl -lresolv"' configure || die "configure libs failed"
+	gnuconfig_update
+}
+
+src_compile() {
+	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
+		cd ${S}/libipsec
+		emake || die "libipsec failed"
+
+		cd ${S}/setkey
+		emake || die "setkey failed"
+
+		cd ${S}/racoon
+		econf || die
+		emake || die "make racoon failed"
+	fi
+
+	cd ${S}
+	emake || die "make main failed"
+
+	#if use doc ; then
+	#	make html || die
+	#fi
+	make man || die "make man failed"
+}
+
+src_install() {
+	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
+		dodir /usr/sbin /usr/share/man/man{5,8}
+		cd ${S}/racoon && einstall || die
+
+		into /usr
+		dobin ${S}/setkey/setkey
+	fi
+
+	cd ${S}
+	into /
+	dobin ping
+	use ipv6 && dobin ping6
+	dosbin arping
+	into /usr
+	dobin tracepath
+	use ipv6 && dobin trace{path,route}6
+	dosbin clockdiff rarpd rdisc ipg tftpd
+
+	fperms 4711 /bin/ping /usr/bin/tracepath
+	use ipv6 && fperms 4711 /bin/ping6 /usr/bin/trace{path,route}6
+
+	dodoc INSTALL RELNOTES
+
+	use ipv6 || rm doc/*6.8
+	doman doc/*.8
+
+	#use doc && dohtml doc/*.html
+}