commit 4060de6692b6fe022319a341f1922ce9506cd974 Author: Juergen Daubert <jue@jue.li> Date: Sat Aug 22 14:54:51 2020 +0200 iputils: update to s20200821 diff --git a/iputils/.signature b/iputils/.signature index 935b225bb..d7389e6ca 100644 --- a/iputils/.signature +++ b/iputils/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dpdl7QmCK/T3Cs5gSyi+GtjTtmDgsgjhvoDso6VaQMh3b+EGygrKCsJy21x8LcuPzED7QWtG77DiPj1IHQyVww= -SHA256 (Pkgfile) = ae5c82625dfb5bc331ac2338baa40157a3bf5966572307c47da8cf61c460441f +RWSE3ohX2g5d/VHI2uki3SsjAU+SWIZ4ekPfLMBEVdBV7rpcMqq5iBHRrmPj/GxuJYqgqSc8fcXgyDhFt9Q8KYkggsBtbGDhpA4= +SHA256 (Pkgfile) = 0e8cdce726b8b062f7a5de023630aede2cab17f5afeb095882b6f47533482755 SHA256 (.footprint) = 43939b63c3bfc9cf8414b95ebaf536426c9dad9e972a6a8baf6f74c00947c372 -SHA256 (iputils-s20190709.tar.gz) = a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a -SHA256 (libcap-2.29.patch) = e75541a231472647723a16c9c176de623617c1d100d10802dd0e47e8fce60491 -SHA256 (iputils-man-s20190709.tar.xz) = eef3556f4093feefb78b969875d09fc28d7c182629c408e0a4c9b3a137c0b374 +SHA256 (iputils-s20200821.tar.gz) = f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b +SHA256 (iputils-man-s20200821.tar.xz) = c5a24c48123d72c12757e13e420477d9e379b1f5d6acba259494884a5f03b762 diff --git a/iputils/Pkgfile b/iputils/Pkgfile index 26003219f..4025b6d68 100644 --- a/iputils/Pkgfile +++ b/iputils/Pkgfile @@ -4,16 +4,14 @@ # Depends on: libcap openssl meson ninja name=iputils -version=s20190709 -release=2 +version=s20200821 +release=1 source=(https://github.com/iputils/iputils/archive/$version/$name-$version.tar.gz - libcap-2.29.patch $name-man-$version.tar.xz) + $name-man-$version.tar.xz) build() { cd $name-$version - patch -p1 -i $SRC/libcap-2.29.patch - meson build --prefix /usr \ -D BUILD_MANS=false \ -D BUILD_TRACEROUTE6=true \ @@ -22,7 +20,7 @@ build() { ninja -C build install -d $PKG/{{sbin,bin},usr/{bin,sbin,share/man/man8}} - install build/ping $PKG/bin/ + install build/ping/ping $PKG/bin/ install build/arping $PKG/sbin/ install build/{tracepath,clockdiff,rdisc,rarpd} $PKG/usr/sbin/ install build/ninfod/ninfod $PKG/usr/sbin/ diff --git a/iputils/iputils-man-s20190709.tar.xz b/iputils/iputils-man-s20190709.tar.xz deleted file mode 100644 index d4f8807ab..000000000 Binary files a/iputils/iputils-man-s20190709.tar.xz and /dev/null differ diff --git a/iputils/iputils-man-s20200821.tar.xz b/iputils/iputils-man-s20200821.tar.xz new file mode 100644 index 000000000..036d21759 Binary files /dev/null and b/iputils/iputils-man-s20200821.tar.xz differ diff --git a/iputils/libcap-2.29.patch b/iputils/libcap-2.29.patch deleted file mode 100644 index 21f697a32..000000000 --- a/iputils/libcap-2.29.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerolasa@iki.fi> -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 <kerolasa@iki.fi> ---- - 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));