| 1 |
commit: 4c0166edf28e7359be5d1057a9cf5a7415b42653 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 29 22:25:38 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 29 22:29:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0166ed |
| 7 |
|
| 8 |
net-misc/iputils: Fix build issue on MUSL |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/503914 |
| 11 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 12 |
|
| 13 |
net-misc/iputils/files/iputils-99999999-musl.patch | 92 ++++++++++++++++++++++ |
| 14 |
net-misc/iputils/iputils-20171016_pre.ebuild | 5 +- |
| 15 |
net-misc/iputils/iputils-99999999.ebuild | 5 +- |
| 16 |
3 files changed, 100 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..167e7fabca7 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-misc/iputils/files/iputils-99999999-musl.patch |
| 23 |
@@ -0,0 +1,92 @@ |
| 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/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild |
| 118 |
index 691040d27e1..fb555325457 100644 |
| 119 |
--- a/net-misc/iputils/iputils-20171016_pre.ebuild |
| 120 |
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild |
| 121 |
@@ -13,7 +13,10 @@ inherit flag-o-matic toolchain-funcs fcaps |
| 122 |
|
| 123 |
MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf" |
| 124 |
|
| 125 |
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch ) |
| 126 |
+PATCHES=( |
| 127 |
+ "${FILESDIR}"/${PN}-99999999-tracepath46.patch |
| 128 |
+ "${FILESDIR}"/${PN}-99999999-musl.patch |
| 129 |
+) |
| 130 |
|
| 131 |
if [[ ${PV} == "99999999" ]] ; then |
| 132 |
EGIT_REPO_URI="https://github.com/iputils/iputils.git" |
| 133 |
|
| 134 |
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild |
| 135 |
index 9731575e02e..90fcf7f7d8a 100644 |
| 136 |
--- a/net-misc/iputils/iputils-99999999.ebuild |
| 137 |
+++ b/net-misc/iputils/iputils-99999999.ebuild |
| 138 |
@@ -11,7 +11,10 @@ EAPI="6" |
| 139 |
|
| 140 |
inherit flag-o-matic toolchain-funcs fcaps |
| 141 |
|
| 142 |
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch ) |
| 143 |
+PATCHES=( |
| 144 |
+ "${FILESDIR}"/${PN}-99999999-tracepath46.patch |
| 145 |
+ "${FILESDIR}"/${PN}-99999999-musl.patch |
| 146 |
+) |
| 147 |
|
| 148 |
if [[ ${PV} == "99999999" ]] ; then |
| 149 |
EGIT_REPO_URI="https://github.com/iputils/iputils.git" |
Archives