<div dir="ltr"><a href="https://github.com/iputils/iputils/blob/master/RELNOTES.old">https://github.com/iputils/iputils/blob/master/RELNOTES.old</a><br><div><br></div><div>mentiones that IDN was enabled by default in:</div><div>[s20160308] and surprisingly the same in [s20150815]<br></div><div>but there are no release notes for s20151218 version we were using until now, don't know how it really relates to <span style="color:rgb(34,34,34);font-family:arial,sans-serif;font-size:small;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">[s20150815].</span></div><div><br></div><div><a href="https://github.com/iputils/iputils/commit/f3a461603ef4fb7512ade3bdb73fe1824e294547">https://github.com/iputils/iputils/commit/f3a461603ef4fb7512ade3bdb73fe1824e294547</a><br></div><div><br></div><div>Easiest way to reproduce this failure is to remove libidn from gnutls PACKAGECONFIG or to use gnutls which doesn't have libidn PACKAGECONFIG at all (like the one in meta-gplv2).</div><div><br></div><div>First it leads to following QA issue:</div><div><a href="http://errors.yoctoproject.org/Errors/Build/53212/">http://errors.yoctoproject.org/Errors/Build/53212/</a><br></div><div><div>ERROR: iputils-s20161105-r0 do_package_qa: QA Issue: iputils-ping rdepends on libidn, but it isn't a build dependency, missing libidn in DEPENDS or PACKAGECONFIG? [build-deps]</div><div>ERROR: iputils-s20161105-r0 do_package_qa: QA Issue: iputils-traceroute6 rdepends on libidn, but it isn't a build dependency, missing libidn in DEPENDS or PACKAGECONFIG? [build-deps]</div><div>ERROR: iputils-s20161105-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.</div><div>ERROR: iputils-s20161105-r0 do_package_qa: Function failed: do_package_qa</div><div>ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/iputils/s20161105-r0/temp/log.do_package_qa.7627</div><div>ERROR: Task (/OE/build/oe-core/openembedded-core/meta/recipes-extended/iputils/iputils_s20161105.bb:do_package_qa) failed with exit code '1'</div></div><div><br></div><div>But if you cleansstate iputils as well (after removing libidn from gnutls PACKAGECONFIG) to empty iputils RSS, then you get the error about missing idna.h:</div><div><a href="http://errors.yoctoproject.org/Errors/Build/53213/">http://errors.yoctoproject.org/Errors/Build/53213/</a><br></div><div><br></div><div>Adding the libidn dependency explicitly in iputils recipe fixes the issue.</div><div><br></div><div>Regards,</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 6, 2018 at 11:03 PM, Martin Jansa <span dir="ltr"><<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Doesn't this new version depend on libidn?<div><br></div><div>Maybe it should be new PACKAGECONFIG or something, but here all builds fail with:</div><div><br></div><div><div>| In file included from ping_common.c:1:0:</div><div>| ping.h:39:10: fatal error: idna.h: No such file or directory</div><div>| #include <idna.h></div><div>| ^~~~~~~~</div></div><div><br></div><div>I'm running another build with just oe-core and nodistro to check if it fails the same there as well.</div><div><br></div><div>Regards,</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 6, 2018 at 12:07 PM, <span dir="ltr"><<a href="mailto:git@git.openembedded.org" target="_blank">git@git.openembedded.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This is an automated email from the git hooks/post-receive script.<br>
<br>
rpurdie pushed a commit to branch master<br>
in repository openembedded-core.<br>
<br>
commit 5997981fa2c22609a88b8cbb595dbf<wbr>7758b2f7c2<br>
Author: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel<wbr>.com</a>><br>
AuthorDate: Thu Feb 1 20:02:08 2018 +0200<br>
<br>
iputils: update to 20161105<br>
<br>
We've been using obsolete upstream URI for quite a while; meanwhile<br>
a lot of development has happened<br>
<br>
Drop all the patches: they are either changing the code that has been refactored,<br>
or are backports.<br>
<br>
Add a new musl fix patch from gentoo.<br>
<br>
ping6 and tracepath6 variants have been folded into standard versions.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel<wbr>.com</a>><br>
Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br>
---<br>
.../iputils/files/0001-Fix-bu<wbr>ild-on-MUSL.patch | 93 ++++++++++++++++++++++<br>
.../files/0001-Fix-header-inc<wbr>lusion-for-musl.patch | 92 ---------------------<br>
.../0001-Intialize-struct-ele<wbr>ments-by-name.patch | 52 ------------<br>
...ing-fix-arping-hang-if-SIG<wbr>ALRM-is-blocked.patch | 44 ----------<br>
.../iputils/files/debian/targ<wbr>ets.diff | 15 ----<br>
.../iputils/files/debian/use_<wbr>gethostbyname2.diff | 31 --------<br>
.../iputils/files/nsgmls-<wbr>path-fix.patch | 27 -------<br>
.../{<a href="http://iputils_s20151218.bb" rel="noreferrer" target="_blank">iputils_s20151218.bb</a> => <a href="http://iputils_s20161105.bb" rel="noreferrer" target="_blank">iputils_s20161105.bb</a>} | 33 +++-----<br>
8 files changed, 103 insertions(+), 284 deletions(-)<br>
<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-build-on-<wbr>MUSL.patch b/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-build-on-<wbr>MUSL.patch<br>
new file mode 100644<br>
index 0000000..c86dafc<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-build-on-<wbr>MUSL.patch<br>
@@ -0,0 +1,93 @@<br>
+From c6c5966d9fae27bc2f0a34ab59b999<wbr>555111bd2d Mon Sep 17 00:00:00 2001<br>
+From: Aric Belsito <<a href="mailto:lluixhi@gmail.com" target="_blank">lluixhi@gmail.com</a>><br>
+Date: Sun, 29 Oct 2017 23:17:03 +0100<br>
+Subject: [PATCH] Fix build on MUSL<br>
+<br>
+Add missing AI_IDN and NI_IDN declarations.<br>
+<br>
+Bug: <a href="https://bugs.gentoo.org/503914" rel="noreferrer" target="_blank">https://bugs.gentoo.org/503914</a><br>
+Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
+---<br>
+ arping.c | 7 +++++++<br>
+ ping.h | 11 +++++++++++<br>
+ tracepath.c | 8 ++++++++<br>
+ traceroute6.c | 4 ++++<br>
+ 4 files changed, 30 insertions(+)<br>
+<br>
+diff --git a/arping.c b/arping.c<br>
+index 1a3f40b..531d29d 100644<br>
+--- a/arping.c<br>
++++ b/arping.c<br>
+@@ -45,6 +45,13 @@ struct sysfs_devattr_values;<br>
+ #ifdef USE_IDN<br>
+ #include <idna.h><br>
+ #include <locale.h><br>
++<br>
++#ifndef AI_IDN<br>
++#define AI_IDN 0x0040<br>
++#endif<br>
++#ifndef AI_CANONIDN<br>
++#define AI_CANONIDN 0x0080<br>
++#endif<br>
+ #endif<br>
+<br>
+ #include "SNAPSHOT.h"<br>
+diff --git a/ping.h b/ping.h<br>
+index 749f3ff..227315f 100644<br>
+--- a/ping.h<br>
++++ b/ping.h<br>
+@@ -38,6 +38,17 @@<br>
+ #include <locale.h><br>
+ #include <idna.h><br>
+ #include <stringprep.h><br>
++<br>
++#ifndef AI_IDN<br>
++#define AI_IDN 0x0040<br>
++#endif<br>
++#ifndef AI_CANONIDN<br>
++#define AI_CANONIDN 0x0080<br>
++#endif<br>
++#ifndef NI_IDN<br>
++#define NI_IDN 32<br>
++#endif<br>
++<br>
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)<br>
+ #define getnameinfo_flags NI_IDN<br>
+ #else<br>
+diff --git a/tracepath.c b/tracepath.c<br>
+index 74a829d..dcec5b9 100644<br>
+--- a/tracepath.c<br>
++++ b/tracepath.c<br>
+@@ -30,6 +30,14 @@<br>
+ #ifdef USE_IDN<br>
+ #include <idna.h><br>
+ #include <locale.h><br>
++<br>
++#ifndef AI_IDN<br>
++#define AI_IDN 0x0040<br>
++#endif<br>
++#ifndef NI_IDN<br>
++#define NI_IDN 32<br>
++#endif<br>
++<br>
+ #define getnameinfo_flags NI_IDN<br>
+ #else<br>
+ #define getnameinfo_flags 0<br>
+diff --git a/traceroute6.c b/traceroute6.c<br>
+index 48fc5c5..8d1eebf 100644<br>
+--- a/traceroute6.c<br>
++++ b/traceroute6.c<br>
+@@ -251,6 +251,10 @@<br>
+ #include <idna.h><br>
+ #include <locale.h><br>
+<br>
++#ifndef NI_IDN<br>
++#define NI_IDN 32<br>
++#endif<br>
++<br>
+ #define getnameinfo_flags NI_IDN<br>
+ #else<br>
+ #define getnameinfo_flags 0<br>
+--<br>
+2.15.1<br>
+<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-header-inclus<wbr>ion-for-musl.patch b/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-header-inclus<wbr>ion-for-musl.patch<br>
deleted file mode 100644<br>
index 20ef07e..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/0001-Fix-header-inclus<wbr>ion-for-musl.patch<br>
+++ /dev/null<br>
@@ -1,92 +0,0 @@<br>
-From be0bb81d72fea4d20da74f4f2236aa<wbr>145684f332 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-Date: Wed, 6 Jan 2016 14:14:22 -0800<br>
-Subject: [PATCH] Fix header inclusion for musl<br>
-<br>
-Fix errors e.g.<br>
-<br>
-In file included from tracepath.c:17:0:<br>
-/usr/include/linux/errqueue.h<wbr>:33:18:<br>
-error: array type has incomplete element type 'struct timespec'<br>
- struct timespec ts[3];<br>
- ^<br>
-tracepath.c: In function 'main':<br>
-tracepath.c:329:16: error: 'INT_MAX' undeclared (first use in this<br>
-function)<br>
- overhead, INT_MAX);<br>
- ^<br>
-tracepath.c:329:16: note: each undeclared identifier is reported only<br>
-once for each function it appears in<br>
-Makefile:131: recipe for target 'tracepath.o' failed<br>
-make: *** [tracepath.o] Error 1<br>
-<br>
-ping_common.c: In function 'main_loop':<br>
-ping_common.c:756:15: error: 'HZ' undeclared (first use in this<br>
-function)<br>
- if (1000 % HZ == 0 ? next <= 1000 / HZ : (next < INT_MAX / HZ &&<br>
-next * HZ <= 1000)) {<br>
-<br>
-protocols/timed.h is not needed and is absent in musl<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
----<br>
-Upstream-Status: Pending<br>
-<br>
- clockdiff.c | 1 -<br>
- ping_common.c | 1 +<br>
- tracepath.c | 2 ++<br>
- tracepath6.c | 1 +<br>
- 4 files changed, 4 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/clockdiff.c b/clockdiff.c<br>
-index 7c1ea1b..1d6341e 100644<br>
---- a/clockdiff.c<br>
-+++ b/clockdiff.c<br>
-@@ -14,7 +14,6 @@<br>
- #include <netinet/ip.h><br>
- #include <netinet/ip_icmp.h><br>
- #define TSPTYPES<br>
--#include <protocols/timed.h><br>
- #include <fcntl.h><br>
- #include <netdb.h><br>
- #include <arpa/inet.h><br>
-diff --git a/ping_common.c b/ping_common.c<br>
-index 7f82851..3ce699d 100644<br>
---- a/ping_common.c<br>
-+++ b/ping_common.c<br>
-@@ -2,6 +2,7 @@<br>
- #include <ctype.h><br>
- #include <sched.h><br>
- #include <math.h><br>
-+#include <asm-generic/param.h><br>
-<br>
- int options;<br>
-<br>
-diff --git a/tracepath.c b/tracepath.c<br>
-index 89e6d16..c9d6ddd 100644<br>
---- a/tracepath.c<br>
-+++ b/tracepath.c<br>
-@@ -12,6 +12,8 @@<br>
- #include <stdio.h><br>
- #include <stdlib.h><br>
- #include <unistd.h><br>
-+#include <limits.h><br>
-+#include <time.h><br>
- #include <sys/socket.h><br>
- #include <linux/types.h><br>
- #include <linux/errqueue.h><br>
-diff --git a/tracepath6.c b/tracepath6.c<br>
-index 126fadf..9d5745c 100644<br>
---- a/tracepath6.c<br>
-+++ b/tracepath6.c<br>
-@@ -12,6 +12,7 @@<br>
- #include <stdio.h><br>
- #include <stdlib.h><br>
- #include <unistd.h><br>
-+#include <limits.h><br>
- #include <sys/socket.h><br>
- #include <netinet/in.h><br>
- #include <netinet/icmp6.h><br>
---<br>
-2.6.4<br>
-<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/0001-Intialize-struct-<wbr>elements-by-name.patch b/meta/recipes-extended/iputil<wbr>s/files/0001-Intialize-struct-<wbr>elements-by-name.patch<br>
deleted file mode 100644<br>
index 6da01dc..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/0001-Intialize-struct-<wbr>elements-by-name.patch<br>
+++ /dev/null<br>
@@ -1,52 +0,0 @@<br>
-From 000629f74908a2a95f6104444c77ad<wbr>93cf40d62d Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
-Date: Wed, 13 Jan 2016 08:50:50 +0000<br>
-Subject: [PATCH] Intialize struct elements by name<br>
-<br>
-makes it portable across glibc and musl<br>
-<br>
-Fixes errors<br>
-<br>
-| ping.c: In function 'send_probe':<br>
-| ping.c:735:19: warning: initialization makes integer from pointer<br>
-without a cast [-Wint-conversion]<br>
-| &iov, 1, &cmsg, 0, 0 };<br>
-| ^<br>
-| ping.c:735:19: note: (near initialization for 'm.__pad1')<br>
-| ping.c:735:19: error: initializer element is not computable at load<br>
-time<br>
-| ping.c:735:19: note: (near initialization for 'm.__pad1')<br>
-| make: *** [ping.o] Error 1<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>><br>
----<br>
-Upstream-Status: Pending<br>
-<br>
- ping.c | 11 +++++++++--<br>
- 1 file changed, 9 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/ping.c b/ping.c<br>
-index 4989760..e67f381 100644<br>
---- a/ping.c<br>
-+++ b/ping.c<br>
-@@ -731,8 +731,15 @@ int send_probe()<br>
-<br>
- do {<br>
- static struct iovec iov = {outpack, 0};<br>
-- static struct msghdr m = { &whereto, sizeof(whereto),<br>
-- &iov, 1, &cmsg, 0, 0 };<br>
-+ static struct msghdr m = {<br>
-+ .msg_name = &whereto,<br>
-+ .msg_namelen = sizeof(whereto),<br>
-+ .msg_iov = &iov,<br>
-+ .msg_iovlen = 1,<br>
-+ .msg_control = &cmsg,<br>
-+ .msg_controllen = 0,<br>
-+ .msg_flags= 0,<br>
-+ };<br>
- m.msg_controllen = cmsg_len;<br>
- iov.iov_len = cc;<br>
-<br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/arping-fix-arping-<wbr>hang-if-SIGALRM-is-blocked.<wbr>patch b/meta/recipes-extended/iputil<wbr>s/files/arping-fix-arping-<wbr>hang-if-SIGALRM-is-blocked.<wbr>patch<br>
deleted file mode 100644<br>
index 7b56276..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/arping-fix-arping-<wbr>hang-if-SIGALRM-is-blocked.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,44 +0,0 @@<br>
-arping: fix arping hang if SIGALRM is blocked<br>
-<br>
-Unblock SIGALRM so that the previously called alarm() can prevent<br>
-recvfrom() from blocking forever in case the inherited procmask is<br>
-blocking SIGALRM and no packet is received.<br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Reported-by: Rui Prior <<a href="mailto:rprior@dcc.fc.up.pt" target="_blank">rprior@dcc.fc.up.pt</a>><br>
-RH-Bugzilla: #1085971<br>
-Signed-off-by: Jan Synacek <<a href="mailto:jsynacek@redhat.com" target="_blank">jsynacek@redhat.com</a>><br>
-Signed-off-by: Zhenbo Gao <<a href="mailto:zhenbo.gao@windriver.com" target="_blank">zhenbo.gao@windriver.com</a>><br>
-<br>
-diff --git a/arping.c.orig b/arping.c<br>
-index 35408c1..2098159 100644<br>
---- a/arping.c.orig<br>
-+++ b/arping.c<br>
-@@ -1215,16 +1215,22 @@ main(int argc, char **argv)<br>
- socklen_t alen = sizeof(from);<br>
- int cc;<br>
-<br>
-+ sigemptyset(&sset);<br>
-+ sigaddset(&sset, SIGALRM);<br>
-+ sigaddset(&sset, SIGINT);<br>
-+ /* Unblock SIGALRM so that the previously called alarm()<br>
-+ * can prevent recvfrom from blocking forever in case the<br>
-+ * inherited procmask is blocking SIGALRM and no packet<br>
-+ * is received. */<br>
-+ sigprocmask(SIG_UNBLOCK, &sset, &osset);<br>
-+<br>
- if ((cc = recvfrom(s, packet, sizeof(packet), 0,<br>
- (struct sockaddr *)&from, &alen)) < 0) {<br>
- perror("arping: recvfrom");<br>
- continue;<br>
- }<br>
-<br>
-- sigemptyset(&sset);<br>
-- sigaddset(&sset, SIGALRM);<br>
-- sigaddset(&sset, SIGINT);<br>
-- sigprocmask(SIG_BLOCK, &sset, &osset);<br>
-+ sigprocmask(SIG_BLOCK, &sset, NULL);<br>
- recv_pack(packet, cc, (struct sockaddr_ll *)&from);<br>
- sigprocmask(SIG_SETMASK, &osset, NULL);<br>
- }<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/debian/targets.diff b/meta/recipes-extended/iputil<wbr>s/files/debian/targets.diff<br>
deleted file mode 100644<br>
index 2cb5576..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/debian/targets.diff<br>
+++ /dev/null<br>
@@ -1,15 +0,0 @@<br>
-Upstream-Status: Inappropriate [disable feature]<br>
-<br>
-Index: iputils-s20121221/Makefile<br>
-=============================<wbr>==============================<wbr>========<br>
---- iputils-s20121221.orig/Makefil<wbr>e<br>
-+++ iputils-s20121221/Makefile<br>
-@@ -106,7 +106,7 @@ endif<br>
- endif<br>
-<br>
- # ------------------------------<wbr>-------<br>
--IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd<br>
-+IPV4_TARGETS=tracepath ping clockdiff arping<br>
- IPV6_TARGETS=tracepath6 traceroute6 ping6<br>
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)<br>
-<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/debian/use_gethostbyna<wbr>me2.diff b/meta/recipes-extended/iputil<wbr>s/files/debian/use_gethostbyna<wbr>me2.diff<br>
deleted file mode 100644<br>
index d3b1886..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/debian/use_gethostbyna<wbr>me2.diff<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-Upstream-Status: Pending [from other distro Debian]<br>
-<br>
-Index: iputils-s20121221/tracepath.c<br>
-=============================<wbr>==============================<wbr>========<br>
---- iputils-s20121221.orig/tracepa<wbr>th.c<br>
-+++ iputils-s20121221/tracepath.c<br>
-@@ -370,9 +370,9 @@ main(int argc, char **argv)<br>
- }<br>
- #endif<br>
-<br>
-- he = gethostbyname(p);<br>
-+ he = gethostbyname2(argv[0], AF_INET);<br>
- if (he == NULL) {<br>
-- herror("gethostbyname");<br>
-+ herror("gethostbyname2");<br>
- exit(1);<br>
- }<br>
-<br>
-Index: iputils-s20121221/ping.c<br>
-=============================<wbr>==============================<wbr>========<br>
---- iputils-s20121221.orig/ping.c<br>
-+++ iputils-s20121221/ping.c<br>
-@@ -279,7 +279,7 @@ main(int argc, char **argv)<br>
- #else<br>
- idn = target;<br>
- #endif<br>
-- hp = gethostbyname(idn);<br>
-+ hp = gethostbyname2(idn, AF_INET);<br>
- if (!hp) {<br>
- fprintf(stderr, "ping: unknown host %s\n", target);<br>
- exit(2);<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/files/nsgmls-path-fix.patch b/meta/recipes-extended/iputil<wbr>s/files/nsgmls-path-fix.patch<br>
deleted file mode 100644<br>
index 92bf946..0000000<br>
--- a/meta/recipes-extended/iputil<wbr>s/files/nsgmls-path-fix.patch<br>
+++ /dev/null<br>
@@ -1,27 +0,0 @@<br>
-Fix nsgmls path issue<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Zhai Edwin <<a href="mailto:edwin.zhai@intel.com" target="_blank">edwin.zhai@intel.com</a>><br>
-<br>
-Index: iputils-s20101006/doc/Makefile<br>
-=============================<wbr>==============================<wbr>========<br>
---- iputils-s20101006.orig/doc/Mak<wbr>efile 2011-09-13 20:42:27.000000000 +0800<br>
-+++ iputils-s20101006/doc/<wbr>Makefile 2011-09-13 21:01:52.000000000 +0800<br>
-@@ -27,10 +27,15 @@<br>
- # docbook2man produces utterly ugly output and I did not find<br>
- # any way to customize this but hacking backend perl script a little.<br>
- # Well, hence...<br>
-+# nsgmls seems append path to search directory according to the sysid path.<br>
-+# e.g. if input ../index.db, it would search $search_directory/../ rather than<br>
-+# $search_directory, which leads searching failure. Fixing nsgmls probably<br>
-+# introduce some side effects, so use this ugly hack: running nsgmls in current<br>
-+# directory, and running docbook2man in tmp directory.<br>
-<br>
- $(MANFILES): index.db<br>
- @-mkdir tmp.db2man<br>
-- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../<a href="http://docbook2man-spec.pl" rel="noreferrer" target="_blank">docbook2man-spec.pl</a> ; mv $@ ..<br>
-+ @set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../<a href="http://docbook2man-spec.pl" rel="noreferrer" target="_blank">docbook2man-spec.pl</a> ; mv $@ ..<br>
- @-rm -rf tmp.db2man<br>
-<br>
- clean:<br>
diff --git a/meta/recipes-extended/iputil<wbr>s/<a href="http://iputils_s20151218.bb" rel="noreferrer" target="_blank">iputils_s20151218.bb</a> b/meta/recipes-extended/iputil<wbr>s/<a href="http://iputils_s20161105.bb" rel="noreferrer" target="_blank">iputils_s20161105.bb</a><br>
similarity index 56%<br>
rename from meta/recipes-extended/iputils/<a href="http://iputils_s20151218.bb" rel="noreferrer" target="_blank"><wbr>iputils_s20151218.bb</a><br>
rename to meta/recipes-extended/iputils/<a href="http://iputils_s20161105.bb" rel="noreferrer" target="_blank"><wbr>iputils_s20161105.bb</a><br>
index 46de6fc..ad7dbc4 100644<br>
--- a/meta/recipes-extended/iputil<wbr>s/<a href="http://iputils_s20151218.bb" rel="noreferrer" target="_blank">iputils_s20151218.bb</a><br>
+++ b/meta/recipes-extended/iputil<wbr>s/<a href="http://iputils_s20161105.bb" rel="noreferrer" target="_blank">iputils_s20161105.bb</a><br>
@@ -1,7 +1,7 @@<br>
SUMMARY = "Network monitoring tools"<br>
DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \<br>
tracepath, tracepath6, ping, ping6 and arping."<br>
-HOMEPAGE = "<a href="http://www.skbuff.net/iputils" rel="noreferrer" target="_blank">http://www.skbuff.net/iputils</a><wbr>"<br>
+HOMEPAGE = "<a href="https://github.com/iputils/iputils" rel="noreferrer" target="_blank">https://github.com/iputils/ip<wbr>utils</a>"<br>
SECTION = "console/network"<br>
<br>
LICENSE = "BSD & GPLv2+"<br>
@@ -13,20 +13,13 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;end<wbr>line=35;md5=f9ceb201733e9a6cf8<wbr>f<br>
<br>
DEPENDS = "gnutls libcap libgcrypt"<br>
<br>
+SRC_URI = "git://<a href="http://github.com/iputils/iputils" rel="noreferrer" target="_blank">github.com/iputils/iput<wbr>ils</a> \<br>
+ file://0001-Fix-build-on-<wbr>MUSL.patch \<br>
+ "<br>
+S = "${WORKDIR}/git"<br>
+SRCREV = "bffc0e957b98d626ab4cea218c892<wbr>51201425442"<br>
<br>
-SRC_URI = "<a href="http://www.skbuff.net/iputils/$%7BBPN%7D-$%7BPV%7D.tar.bz2" rel="noreferrer" target="_blank">http://www.skbuff.net/iputils<wbr>/${BPN}-${PV}.tar.bz2</a> \<br>
- file://debian/use_gethostbyna<wbr>me2.diff \<br>
- file://debian/targets.diff \<br>
- file://nsgmls-path-fix.patch \<br>
- file://0001-Fix-header-inclus<wbr>ion-for-musl.patch \<br>
- file://0001-Intialize-struct-<wbr>elements-by-name.patch \<br>
- file://arping-fix-arping-<wbr>hang-if-SIGALRM-is-blocked.<wbr>patch \<br>
- "<br>
-<br>
-SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc75<wbr>3ce"<br>
-SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4<wbr>e330642f522f50026917fadc349a54<wbr>825a1"<br>
-<br>
-UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"<br>
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"<br>
<br>
EXTRA_OEMAKE = "-e MAKEFLAGS="<br>
<br>
@@ -38,11 +31,10 @@ do_install () {<br>
install -m 0755 -d ${D}${base_bindir}<br>
# SUID root programs<br>
install -m 4555 ping ${D}${base_bindir}/ping<br>
- install -m 4555 ping6 ${D}${base_bindir}/ping6<br>
install -m 4555 traceroute6 ${D}${base_bindir}/<br>
install -m 4555 clockdiff ${D}${base_bindir}/<br>
# Other programgs<br>
- for i in arping tracepath tracepath6; do<br>
+ for i in arping tracepath; do<br>
install -m 0755 $i ${D}${base_bindir}/<br>
done<br>
}<br>
@@ -54,19 +46,14 @@ ALTERNATIVE_PRIORITY = "100"<br>
ALTERNATIVE_${PN}-ping = "ping"<br>
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"<br>
<br>
-ALTERNATIVE_${PN}-ping6 = "ping6"<br>
-ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"<br>
-<br>
-PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff"<br>
+PACKAGES += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff"<br>
<br>
ALLOW_EMPTY_${PN} = "1"<br>
-RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff"<br>
+RDEPENDS_${PN} += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff"<br>
<br>
FILES_${PN} = ""<br>
FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"<br>
-FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}"<br>
FILES_${PN}-arping = "${base_bindir}/arping"<br>
FILES_${PN}-tracepath = "${base_bindir}/tracepath"<br>
-FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6"<br>
FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"<br>
FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"<br>
<span class="m_-3784645872650506308HOEnZb"><font color="#888888"><br>
--<br>
To stop receiving notification emails like this one, please contact<br>
the administrator of this repository.<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-commits mailing list<br>
<a href="mailto:Openembedded-commits@lists.openembedded.org" target="_blank">Openembedded-commits@lists.ope<wbr>nembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-commits" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>commits</a><br>
</font></span></blockquote></div><br></div>
</div></div></blockquote></div><br></div>