Punt setkey since ipsec-tools exists now to handle it #78588.

Package-Manager: portage-2.0.51-r13

4 files changed, 16 insertions, 169 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 83bb5eb11e1a..12a2378001eb 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.36 2005/01/04 04:47:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.37 2005/01/19 01:09:46 vapier Exp $
+
+  18 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/iputils-021109-pfkey.patch, iputils-021109-r3.ebuild:
+  Punt setkey since ipsec-tools exists now to handle it #78588.
 
   03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
   Restore USE=doc with an extra check in case we're in the middle of a
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 533a821de3c0..461485258ce6 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,11 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 484743b0cc8d50291a99b17e467a9f53 ChangeLog 5380
-MD5 4cce9d9073915f2baa62895f6dc62a92 iputils-021109-r3.ebuild 2868
+MD5 11e6020fc82bd6316b4a1c824a739261 ChangeLog 5558
+MD5 78f016c49d7c098a5060e600da630898 iputils-021109-r3.ebuild 2239
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d85216426f34d4e768ab8f9f48c66e4f files/021109-syserror.patch 324
-MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
 MD5 c11c8762616b29e6d556a147aaa9374a files/021109-no-pfkey-search.patch 307
 MD5 2baac2d4f1c8f01957aaaf6b6349c203 files/021109-gcc34.patch 347
 MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109-r3 73
@@ -13,9 +12,9 @@ MD5 79de65b9da536090d0560ba51520fd9d files/iputils-021109-linux-udp-header.patch
 MD5 c9986b4299c200260da8f025c5e4b0ea files/021109-ipg-linux-2.6.patch 981
 MD5 b4615612d4514f12b35fbaf27d3e04fe files/021109-uclibc-no-ether_ntohost.patch 635
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB2ynQroRuSHgZdywRAjXWAJ9mayGJPfn2OqLfERVaW5ZCoXmpXQCcCz6C
-ObmOZ4HbFjidYwmhuidh1X0=
-=8f9/
+iD8DBQFB7bOKroRuSHgZdywRAs2UAJ97VMuvjb0qqi5wrQLhzWK9/HxJhQCfQXp3
+RM0U1St0wpUBy0LISdkX+Ng=
+=R+nw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/files/iputils-021109-pfkey.patch b/net-misc/iputils/files/iputils-021109-pfkey.patch
deleted file mode 100644
index 6dd815188212..000000000000
--- a/net-misc/iputils/files/iputils-021109-pfkey.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef __NET_PFKEYV2_H_
-#define __NET_PFKEYV2_H_ 1
-
-#include <stdint.h>
-#include <linux/pfkeyv2.h>
-
-#ifndef SADB_X_AALG_NULL
-#  define SADB_X_AALG_NULL	5	/*251*/	/* null authentication */
-#endif
-#ifndef SADB_AALG_SHA2_256
-#  define SADB_AALG_SHA2_256           5
-#endif
-#ifndef SADB_AALG_SHA2_384
-#  define SADB_AALG_SHA2_384           6
-#endif
-#ifndef SADB_AALG_SHA2_512
-#  define SADB_AALG_SHA2_512           7
-#endif
-#ifndef SADB_X_AALG_SHA2_256
-#  define SADB_X_AALG_SHA2_256		SADB_AALG_SHA2_256
-#endif
-#ifndef SADB_X_AALG_SHA2_384
-#  define SADB_X_AALG_SHA2_384		SADB_AALG_SHA2_384
-#endif
-#ifndef SADB_X_AALG_SHA2_512
-#  define SADB_X_AALG_SHA2_512		SADB_AALG_SHA2_512
-#endif
-#ifndef SADB_AALG_RIPEMD160HMAC
-#  define SADB_AALG_RIPEMD160HMAC      8
-#endif
-#ifndef SADB_X_AALG_MD5
-#  define SADB_X_AALG_MD5              249
-#endif
-#ifndef SADB_X_AALG_SHA
-#  define SADB_X_AALG_SHA              250
-#endif
-
-/* private allocations - based on RFC2407/IANA assignment */
-#ifndef SADB_X_EALG_CAST128CBC
-#  define SADB_X_EALG_CAST128CBC	5	/*6*/
-#endif
-#ifndef SADB_X_EALG_BLOWFISHCBC
-#  define SADB_X_EALG_BLOWFISHCBC	4	/*7*/
-#endif
-#ifndef SADB_X_EALG_RIJNDAELCBC
-#  define SADB_X_EALG_RIJNDAELCBC	12
-#endif
-#ifndef SADB_X_EALG_AES
-#  define SADB_X_EALG_AES		12
-#endif
-
-#ifndef SADB_X_CALG_NONE
-#  define SADB_X_CALG_NONE	0
-#endif
-#ifndef SADB_X_CALG_OUI
-#  define SADB_X_CALG_OUI		1
-#endif
-#ifndef SADB_X_CALG_DEFLATE
-#  define SADB_X_CALG_DEFLATE	2
-#endif
-#ifndef SADB_X_CALG_LZS
-#  define SADB_X_CALG_LZS		3
-#endif
-#ifndef SADB_X_CALG_MAX
-#  define SADB_X_CALG_MAX		4
-#endif
-
-#ifndef SADB_X_ENT_NONE
-#  define SADB_X_EXT_NONE		0x0000	/* i.e. new format. */
-#endif
-#ifndef SADB_X_EXT_OLD
-#  define SADB_X_EXT_OLD		0x0001	/* old format. */
-#endif
-
-#ifndef SADB_X_EXT_IV48
-#  define SADB_X_EXT_IV4B		0x0010	/* IV length of 4 bytes in use */
-#endif
-#ifndef SADB_X_EXT_DERIV
-#  define SADB_X_EXT_DERIV	0x0020	/* DES derived */
-#endif
-#ifndef SADB_X_EXT_CYCSEQ
-#  define SADB_X_EXT_CYCSEQ	0x0040	/* allowing to cyclic sequence. */
-#endif
-
-	/* three of followings are exclusive flags each them */
-#ifndef SADB_X_EXT_PSEQ
-#  define SADB_X_EXT_PSEQ		0x0000	/* sequencial padding for ESP */
-#endif
-#ifndef SADB_X_EXT_PRAND
-#  define SADB_X_EXT_PRAND	0x0100	/* random padding for ESP */
-#endif
-#ifndef SADB_X_EXT_PZERO
-#  define SADB_X_EXT_PZERO	0x0200	/* zero padding for ESP */
-#endif
-#ifndef SADB_X_EXT_PMASK
-#  define SADB_X_EXT_PMASK	0x0300	/* mask for padding flag */
-#endif
-#ifndef SADB_X_EXT_RAWCPI
-#  define SADB_X_EXT_RAWCPI	0x0080	/* use well known CPI (IPComp) */
-#endif
-
-#ifndef PFKEY_SOFT_LIFETIME_RATE
-#  define PFKEY_SOFT_LIFETIME_RATE	80
-#endif
-
-#ifndef SADB_X_LIFETIME_ALLOCATIONS
-#  define SADB_X_LIFETIME_ALLOCATIONS	0
-#endif
-#ifndef SADB_X_LIFETIME_BYTES
-#  define SADB_X_LIFETIME_BYTES		1
-#endif
-#ifndef SADB_X_LIFETIME_ADDTIME
-#  define SADB_X_LIFETIME_ADDTIME		2
-#endif
-#ifndef SADB_X_LIFETIME_USETIME
-#  define SADB_X_LIFETIME_USETIME		3
-#endif
-
-#define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1)))
-#define	PFKEY_EXTLEN(msg) \
-	PFKEY_UNUNIT64(((struct sadb_ext *)(msg))->sadb_ext_len)
-#define PFKEY_ADDR_PREFIX(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_prefixlen)
-#define PFKEY_ADDR_PROTO(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_proto)
-#define PFKEY_ADDR_SADDR(ext) \
-	((struct sockaddr *)((caddr_t)(ext) + sizeof(struct sadb_address)))
-
-/* in 64bits */
-#define	PFKEY_UNUNIT64(a)	((a) << 3)
-#define	PFKEY_UNIT64(a)		((a) >> 3)
-
-#endif
diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index be5f49762f83..aa81f8553b8b 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.18 2005/01/04 23:41:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.19 2005/01/19 01:09:46 vapier Exp $
 
 inherit flag-o-matic gnuconfig eutils toolchain-funcs
 
@@ -16,8 +16,6 @@ IUSE="static ipv6 uclibc doc"
 
 DEPEND="virtual/libc
 	virtual/os-headers
-	sys-devel/bison
-	sys-devel/flex
 	dev-libs/openssl
 	sys-devel/autoconf
 	doc? (
@@ -34,7 +32,6 @@ 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}-gcc34.patch
@@ -49,44 +46,25 @@ src_unpack() {
 	sed -i \
 		-e "/^CCOPT=/s:-O2:${CFLAGS}:" \
 		-e "/^CC=/s:.*::" \
-		Makefile \
-		|| die "sed Makefile opts failed"
-	sed -i \
 		-e '/^all:/s:check-kernel::' \
 		-e 's:-I$(KERNEL_INCLUDE)::' \
 		-e 's:-I/usr/src/linux/include::' \
-		Makefile libipsec/Makefile setkey/Makefile \
-		|| die "sed /usr/include failed"
+		Makefile \
+		|| die "sed Makefile failed"
 	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-
-	sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
-
-	sed -i 's:yacc:bison -y:' libipsec/Makefile #59191
 }
 
 src_compile() {
 	tc-export CC AR
-
-	# 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"
-
-		cd ${S}/setkey
-		emake || die "setkey failed"
-	fi
-
-	cd ${S}
 	emake || die "make main failed"
 
 	# We include the extra check for docbook2html 
 	# because when we emerge from a stage1/stage2, 
 	# it may not exist #23156
 	if use doc && type -p docbook2html ; then
-		make html || die
+		emake -j1 html || die
 	fi
-	make man || die "make man failed"
+	emake -j1 man || die "make man failed"
 }
 
 src_install() {
@@ -95,7 +73,6 @@ src_install() {
 	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