From 0efc3f574d3b120f3a9de43d898625eb9c592629 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 10 Dec 2014 19:07:27 +0100 Subject: [PATCH] iputils: make ping{,6} setuid rather than using CAP_NET_RAW. The reason is that we can't preserve capabilities when making the rootfs tarballs. --- srcpkgs/iputils/INSTALL | 9 --------- srcpkgs/iputils/template | 8 +++++--- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/iputils/INSTALL diff --git a/srcpkgs/iputils/INSTALL b/srcpkgs/iputils/INSTALL deleted file mode 100644 index 75299c13b2..0000000000 --- a/srcpkgs/iputils/INSTALL +++ /dev/null @@ -1,9 +0,0 @@ -case ${ACTION} in -post) - # Set required capability to ping{,6}. - for f in ping ping6; do - setcap cap_net_raw=ep usr/sbin/${f} 2>/dev/null || \ - chmod +s usr/sbin/${f} - done - ;; -esac diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index 185253512c..0ff951556a 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -1,7 +1,7 @@ # Template file for 'iputils' pkgname=iputils version=20121221 -revision=5 +revision=6 patch_args="-Np1" wrksrc="${pkgname}-s${version}" makedepends="libressl-devel libcap-devel" @@ -20,7 +20,10 @@ do_build() { } do_install() { - for f in clockdiff arping ping ping6 rdisc tracepath tracepath6; do + for f in ping ping6; do + vinstall ${f} 4755 usr/sbin + done + for f in clockdiff arping rdisc tracepath tracepath6; do vinstall ${f} 755 usr/sbin done for f in clockdiff arping ping rdisc tracepath; do @@ -29,5 +32,4 @@ do_install() { cd ${DESTDIR}/usr/share/man/man8 ln -s ping.8 ping6.8 ln -s tracepath.8 tracepath6.8 - }