1 |
commit: 22fb31f2d88999b598f2446b05afec3620babaee |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 11 10:31:01 2016 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 11 10:31:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fb31f2 |
7 |
|
8 |
app-admin/collectd: Update file capabilities |
9 |
|
10 |
Add missing capabilities for ceph, dns, exec and turbostat plugin when |
11 |
"filecaps" USE flag is used. |
12 |
|
13 |
Package-Manager: portage-2.3.1 |
14 |
|
15 |
app-admin/collectd/collectd-5.5.2.ebuild | 8 +++++++- |
16 |
app-admin/collectd/collectd-5.6.0.ebuild | 8 +++++++- |
17 |
app-admin/collectd/collectd-5.6.1.ebuild | 8 +++++++- |
18 |
3 files changed, 21 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/collectd/collectd-5.5.2.ebuild b/app-admin/collectd/collectd-5.5.2.ebuild |
21 |
index cfb74e9..a20f83a 100644 |
22 |
--- a/app-admin/collectd/collectd-5.5.2.ebuild |
23 |
+++ b/app-admin/collectd/collectd-5.5.2.ebuild |
24 |
@@ -447,9 +447,15 @@ src_install() { |
25 |
|
26 |
pkg_postinst() { |
27 |
local caps=() |
28 |
- use collectd_plugins_ping && caps+=('cap_net_raw') |
29 |
+ use collectd_plugins_ceph && caps+=('cap_dac_override') |
30 |
+ use collectd_plugins_exec && caps+=('cap_setuid' 'cap_setgid') |
31 |
use collectd_plugins_iptables && caps+=('cap_net_admin') |
32 |
use collectd_plugins_filecount && caps+=('cap_dac_read_search') |
33 |
+ use collectd_plugins_turbostat && caps+=('cap_sys_rawio') |
34 |
+ |
35 |
+ if use collectd_plugins_dns || use collectd_plugins_ping; then |
36 |
+ caps+=('cap_net_raw') |
37 |
+ fi |
38 |
|
39 |
if [ ${#caps[@]} -gt 0 ]; then |
40 |
local caps_str=$(IFS=","; echo "${caps[*]}") |
41 |
|
42 |
diff --git a/app-admin/collectd/collectd-5.6.0.ebuild b/app-admin/collectd/collectd-5.6.0.ebuild |
43 |
index 8bd0762..9233874 100644 |
44 |
--- a/app-admin/collectd/collectd-5.6.0.ebuild |
45 |
+++ b/app-admin/collectd/collectd-5.6.0.ebuild |
46 |
@@ -461,9 +461,15 @@ src_install() { |
47 |
|
48 |
pkg_postinst() { |
49 |
local caps=() |
50 |
- use collectd_plugins_ping && caps+=('cap_net_raw') |
51 |
+ use collectd_plugins_ceph && caps+=('cap_dac_override') |
52 |
+ use collectd_plugins_exec && caps+=('cap_setuid' 'cap_setgid') |
53 |
use collectd_plugins_iptables && caps+=('cap_net_admin') |
54 |
use collectd_plugins_filecount && caps+=('cap_dac_read_search') |
55 |
+ use collectd_plugins_turbostat && caps+=('cap_sys_rawio') |
56 |
+ |
57 |
+ if use collectd_plugins_dns || use collectd_plugins_ping; then |
58 |
+ caps+=('cap_net_raw') |
59 |
+ fi |
60 |
|
61 |
if [ ${#caps[@]} -gt 0 ]; then |
62 |
local caps_str=$(IFS=","; echo "${caps[*]}") |
63 |
|
64 |
diff --git a/app-admin/collectd/collectd-5.6.1.ebuild b/app-admin/collectd/collectd-5.6.1.ebuild |
65 |
index 29cb16f..fc4601c 100644 |
66 |
--- a/app-admin/collectd/collectd-5.6.1.ebuild |
67 |
+++ b/app-admin/collectd/collectd-5.6.1.ebuild |
68 |
@@ -459,9 +459,15 @@ src_install() { |
69 |
|
70 |
pkg_postinst() { |
71 |
local caps=() |
72 |
- use collectd_plugins_ping && caps+=('cap_net_raw') |
73 |
+ use collectd_plugins_ceph && caps+=('cap_dac_override') |
74 |
+ use collectd_plugins_exec && caps+=('cap_setuid' 'cap_setgid') |
75 |
use collectd_plugins_iptables && caps+=('cap_net_admin') |
76 |
use collectd_plugins_filecount && caps+=('cap_dac_read_search') |
77 |
+ use collectd_plugins_turbostat && caps+=('cap_sys_rawio') |
78 |
+ |
79 |
+ if use collectd_plugins_dns || use collectd_plugins_ping; then |
80 |
+ caps+=('cap_net_raw') |
81 |
+ fi |
82 |
|
83 |
if [ ${#caps[@]} -gt 0 ]; then |
84 |
local caps_str=$(IFS=","; echo "${caps[*]}") |