diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /net-misc/iputils | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'net-misc/iputils')
-rw-r--r-- | net-misc/iputils/Manifest | 5 | ||||
-rw-r--r-- | net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch | 54 | ||||
-rw-r--r-- | net-misc/iputils/files/iputils-20180629-musl.patch | 87 | ||||
-rw-r--r-- | net-misc/iputils/files/iputils-20190515-fix-setcap.patch | 67 | ||||
-rw-r--r-- | net-misc/iputils/files/rarpd.conf.d | 8 | ||||
-rw-r--r-- | net-misc/iputils/files/rarpd.init.d | 19 |
6 files changed, 0 insertions, 240 deletions
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 5afa15a74491..1a4571640f39 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,12 +1,7 @@ AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 -AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df -AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d -AUX iputils-20190515-fix-setcap.patch 1706 BLAKE2B e90392bfe79201cbf88e2c6356b9f24d014e845cd65b29d66532dcabc8672df7f47e2bde0d6f267c4aff63f55bd4949ac91ab9d411c71c183586cbe47d6064f9 SHA512 769111d6bfd124d37125554993ea8c47dde2f6d917226597af9521db92fc31417b48648945bffb54f11201f230cb46d820f5a1ded027e1ee8e781d935841507b AUX iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch 1134 BLAKE2B cb6a700f3b0681e6abf5bfcfed3b5b4736aeba481e1b5334193cc32dab8e21134ed729d1b6b098495e46f59416f9d2c29f186b87143adcb2824f08058c7792ce SHA512 4e8bd9d4ae752dcdcb169eec1c42bc16d3f89cd1579140db74c3883da54145faea875513aca4bf8241208253b8950590fd615fe2ea7e448d431d509ff2e8dc03 AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 2852 BLAKE2B a9375c41ba6dde249ec2a0a287eef68228198c7132dd145550c55a6f42b29d2e53160ef9a99455e0f60e2bb738f1a2dbeff016f2ce6903ead58c75bdcafeb618 SHA512 e9f322620ce2e10830c7127fdb64e68ea7bad59620e8b1ffd10ec9ee9f49f74500f0efe25de62feb0e1dd3cbd37af744263b53deeae8d78d44a6b9d335686afc AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07 -AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 -AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 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 8d8160a3d4af..000000000000 --- 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 48742d966021..000000000000 --- 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 6e9c7c6a8354..000000000000 --- 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 ef7fc48e17bf..000000000000 --- 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 27081fc760c0..000000000000 --- 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 -} |