diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-01-08 17:30:50 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-01-08 17:30:50 +0000 |
| commit | 4b4345dce19d15267782d24bf330536daf540a61 (patch) | |
| tree | 12259843c2aa69f507ccaae578bb143eef9f2e8d /net-misc | |
| parent | going stable for sparc (diff) | |
| download | gentoo-2-4b4345dce19d15267782d24bf330536daf540a61.tar.gz gentoo-2-4b4345dce19d15267782d24bf330536daf540a61.tar.bz2 gentoo-2-4b4345dce19d15267782d24bf330536daf540a61.zip | |
Added working 2.6 support in; this also now installs setkey and racoon if you are using 2.6 headers.
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/iputils/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/iputils/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-021109.ebuild | 28 |
3 files changed, 33 insertions, 4 deletions
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 614da7ddf600..71760c99a2ba 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for net-misc/iputils # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.16 2003/11/17 00:19:37 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.17 2004/01/08 17:30:39 plasmaroo Exp $ + 08 Jan 2004; <plasmaroo@gentoo.org> iputils-021109.ebuild: + Added 2.6 support; this now installs setkey and racoon if you have 2.6 + headers. *iputils-021109 (16 Nov 2003) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 33f463c8db19..6b1f24cb35d2 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,5 +1,5 @@ -MD5 0da5a0149a72081afb60abfcb7a6171d ChangeLog 2759 -MD5 de4e16a75db2bbfc884d60119d39ea32 iputils-021109.ebuild 1423 +MD5 0388dfb64cf3cc0378391f88aedcd2d3 ChangeLog 2908 +MD5 34ee2d9d0280b9830662e93ced843677 iputils-021109.ebuild 2288 MD5 21bbbdb8abaaadd8e7d084aab7d181b6 iputils-020927.ebuild 1333 MD5 d6d6f3cb8ff77c826d432ed7eb394c43 files/digest-iputils-020927 68 MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477 diff --git a/net-misc/iputils/iputils-021109.ebuild b/net-misc/iputils/iputils-021109.ebuild index 70ef7ca78978..153a928d3ead 100644 --- a/net-misc/iputils/iputils-021109.ebuild +++ b/net-misc/iputils/iputils-021109.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.6 2004/01/08 16:27:46 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109.ebuild,v 1.7 2004/01/08 17:30:39 plasmaroo Exp $ DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing" @@ -27,6 +27,7 @@ src_unpack() { unpack ${A} cd ${S} + cp ${FILESDIR}/${P}-pfkey.patch include-glibc/net/pfkeyv2.h || die sed -e "27s:-O2:${CFLAGS}:;68s:./configure:unset CFLAGS\;./configure:" -i Makefile sed -e "20d;21d;22d;23d;24d" -i Makefile @@ -35,6 +36,21 @@ src_unpack() { src_compile() { use static && LDFLAGS="${LDFLAGS} -static" + + if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ]; then + sed -e '1s:/usr/src/linux/include:/usr/include:' -i libipsec/Makefile + sed -e '1s:/usr/src/linux/include:/usr/include:' -i setkey/Makefile + sed -e '1s:/usr/src/linux/include:/usr/include:;10s:-ll:-lfl:' -i setkey/Makefile + sed -e "51s:ifdef:ifndef:;68d; 69d; 70d;" -i racoon/grabmyaddr.c + sed -e '461i\LIBS="$LIBS -lfl -lresolv"' -i racoon/configure.in + cd ${S}/libipsec && emake || die + cd ${S}/setkey && emake || die + + cd ${S}/racoon + autoconf || die; econf || die; emake || die + fi + + cd ${S} emake KERNEL_INCLUDE="/usr/include" || die # if [ "`use doc`" ]; then @@ -46,6 +62,16 @@ src_compile() { src_install() { + if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ]; then + mkdir -p ${D}/usr/sbin; mkdir -p ${D}/usr/share/man/man8 + mkdir -p ${D}/usr/share/man/man5; + cd ${S}/racoon && einstall || die + + into /usr + dobin ${S}/setkey/setkey + fi + + cd ${S} into / dobin ping ping6 dosbin arping |