[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

[Thomas Deutschmann]

commit:     22fb31f2d88999b598f2446b05afec3620babaee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 10:31:01 2016 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 10:31:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fb31f2

app-admin/collectd: Update file capabilities

Add missing capabilities for ceph, dns, exec and turbostat plugin when
"filecaps" USE flag is used.

Package-Manager: portage-2.3.1

 app-admin/collectd/collectd-5.5.2.ebuild | 8 +++++++-
 app-admin/collectd/collectd-5.6.0.ebuild | 8 +++++++-
 app-admin/collectd/collectd-5.6.1.ebuild | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.2.ebuild 
b/app-admin/collectd/collectd-5.5.2.ebuild
index cfb74e9..a20f83a 100644
--- a/app-admin/collectd/collectd-5.5.2.ebuild
+++ b/app-admin/collectd/collectd-5.5.2.ebuild
@@ -447,9 +447,15 @@ src_install() {
 
 pkg_postinst() {
        local caps=()
-       use collectd_plugins_ping      && caps+=('cap_net_raw')
+       use collectd_plugins_ceph      && caps+=('cap_dac_override')
+       use collectd_plugins_exec      && caps+=('cap_setuid' 'cap_setgid')
        use collectd_plugins_iptables  && caps+=('cap_net_admin')
        use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+       use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+       if use collectd_plugins_dns || use collectd_plugins_ping; then
+               caps+=('cap_net_raw')
+       fi
 
        if [ ${#caps[@]} -gt 0 ]; then
                local caps_str=$(IFS=","; echo "${caps[*]}")

diff --git a/app-admin/collectd/collectd-5.6.0.ebuild 
b/app-admin/collectd/collectd-5.6.0.ebuild
index 8bd0762..9233874 100644
--- a/app-admin/collectd/collectd-5.6.0.ebuild
+++ b/app-admin/collectd/collectd-5.6.0.ebuild
@@ -461,9 +461,15 @@ src_install() {
 
 pkg_postinst() {
        local caps=()
-       use collectd_plugins_ping      && caps+=('cap_net_raw')
+       use collectd_plugins_ceph      && caps+=('cap_dac_override')
+       use collectd_plugins_exec      && caps+=('cap_setuid' 'cap_setgid')
        use collectd_plugins_iptables  && caps+=('cap_net_admin')
        use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+       use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+       if use collectd_plugins_dns || use collectd_plugins_ping; then
+               caps+=('cap_net_raw')
+       fi
 
        if [ ${#caps[@]} -gt 0 ]; then
                local caps_str=$(IFS=","; echo "${caps[*]}")

diff --git a/app-admin/collectd/collectd-5.6.1.ebuild 
b/app-admin/collectd/collectd-5.6.1.ebuild
index 29cb16f..fc4601c 100644
--- a/app-admin/collectd/collectd-5.6.1.ebuild
+++ b/app-admin/collectd/collectd-5.6.1.ebuild
@@ -459,9 +459,15 @@ src_install() {
 
 pkg_postinst() {
        local caps=()
-       use collectd_plugins_ping      && caps+=('cap_net_raw')
+       use collectd_plugins_ceph      && caps+=('cap_dac_override')
+       use collectd_plugins_exec      && caps+=('cap_setuid' 'cap_setgid')
        use collectd_plugins_iptables  && caps+=('cap_net_admin')
        use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+       use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+       if use collectd_plugins_dns || use collectd_plugins_ping; then
+               caps+=('cap_net_raw')
+       fi
 
        if [ ${#caps[@]} -gt 0 ]; then
                local caps_str=$(IFS=","; echo "${caps[*]}")