gentoo resync : 17.05.2018

14 files changed, 0 insertions, 859 deletions

diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
deleted file mode 100644
index e790d2b51038..000000000000
--- a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iputils/rarpd.c.mps	2004-06-10 15:27:01.000000000 +0200
-+++ iputils/rarpd.c	2004-06-10 15:26:29.000000000 +0200
-@@ -42,7 +42,9 @@ int listen_arp;
- char *ifname;
- char *tftp_dir = "/etc/tftpboot";
- 
-+#ifndef __UCLIBC__
- extern int ether_ntohost(char *name, unsigned char *ea);
-+#endif
- void usage(void) __attribute__((noreturn));
- 
- struct iflink
-@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
- 				6,
- 			};
- 
-+#ifndef __UCLIBC__
- 			if (ether_ntohost(ename, lladdr) != 0 ||
-+#else
-+			if (
-+#endif
- 			    (hp = gethostbyname(ename)) == NULL) {
- 				if (verbose)
- 					syslog(LOG_INFO, "not found in /etc/ethers");
diff --git a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
deleted file mode 100644
index cae87791dc21..000000000000
--- a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20071127/ping_common.h.orig	2008-06-10 11:16:06.000000000 +0100
-+++ iputils-s20071127/ping_common.h	2008-06-10 11:16:18.000000000 +0100
-@@ -28,7 +28,7 @@
- 
- #define	MAXWAIT		10		/* max seconds to wait for response */
- #define MININTERVAL	10		/* Minimal interpacket gap */
--#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
-+#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
- 
- #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
- 
diff --git a/net-misc/iputils/files/iputils-20100418-so_mark.patch b/net-misc/iputils/files/iputils-20100418-so_mark.patch
deleted file mode 100644
index ad92254d6f8d..000000000000
--- a/net-misc/iputils/files/iputils-20100418-so_mark.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/335347
-
-fix building with older linux headers that don't define SO_MARK
-
---- ping_common.c
-+++ ping_common.c
-@@ -485,6 +485,7 @@
- 			fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
- 	}
- #endif
-+#ifdef SO_MARK
- 	if (options & F_MARK) {
- 		if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
- 				&mark, sizeof(mark)) == -1) {
-@@ -494,6 +495,7 @@
- 			fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
- 		}
- 	}
-+#endif
- 
- 	/* Set some SNDTIMEO to prevent blocking forever
- 	 * on sends, when device is too slow or stalls. Just put limit
diff --git a/net-misc/iputils/files/iputils-20121221-crypto-build.patch b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
deleted file mode 100644
index 1ec3c101d525..000000000000
--- a/net-misc/iputils/files/iputils-20121221-crypto-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
-From: Arjan van de Ven <arjanvandeven@gmail.com>
-Date: Wed, 16 Jan 2013 03:12:15 +0900
-Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
-
-The ping6 command can use either openssl or gnutls...
-and the Makefile has a bunch of setup for defining which of the two to use.
-
-Unfortunately, the final -D define on the commandline to enable gnutls
-inside the ping6.c file didn't actually make it onto the gcc
-commandline.
-This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
-
-Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
-Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c62d9df..89249f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
- DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
- LIB_ping  = $(LIB_CAP) $(LIB_IDN)
--DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
-+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
- LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
- 
- ping: ping_common.o
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
deleted file mode 100644
index 66424c85cf8e..000000000000
--- a/net-misc/iputils/files/iputils-20121221-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:36:16 -0500
-Subject: [PATCH [iputils]] fix handling of CFLAGS
-
-This defaults CFLAGS to -O3 without clobbering settings people have set
-up in the environment already.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2c49940..ecabac3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- # Configuration
- #
- 
--# CC
--CC=gcc
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- # Libraries
-@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
- 
- # -------------------------------------
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
--# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
--CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
--CCOPTOPT=-O3
--GLIBCFIX=-D_GNU_SOURCE
--DEFINES=
-+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
-+CFLAGS?=-O3 -g
-+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-+CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
- 
- FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
-@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
- LDLIBS=$(LDLIB) $(ADDLIB)
- 
- UNAME_N:=$(shell uname -n)
-@@ -132,6 +128,7 @@ all: $(TARGETS)
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
- %.o: %.c
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
-+LINK.o += $(CFLAGS)
- $(TARGETS): %: %.o
- 	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
- 
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-openssl.patch b/net-misc/iputils/files/iputils-20121221-openssl.patch
deleted file mode 100644
index 1c6ba81dab8b..000000000000
--- a/net-misc/iputils/files/iputils-20121221-openssl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |  5 ++++-
- ping6.c  | 14 +++++++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 89249f5..2c49940 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
- 
- # GNU TLS library for ping6 [yes|no|static]
- USE_GNUTLS=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
- 	DEF_CRYPTO = -DUSE_GNUTLS
- else
-+ifneq ($(USE_CRYPTO),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+	DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
- 
- # USE_RESOLV: LIB_RESOLV
-diff --git a/ping6.c b/ping6.c
-index c39864d..f2f90af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -168,8 +168,10 @@ static int icmp_sock;
- 
- #ifdef USE_GNUTLS
- # include <gnutls/openssl.h>
--#else
-+# define USE_CRYPTO
-+#elif defined USE_OPENSSL
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
- 
- /* Node Information query */
-@@ -326,6 +328,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- 	static __u8 digest[MD5_DIGEST_LENGTH];
- 	static int seq = -1;
- 
-@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- 			return -1;
- 		return ntohsp((__u16 *)nonce);
- 	}
-+# else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+# endif
- }
- #endif
- 
-@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
- 
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
- 	int n;
-@@ -627,6 +635,10 @@ errexit:
- 	free(idn);
- 	free(name);
- 	exit(1);
-+#else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+#endif
- }
- 
- int niquery_option_help_handler(int index, const char *arg)
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
deleted file mode 100644
index 283aa989f322..000000000000
--- a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
+++ /dev/null
@@ -1,224 +0,0 @@
-http://openwall.info/wiki/people/segoon/ping
-
---- iputils-s20101006/ping.c
-+++ iputils-s20101006/ping.c
-@@ -88,6 +88,7 @@ struct sockaddr_in whereto;	/* who to pi
- int optlen = 0;
- int settos = 0;			/* Set TOS, Precendence or other QOS options */
- int icmp_sock;			/* socket file descriptor */
-+int using_ping_socket = 0;
- u_char outpack[0x10000];
- int maxpacket = sizeof(outpack);
- 
-@@ -123,7 +124,11 @@ main(int argc, char **argv)
- 	char *target, hnamebuf[MAX_HOSTNAMELEN];
- 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
- 
--	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-+	icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-+	if (icmp_sock != -1)
-+		using_ping_socket = 1;
-+	else
-+		icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
- 	socket_errno = errno;
- 
- 	uid = getuid();
-@@ -377,13 +382,35 @@ main(int argc, char **argv)
- 		}
- 	}
- 
--	if ((options&F_STRICTSOURCE) &&
--	    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
--		perror("bind");
--		exit(2);
-+	if (!using_ping_socket) {
-+		if ((options&F_STRICTSOURCE) &&
-+		    bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+	} else {
-+		struct sockaddr_in sa;
-+		socklen_t sl;
-+
-+		sa.sin_family = AF_INET;
-+		sa.sin_port = 0;
-+		sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
-+			source.sin_addr.s_addr : 0;
-+		sl = sizeof(sa);
-+
-+		if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+
-+		if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
-+			perror("getsockname");
-+			exit(2);
-+		}
-+		ident = sa.sin_port;
- 	}
- 
--	if (1) {
-+	if (!using_ping_socket) {
- 		struct icmp_filter filt;
- 		filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
- 			      (1<<ICMP_DEST_UNREACH)|
-@@ -398,6 +425,12 @@ main(int argc, char **argv)
- 	hold = 1;
- 	if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
- 		fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
-+	if (using_ping_socket) {
-+		if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RECVTTL)");
-+		if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RETOPTS)");
-+	}
- 
- 	/* record route option */
- 	if (options & F_RROUTE) {
-@@ -566,6 +599,7 @@ int receive_error_msg()
- 		nerrors++;
- 	} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
- 		struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
-+		int error_pkt;
- 
- 		if (res < sizeof(icmph) ||
- 		    target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
-@@ -576,9 +610,18 @@ int receive_error_msg()
- 			goto out;
- 		}
- 
--		acknowledge(ntohs(icmph.un.echo.sequence));
-+		error_pkt = (e->ee_type != ICMP_REDIRECT &&
-+			     e->ee_type != ICMP_SOURCE_QUENCH);
-+		if (error_pkt) {
-+			acknowledge(ntohs(icmph.un.echo.sequence));
-+			net_errors++;
-+			nerrors++;
-+		}
-+		else {
-+			saved_errno = 0;
-+		}
- 
--		if (!working_recverr) {
-+		if (!using_ping_socket && !working_recverr) {
- 			struct icmp_filter filt;
- 			working_recverr = 1;
- 			/* OK, it works. Add stronger filter. */
-@@ -589,15 +632,14 @@ int receive_error_msg()
- 				perror("\rWARNING: setsockopt(ICMP_FILTER)");
- 		}
- 
--		net_errors++;
--		nerrors++;
- 		if (options & F_QUIET)
- 			goto out;
- 		if (options & F_FLOOD) {
--			write_stdout("\bE", 2);
-+			if (error_pkt)
-+				write_stdout("\bE", 2);
- 		} else {
- 			print_timestamp();
--			printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
-+			printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
- 			pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
- 			fflush(stdout);
- 		}
-@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, 
- 	struct iphdr *ip;
- 	int hlen;
- 	int csfailed;
-+	struct cmsghdr *cmsg;
-+	int ttl;
-+	__u8 *opts;
-+	int optlen;
- 
- 	/* Check the IP header */
- 	ip = (struct iphdr *)buf;
--	hlen = ip->ihl*4;
--	if (cc < hlen + 8 || ip->ihl < 5) {
--		if (options & F_VERBOSE)
--			fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
--				pr_addr(from->sin_addr.s_addr));
--		return 1;
-+	if (!using_ping_socket) {
-+		hlen = ip->ihl*4;
-+		if (cc < hlen + 8 || ip->ihl < 5) {
-+			if (options & F_VERBOSE)
-+				fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-+					pr_addr(from->sin_addr.s_addr));
-+			return 1;
-+		}
-+		ttl = ip->ttl;
-+		opts = buf + sizeof(struct iphdr);
-+		optlen = hlen - sizeof(struct iphdr);
-+	} else {
-+		hlen = 0;
-+		ttl = 0;
-+		opts = buf;
-+		optlen = 0;
-+		for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-+			if (cmsg->cmsg_level != SOL_IP)
-+				continue;
-+			if (cmsg->cmsg_type == IP_TTL) {
-+				if (cmsg->cmsg_len < sizeof(int))
-+					continue;
-+				ttl = *(int *) CMSG_DATA(cmsg);
-+			} else if (cmsg->cmsg_type == IP_RETOPTS) {
-+				opts = (__u8 *) CMSG_DATA(cmsg);
-+				optlen = cmsg->cmsg_len;
-+			}
-+		}
- 	}
- 
- 	/* Now the ICMP part */
-@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, 
- 			return 1;			/* 'Twas not our ECHO */
- 		if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
- 				      ntohs(icp->un.echo.sequence),
--				      ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
-+				      ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
- 				      pr_echo_reply))
- 			return 0;
- 	} else {
-@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, 
- 	}
- 
- 	if (!(options & F_FLOOD)) {
--		pr_options(buf + sizeof(struct iphdr), hlen);
-+		pr_options(opts, optlen + sizeof(struct iphdr));
- 
- 		if (options & F_AUDIBLE)
- 			putchar('\a');
-@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
- 			printf("Redirect, Bad Code: %d", code);
- 			break;
- 		}
--		if (icp)
--			printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
-+		printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
- 		if (icp && (options & F_VERBOSE))
- 			pr_iph((struct iphdr*)(icp + 1));
- 		break;
-@@ -1217,7 +1284,7 @@ void install_filter(void)
- 		insns
- 	};
- 
--	if (once)
-+	if (once || using_ping_socket)
- 		return;
- 	once = 1;
- 
---- iputils-s20101006/ping_common.c
-+++ iputils-s20101006/ping_common.c
-@@ -515,7 +515,8 @@ void setup(int icmp_sock)
- 			*p++ = i;
- 	}
- 
--	ident = htons(getpid() & 0xFFFF);
-+	if (!ident)
-+		ident = htons(getpid() & 0xFFFF);
- 
- 	set_signal(SIGINT, sigexit);
- 	set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
deleted file mode 100644
index 22bfb8811ed3..000000000000
--- a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 1 Aug 2012 11:43:34 -0400
-Subject: [PATCH iputils] doc: fix parallel build of html/man pages
-
-The use of the same tempdir prevents building of these files in parallel.
-So build all of them in unique tempdirs so we can do them in parallel.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/Makefile | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 7ec4f1c..4f930a3 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -12,29 +12,40 @@ man: $(MANFILES)
- # lots of some strange temporary junk directories and files.
- # So, scope it to a temporary dir and clean all after each run.
- 
--$(HTMLFILES): index.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
--	@-rm -rf tmp.db2html
-+SETUP_TMPDIR = \
-+	t="tmp.db2html.$@"; \
-+	rm -rf $$t; \
-+	mkdir $$t; \
-+	cd $$t
-+CLEAN_TMPDIR = \
-+	cd ..; \
-+	rm -rf $$t
-+
-+MAKE_HTML = \
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	docbook2html ../$<; \
-+	mv *.html ..; \
-+	$(CLEAN_TMPDIR)
- 
-+$(HTMLFILES): index.db
-+	$(MAKE_HTML)
- iputils.html: iputils.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
--	@-rm -rf tmp.db2html
-+	$(MAKE_HTML)
- 
- # docbook2man produces utterly ugly output and I did not find
- # any way to customize this but hacking backend perl script a little.
- # Well, hence...
- 
- $(MANFILES): index.db
--	@-mkdir tmp.db2man
--	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
--	@-rm -rf tmp.db2man
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
-+	mv $@ ..; \
-+	$(CLEAN_TMPDIR)
- 
- clean:
--	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
-+	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
- 
- snapshot:
- 	@date "+%y%m%d" > snapshot.db
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-printf-size.patch b/net-misc/iputils/files/iputils-20121221-printf-size.patch
deleted file mode 100644
index 6d6c3b7d2580..000000000000
--- a/net-misc/iputils/files/iputils-20121221-printf-size.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Aug 2010 01:16:42 -0400
-Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
-
-Since the printf funcs already return the length of chars displayed,
-use that value instead of re-calculating the length with strlen.
-
-This also fixes the handling of the strlen return -- it's a size_t,
-not an int.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tracepath.c  | 11 ++++-------
- tracepath6.c | 11 ++++-------
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/tracepath.c b/tracepath.c
-index 8a08f1d..f155816 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -73,13 +73,10 @@ void data_wait(int fd)
- 
- void print_host(const char *a, const char *b, int both)
- {
--	int plen = 0;
--	printf("%s", a);
--	plen = strlen(a);
--	if (both) {
--		printf(" (%s)", b);
--		plen += strlen(b) + 3;
--	}
-+	int plen;
-+	plen = printf("%s", a);
-+	if (both)
-+		plen += printf(" (%s)", b);
- 	if (plen >= HOST_COLUMN_SIZE)
- 		plen = HOST_COLUMN_SIZE - 1;
- 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
-diff --git a/tracepath6.c b/tracepath6.c
-index 126fadf..bee95c3 100644
---- a/tracepath6.c
-+++ b/tracepath6.c
-@@ -86,13 +86,10 @@ void data_wait(int fd)
- 
- void print_host(const char *a, const char *b, int both)
- {
--	int plen = 0;
--	printf("%s", a);
--	plen = strlen(a);
--	if (both) {
--		printf(" (%s)", b);
--		plen += strlen(b) + 3;
--	}
-+	int plen;
-+	plen = printf("%s", a);
-+	if (both)
-+		plen += printf(" (%s)", b);
- 	if (plen >= HOST_COLUMN_SIZE)
- 		plen = HOST_COLUMN_SIZE - 1;
- 	printf("%*s", HOST_COLUMN_SIZE - plen, "");
--- 
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch b/net-misc/iputils/files/iputils-20121221-strtod.patch
deleted file mode 100644
index 303acf5c42c4..000000000000
--- a/net-misc/iputils/files/iputils-20121221-strtod.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/472592
-
-From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Apr 2015 20:41:31 -0400
-Subject: [PATCH iputils] ping: fix -i number parsing in locales
-
-Always use #.# format for the -i flag even when the current locale uses
-a different separator.  Locale de_DE which uses #,# normally.
-
-Simple testcase:
-$ make USE_IDN=1
-$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
-
-Reported-by: Sergey Fionov <fionov@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- ping_common.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/ping_common.c b/ping_common.c
-index 62f53a6..0a37e09 100644
---- a/ping_common.c
-+++ b/ping_common.c
-@@ -269,9 +269,17 @@ void common_options(int ch)
- 		double dbl;
- 		char *ep;
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "C");
-+#endif
-+
- 		errno = 0;
- 		dbl = strtod(optarg, &ep);
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "");
-+#endif
-+
- 		if (errno || *ep != '\0' ||
- 		    !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
- 			fprintf(stderr, "ping: bad timing interval\n");
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
deleted file mode 100644
index 0ea56685d26d..000000000000
--- a/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d81a44625b04d487c895473aa77af13420b7afdd Mon Sep 17 00:00:00 2001
-From: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
-Date: Thu, 19 Jun 2014 17:25:49 +0900
-Subject: [PATCH iputils] tftpd: Exit if setuid()/setgid() failed.
-
-Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
----
- tftpd.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index 2a39ec4..e3af2f4 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -111,8 +111,14 @@ int main(int ac, char **av)
- 
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
--		setgid(65534);
--		setuid(65534);
-+		if (setgid(65534)) {
-+			syslog(LOG_ERR, "setgid");
-+			exit(1);
-+		}
-+		if (setuid(65534)) {
-+			syslog(LOG_ERR, "setuid");
-+			exit(1);
-+		}
- 	}
- 
- 	ac--; av++;
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b5f646..000000000000
--- a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- 	register int n = 0;
- 	int on = 1;
- 
-+	openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
- 		if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- 	while (ac-- > 0 && n < MAXARG)
- 		dirs[n++] = *av++;
- 
--	openlog("tftpd", LOG_PID, LOG_DAEMON);
- 	if (ioctl(0, FIONBIO, &on) < 0) {
- 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- 		exit(1);
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch
deleted file mode 100644
index 13f5639a6fb6..000000000000
--- a/net-misc/iputils/files/iputils-99999999-openssl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH iputils] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile         |  5 ++++-
- iputils_md5dig.h |  4 +++-
- ping6.c          | 10 ++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 54e5a6d..7147f08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
- 
- # Libgcrypt (for MD5) for ping6 [yes|no|static]
- USE_GCRYPT=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
- 	DEF_CRYPTO = -DUSE_GCRYPT
- else
-+ifneq ($(USE_CRYPTO),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+	DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
- 
- # USE_RESOLV: LIB_RESOLV
-diff --git a/iputils_md5dig.h b/iputils_md5dig.h
-index 4cec866..d6c4d46 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -5,8 +5,10 @@
- # include <stdlib.h>
- # include <gcrypt.h>
- # define IPUTILS_MD5DIG_LEN	16
--#else
-+# define USE_CRYPTO
-+#elif defined(USE_OPENSSL)
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
- 
- #ifdef USE_GCRYPT
-diff --git a/ping6.c b/ping6.c
-index 7085f31..7b7c1af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -324,6 +324,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- 	static __u8 digest[MD5_DIGEST_LENGTH];
- 	static int seq = -1;
- 
-@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- 			return -1;
- 		return ntohsp((__u16 *)nonce);
- 	}
-+# else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+# endif
- }
- #endif
- 
-@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
- 
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
- 	int n;
-@@ -625,6 +631,10 @@ errexit:
- 	free(idn);
- 	free(name);
- 	exit(1);
-+#else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+#endif
- }
- 
- int niquery_option_help_handler(int index, const char *arg)
--- 
-2.3.5
-
diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b5f646..000000000000
--- a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- 	register int n = 0;
- 	int on = 1;
- 
-+	openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
- 		if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- 	while (ac-- > 0 && n < MAXARG)
- 		dirs[n++] = *av++;
- 
--	openlog("tftpd", LOG_PID, LOG_DAEMON);
- 	if (ioctl(0, FIONBIO, &on) < 0) {
- 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- 		exit(1);
--- 
-2.3.5
-