mirror of
https://git.yoctoproject.org/poky
synced 2026-06-05 02:20:12 +00:00
iputils: upgrade to s20190709
build system is changed to meson. (From OE-Core rev: 3d2085642a8b4058ded6ab0c426feefc097f85c1) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changhyeok Bae
committed by
Richard Purdie
Richard Purdie
parent
99e652fa88
commit
0abaeab83f
@@ -1,58 +0,0 @@
|
||||
From 714e2b458c151c5bdfe93647445cd00dd8e36fff 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
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
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
|
||||
@@ -1,26 +0,0 @@
|
||||
From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross@burtonini.com>
|
||||
Date: Mon, 23 Jul 2018 14:21:03 +0100
|
||||
Subject: [PATCH] Add install
|
||||
|
||||
Add a simple install rule so that we always install the binaries that were built.
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
---
|
||||
Makefile | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 17fc5c9..e0c2784 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -231,3 +231,7 @@ rpm:
|
||||
@$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
|
||||
@rm -f $(RPMTMP)/iputils.tar.bz2
|
||||
|
||||
+install:
|
||||
+ for t in $(TARGETS); do \
|
||||
+ install -D $$t $(DESTDIR)$(bindir)/$$t; \
|
||||
+ done
|
||||
@@ -1,61 +0,0 @@
|
||||
SUMMARY = "Network monitoring tools"
|
||||
DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
|
||||
tracepath, tracepath6, ping, ping6 and arping."
|
||||
HOMEPAGE = "https://github.com/iputils/iputils"
|
||||
SECTION = "console/network"
|
||||
|
||||
LICENSE = "BSD & GPLv2+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=b792e38abdc59f766a3153908f23e766 \
|
||||
file://LICENSE.BSD3;md5=0f00d99239d922ffd13cabef83b33444 \
|
||||
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
DEPENDS = "gnutls libcap libgcrypt"
|
||||
|
||||
SRC_URI = "git://github.com/iputils/iputils \
|
||||
file://ai_canonidn.patch \
|
||||
file://install.patch"
|
||||
SRCREV = "f6aac8dbe3f8c45c53424854a3312bdd8cdd58d3"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
|
||||
|
||||
EXTRA_OEMAKE = "-e MAKEFLAGS="
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[libidn] = "USE_IDN=yes,USE_IDN=no,libidn2"
|
||||
|
||||
do_compile () {
|
||||
oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" ${PACKAGECONFIG_CONFARGS} all
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake DESTDIR=${D} bindir=${base_bindir} install
|
||||
for b in ping traceroute6 clockdiff; do
|
||||
chmod u+s ${D}${base_bindir}/$b
|
||||
done
|
||||
}
|
||||
|
||||
inherit update-alternatives
|
||||
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
ALTERNATIVE_${PN}-ping = "ping"
|
||||
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
|
||||
|
||||
SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc"
|
||||
PACKAGES += "${SPLITPKGS}"
|
||||
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
RDEPENDS_${PN} += "${SPLITPKGS}"
|
||||
|
||||
FILES_${PN} = ""
|
||||
FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
|
||||
FILES_${PN}-arping = "${base_bindir}/arping"
|
||||
FILES_${PN}-tracepath = "${base_bindir}/tracepath"
|
||||
FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
|
||||
FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
|
||||
FILES_${PN}-tftpd = "${base_bindir}/tftpd"
|
||||
FILES_${PN}-rarpd = "${base_bindir}/rarpd"
|
||||
FILES_${PN}-rdisc = "${base_bindir}/rdisc"
|
||||
@@ -0,0 +1,55 @@
|
||||
SUMMARY = "Network monitoring tools"
|
||||
DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
|
||||
tracepath, tracepath6, ping, ping6 and arping."
|
||||
HOMEPAGE = "https://github.com/iputils/iputils"
|
||||
SECTION = "console/network"
|
||||
|
||||
LICENSE = "BSD & GPLv2+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
|
||||
|
||||
DEPENDS = "gnutls"
|
||||
|
||||
SRC_URI = "git://github.com/iputils/iputils"
|
||||
SRCREV = "13e00847176aa23683d68fce1d17ffb523510946"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
|
||||
|
||||
PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6"
|
||||
PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap"
|
||||
PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt"
|
||||
PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
|
||||
PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
|
||||
PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
|
||||
PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false,"
|
||||
PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
|
||||
|
||||
inherit meson update-alternatives
|
||||
|
||||
EXTRA_OEMESON += "--prefix=/"
|
||||
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
ALTERNATIVE_${PN}-ping = "ping"
|
||||
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
|
||||
|
||||
SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod"
|
||||
PACKAGES += "${SPLITPKGS}"
|
||||
|
||||
ALLOW_EMPTY_${PN} = "1"
|
||||
ALLOW_EMPTY_${PN}-rarpd = "1"
|
||||
ALLOW_EMPTY_${PN}-traceroute6 = "1"
|
||||
RDEPENDS_${PN} += "${SPLITPKGS}"
|
||||
|
||||
FILES_${PN} = ""
|
||||
FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
|
||||
FILES_${PN}-arping = "${base_bindir}/arping"
|
||||
FILES_${PN}-tracepath = "${base_bindir}/tracepath"
|
||||
FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
|
||||
FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
|
||||
FILES_${PN}-tftpd = "${base_bindir}/tftpd"
|
||||
FILES_${PN}-rarpd = "${base_sbindir}/rarpd"
|
||||
FILES_${PN}-rdisc = "${base_sbindir}/rdisc"
|
||||
FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
|
||||
Reference in New Issue
Block a user