iputils: update to 20190709.
Drop +e from ping's caps as ping manages capabilities itself.
This commit is contained in:
parent
c95d37b8d2
commit
7ce26013ab
3 changed files with 3 additions and 70 deletions
|
@ -1,5 +1,5 @@
|
|||
case "${ACTION}" in
|
||||
post)
|
||||
setcap CAP_NET_RAW+ep usr/bin/iputils-ping
|
||||
setcap CAP_NET_RAW+p usr/bin/iputils-ping
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weiss <dev.primeos@gmail.com>
|
||||
Date: Thu, 16 May 2019 09:44:27 +0000
|
||||
Subject: [PATCH] build-sys: Make setcap really optional
|
||||
|
||||
The setcap dependency is marked as optional but meson.build depends on
|
||||
setcap.path():
|
||||
|
||||
meson.build:246:7: ERROR: add_install_script args must be strings
|
||||
---
|
||||
meson.build | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git meson.build meson.build
|
||||
index 8af9e18..95c778a 100644
|
||||
--- meson.build
|
||||
+++ meson.build
|
||||
@@ -221,10 +221,13 @@ config_h = configure_file(
|
||||
setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false)
|
||||
if get_option('NO_SETCAP_OR_SUID')
|
||||
perm_type = 'none'
|
||||
+ setcap_path = '/dev/null'
|
||||
elif cap_dep.found() and setcap.found()
|
||||
perm_type = 'caps'
|
||||
+ setcap_path = setcap.path()
|
||||
else
|
||||
perm_type = 'setuid'
|
||||
+ setcap_path = '/dev/null'
|
||||
endif
|
||||
|
||||
############################################################
|
||||
@@ -243,7 +246,7 @@ if build_ping == true
|
||||
join_paths(get_option('prefix'), get_option('bindir')),
|
||||
'ping',
|
||||
perm_type,
|
||||
- setcap.path()
|
||||
+ setcap_path
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -263,7 +266,7 @@ if build_traceroute6 == true
|
||||
join_paths(get_option('prefix'), get_option('bindir')),
|
||||
'traceroute6',
|
||||
perm_type,
|
||||
- setcap.path()
|
||||
+ setcap_path
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -276,7 +279,7 @@ if build_clockdiff == true
|
||||
join_paths(get_option('prefix'), get_option('bindir')),
|
||||
'clockdiff',
|
||||
perm_type,
|
||||
- setcap.path()
|
||||
+ setcap_path
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -306,7 +309,7 @@ if build_arping == true
|
||||
join_paths(get_option('prefix'), get_option('bindir')),
|
||||
'arping',
|
||||
perm_type,
|
||||
- setcap.path()
|
||||
+ setcap_path
|
||||
)
|
||||
endif
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'iputils'
|
||||
pkgname=iputils
|
||||
version=20190515
|
||||
version=20190709
|
||||
revision=1
|
||||
wrksrc="${pkgname}-s${version}"
|
||||
build_style=meson
|
||||
|
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
|
|||
license="BSD-3-Clause, GPL-2.0-or-later"
|
||||
homepage="https://github.com/iputils/iputils"
|
||||
distfiles="https://github.com/iputils/iputils/archive/s${version}.tar.gz"
|
||||
checksum=9b5125eb5ef9f4e947ad8fdddcf77f538f53b8f47b53eb5bc5347cb16d01c8fd
|
||||
checksum=a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a
|
||||
|
||||
alternatives="
|
||||
ping:ping:/usr/bin/${pkgname}-ping
|
||||
|
|
Loading…
Reference in a new issue