diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-04-22 09:50:11 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2019-04-23 11:53:41 +0200 |
| commit | cb42800cb623ba05740caba6cbf63b5e3a9edceb (patch) | |
| tree | 5d3ab6db9e584053cbcb4c2217a0b740951b6ecd /net-misc/iputils/files | |
| parent | dev-ruby/safe_yaml: remove unused patch(es) (diff) | |
| download | gentoo-cb42800cb623ba05740caba6cbf63b5e3a9edceb.tar.gz gentoo-cb42800cb623ba05740caba6cbf63b5e3a9edceb.tar.bz2 gentoo-cb42800cb623ba05740caba6cbf63b5e3a9edceb.zip | |
net-misc/iputils: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/11776
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-misc/iputils/files')
| -rw-r--r-- | net-misc/iputils/files/iputils-99999999-musl.patch | 92 | ||||
| -rw-r--r-- | net-misc/iputils/files/iputils-99999999-tracepath46.patch | 30 |
2 files changed, 0 insertions, 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 167e7fabca70..000000000000 --- 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 20d017b34ee9..000000000000 --- 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 - |