From 43dd69f232cee1d88683f6723f64b3db09591765 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 19 Jun 2019 23:30:06 +0200 Subject: [PATCH] package/iputils: re-enable traceroute6 Bump to s20190515 removed traceroute6 build (it's not built by default since this version in upstream). Reenable it again. Fixes: 9ffcd9279e ("package/iputils: bump to version s20190515") This requires fix similar to one in 0003-meson.build-fix-build-with-NLS.patch [1] traceroute6 is in /usr/sbin, so no need to handle busybox problem (6e18892733 "package/iputils: move binaries to the location also used by Busybox"). [1] http://autobuild.buildroot.org/results/0a8a3efe734ac7fb3a68ba505277681857dc0a3d Suggested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- .../0005-traceroute6-fix-build-with-NLS.patch | 30 +++++++++++++++++++ package/iputils/iputils.mk | 3 ++ 2 files changed, 33 insertions(+) create mode 100644 package/iputils/0005-traceroute6-fix-build-with-NLS.patch diff --git a/package/iputils/0005-traceroute6-fix-build-with-NLS.patch b/package/iputils/0005-traceroute6-fix-build-with-NLS.patch new file mode 100644 index 0000000000..70315c551b --- /dev/null +++ b/package/iputils/0005-traceroute6-fix-build-with-NLS.patch @@ -0,0 +1,30 @@ +From b18c6c48e4dabaf8bf9b178b3deca631fc79c96e Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Tue, 11 Jun 2019 21:51:58 +0200 +Subject: [PATCH] traceroute6: fix build with NLS + +commit 418d8be ("build-sys: fix build with NLS") fixed problems for +default packages using libintl. Fix also traceroute6 (build it must be +enabled with -DBUILD_TRACEROUTE6=true) + +Signed-off-by: Petr Vorel +Upstream status: 81bfb31a714641b70c2a7c7d9ce12cf08f98a372 +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2b545b6..85db8a6 100644 +--- a/meson.build ++++ b/meson.build +@@ -266,7 +266,7 @@ endif + + if build_traceroute6 == true + executable('traceroute6', ['traceroute6.c', git_version_h], +- dependencies : [cap_dep, idn_dep], ++ dependencies : [cap_dep, intl_dep, idn_dep], + link_with : [libcommon], + install: true) + meson.add_install_script('build-aux/setcap-setuid.sh', +-- +2.21.0 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 1ae5d83bf3..c6bff92848 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -49,6 +49,8 @@ IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false endif +IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true + # XSL Stylesheets for DocBook 5 not packaged for buildroot IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false @@ -69,6 +71,7 @@ define IPUTILS_PERMISSIONS /usr/sbin/arping f 4755 0 0 - - - - - /usr/bin/clockdiff f 4755 0 0 - - - - - /bin/ping f 4755 0 0 - - - - - + /usr/bin/traceroute6 f 4755 0 0 - - - - - endef $(eval $(meson-package)) -- 2.30.2