Version bump.

(Portage version: 2.1.2_rc3-r8)

6 files changed, 327 insertions, 0 deletions

diff --git a/net-misc/iputils/files/digest-iputils-20060512 b/net-misc/iputils/files/digest-iputils-20060512
new file mode 100644
index 000000000000..8b513147875a
--- /dev/null
+++ b/net-misc/iputils/files/digest-iputils-20060512
@@ -0,0 +1,3 @@
+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-20060512-RFC3542.patch b/net-misc/iputils/files/iputils-20060512-RFC3542.patch
new file mode 100644
index 000000000000..8aad86d766d8
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20060512-RFC3542.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..aab44f8feaf2
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20060512-gcc4.patch
@@ -0,0 +1,168 @@
+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-kernel-ifaddr.patch b/net-misc/iputils/files/iputils-20060512-kernel-ifaddr.patch
new file mode 100644
index 000000000000..de90efea2642
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20060512-kernel-ifaddr.patch
@@ -0,0 +1,85 @@
+--- rarpd.c.orig
++++ rarpd.c
+@@ -47,6 +47,14 @@
+ #endif
+ void usage(void) __attribute__((noreturn));
+ 
++struct kern_ifaddr
++{
++	struct kern_ifaddr 	*next;
++	__u32		prefix;
++	__u32		mask;
++	__u32		local;
++};
++
+ struct iflink
+ {
+ 	struct iflink	*next;
+@@ -54,17 +62,9 @@
+ 	int		hatype;
+ 	unsigned char	lladdr[16];
+ 	unsigned char	name[IFNAMSIZ];
+-	struct ifaddr 	*ifa_list;
++	struct kern_ifaddr 	*ifa_list;
+ } *ifl_list;
+ 
+-struct ifaddr
+-{
+-	struct ifaddr 	*next;
+-	__u32		prefix;
+-	__u32		mask;
+-	__u32		local;
+-};
+-
+ struct rarp_map
+ {
+ 	struct rarp_map *next;
+@@ -91,7 +91,7 @@
+ 	int fd;
+ 	struct ifreq *ifrp, *ifend;
+ 	struct iflink *ifl;
+-	struct ifaddr *ifa;
++	struct kern_ifaddr *ifa;
+ 	struct ifconf ifc;
+ 	struct ifreq ibuf[256];
+ 
+@@ -182,7 +182,7 @@
+ 		if (ifa == NULL) {
+ 			if (mask == 0 || prefix == 0)
+ 				continue;
+-			ifa = (struct ifaddr*)malloc(sizeof(*ifa));
++			ifa = (struct kern_ifaddr*)malloc(sizeof(*ifa));
+ 			memset(ifa, 0, sizeof(*ifa));
+ 			ifa->local = addr;
+ 			ifa->prefix = prefix;
+@@ -238,10 +238,10 @@
+ 	return dent != NULL;
+ }
+ 
+-struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist)
++struct kern_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist)
+ {
+ 	struct iflink *ifl;
+-	struct ifaddr *ifa;
++	struct kern_ifaddr *ifa;
+ 	int retry = 0;
+ 	int i;
+ 
+@@ -297,7 +297,7 @@
+ 
+ 	if (r == NULL) {
+ 		if (hatype == ARPHRD_ETHER && halen == 6) {
+-			struct ifaddr *ifa;
++			struct kern_ifaddr *ifa;
+ 			struct hostent *hp;
+ 			char ename[256];
+ 			static struct rarp_map emap = {
+@@ -370,7 +370,7 @@
+ {
+ 	__u32 laddr = 0;
+ 	struct iflink *ifl;
+-	struct ifaddr *ifa;
++	struct kern_ifaddr *ifa;
+ 
+ 	for (ifl=ifl_list; ifl; ifl = ifl->next)
+ 		if (ifl->index == ifindex)
diff --git a/net-misc/iputils/files/iputils-20060512-linux-headers.patch b/net-misc/iputils/files/iputils-20060512-linux-headers.patch
new file mode 100644
index 000000000000..0281f85dceef
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20060512-linux-headers.patch
@@ -0,0 +1,10 @@
+--- rdisc.c
++++ rdisc.c
+@@ -34,6 +34,7 @@
+ #include <sys/time.h>
+ /* Do not use "improved" glibc version! */
+ #include <linux/limits.h>
++#include <linux/types.h>
+ 
+ #include <sys/param.h>
+ #include <sys/socket.h>
diff --git a/net-misc/iputils/files/iputils-20060512-makefile.patch b/net-misc/iputils/files/iputils-20060512-makefile.patch
new file mode 100644
index 000000000000..dbfd6f2f5f71
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20060512-makefile.patch
@@ -0,0 +1,36 @@
+--- 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: