summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2019-08-23 23:56:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:21 +0100
commit0abaeab83fc8b7967b93a9ff89a0947bf4b95129 (patch)
treed47493e0d1e06bca1000a7a9c71ffc3b59b31d08 /meta
parent99e652fa88116929ed1d5ed44eb7d27fac6fea77 (diff)
downloadpoky-0abaeab83fc8b7967b93a9ff89a0947bf4b95129.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/iputils/iputils/ai_canonidn.patch58
-rw-r--r--meta/recipes-extended/iputils/iputils/install.patch26
-rw-r--r--meta/recipes-extended/iputils/iputils_s20180629.bb61
-rw-r--r--meta/recipes-extended/iputils/iputils_s20190709.bb55
4 files changed, 55 insertions, 145 deletions
diff --git a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch b/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
deleted file mode 100644
index cd91267b78..0000000000
--- a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 714e2b458c151c5bdfe93647445cd00dd8e36fff Mon Sep 17 00:00:00 2001
2From: Petr Vorel <petr.vorel@gmail.com>
3Date: Sat, 21 Jul 2018 17:46:14 +0200
4Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
5
6Upstream-Status: Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
10systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
11alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
12uClibc-ng 1.0.30) when not using the system libidn2.
13
14Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
15
16Reported-by: Nicholas Fish
17Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
18
19---
20 ping.c | 2 +-
21 ping.h | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/ping.c b/ping.c
25index 733477f..b241815 100644
26--- a/ping.c
27+++ b/ping.c
28@@ -207,9 +207,9 @@ main(int argc, char **argv)
29
30 #ifdef USE_IDN
31 setlocale(LC_ALL, "");
32-#endif
33 if (!strcmp(setlocale(LC_ALL, NULL), "C"))
34 hints.ai_flags &= ~ AI_CANONIDN;
35+#endif
36
37 /* Support being called using `ping4` or `ping6` symlinks */
38 if (argv[0][strlen(argv[0])-1] == '4')
39diff --git a/ping.h b/ping.h
40index 3e09685..8a0c4ef 100644
41--- a/ping.h
42+++ b/ping.h
43@@ -28,7 +28,6 @@
44 #include <netinet/icmp6.h>
45 #include <linux/filter.h>
46 #include <resolv.h>
47-#include <locale.h>
48
49 #ifdef CAPABILITIES
50 #include <sys/prctl.h>
51@@ -36,6 +35,7 @@
52 #endif
53
54 #ifdef USE_IDN
55+#include <locale.h>
56 #include <idn2.h>
57 #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
58 #define getnameinfo_flags NI_IDN
diff --git a/meta/recipes-extended/iputils/iputils/install.patch b/meta/recipes-extended/iputils/iputils/install.patch
deleted file mode 100644
index abfefd7a58..0000000000
--- a/meta/recipes-extended/iputils/iputils/install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross@burtonini.com>
3Date: Mon, 23 Jul 2018 14:21:03 +0100
4Subject: [PATCH] Add install
5
6Add a simple install rule so that we always install the binaries that were built.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11---
12 Makefile | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/Makefile b/Makefile
16index 17fc5c9..e0c2784 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -231,3 +231,7 @@ rpm:
20 @$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
21 @rm -f $(RPMTMP)/iputils.tar.bz2
22
23+install:
24+ for t in $(TARGETS); do \
25+ install -D $$t $(DESTDIR)$(bindir)/$$t; \
26+ done
diff --git a/meta/recipes-extended/iputils/iputils_s20180629.bb b/meta/recipes-extended/iputils/iputils_s20180629.bb
deleted file mode 100644
index eff44be1bd..0000000000
--- a/meta/recipes-extended/iputils/iputils_s20180629.bb
+++ /dev/null
@@ -1,61 +0,0 @@
1SUMMARY = "Network monitoring tools"
2DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
3tracepath, tracepath6, ping, ping6 and arping."
4HOMEPAGE = "https://github.com/iputils/iputils"
5SECTION = "console/network"
6
7LICENSE = "BSD & GPLv2+"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=b792e38abdc59f766a3153908f23e766 \
10 file://LICENSE.BSD3;md5=0f00d99239d922ffd13cabef83b33444 \
11 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12
13DEPENDS = "gnutls libcap libgcrypt"
14
15SRC_URI = "git://github.com/iputils/iputils \
16 file://ai_canonidn.patch \
17 file://install.patch"
18SRCREV = "f6aac8dbe3f8c45c53424854a3312bdd8cdd58d3"
19
20S = "${WORKDIR}/git"
21
22UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
23
24EXTRA_OEMAKE = "-e MAKEFLAGS="
25
26PACKAGECONFIG ??= ""
27PACKAGECONFIG[libidn] = "USE_IDN=yes,USE_IDN=no,libidn2"
28
29do_compile () {
30 oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" ${PACKAGECONFIG_CONFARGS} all
31}
32
33do_install() {
34 oe_runmake DESTDIR=${D} bindir=${base_bindir} install
35 for b in ping traceroute6 clockdiff; do
36 chmod u+s ${D}${base_bindir}/$b
37 done
38}
39
40inherit update-alternatives
41
42ALTERNATIVE_PRIORITY = "100"
43
44ALTERNATIVE_${PN}-ping = "ping"
45ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
46
47SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc"
48PACKAGES += "${SPLITPKGS}"
49
50ALLOW_EMPTY_${PN} = "1"
51RDEPENDS_${PN} += "${SPLITPKGS}"
52
53FILES_${PN} = ""
54FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
55FILES_${PN}-arping = "${base_bindir}/arping"
56FILES_${PN}-tracepath = "${base_bindir}/tracepath"
57FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
58FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
59FILES_${PN}-tftpd = "${base_bindir}/tftpd"
60FILES_${PN}-rarpd = "${base_bindir}/rarpd"
61FILES_${PN}-rdisc = "${base_bindir}/rdisc"
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb
new file mode 100644
index 0000000000..34a6c68260
--- /dev/null
+++ b/meta/recipes-extended/iputils/iputils_s20190709.bb
@@ -0,0 +1,55 @@
1SUMMARY = "Network monitoring tools"
2DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
3tracepath, tracepath6, ping, ping6 and arping."
4HOMEPAGE = "https://github.com/iputils/iputils"
5SECTION = "console/network"
6
7LICENSE = "BSD & GPLv2+"
8
9LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
10
11DEPENDS = "gnutls"
12
13SRC_URI = "git://github.com/iputils/iputils"
14SRCREV = "13e00847176aa23683d68fce1d17ffb523510946"
15
16S = "${WORKDIR}/git"
17
18UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
19
20PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6"
21PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap"
22PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt"
23PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
24PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
25PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
26PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false,"
27PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
28
29inherit meson update-alternatives
30
31EXTRA_OEMESON += "--prefix=/"
32
33ALTERNATIVE_PRIORITY = "100"
34
35ALTERNATIVE_${PN}-ping = "ping"
36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
37
38SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod"
39PACKAGES += "${SPLITPKGS}"
40
41ALLOW_EMPTY_${PN} = "1"
42ALLOW_EMPTY_${PN}-rarpd = "1"
43ALLOW_EMPTY_${PN}-traceroute6 = "1"
44RDEPENDS_${PN} += "${SPLITPKGS}"
45
46FILES_${PN} = ""
47FILES_${PN}-ping = "${base_bindir}/ping.${BPN}"
48FILES_${PN}-arping = "${base_bindir}/arping"
49FILES_${PN}-tracepath = "${base_bindir}/tracepath"
50FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
51FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
52FILES_${PN}-tftpd = "${base_bindir}/tftpd"
53FILES_${PN}-rarpd = "${base_sbindir}/rarpd"
54FILES_${PN}-rdisc = "${base_sbindir}/rdisc"
55FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"