1 |
commit: cb42800cb623ba05740caba6cbf63b5e3a9edceb |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Apr 22 07:50:11 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 23 09:53:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb42800c |
7 |
|
8 |
net-misc/iputils: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/11776 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
net-misc/iputils/files/iputils-99999999-musl.patch | 92 ---------------------- |
15 |
.../files/iputils-99999999-tracepath46.patch | 30 ------- |
16 |
2 files changed, 122 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch |
19 |
deleted file mode 100644 |
20 |
index 167e7fabca7..00000000000 |
21 |
--- a/net-misc/iputils/files/iputils-99999999-musl.patch |
22 |
+++ /dev/null |
23 |
@@ -1,92 +0,0 @@ |
24 |
-From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001 |
25 |
-From: Aric Belsito <lluixhi@×××××.com> |
26 |
-Date: Sun, 29 Oct 2017 23:17:03 +0100 |
27 |
-Subject: [PATCH] Fix build on MUSL |
28 |
- |
29 |
-Add missing AI_IDN and NI_IDN declarations. |
30 |
- |
31 |
-Bug: https://bugs.gentoo.org/503914 |
32 |
---- |
33 |
- arping.c | 7 +++++++ |
34 |
- ping.h | 11 +++++++++++ |
35 |
- tracepath.c | 8 ++++++++ |
36 |
- traceroute6.c | 4 ++++ |
37 |
- 4 files changed, 30 insertions(+) |
38 |
- |
39 |
-diff --git a/arping.c b/arping.c |
40 |
-index 0ac18cd..5d2145e 100644 |
41 |
---- a/arping.c |
42 |
-+++ b/arping.c |
43 |
-@@ -45,6 +45,13 @@ |
44 |
- #ifdef USE_IDN |
45 |
- #include <idna.h> |
46 |
- #include <locale.h> |
47 |
-+ |
48 |
-+#ifndef AI_IDN |
49 |
-+#define AI_IDN 0x0040 |
50 |
-+#endif |
51 |
-+#ifndef AI_CANONIDN |
52 |
-+#define AI_CANONIDN 0x0080 |
53 |
-+#endif |
54 |
- #endif |
55 |
- |
56 |
- #include "SNAPSHOT.h" |
57 |
-diff --git a/ping.h b/ping.h |
58 |
-index c5f0321..0391de0 100644 |
59 |
---- a/ping.h |
60 |
-+++ b/ping.h |
61 |
-@@ -38,6 +38,17 @@ |
62 |
- #include <locale.h> |
63 |
- #include <idna.h> |
64 |
- #include <stringprep.h> |
65 |
-+ |
66 |
-+#ifndef AI_IDN |
67 |
-+#define AI_IDN 0x0040 |
68 |
-+#endif |
69 |
-+#ifndef AI_CANONIDN |
70 |
-+#define AI_CANONIDN 0x0080 |
71 |
-+#endif |
72 |
-+#ifndef NI_IDN |
73 |
-+#define NI_IDN 32 |
74 |
-+#endif |
75 |
-+ |
76 |
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN) |
77 |
- #define getnameinfo_flags NI_IDN |
78 |
- #else |
79 |
-diff --git a/tracepath.c b/tracepath.c |
80 |
-index b0eb911..c50e3ec 100644 |
81 |
---- a/tracepath.c |
82 |
-+++ b/tracepath.c |
83 |
-@@ -30,6 +30,14 @@ |
84 |
- #ifdef USE_IDN |
85 |
- #include <idna.h> |
86 |
- #include <locale.h> |
87 |
-+ |
88 |
-+#ifndef AI_IDN |
89 |
-+#define AI_IDN 0x0040 |
90 |
-+#endif |
91 |
-+#ifndef NI_IDN |
92 |
-+#define NI_IDN 32 |
93 |
-+#endif |
94 |
-+ |
95 |
- #define getnameinfo_flags NI_IDN |
96 |
- #else |
97 |
- #define getnameinfo_flags 0 |
98 |
-diff --git a/traceroute6.c b/traceroute6.c |
99 |
-index 7807956..c6d868a 100644 |
100 |
---- a/traceroute6.c |
101 |
-+++ b/traceroute6.c |
102 |
-@@ -247,6 +247,10 @@ |
103 |
- #include <idna.h> |
104 |
- #include <locale.h> |
105 |
- |
106 |
-+#ifndef NI_IDN |
107 |
-+#define NI_IDN 32 |
108 |
-+#endif |
109 |
-+ |
110 |
- #define getnameinfo_flags NI_IDN |
111 |
- #else |
112 |
- #define getnameinfo_flags 0 |
113 |
--- |
114 |
-2.14.3 |
115 |
- |
116 |
|
117 |
diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch |
118 |
deleted file mode 100644 |
119 |
index 20d017b34ee..00000000000 |
120 |
--- a/net-misc/iputils/files/iputils-99999999-tracepath46.patch |
121 |
+++ /dev/null |
122 |
@@ -1,30 +0,0 @@ |
123 |
-From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001 |
124 |
-From: Thomas Deutschmann <whissi@g.o> |
125 |
-Date: Thu, 19 Oct 2017 17:38:20 +0200 |
126 |
-Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or |
127 |
- `tracepath6` |
128 |
- |
129 |
---- |
130 |
- tracepath.c | 6 ++++++ |
131 |
- 1 file changed, 6 insertions(+) |
132 |
- |
133 |
-diff --git a/tracepath.c b/tracepath.c |
134 |
-index b0eb911..d2a6edf 100644 |
135 |
---- a/tracepath.c |
136 |
-+++ b/tracepath.c |
137 |
-@@ -394,6 +394,12 @@ int main(int argc, char **argv) |
138 |
- setlocale(LC_ALL, ""); |
139 |
- #endif |
140 |
- |
141 |
-+ /* Support being called using `tracepath4` or `tracepath6` symlinks */ |
142 |
-+ if (argv[0][strlen(argv[0])-1] == '4') |
143 |
-+ hints.ai_family = AF_INET; |
144 |
-+ else if (argv[0][strlen(argv[0])-1] == '6') |
145 |
-+ hints.ai_family = AF_INET6; |
146 |
-+ |
147 |
- while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) { |
148 |
- switch(ch) { |
149 |
- case '4': |
150 |
--- |
151 |
-2.14.3 |
152 |
- |