old

(Portage version: 2.1.4)

12 files changed, 0 insertions, 598 deletions

diff --git a/net-misc/iputils/files/021109-ipg-linux-2.6.patch b/net-misc/iputils/files/021109-ipg-linux-2.6.patch
deleted file mode 100644
index 550a8d584c78..000000000000
--- a/net-misc/iputils/files/021109-ipg-linux-2.6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-In newer kernels, the pg file has moved around in /proc/.
-
-http://bugs.gentoo.org/show_bug.cgi?id=71756
-
---- iputils/ipg.orig	2005-01-03 22:47:26.314393976 -0500
-+++ iputils/ipg	2005-01-03 22:49:09.686679000 -0500
-@@ -1,21 +1,31 @@
--#! /bin/bash
-+#!/bin/bash
- 
--modprobe pg3
-+modprobe pg3 >& /dev/null
-+modprobe pktgen >& /dev/null
-+
-+PGDEV=/proc/net/pg
-+if [[ ! -e ${PGDEV} ]] ; then
-+	PGDEV=/proc/net/pktgen/pg0
-+	if [[ ! -e ${PGDEV} ]] ; then
-+		echo "Couldn't not locate pg in /proc/net :("
-+		exit 1
-+	fi
-+fi
- 
- function pgset() {
-     local result
- 
--    echo $1 > /proc/net/pg
-+    echo $1 > ${PGDEV}
- 
--    result=`cat /proc/net/pg | fgrep "Result: OK:"`
-+    result=`cat ${PGDEV} | fgrep "Result: OK:"`
-     if [ "$result" = "" ]; then
--         cat /proc/net/pg | fgrep Result:
-+         cat ${PGDEV} | fgrep Result:
-     fi
- }
- 
- function pg() {
--    echo inject > /proc/net/pg
--    cat /proc/net/pg
-+    echo inject > ${PGDEV}
-+    cat ${PGDEV}
- }
- 
- pgset "odev eth0"
diff --git a/net-misc/iputils/files/021109-no-pfkey-search.patch b/net-misc/iputils/files/021109-no-pfkey-search.patch
deleted file mode 100644
index 836040cc92a5..000000000000
--- a/net-misc/iputils/files/021109-no-pfkey-search.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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-syserror.patch b/net-misc/iputils/files/021109-syserror.patch
deleted file mode 100644
index a4f94f409e38..000000000000
--- a/net-misc/iputils/files/021109-syserror.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- iputils/rdisc.c.orig	2005-01-03 22:53:27.852431840 -0500
-+++ iputils/rdisc.c	2005-01-03 22:53:27.864430016 -0500
-@@ -1504,5 +1504,5 @@
- 	if (logging)
- 		syslog(LOG_ERR, "%s: %m", str);
- 	else
--		(void) fprintf(stderr, "%s: %s\n", str, sys_errlist[errno]);
-+		(void) fprintf(stderr, "%s: %s\n", str, strerror(errno));
- }
diff --git a/net-misc/iputils/files/digest-iputils-021109-r3 b/net-misc/iputils/files/digest-iputils-021109-r3
deleted file mode 100644
index 2396ba35bbb0..000000000000
--- a/net-misc/iputils/files/digest-iputils-021109-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dd10ef3d76480990a2174d2bb0daddaf iputils-ss021109-try.tar.bz2 428335
-RMD160 7786bff8416164906208d47853af83581195c6b6 iputils-ss021109-try.tar.bz2 428335
-SHA256 06ea9c83b5ff1ed02f526ed798a59e949793da1c232457077e75fcc8a10cdcb4 iputils-ss021109-try.tar.bz2 428335
diff --git a/net-misc/iputils/files/digest-iputils-20060512 b/net-misc/iputils/files/digest-iputils-20060512
deleted file mode 100644
index 8b513147875a..000000000000
--- a/net-misc/iputils/files/digest-iputils-20060512
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec00560576a068fb95fe0bf1a298e2d5 iputils-s20060512.tar.bz2 88091
-RMD160 7fedbf48a0899e81f9e9d8b4902c0ab3d7b66db7 iputils-s20060512.tar.bz2 88091
-SHA256 61d5adff80ebe0530c8f4b9933cc8e08d8528012f8a96a788e638b411f369e8e iputils-s20060512.tar.bz2 88091
diff --git a/net-misc/iputils/files/iputils-021109-bindnow.patch b/net-misc/iputils/files/iputils-021109-bindnow.patch
deleted file mode 100644
index 469418b2036a..000000000000
--- a/net-misc/iputils/files/iputils-021109-bindnow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Since these binaries are going to be setuid root, we want 
-don't want to allow lazy bindings, otherwise we allow some 
-information leakage.
-
-http://bugs.gentoo.org/77526
-
---- Makefile
-+++ Makefile
-@@ -39,3 +39,7 @@
- ping: ping.o ping_common.o
-+	$(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping6: ping6.o ping_common.o
-+	$(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
-+traceroute6: traceroute6.o
-+	$(LINK.o) $^ $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping.o ping6.o ping_common.o: ping_common.h
diff --git a/net-misc/iputils/files/iputils-021109-gcc4.patch b/net-misc/iputils/files/iputils-021109-gcc4.patch
deleted file mode 100644
index 2ed079e06d77..000000000000
--- a/net-misc/iputils/files/iputils-021109-gcc4.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-fix a lot of incorrect types
-
---- iputils/arping.c
-+++ iputils/arping.c
-@@ -434,7 +434,7 @@ main(int argc, char **argv)
- 			}
- 		} else if (!dad) {
- 			int on = 1;
--			int alen = sizeof(saddr);
-+			socklen_t alen = sizeof(saddr);
- 
- 			saddr.sin_port = htons(1025);
- 			saddr.sin_addr = dst;
-@@ -463,7 +463,7 @@ main(int argc, char **argv)
- 	}
- 
- 	if (1) {
--		int alen = sizeof(me);
-+		socklen_t alen = sizeof(me);
- 		if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
- 			perror("getsockname");
- 			exit(2);
-@@ -495,9 +495,9 @@ main(int argc, char **argv)
- 
- 	while(1) {
- 		sigset_t sset, osset;
--		char packet[4096];
-+		unsigned char packet[4096];
- 		struct sockaddr_ll from;
--		int alen = sizeof(from);
-+		socklen_t alen = sizeof(from);
- 		int cc;
- 
- 		if ((cc = recvfrom(s, packet, sizeof(packet), 0,
---- iputils/clockdiff.c
-+++ iputils/clockdiff.c
-@@ -120,7 +120,7 @@ long rtt_sigma = 0;
- int
- measure(struct sockaddr_in * addr)
- {
--	int length;
-+	socklen_t length;
- 	int msgcount;
- 	int cc, count;
- 	fd_set ready;
-@@ -299,7 +299,7 @@ char *myname, *hisname;
- int
- measure_opt(struct sockaddr_in * addr)
- {
--	int length;
-+	socklen_t length;
- 	int msgcount;
- 	int cc, count;
- 	fd_set ready;
-@@ -597,7 +597,7 @@ main(int argc, char *argv[])
- 	}
- 	if (ip_opt_len) {
- 		struct sockaddr_in myaddr;
--		int addrlen = sizeof(myaddr);
-+		socklen_t addrlen = sizeof(myaddr);
- 		unsigned char rspace[ip_opt_len];
- 
- 	        bzero(rspace, sizeof(rspace));
---- iputils/ping6.c
-+++ iputils/ping6.c
-@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
- 	hostname = target;
- 
- 	if (ipv6_addr_any(&source.sin6_addr)) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
---- iputils/ping.c
-+++ iputils/ping.c
-@@ -260,7 +260,7 @@ main(int argc, char **argv)
- 	}
- 
- 	if (source.sin_addr.s_addr == 0) {
--		int alen;
-+		socklen_t alen;
- 		struct sockaddr_in dst = whereto;
- 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
- 
---- iputils/ping_common.c
-+++ iputils/ping_common.c
-@@ -67,7 +67,7 @@ static void fill(char *patp)
- 	int ii, jj, kk;
- 	int pat[16];
- 	char *cp;
--	char *bp = outpack+8;
-+	u_char *bp = outpack+8;
- 
- 	for (cp = patp; *cp; cp++) {
- 		if (!isxdigit(*cp)) {
-@@ -393,7 +393,7 @@ resend:
- void sock_setbufs(int icmp_sock, int alloc)
- {
- 	int rcvbuf, hold;
--	int tmplen = sizeof(hold);
-+	socklen_t tmplen = sizeof(hold);
- 
- 	if (!sndbuf)
- 		sndbuf = alloc;
-@@ -464,7 +464,7 @@ void setup(int icmp_sock)
- 
- 	if (!(options & F_PINGFILLED)) {
- 		int i;
--		char *p = outpack+8;
-+		u_char *p = outpack+8;
- 
- 		/* Do not forget about case of small datalen,
- 		 * fill timestamp area too!
---- iputils/rarpd.c
-+++ iputils/rarpd.c
-@@ -423,7 +423,7 @@ void serve_it(int fd)
- {
- 	unsigned char buf[1024];
- 	struct sockaddr_ll sll;
--	int sll_len = sizeof(sll);
-+	socklen_t sll_len = sizeof(sll);
- 	struct arphdr *a = (struct arphdr*)buf;
- 	struct rarp_map *rmap;
- 	unsigned char *ptr;
---- iputils/rdisc.c
-+++ iputils/rdisc.c
-@@ -451,7 +451,7 @@ next:
- 	for (;;) {
- 		u_char	packet[MAXPACKET];
- 		int len = sizeof (packet);
--		int fromlen = sizeof (from);
-+		socklen_t fromlen = sizeof (from);
- 		int cc;
- 
- 		cc=recvfrom(s, (char *)packet, len, 0, 
---- iputils/tftpd.c
-+++ iputils/tftpd.c
-@@ -89,7 +89,7 @@ union {
- 	struct	sockaddr_in  sin;
- 	struct	sockaddr_in6 sin6;
- } from;
--int	fromlen;
-+socklen_t	fromlen;
- 
- #define MAXARG	1
- char	*dirs[MAXARG+1];
-@@ -149,7 +149,8 @@ int main(int ac, char **av)
- 	 */
- 	{
- 		int pid;
--		int i, j;
-+		int i;
-+		socklen_t j;
- 
- 		for (i = 1; i < 20; i++) {
- 		    pid = fork();
---- iputils/traceroute6.c
-+++ iputils/traceroute6.c
-@@ -501,7 +501,7 @@ int main(int argc, char *argv[])
- 				  (char *)&on, sizeof(on));
- 
- 	if (source == NULL) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
-@@ -622,7 +622,7 @@ wait_for_reply(sock, from, reset_timer)
- 	fd_set fds;
- 	static struct timeval wait;
- 	int cc = 0;
--	int fromlen = sizeof (*from);
-+	socklen_t fromlen = sizeof (*from);
- 
- 	FD_ZERO(&fds);
- 	FD_SET(sock, &fds);
diff --git a/net-misc/iputils/files/iputils-021109-ipv6-updates.patch b/net-misc/iputils/files/iputils-021109-ipv6-updates.patch
deleted file mode 100644
index 6e0acc8fd4fc..000000000000
--- a/net-misc/iputils/files/iputils-021109-ipv6-updates.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Handle ipv6 define changes
-
-http://bugs.gentoo.org/134751
-
---- iputils/ping_common.h
-+++ iputils/ping_common.h
-@@ -37,6 +37,17 @@
- #define	CLR(bit)	(A(bit) &= (~B(bit)))
- #define	TST(bit)	(A(bit) & B(bit))
- 
-+/* handle updates to IPV6 defines */
-+#ifndef IPV6_2292PKTINFO
-+# define IPV6_2292PKTINFO IPV6_PKTINFO
-+#endif
-+#ifndef IPV6_2292RTHDR
-+# define IPV6_2292RTHDR IPV6_RTHDR
-+#endif
-+#ifndef IPV6_2292HOPLIMIT
-+# define IPV6_2292HOPLIMIT IPV6_HOPLIMIT
-+#endif
-+
- /* various options */
- extern int options;
- #define	F_FLOOD		0x001
---- iputils/ping6.c
-+++ iputils/ping6.c
-@@ -153,7 +153,7 @@ extern struct cmsghdr *	inet6_srcrt_init
- 
- 	cmsg->cmsg_len = sizeof(struct cmsghdr) + sizeof(struct rt0_hdr);
- 	cmsg->cmsg_level = SOL_IPV6;
--	cmsg->cmsg_type = IPV6_RTHDR;
-+	cmsg->cmsg_type = IPV6_2292RTHDR;
- 
- 	return cmsg;
- }
-@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
- 		cmsglen += CMSG_SPACE(sizeof(*ipi));
- 		cmsg->cmsg_len = CMSG_LEN(sizeof(*ipi));
- 		cmsg->cmsg_level = SOL_IPV6;
--		cmsg->cmsg_type = IPV6_PKTINFO;
-+		cmsg->cmsg_type = IPV6_2292PKTINFO;
- 				
- 		ipi = (struct in6_pktinfo*)CMSG_DATA(cmsg);
- 		memset(ipi, 0, sizeof(*ipi));
-@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
- 
- 	if (1) {
- 		int on = 1;
--		if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_HOPLIMIT,
-+		if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_2292HOPLIMIT,
- 			       &on, sizeof(on)) == -1) {
- 			perror ("can't receive hop limit");
- 			exit(2);
-@@ -701,7 +701,7 @@ parse_reply(struct msghdr *msg, int cc, 
- 
- 	for (c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) {
- 		if (c->cmsg_level != SOL_IPV6 ||
--		    c->cmsg_type != IPV6_HOPLIMIT)
-+		    c->cmsg_type != IPV6_2292HOPLIMIT)
- 			continue;
- 		if (c->cmsg_len < CMSG_LEN(sizeof(int)))
- 			continue;
---- iputils/tracepath6.c
-+++ iputils/tracepath6.c
-@@ -25,6 +25,8 @@
- #include <sys/uio.h>
- #include <arpa/inet.h>
- 
-+#include "ping_common.h"
-+
- int overhead = 48;
- int mtu = 128000;
- int hops_to = -1;
-@@ -111,7 +111,7 @@ int recverr(int fd, int ttl)
- 		if (cmsg->cmsg_level == SOL_IPV6) {
- 			if (cmsg->cmsg_type == IPV6_RECVERR) {
- 				e = (struct sock_extended_err *)CMSG_DATA(cmsg);
--			} else if (cmsg->cmsg_type == IPV6_HOPLIMIT) {
-+			} else if (cmsg->cmsg_type == IPV6_2292HOPLIMIT) {
- 				rethops = *(int*)CMSG_DATA(cmsg);
- 			}
- 		} else if (cmsg->cmsg_level == SOL_IP) {
-@@ -349,8 +349,8 @@ int main(int argc, char **argv)
- 		perror("IP_RECVERR");
- 		exit(1);
- 	}
--	if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &on, sizeof(on))) {
--		perror("IPV6_HOPLIMIT");
-+	if (setsockopt(fd, SOL_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on))) {
-+		perror("IPV6_2292HOPLIMIT");
- 		exit(1);
- 	}
- 	if (mapped && setsockopt(fd, SOL_IP, IP_RECVTTL, &on, sizeof(on))) {
diff --git a/net-misc/iputils/files/iputils-021109-linux-udp-header.patch b/net-misc/iputils/files/iputils-021109-linux-udp-header.patch
deleted file mode 100644
index b60a23534dd9..000000000000
--- a/net-misc/iputils/files/iputils-021109-linux-udp-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru iputils.old/traceroute6.c iputils/traceroute6.c
---- iputils.old/traceroute6.c	2004-09-29 21:10:48.540700488 -0400
-+++ iputils/traceroute6.c	2004-09-29 21:11:58.667039664 -0400
-@@ -244,7 +244,11 @@
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
-+#if __linux__
-+#include <linux/udp.h>
-+#else
- #include <netinet/udp.h>
-+#endif
- 
- #include <linux/ipv6.h>
- #include <linux/in6.h>
diff --git a/net-misc/iputils/files/iputils-20060512-RFC3542.patch b/net-misc/iputils/files/iputils-20060512-RFC3542.patch
deleted file mode 100644
index 8aad86d766d8..000000000000
--- a/net-misc/iputils/files/iputils-20060512-RFC3542.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-taken from upstream git repo
-
---- ping6.c
-+++ ping6.c
-@@ -80,6 +80,11 @@
- #define SOL_ICMPV6 IPPROTO_ICMPV6
- #endif
- 
-+/* RFC3542 */
-+#ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
-+#define ICMP6_DST_UNREACH_BEYONDSCOPE ICMP6_DST_UNREACH_NOTNEIGHBOR
-+#endif
-+
- #ifndef IPV6_SRCRT_TYPE_0
- #define IPV6_SRCRT_TYPE_0	0
- #endif
-@@ -829,7 +834,7 @@
- 		case ICMP6_DST_UNREACH_ADMIN:
- 			printf("Administratively prohibited");
- 			break;
--		case ICMP6_DST_UNREACH_NOTNEIGHBOR:
-+		case ICMP6_DST_UNREACH_BEYONDSCOPE:
- 			printf("Not neighbour");
- 			break;
- 		case ICMP6_DST_UNREACH_ADDR:
diff --git a/net-misc/iputils/files/iputils-20060512-gcc4.patch b/net-misc/iputils/files/iputils-20060512-gcc4.patch
deleted file mode 100644
index aab44f8feaf2..000000000000
--- a/net-misc/iputils/files/iputils-20060512-gcc4.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-fix a lot of incorrect types
-
---- iputils/arping.c
-+++ iputils/arping.c
-@@ -434,7 +434,7 @@ main(int argc, char **argv)
- 			}
- 		} else if (!dad) {
- 			int on = 1;
--			int alen = sizeof(saddr);
-+			socklen_t alen = sizeof(saddr);
- 
- 			saddr.sin_port = htons(1025);
- 			saddr.sin_addr = dst;
-@@ -463,7 +463,7 @@ main(int argc, char **argv)
- 	}
- 
- 	if (1) {
--		int alen = sizeof(me);
-+		socklen_t alen = sizeof(me);
- 		if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
- 			perror("getsockname");
- 			exit(2);
-@@ -495,9 +495,9 @@ main(int argc, char **argv)
- 
- 	while(1) {
- 		sigset_t sset, osset;
--		char packet[4096];
-+		unsigned char packet[4096];
- 		struct sockaddr_ll from;
--		int alen = sizeof(from);
-+		socklen_t alen = sizeof(from);
- 		int cc;
- 
- 		if ((cc = recvfrom(s, packet, sizeof(packet), 0,
---- iputils/clockdiff.c
-+++ iputils/clockdiff.c
-@@ -120,7 +120,7 @@ long rtt_sigma = 0;
- int
- measure(struct sockaddr_in * addr)
- {
--	int length;
-+	socklen_t length;
- 	int msgcount;
- 	int cc, count;
- 	fd_set ready;
-@@ -299,7 +299,7 @@ char *myname, *hisname;
- int
- measure_opt(struct sockaddr_in * addr)
- {
--	int length;
-+	socklen_t length;
- 	int msgcount;
- 	int cc, count;
- 	fd_set ready;
-@@ -597,7 +597,7 @@ main(int argc, char *argv[])
- 	}
- 	if (ip_opt_len) {
- 		struct sockaddr_in myaddr;
--		int addrlen = sizeof(myaddr);
-+		socklen_t addrlen = sizeof(myaddr);
- 		unsigned char rspace[ip_opt_len];
- 
- 	        bzero(rspace, sizeof(rspace));
---- iputils/ping6.c
-+++ iputils/ping6.c
-@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
- 	hostname = target;
- 
- 	if (ipv6_addr_any(&source.sin6_addr)) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
---- iputils/ping.c
-+++ iputils/ping.c
-@@ -260,7 +260,7 @@ main(int argc, char **argv)
- 	}
- 
- 	if (source.sin_addr.s_addr == 0) {
--		int alen;
-+		socklen_t alen;
- 		struct sockaddr_in dst = whereto;
- 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
- 
---- iputils/ping_common.c
-+++ iputils/ping_common.c
-@@ -67,7 +67,7 @@ static void fill(char *patp)
- 	int ii, jj, kk;
- 	int pat[16];
- 	char *cp;
--	char *bp = outpack+8;
-+	u_char *bp = outpack+8;
- 
- 	for (cp = patp; *cp; cp++) {
- 		if (!isxdigit(*cp)) {
-@@ -393,7 +393,7 @@ resend:
- void sock_setbufs(int icmp_sock, int alloc)
- {
- 	int rcvbuf, hold;
--	int tmplen = sizeof(hold);
-+	socklen_t tmplen = sizeof(hold);
- 
- 	if (!sndbuf)
- 		sndbuf = alloc;
-@@ -464,7 +464,7 @@ void setup(int icmp_sock)
- 
- 	if (!(options & F_PINGFILLED)) {
- 		int i;
--		char *p = outpack+8;
-+		u_char *p = outpack+8;
- 
- 		/* Do not forget about case of small datalen,
- 		 * fill timestamp area too!
---- iputils/rarpd.c
-+++ iputils/rarpd.c
-@@ -423,7 +423,7 @@ void serve_it(int fd)
- {
- 	unsigned char buf[1024];
- 	struct sockaddr_ll sll;
--	int sll_len = sizeof(sll);
-+	socklen_t sll_len = sizeof(sll);
- 	struct arphdr *a = (struct arphdr*)buf;
- 	struct rarp_map *rmap;
- 	unsigned char *ptr;
---- iputils/rdisc.c
-+++ iputils/rdisc.c
-@@ -451,7 +451,7 @@ next:
- 	for (;;) {
- 		u_char	packet[MAXPACKET];
- 		int len = sizeof (packet);
--		int fromlen = sizeof (from);
-+		socklen_t fromlen = sizeof (from);
- 		int cc;
- 
- 		cc=recvfrom(s, (char *)packet, len, 0, 
---- iputils/tftpd.c
-+++ iputils/tftpd.c
-@@ -89,7 +89,7 @@ union {
- 	struct	sockaddr_in  sin;
- 	struct	sockaddr_in6 sin6;
- } from;
--int	fromlen;
-+socklen_t	fromlen;
- 
- #define MAXARG	1
- char	*dirs[MAXARG+1];
-@@ -149,7 +149,8 @@ int main(int ac, char **av)
- 	 */
- 	{
- 		int pid;
--		int i, j;
-+		int i;
-+		socklen_t j;
- 
- 		for (i = 1; i < 20; i++) {
- 		    pid = fork();
---- iputils/traceroute6.c
-+++ iputils/traceroute6.c
-@@ -501,7 +501,7 @@ int main(int argc, char *argv[])
- 				  (char *)&on, sizeof(on));
- 
- 	if (source == NULL) {
--		int alen;
-+		socklen_t alen;
- 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- 
- 		if (probe_fd < 0) {
diff --git a/net-misc/iputils/files/iputils-20060512-makefile.patch b/net-misc/iputils/files/iputils-20060512-makefile.patch
deleted file mode 100644
index dbfd6f2f5f71..000000000000
--- a/net-misc/iputils/files/iputils-20060512-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -1,20 +1,18 @@
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- 
--DEFINES= 
--
- #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
- LDLIBS=-lresolv
--ADDLIB=
- 
- #options if you compile with libc5, and without a bind>=4.9.4 libresolv
- # NOT AVAILABLE. Please, use libresolv.
- 
--CC=gcc
-+CC ?= gcc
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
- #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
--CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) -I../include $(DEFINES) 
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wstrict-prototypes -Wall
-+CPPFLAGS += -D_GNU_SOURCE
- 
- IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
-@@ -35,7 +33,7 @@
- rdisc_srv: rdisc_srv.o
- 
- rdisc_srv.o: rdisc.c
--	$(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
- 
- 
- check-kernel: