[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[Robin H. Johnson]

commit:     a646c7a9114a2dea6c92f877d48249f90d792971
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jan 19 17:26:34 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 21:09:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a646c7a9

net-misc/iputils: remove unused patches

(cherry picked from commit 098227ab3f128470bffb406a43f32c766c9aa9b5)
Fixes: https://github.com/gentoo/gentoo/pull/3542
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 .../files/iputils-20150815-defines_and_libs.patch  | 28 ---------
 ...ls-20150815-handle_single_protocol_system.patch | 70 ----------------------
 2 files changed, 98 deletions(-)

diff --git a/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch b/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch
deleted file mode 100644
index 4def935..00000000
--- a/net-misc/iputils/files/iputils-20150815-defines_and_libs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ba739daf98450fe725569724eefc64a2afdeb909 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
-Date: Thu, 20 Aug 2015 16:16:14 +0200
-Subject: [PATCH] ping: fix defines and libs in Makefile
-
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9b0b70f..4eea516 100644
---- a/Makefile
-+++ b/Makefile
-@@ -153,10 +153,10 @@ DEF_clockdiff = $(DEF_CAP)
- LIB_clockdiff = $(LIB_CAP)
- 
- # ping / ping6
--DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
--DEF_ping6_common = $(DEF_CAP) $(DEF_IDN)
--DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
--LIB_ping  = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV)
-+DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_CRYPTO) $(DEF_WITHOUT_IFADDRS)
-+DEF_ping_common = $(DEF_ping)
-+DEF_ping6_common = $(DEF_ping)
-+LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_CRYPTO) $(LIB_RESOLV)
- 
- ping: ping_common.o ping6_common.o
- ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h

diff --git a/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch b/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch
deleted file mode 100644
index 1bf98cc..00000000
--- a/net-misc/iputils/files/iputils-20150815-handle_single_protocol_system.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 9fd870a4bac0b8b2070c38452f378ef1eb7d460a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
-Date: Fri, 21 Aug 2015 00:55:56 +0200
-Subject: [PATCH] ping: handle single protocol systems
-
----
- ping.c | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index ec9708e..95a10a7 100644
---- a/ping.c
-+++ b/ping.c
-@@ -110,26 +110,26 @@ static struct sockaddr_in source = { .sin_family = AF_INET };
- static char *device;
- static int pmtudisc = -1;
- 
--static void create_socket(socket_st *sock, int family, int socktype, int protocol)
-+static void create_socket(socket_st *sock, int family, int socktype, int protocol, int requisite)
- {
- 	errno = 0;
- 
- 	sock->fd = socket(family, socktype, protocol);
- 
--	/* Fallback to raw socket when ping socket failed */
--	if (sock->fd == -1 && socktype == SOCK_DGRAM) {
-+	/* Attempt creating a raw socket when ping socket failed */
-+	if (sock->fd == -1 && errno != EAFNOSUPPORT && socktype == SOCK_DGRAM) {
- 		if (options & F_VERBOSE)
- 			fprintf(stderr, "ping: socket: %s, attempting raw socket...\n", strerror(errno));
--		create_socket(sock, family, SOCK_RAW, protocol);
-+		create_socket(sock, family, SOCK_RAW, protocol, requisite);
- 		return;
- 	}
- 
- 	if (sock->fd == -1) {
--		if (socktype == SOCK_RAW)
--			fprintf(stderr, "ping: socket: %s (raw socket required by specified options).\n", strerror(errno));
--		else
-+		if (requisite || errno != EAFNOSUPPORT || options & F_VERBOSE)
- 			fprintf(stderr, "ping: socket: %s\n", strerror(errno));
--		exit(2);
-+		if (requisite)
-+			exit(2);
-+		return;
- 	}
- 
- 	sock->socktype = socktype;
-@@ -442,11 +442,19 @@ main(int argc, char **argv)
- 	/* Create sockets */
- 	enable_capability_raw();
- 	if (hints.ai_family != AF_INET6)
--		create_socket(&sock4, AF_INET, hints.ai_socktype, IPPROTO_ICMP);
-+		create_socket(&sock4, AF_INET, hints.ai_socktype, IPPROTO_ICMP, hints.ai_family == AF_INET);
- 	if (hints.ai_family != AF_INET)
--		create_socket(&sock6, AF_INET6, hints.ai_socktype, IPPROTO_ICMPV6);
-+		create_socket(&sock6, AF_INET6, hints.ai_socktype, IPPROTO_ICMPV6, sock4.fd == -1);
- 	disable_capability_raw();
- 
-+	/* Limit address family on single-protocol systems */
-+	if (hints.ai_family == AF_UNSPEC) {
-+		if (sock4.fd == -1)
-+			hints.ai_family = AF_INET6;
-+		else if (sock6.fd == -1)
-+			hints.ai_family = AF_INET;
-+	}
-+
- 	/* Set socket options */
- 	if (settos)
- 		set_socket_option(&sock4, IPPROTO_IP, IP_TOS, &settos, sizeof settos);

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[Lars Wendler]

commit:     2a16bdf4936d5295ddc382647b67328d4215dfab
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu May 17 08:31:41 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 17 09:14:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a16bdf4

net-misc/iputils: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/8451

 .../files/021109-uclibc-no-ether_ntohost.patch     | 24 ----------------------
 .../iputils/files/iputils-20100418-so_mark.patch   | 22 --------------------
 2 files changed, 46 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 e790d2b5103..00000000000
--- 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-20100418-so_mark.patch b/net-misc/iputils/files/iputils-20100418-so_mark.patch
deleted file mode 100644
index ad92254d6f8..00000000000
--- 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

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[Lars Wendler]

commit:     14e90019515222d46c5cced6795ed993cfafcb0d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  3 17:30:21 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 17:30:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e90019

net-misc/iputils: Re-added accidentally removed patch

Closes: https://bugs.gentoo.org/682426
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../iputils/files/iputils-20150815-nonroot-floodping.patch    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
new file mode 100644
index 00000000000..50e108b09e8
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
@@ -0,0 +1,11 @@
+--- iputils-s20150815/ping.h
++++ iputils-s20150815/ping.h
+@@ -61,7 +61,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))
+ 

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[David Seifert]

commit:     cb42800cb623ba05740caba6cbf63b5e3a9edceb
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 22 07:50:11 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 09:53:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb42800c

net-misc/iputils: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/11776
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-misc/iputils/files/iputils-99999999-musl.patch | 92 ----------------------
 .../files/iputils-99999999-tracepath46.patch       | 30 -------
 2 files changed, 122 deletions(-)

diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch
deleted file mode 100644
index 167e7fabca7..00000000000
--- a/net-misc/iputils/files/iputils-99999999-musl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Sun, 29 Oct 2017 23:17:03 +0100
-Subject: [PATCH] Fix build on MUSL
-
-Add missing AI_IDN and NI_IDN declarations.
-
-Bug: https://bugs.gentoo.org/503914
----
- arping.c      |  7 +++++++
- ping.h        | 11 +++++++++++
- tracepath.c   |  8 ++++++++
- traceroute6.c |  4 ++++
- 4 files changed, 30 insertions(+)
-
-diff --git a/arping.c b/arping.c
-index 0ac18cd..5d2145e 100644
---- a/arping.c
-+++ b/arping.c
-@@ -45,6 +45,13 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
- #endif
- 
- #include "SNAPSHOT.h"
-diff --git a/ping.h b/ping.h
-index c5f0321..0391de0 100644
---- a/ping.h
-+++ b/ping.h
-@@ -38,6 +38,17 @@
- #include <locale.h>
- #include <idna.h>
- #include <stringprep.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
- #else
-diff --git a/tracepath.c b/tracepath.c
-index b0eb911..c50e3ec 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -30,6 +30,14 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
-diff --git a/traceroute6.c b/traceroute6.c
-index 7807956..c6d868a 100644
---- a/traceroute6.c
-+++ b/traceroute6.c
-@@ -247,6 +247,10 @@
- #include <idna.h>
- #include <locale.h>
- 
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
--- 
-2.14.3
-

diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
deleted file mode 100644
index 20d017b34ee..00000000000
--- a/net-misc/iputils/files/iputils-99999999-tracepath46.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 19 Oct 2017 17:38:20 +0200
-Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
- `tracepath6`
-
----
- tracepath.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tracepath.c b/tracepath.c
-index b0eb911..d2a6edf 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -394,6 +394,12 @@ int main(int argc, char **argv)
- 	setlocale(LC_ALL, "");
- #endif
- 
-+	/* Support being called using `tracepath4` or `tracepath6` symlinks */
-+	if (argv[0][strlen(argv[0])-1] == '4')
-+		hints.ai_family = AF_INET;
-+	else if (argv[0][strlen(argv[0])-1] == '6')
-+		hints.ai_family = AF_INET6;
-+
- 	while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
- 		switch(ch) {
- 		case '4':
--- 
-2.14.3
-

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/files/

[Conrad Kostecki]

commit:     5fad00b8d194ef886e0a4985402272f6176c7ec6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Sep  4 18:24:42 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fad00b8

net-misc/iputils: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/17417
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/iputils-20180629-fix-ping-on-musl.patch  | 54 --------------
 net-misc/iputils/files/iputils-20180629-musl.patch | 87 ----------------------
 .../files/iputils-20190515-fix-setcap.patch        | 67 -----------------
 net-misc/iputils/files/rarpd.conf.d                |  8 --
 net-misc/iputils/files/rarpd.init.d                | 19 -----
 5 files changed, 235 deletions(-)

diff --git a/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch b/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
deleted file mode 100644
index 8d8160a3d4a..00000000000
--- a/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Sat, 21 Jul 2018 17:46:14 +0200
-Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
-
-Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
-systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
-alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
-uClibc-ng 1.0.30) when not using the system libidn2.
-
-Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
-
-Reported-by: Nicholas Fish
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
- ping.c | 2 +-
- ping.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index 733477f..b241815 100644
---- a/ping.c
-+++ b/ping.c
-@@ -207,9 +207,9 @@ main(int argc, char **argv)
- 
- #ifdef USE_IDN
- 	setlocale(LC_ALL, "");
--#endif
- 	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- 		hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
- 
- 	/* Support being called using `ping4` or `ping6` symlinks */
- 	if (argv[0][strlen(argv[0])-1] == '4')
-diff --git a/ping.h b/ping.h
-index 3e09685..8a0c4ef 100644
---- a/ping.h
-+++ b/ping.h
-@@ -28,7 +28,6 @@
- #include <netinet/icmp6.h>
- #include <linux/filter.h>
- #include <resolv.h>
--#include <locale.h>
- 
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
-@@ -36,6 +35,7 @@
- #endif
- 
- #ifdef USE_IDN
-+#include <locale.h>
- #include <idn2.h>
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN

diff --git a/net-misc/iputils/files/iputils-20180629-musl.patch b/net-misc/iputils/files/iputils-20180629-musl.patch
deleted file mode 100644
index 48742d96602..00000000000
--- a/net-misc/iputils/files/iputils-20180629-musl.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 5007d7067918fb3d950d34c01d059e5222db679a
-Author:     Aric Belsito <lluixhi@gmail.com>
-AuthorDate: Mon Dec 4 00:10:29 2017 +0100
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Wed Jul 11 01:33:28 2018 +0200
-
-    Fix build on MUSL
-    
-    Add missing AI_IDN and NI_IDN declarations.
-    
-    Bug: https://bugs.gentoo.org/503914
-    Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-
-diff --git a/arping.c b/arping.c
-index c2f2129..d753345 100644
---- a/arping.c
-+++ b/arping.c
-@@ -44,6 +44,13 @@
- 
- #ifdef USE_IDN
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
- #endif
- 
- #include "SNAPSHOT.h"
-diff --git a/ping.h b/ping.h
-index 3e09685..1e51c67 100644
---- a/ping.h
-+++ b/ping.h
-@@ -37,6 +37,17 @@
- 
- #ifdef USE_IDN
- #include <idn2.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
- #else
-diff --git a/tracepath.c b/tracepath.c
-index 53bda16..9558e49 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -29,6 +29,14 @@
- 
- #ifdef USE_IDN
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
-diff --git a/traceroute6.c b/traceroute6.c
-index a1022f9..ab34615 100644
---- a/traceroute6.c
-+++ b/traceroute6.c
-@@ -246,6 +246,10 @@
- #ifdef USE_IDN
- #include <locale.h>
- 
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define ADDRINFO_IDN_FLAGS	AI_IDN
- #define getnameinfo_flags	NI_IDN
- #else

diff --git a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch
deleted file mode 100644
index 6e9c7c6a835..00000000000
--- a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001
-From: Michael Weiss <dev.primeos@gmail.com>
-Date: Thu, 16 May 2019 09:44:27 +0000
-Subject: [PATCH] build-sys: Make setcap really optional
-
-The setcap dependency is marked as optional but meson.build depends on
-setcap.path():
-
-meson.build:246:7: ERROR:  add_install_script args must be strings
----
- meson.build | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 8af9e18..95c778a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -221,10 +221,13 @@ config_h = configure_file(
- setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
- if get_option('NO_SETCAP_OR_SUID')
- 	perm_type = 'none'
-+	setcap_path = '/dev/null'
- elif cap_dep.found() and setcap.found()
- 	perm_type = 'caps'
-+	setcap_path = setcap.path()
- else
- 	perm_type = 'setuid'
-+	setcap_path = '/dev/null'
- endif
- 
- ############################################################
-@@ -243,7 +246,7 @@ if build_ping == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'ping',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -263,7 +266,7 @@ if build_traceroute6 == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'traceroute6',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -276,7 +279,7 @@ if build_clockdiff == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'clockdiff',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 
-@@ -306,7 +309,7 @@ if build_arping == true
- 		join_paths(get_option('prefix'), get_option('bindir')),
- 		'arping',
- 		perm_type,
--		setcap.path()
-+		setcap_path
- 	)
- endif
- 

diff --git a/net-misc/iputils/files/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d
deleted file mode 100644
index ef7fc48e17b..00000000000
--- a/net-misc/iputils/files/rarpd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for /etc/init.d/rarpd
-
-# You probably want to select the interface for this to listen on.
-# By default it uses loopback which most likely won't help.
-RARPD_IFACE="lo"
-
-# See the rarpd(8) manpage for more info.
-RARPD_OPTS="-b /tftpboot"

diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
deleted file mode 100644
index 27081fc760c..00000000000
--- a/net-misc/iputils/files/rarpd.init.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/rarpd.pid"
-command="/usr/sbin/rarpd"
-# The -d option keeps it from forking.  This way s-s-d can do the fork and
-# set up the pidfile with the right value below.
-command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}"
-start_stop_daemon_args="--background --make-pidfile"
-
-start_pre() {
-	if [ ! -f /etc/ethers ] ; then
-		eerror "Please create /etc/ethers with the following content:"
-		eerror "[MAC address] [name or IP]"
-		return 1
-	fi
-	return 0
-}