diff --git a/network/misc/iputils/actions.py b/network/misc/iputils/actions.py index 35449cd16b..5ff1d05e96 100644 --- a/network/misc/iputils/actions.py +++ b/network/misc/iputils/actions.py @@ -5,14 +5,22 @@ # See the file http://www.gnu.org/licenses/gpl.txt from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get +def setup(): + mesontools.configure("-DBUILD_RARPD=true \ + -DBUILD_MANS=false \ + -DBUILD_HTML_MANS=false \ + -DBUILD_TRACEROUTE6=true") + def build(): - autotools.make("USE_NETTLE=no USE_GNUTLS=no CCOPT='%s -fpie' CC=%s" % (get.CFLAGS(), get.CC())) + mesontools.build() def install(): + shelltools.cd("build") pisitools.dobin("ping") for app in ["clockdiff", "rarpd", "tftpd", "arping", "rdisc", "tracepath", "traceroute6"]: @@ -22,4 +30,4 @@ def install(): shelltools.chmod("%s/usr/bin/ping" % get.installDIR(), 04711) #shelltools.chmod("%s/usr/bin/ping6" % get.installDIR(), 04711) - pisitools.dodoc("RELNOTES*") + pisitools.dodoc("../README.md") diff --git a/network/misc/iputils/files/fix-setuid-redeclared.patch b/network/misc/iputils/files/fix-setuid-redeclared.patch new file mode 100644 index 0000000000..21f697a329 --- /dev/null +++ b/network/misc/iputils/files/fix-setuid-redeclared.patch @@ -0,0 +1,48 @@ +From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001 +From: Sami Kerola +Date: Sat, 28 Dec 2019 17:16:27 +0000 +Subject: [PATCH] ninfod: change variable name to avoid colliding with function + name + +The sys/capability.h header has 'extern int cap_setuid(uid_t uid);' +function prototype. + +Addresses: https://github.com/iputils/iputils/issues/246 +Signed-off-by: Sami Kerola +--- + ninfod/ninfod.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c +index 26112d0..95583de 100644 +--- a/ninfod/ninfod.c ++++ b/ninfod/ninfod.c +@@ -455,7 +455,7 @@ static void do_daemonize(void) + /* --------- */ + #ifdef HAVE_LIBCAP + static const cap_value_t cap_net_raw = CAP_NET_RAW; +-static const cap_value_t cap_setuid = CAP_SETUID; ++static const cap_value_t cap_setuserid = CAP_SETUID; + static cap_flag_value_t cap_ok; + #else + static uid_t euid; +@@ -487,7 +487,7 @@ static void limit_capabilities(void) + + cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); + if (cap_ok != CAP_CLEAR) +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); +@@ -520,8 +520,8 @@ static void drop_capabilities(void) + + /* setuid / setuid */ + if (cap_ok != CAP_CLEAR) { +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); +- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); ++ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); diff --git a/network/misc/iputils/pspec.xml b/network/misc/iputils/pspec.xml index cfe338c647..e3bf399cf3 100644 --- a/network/misc/iputils/pspec.xml +++ b/network/misc/iputils/pspec.xml @@ -12,15 +12,16 @@ app:console Network monitoring tools including ping and ping6 iputils contains network monitoring tools including ping and ping6. - https://github.com/iputils/iputils/archive/s20180629.tar.gz + https://github.com/iputils/iputils/archive/s20190709.tar.gz openssl-devel libidn2-devel libcap-devel - + docbook-xsl + + fix-setuid-redeclared.patch + @@ -58,6 +59,13 @@ + + 2020-02-07 + 20190709 + Version bump. + İdris Kalp + idriskalp@gmail.com + 2018-08-13 20180629