old

2 files changed, 0 insertions, 219 deletions

diff --git a/net-misc/iputils/files/iputils-021109-gcc34.patch b/net-misc/iputils/files/iputils-021109-gcc34.patch
deleted file mode 100644
index 98e1c6eb960f..000000000000
--- a/net-misc/iputils/files/iputils-021109-gcc34.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-iputils has a lot of ugly goto's that break when using 
-large gcc inline-limits.
-
-Fixes by Robert Moss and Dave Stahl
-http://bugs.gentoo.org/49241
-http://bugs.gentoo.org/80969
-
---- iputils/tracepath.c
-+++ iputils/tracepath.c
-@@ -76,7 +76,7 @@
- 	int progress = -1;
- 	int broken_router;
- 	
--restart:
-+       while (1) {
- 	memset(&rcvbuf, -1, sizeof(rcvbuf));
- 	iov.iov_base = &rcvbuf;
- 	iov.iov_len = sizeof(rcvbuf);
-@@ -93,7 +93,7 @@
- 	if (res < 0) {
- 		if (errno == EAGAIN)
- 			return progress;
--		goto restart;
-+		continue;
- 	}
- 
- 	progress = mtu;
-@@ -216,7 +216,7 @@
- 		perror("NET ERROR");
- 		return 0;
- 	}
--	goto restart;
-+       }
- }
- 
- int probe_ttl(int fd, int ttl)
-@@ -227,7 +227,6 @@
- 
- 	memset(sndbuf,0,mtu);
- 
--restart:
- 	for (i=0; i<10; i++) {
- 		int res;
- 
-@@ -243,7 +242,8 @@
- 		if (res==0)
- 			return 0;
- 		if (res > 0)
--			goto restart;
-+			i = 0;
-+			continue;
- 	}
- 	hisptr = (hisptr + 1)&63;
- 
---- iputils/tracepath6.c
-+++ iputils/tracepath6.c
-@@ -66,7 +66,7 @@
- 	int progress = -1;
- 	int broken_router;
- 
--restart:
-+       while (1) {
- 	memset(&rcvbuf, -1, sizeof(rcvbuf));
- 	iov.iov_base = &rcvbuf;
- 	iov.iov_len = sizeof(rcvbuf);
-@@ -83,7 +83,7 @@
- 	if (res < 0) {
- 		if (errno == EAGAIN)
- 			return progress;
--		goto restart;
-+		continue;
- 	}
- 
- 	progress = 2;
-@@ -222,34 +222,29 @@
- 		perror("NET ERROR");
- 		return 0;
- 	}
--	goto restart;
-+       }
- }
- 
- int probe_ttl(int fd, int ttl)
- {
--	int i;
-+	int i=0, res;
- 	char sndbuf[mtu];
- 	struct probehdr *hdr = (struct probehdr*)sndbuf;
- 
--restart:
--
--	for (i=0; i<10; i++) {
--		int res;
--
--		hdr->ttl = ttl;
--		gettimeofday(&hdr->tv, NULL);
--		if (send(fd, sndbuf, mtu-overhead, 0) > 0)
--			break;
--		res = recverr(fd, ttl);
--		if (res==0)
--			return 0;
--		if (res > 0)
--			goto restart;
--	}
--
--	if (i<10) {
--		int res;
--
-+	while (i<10) {
-+		for (i=0; i<10; i++) {
-+			hdr->ttl = ttl;
-+			gettimeofday(&hdr->tv, NULL);
-+			if (send(fd, sndbuf, mtu-overhead, 0) > 0)
-+				break;
-+			res = recverr(fd, ttl);
-+			if (res==0)
-+				return 0;
-+			if (res > 0) {
-+				i = 0;
-+				continue;
-+			}
-+		}
- 		data_wait(fd);
- 		if (recv(fd, sndbuf, sizeof(sndbuf), MSG_DONTWAIT) > 0) {
- 			printf("%2d?: reply received 8)\n", ttl);
-@@ -257,7 +252,7 @@
- 		}
- 		res = recverr(fd, ttl);
- 		if (res == 1)
--			goto restart;
-+			continue;
- 		return res;
- 	}
- 
diff --git a/net-misc/iputils/files/iputils-20060512-kernel-ifaddr.patch b/net-misc/iputils/files/iputils-20060512-kernel-ifaddr.patch
deleted file mode 100644
index de90efea2642..000000000000
--- a/net-misc/iputils/files/iputils-20060512-kernel-ifaddr.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- 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)