Accepting request 718740 from home:pevik:branches:network:utilities

- Set caps for clockdiff (boo#1140994), based on change in permissions package
  5da6a81e38
- With new permissions package both clockdiff and ping have capabilities
  cap_net_raw+p instead of cap_net_raw+ep (boo#1140993), also ping6 does not
  try to set permissions on links (boo#1140991)
- Pass -DNO_SETCAP_OR_SUID=true (don't run setcap via distro script
  build-aux/setcap-setuid.sh, we set capabilities with rpm)

OBS-URL: https://build.opensuse.org/request/show/718740
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=74

iputils.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jul 26 06:19:44 UTC 2019 - Petr Vorel <pvorel@suse.cz>
+
+- Set caps for clockdiff (boo#1140994), based on change in permissions package
+  https://github.com/openSUSE/permissions/commit/5da6a81e38bb74f2090d73208b1a0101a0c5b73b
+- With new permissions package both clockdiff and ping have capabilities
+  cap_net_raw+p instead of cap_net_raw+ep (boo#1140993), also ping6 does not
+  try to set permissions on links (boo#1140991)
+- Pass -DNO_SETCAP_OR_SUID=true (don't run setcap via distro script
+  build-aux/setcap-setuid.sh, we set capabilities with rpm)
+
 -------------------------------------------------------------------
 Wed Jul 10 08:27:00 UTC 2019 - Petr Vorel <pvorel@suse.cz>
 

iputils.spec

@@ -79,7 +79,7 @@ out their IP addresses.
 # Pulled-in by the LINK.o variable.
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
-%meson -DBUILD_NINFOD=false -DBUILD_TFTPD=false -DBUILD_RARPD=true
+%meson -DBUILD_NINFOD=false -DBUILD_TFTPD=false -DBUILD_RARPD=true -DNO_SETCAP_OR_SUID=true
 %meson_build
 
 %install
@@ -120,9 +120,11 @@ ln -sf %{_bindir}/tracepath6    %{buildroot}/bin
 
 %post
 %service_add_post rdisc.service
+%set_permissions %{_bindir}/clockdiff
 %set_permissions %{_bindir}/ping
 
 %verifyscript
+%verify_permissions -e %{_bindir}/clockdiff
 %verify_permissions -e %{_bindir}/ping
 
 %preun
@@ -145,9 +147,9 @@ ln -sf %{_bindir}/tracepath6    %{buildroot}/bin
 
 %files -f %{name}.lang
 %license LICENSE
-%verify(not mode caps) %attr(0755,root,root) %{_bindir}/ping
 %{_bindir}/arping
-%{_bindir}/clockdiff
+%verify(not mode caps) %attr(0755,root,root) %{_bindir}/clockdiff
+%verify(not mode caps) %attr(0755,root,root) %{_bindir}/ping
 %{_bindir}/ping6
 %{_sbindir}/rcrdisc
 %{_sbindir}/rdisc