commit: 7a347bf30b5593ed8a5db30c7b3628042885a882 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon May 10 14:43:31 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon May 10 14:43:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a347bf3
net-misc/iputils: Remove old 20190709-r1, 20200821-r2 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-misc/iputils/Manifest | 4 - .../files/iputils-20150815-nonroot-floodping.patch | 11 -- ...rt-partially-fix-sent-vs-received-package.patch | 34 ---- ...-main-loop-over-multiple-addrinfo-results.patch | 86 --------- ...ping-try-next-addrinfo-on-connect-failure.patch | 190 -------------------- .../iputils/files/iputils-20200821-fclose.patch | 45 ----- .../iputils-20200821-getrandom-fallback.patch | 43 ----- .../files/iputils-20200821-install-sbindir.patch | 29 --- net-misc/iputils/iputils-20190709-r1.ebuild | 198 --------------------- net-misc/iputils/iputils-20200821-r2.ebuild | 178 ------------------ net-misc/iputils/metadata.xml | 1 - 11 files changed, 819 deletions(-) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index b159499340d..9743e063f14 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,6 +1,2 @@ -DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 -DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526 -DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 -DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch deleted file mode 100644 index 50e108b09e8..00000000000 --- a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)) - diff --git a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch deleted file mode 100644 index 715ed45041b..00000000000 --- a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerol...@iki.fi> -Date: Wed, 31 Jul 2019 21:28:12 +0100 -Subject: [PATCH] arping: revert partially - fix sent vs received packages - return value - -Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression. The -arping -D needs return value evaluation that was the earlier default, in -other cases the new return value should be correct. - -Addresses: https://github.com/iputils/iputils/issues/209 -See-also: https://github.com/void-linux/void-packages/issues/13304 -Signed-off-by: Sami Kerola <kerol...@iki.fi> ---- - arping.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/arping.c b/arping.c -index 77c9c56..2c87c15 100644 ---- a/arping.c -+++ b/arping.c -@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl) - close(tfd); - freeifaddrs(ctl->ifa0); - rc |= finish(ctl); -- rc |= (ctl->sent != ctl->received); -+ if (ctl->dad && ctl->quit_on_reply) -+ /* Duplicate address detection mode return value */ -+ rc |= !(ctl->brd_sent != ctl->received); -+ else -+ rc |= (ctl->sent != ctl->received); - return rc; - } - diff --git a/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch b/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch deleted file mode 100644 index 9814707d723..00000000000 --- a/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Benjamin Poirier <benjamin.poir...@gmail.com> -Date: Thu, 26 Dec 2019 10:44:03 +0900 -Subject: ping: fix main loop over multiple addrinfo results - -Despite what the log of commit f68eec0eafad ("ping: perform dual-stack ping -by default") says, main() was not designed to loop over multiple addresses -returned by getaddrinfo(). This is apparent because until commit -db11bc96a68c ("ping: make command to return from main()"), ping{4,6}_run() -never returned (they always exited). After commit db11bc96a68c, we -encounter unexpected situations if getaddrinfo returns multiple results and -ping{4,6}_run() return != 0. - -For example (notice echo reply is not received): - - root@vsid:/src/iputils# ./builddir/ping/ping -w1 google.com - PING google.com(nrt12s22-in-x0e.1e100.net (2404:6800:4004:80c::200e)) 56 data bytes - - --- google.com ping statistics --- - 1 packets transmitted, 0 received, 100% packet loss, time 0ms - - PING (216.58.197.142) 56(84) bytes of data. - - --- ping statistics --- - 1 packets transmitted, 0 received, 100% packet loss, time -1002ms - - root@vsid:/src/iputils# - -Establish the following convention: - -* return value >= 0 -> exit with this code (same behavior as before commit - db11bc96a68c) - -* return value < 0 -> go on to next addrinfo result - -The second case will be used in the following patch. - -Fixes: db11bc96a68c ("ping: make command to return from main()") -Signed-off-by: Benjamin Poirier <bpoir...@cumulusnetworks.com> -Origin: https://github.com/iputils/iputils/commit/c249e48bb865e731896b7d8ceaf4bca7d28768b6 -Bug-Debian: https://bugs.debian.org/947921 -See-also: https://github.com/iputils/iputils/pull/244 ---- - ping.c | 6 +++++- - ping6_common.c | 1 + - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ping.c b/ping.c -index 34653be..ae687b4 100644 ---- a/ping.c -+++ b/ping.c -@@ -495,8 +495,11 @@ main(int argc, char **argv) - error(2, 0, _("unknown protocol family: %d"), ai->ai_family); - } - -- if (ret_val == 0) -+ if (ret_val >= 0) - break; -+ /* ret_val < 0 means to go on to next addrinfo result, there -+ * better be one. */ -+ assert(ai->ai_next); - } - - freeaddrinfo(result); -@@ -504,6 +507,7 @@ main(int argc, char **argv) - return ret_val; - } - -+/* return >= 0: exit with this code, < 0: go on to next addrinfo result */ - int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock) - { - static const struct addrinfo hints = { -diff --git a/ping6_common.c b/ping6_common.c -index 6cc5404..731dc6d 100644 ---- a/ping6_common.c -+++ b/ping6_common.c -@@ -551,6 +551,7 @@ int niquery_option_handler(const char *opt_arg) - return ret; - } - -+/* return >= 0: exit with this code, < 0: go on to next addrinfo result */ - int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock) - { - static const struct addrinfo hints = { --- -2.25.0.rc2 - diff --git a/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch b/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch deleted file mode 100644 index a308fb7c9f6..00000000000 --- a/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch +++ /dev/null @@ -1,190 +0,0 @@ -From: Benjamin Poirier <benjamin.poir...@gmail.com> -Date: Wed, 25 Dec 2019 13:33:12 +0900 -Subject: ping: try next addrinfo on connect failure - -On hosts that have routing rules matching on the outgoing interface [1], -getaddrinfo() may return results sorted in a suboptimal order because it is -not aware of the network interface passed to ping via the "-I" option. In -particular, address reachability detection may fail and getaddrinfo() will -return ipv6 results first, even though the only routes available are ipv4. - -Improve user experience by trying next addrinfo entry if we encounter a -failure at connect() time because of missing or unreachable routes. - -[1] For example, on switches running Cumulus Linux, the default VRF is used -for front ports and a "mgmt" VRF is used for the management interface, which -also handles all DNS traffic. (VRFs apply different routing rules based on -the iif/oif, ie. influenced by SO_BINDTODEVICE.) In the default vrf, it's -possible to ping an ipv4 address via the mgmt vrf by specifying "-I mgmt". -However, that will fail if the target host is specified by name, has a AAAA -record and there is no ipv6 route to it. - -Since libc commit 5ddb5bf5fb, getaddrinfo() does a udp connect to result -addresses to check if there is a route to them. This is to implement -RFC3484 ยง6 Rule 1 ("Avoid unusable destinations") which is part of the -algorithm to order results. getaddrinfo() is unaware of ping's "-I" option -and tries to connect its socket via the default vrf, which has no ipv6 route -to the target host (and, in fact, no ipv4 route either). Following this -failure, getaddrinfo() returns results ordered according to -/etc/gai.conf (Rule 6) - by default, ipv6 first. - -ping tries only the first entry returned by getaddrinfo() and fails to -connect to it because there is no ipv6 route to the host, even in the mgmt -vrf. However, if getaddrinfo() had ordered the ipv4 result first or ping -had tried the next addrinfo entry (the ipv4 one), ping could connect a udp -socket to it and later successfully exchange icmp messages with it. - -Example: - - cumulus@act-5812-10:~$ ip vrf list - Name Table - ----------------------- - mgmt 1001 - cumulus@act-5812-10:~$ ip vrf identify - cumulus@act-5812-10:~$ # --> default vrf - cumulus@act-5812-10:~$ - cumulus@act-5812-10:~$ ip rule - 99: from all to 10.230.0.53 ipproto udp dport 53 lookup mgmt - 99: from all to 10.20.249.1 ipproto udp dport 53 lookup mgmt - 1000: from all lookup [l3mdev-table] - 32765: from all lookup local - 32766: from all lookup main - 32767: from all lookup default - - cumulus@act-5812-10:~$ ip route - - cumulus@act-5812-10:~$ ip -6 route - ::1 dev lo proto kernel metric 256 pref medium - - cumulus@act-5812-10:~$ ip route show vrf mgmt - default via 10.230.130.1 dev eth0 - unreachable default metric 4278198272 - 10.230.130.0/24 dev eth0 proto kernel scope link src 10.230.130.211 - 127.0.0.0/8 dev mgmt proto kernel scope link src 127.0.0.1 - - cumulus@act-5812-10:~$ ip -6 route show vrf mgmt - ::1 dev mgmt proto kernel metric 256 pref medium - anycast fe80:: dev eth0 proto kernel metric 0 pref medium - fe80::/64 dev eth0 proto kernel metric 256 pref medium - ff00::/8 dev eth0 metric 256 pref medium - unreachable default dev lo metric 4278198272 pref medium - - cumulus@act-5812-10:~$ host google.com - google.com has address 172.217.0.46 - google.com has IPv6 address 2607:f8b0:4005:802::200e - google.com mail is handled by 30 alt2.aspmx.l.google.com. - google.com mail is handled by 40 alt3.aspmx.l.google.com. - google.com mail is handled by 20 alt1.aspmx.l.google.com. - google.com mail is handled by 10 aspmx.l.google.com. - google.com mail is handled by 50 alt4.aspmx.l.google.com. - -Success with numeric address - - cumulus@act-5812-10:~$ ping -n -c1 -I mgmt 172.217.0.46 - ping: Warning: source address might be selected on device other than mgmt. - PING 172.217.0.46 (172.217.0.46) from 10.230.130.211 mgmt: 56(84) bytes of data. - 64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.68 ms - - --- 172.217.0.46 ping statistics --- - 1 packets transmitted, 1 received, 0% packet loss, time 0ms - rtt min/avg/max/mdev = 4.675/4.675/4.675/0.000 ms - -Failure with host by name - - cumulus@act-5812-10:~$ ping -n -c1 -I mgmt google.com - connect: No route to host - -Success when running in the mgmt vrf because getaddrinfo()'s address -reachability test is effective and ipv4 result(s) are ordered first. - - cumulus@act-5812-10:~$ ip vrf exec mgmt ping -n -c1 google.com - PING google.com (172.217.0.46) 56(84) bytes of data. - 64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.65 ms - - --- google.com ping statistics --- - 1 packets transmitted, 1 received, 0% packet loss, time 0ms - rtt min/avg/max/mdev = 4.650/4.650/4.650/0.000 ms - -For demonstration purposes, the following configuration allows one to -reproduce a similar problem. Starting from a host with a vanilla -configuration, default ipv4 route using eth0, no ipv6 global routes: - - root@vsid:~# ip route - default via 192.168.15.1 dev eth0 - 192.168.15.0/24 dev eth0 proto kernel scope link src 192.168.15.100 - - root@vsid:~# ip -6 route - ::1 dev lo proto kernel metric 256 pref medium - fe80::/64 dev eth0 proto kernel metric 256 pref medium - - root@vsid:~# ip rou flush table main - - root@vsid:~# ip rou add table 1 192.168.15.0/24 dev eth0 - - root@vsid:~# ip rou add table 1 default via 192.168.15.1 - - root@vsid:~# ip rule - 0: from all lookup local - 32766: from all lookup main - 32767: from all lookup default - root@vsid:~# ip rule add pref 1 to 192.168.15.1 ipproto udp dport 53 lookup 1 - root@vsid:~# ip rule add pref 2 oif eth0 lookup 1 - root@vsid:~# ping -c1 -I eth0 google.com - - ping: connect: Network is unreachable - -With the current patch - - root@vsid:~# /src/iputils/builddir/ping/ping -c1 -I eth0 google.com - PING (172.217.174.110) from 192.168.15.100 eth0: 56(84) bytes of data. - 64 bytes from nrt12s28-in-f14.1e100.net (172.217.174.110): icmp_seq=1 ttl=53 time=11.3 ms - - --- ping statistics --- - 1 packets transmitted, 1 received, 0% packet loss, time 0ms - rtt min/avg/max/mdev = 11.313/11.313/11.313/0.000 ms - -Signed-off-by: Benjamin Poirier <bpoir...@cumulusnetworks.com> -Origin: https://github.com/iputils/iputils/commit/2705c8248281fbb8efaa5326ab1d0ed0a670bd3d -Bug-Debian: https://bugs.debian.org/947921 -See-also: https://github.com/iputils/iputils/pull/244 ---- - ping.c | 3 +++ - ping6_common.c | 7 ++++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/ping.c b/ping.c -index 34653be..013c4e6 100644 ---- a/ping.c -+++ b/ping.c -@@ -628,6 +628,9 @@ int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock) - error(2, errno, _("cannot set broadcasting")); - if (connect(probe_fd, (struct sockaddr *)&dst, sizeof(dst)) == -1) - error(2, errno, "connect"); -+ } else if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) { -+ close(probe_fd); -+ return -1; - } else - error(2, errno, "connect"); - } -diff --git a/ping6_common.c b/ping6_common.c -index 6cc5404..bc1030b 100644 ---- a/ping6_common.c -+++ b/ping6_common.c -@@ -651,8 +651,13 @@ int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock - firsthop.sin6_family = AF_INET6; - - firsthop.sin6_port = htons(1025); -- if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1) -+ if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1) { -+ if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) { -+ close(probe_fd); -+ return -1; -+ } - error(2, errno, "connect"); -+ } - alen = sizeof source6; - if (getsockname(probe_fd, (struct sockaddr *)&source6, &alen) == -1) - error(2, errno, "getsockname"); --- -2.25.0.rc2 - diff --git a/net-misc/iputils/files/iputils-20200821-fclose.patch b/net-misc/iputils/files/iputils-20200821-fclose.patch deleted file mode 100644 index cc370f0a556..00000000000 --- a/net-misc/iputils/files/iputils-20200821-fclose.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e1c3d09b412ad0d022178344b8cbf748dc60f17f Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Sun, 24 Jan 2021 23:29:27 -0500 -Subject: [PATCH] tftpd: recvfile: avoid closing the file twice - -The close_stream function calls fclose, so don't call it again. - -This resolves an abort in glibc: - - Message: Process 1038079 (tftpd) of user 65534 dumped core. - - Stack trace of thread 1038079: - #0 0x00007f5f650ed204 raise (libc.so.6 + 0x39204) - #1 0x00007f5f650d6547 abort (libc.so.6 + 0x22547) - #2 0x00007f5f6512f25f n/a (libc.so.6 + 0x7b25f) - #3 0x00007f5f651372fa n/a (libc.so.6 + 0x832fa) - #4 0x00007f5f65138dc2 n/a (libc.so.6 + 0x84dc2) - #5 0x00007f5f65124b2f fclose (libc.so.6 + 0x70b2f) - #6 0x000055571a50de73 recvfile (tftpd + 0x2e73) - #7 0x000055571a50e064 tftp (tftpd + 0x3064) - #8 0x000055571a50e387 tftpd_inetd (tftpd + 0x3387) - #9 0x000055571a50e50f main (tftpd + 0x350f) - #10 0x00007f5f650d7e6d __libc_start_main (libc.so.6 + 0x23e6d) - #11 0x000055571a50d3ca _start (tftpd + 0x23ca) - -Fixes: 5d6be65 ("tftpd: remove global variables by using a run state struct") - -Reviewed-by: Petr Vorel <pvo...@suse.cz> -Signed-off-by: Mike Gilbert <flop...@gentoo.org> ---- - tftpd/tftpd.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c -index 42998f9b..a09d32ba 100644 ---- a/tftpd/tftpd.c -+++ b/tftpd/tftpd.c -@@ -387,7 +387,6 @@ void recvfile(struct run_state *ctl, struct formats *pf) - write_behind(ctl->file, pf->f_convert); - if (close_stream(ctl->file)) - syslog(LOG_ERR, "tftpd: write error: %s\n", strerror(errno)); -- fclose(ctl->file); /* close data file */ - - ap->th_opcode = htons((uint16_t)ACK); /* send the "final" ack */ - ap->th_block = htons(block); diff --git a/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch b/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch deleted file mode 100644 index 5b69e5c88fb..00000000000 --- a/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 469b41ac89b9f6772ea31df8379669d205be95f8 Mon Sep 17 00:00:00 2001 -From: Nuno Silva <nuno.m.ribeiro.si...@tecnico.ulisboa.pt> -Date: Mon, 24 Aug 2020 19:34:53 +0100 -Subject: [PATCH] common: fix infinite loop when getrandom fails - -Fixes: https://github.com/iputils/iputils/issues/291 ---- - iputils_common.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/iputils_common.c b/iputils_common.c -index 58eacd0..c41f201 100644 ---- a/iputils_common.c -+++ b/iputils_common.c -@@ -98,18 +98,24 @@ static unsigned int iputil_srand_fallback(void) - void iputils_srand(void) - { - unsigned int i; -+ - #if HAVE_GETRANDOM - ssize_t ret; - -- while ((ret = getrandom(&i, sizeof(i), GRND_NONBLOCK)) != sizeof(i)) { -- switch(errno) { -+ do { -+ errno = 0; -+ ret = getrandom(&i, sizeof(i), GRND_NONBLOCK); -+ switch (errno) { -+ case 0: -+ break; - case EINTR: - continue; - default: - i = iputil_srand_fallback(); -- break; -+ goto done; - } -- } -+ } while (ret != sizeof(i)); -+ done: - #else - i = iputil_srand_fallback(); - #endif diff --git a/net-misc/iputils/files/iputils-20200821-install-sbindir.patch b/net-misc/iputils/files/iputils-20200821-install-sbindir.patch deleted file mode 100644 index cb1575841cc..00000000000 --- a/net-misc/iputils/files/iputils-20200821-install-sbindir.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8d1420f3019cd1caccf2ffa15a5873f0c61ab529 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Sun, 24 Jan 2021 22:39:03 -0500 -Subject: [PATCH] tftpd: install into sbindir - -The xinet.d config expects the daemon to live in sbindir. - -Closes: https://github.com/iputils/iputils/pull/310 - -Reviewed-by: Petr Vorel <pvo...@suse.cz> -Signed-off-by: Mike Gilbert <flop...@gentoo.org> ---- - tftpd/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tftpd/meson.build b/tftpd/meson.build -index 6e508a24..b4cf6812 100644 ---- a/tftpd/meson.build -+++ b/tftpd/meson.build -@@ -3,7 +3,8 @@ inc = include_directories('..') - executable('tftpd', ['tftpd.c', 'tftpsubs.c', git_version_h], - include_directories : inc, - link_with : [libcommon], -- install: true) -+ install: true, -+ install_dir: sbindir) - - subs = configuration_data() - subs.set('sbindir', sbindir) diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild deleted file mode 100644 index 8c5d1387e1a..00000000000 --- a/net-misc/iputils/iputils-20190709-r1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="ja" - -inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git"; - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"; - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" - -BDEPEND="virtual/pkgconfig" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - ipv6? ( - ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( - nettle? ( dev-libs/nettle[static-libs(+)] ) - !nettle? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - ) - ) - nls? ( sys-devel/gettext[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-arping-revert-partially-fix-sent-vs-received-package.patch - "${FILESDIR}"/${P}-ping-try-next-addrinfo-on-connect-failure.patch - "${FILESDIR}"/${P}-ping-fix-main-loop-over-multiple-addrinfo-results.patch -) - -src_prepare() { - use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) - - default - - l10n_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - ) - - if use ipv6 && use ssl ; then - emesonargs+=( - -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" - ) - else - emesonargs+=( - -DUSE_CRYPTO="none" - ) - fi - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild deleted file mode 100644 index 55b1e38f169..00000000000 --- a/net-misc/iputils/iputils-20200821-r2.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="de fr ja pt_BR tr uk zh_CN" - -inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git"; - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"; - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6" - -BDEPEND="virtual/pkgconfig" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( sys-devel/gettext[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - -PATCHES=( - "${FILESDIR}/iputils-20200821-getrandom-fallback.patch" - "${FILESDIR}/iputils-20200821-fclose.patch" - "${FILESDIR}/iputils-20200821-install-sbindir.patch" -) - -src_prepare() { - default - - l10n_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - ) - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml index 6d135dfdb42..11c6f638649 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -15,7 +15,6 @@ <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag> <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag> - <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
