Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.

3 files changed, 17 insertions, 16 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 431cf3e544ea..da741c09d7a2 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/iputils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.34 2005/01/04 03:52:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.35 2005/01/04 04:28:15 vapier Exp $
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
+  Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.
 
   03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
   +files/021109-ipg-linux-2.6.patch, iputils-021109-r3.ebuild:
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index a8b54390b43e..6603b9055359 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e2ccbeed9ec09bab7f076ddf927b1eee ChangeLog 5062
-MD5 803f089c3d1999303ca7b3c72777c755 iputils-021109-r3.ebuild 2689
+MD5 eaab0bbaa549583a4463925df84abecb ChangeLog 5212
+MD5 4494c85b5d3a99a6b5837d3290d7ea1f iputils-021109-r3.ebuild 2718
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d85216426f34d4e768ab8f9f48c66e4f files/021109-syserror.patch 324
 MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
@@ -15,7 +15,7 @@ MD5 b4615612d4514f12b35fbaf27d3e04fe files/021109-uclibc-no-ether_ntohost.patch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB2hVvroRuSHgZdywRAu7lAJ9n0Yp2L3OlxJRyq5poIMpHHh3FTQCffw6e
-H6nU75qDqX4NwB0WFbAIdO0=
-=i3u3
+iD8DBQFB2ht3roRuSHgZdywRAsX4AKCB+o7rNtfkE4H8iiYnj7Nx0nwgZQCgj2o6
+R8s2PXh7/42PUEqjYvYz1cI=
+=+uiS
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index 9142a744f783..20a21c23ce69 100644
--- a/net-misc/iputils/iputils-021109-r3.ebuild
+++ b/net-misc/iputils/iputils-021109-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.15 2005/01/04 04:02:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.16 2005/01/04 04:28:15 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils toolchain-funcs
 
@@ -51,12 +51,13 @@ src_unpack() {
 		Makefile \
 		|| die "sed Makefile opts failed"
 	sed -i \
-		-e "s:/usr/src/linux/include:${ROOT}/usr/include:" \
+		-e 's:-I$(KERNEL_INCLUDE)::' \
+		-e 's:-I/usr/src/linux/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 -L${ROOT}/usr/lib ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
+	sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
 
 	sed -i 's:yacc:bison -y:' libipsec/Makefile #59191
 }
@@ -64,7 +65,9 @@ src_unpack() {
 src_compile() {
 	tc-export CC AR
 
-	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
+	# We have to make sure ipsec.h is usuable #67569
+	echo '#include <linux/ipsec.h>' > "${T}"/test.c
+	if ${CC} -c "${T}"/test.c >&/dev/null ; then
 		cd ${S}/libipsec
 		emake || die "libipsec failed"
 
@@ -82,17 +85,12 @@ src_compile() {
 }
 
 src_install() {
-	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
-		into /usr
-		dobin ${S}/setkey/setkey
-	fi
-
-	cd ${S}
 	into /
 	dobin ping
 	use ipv6 && dobin ping6
 	dosbin arping
 	into /usr
+	[[ -x setkey/setkey ]] && dobin setkey/setkey
 	dosbin tracepath
 	use ipv6 && dosbin trace{path,route}6
 	dosbin clockdiff rarpd rdisc ipg tftpd