summaryrefslogtreecommitdiff
path: root/app-admin/collectd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-31 10:55:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-03-31 10:55:17 +0100
commit75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch)
treecef96ea0860ae39a202bbf1e226100335209627d /app-admin/collectd
parent1173ad5704ce725916e0c332416aff326d850d06 (diff)
gentoo resync : 31.03.2018
Diffstat (limited to 'app-admin/collectd')
-rw-r--r--app-admin/collectd/Manifest2
-rw-r--r--app-admin/collectd/collectd-5.7.2-r2.ebuild (renamed from app-admin/collectd/collectd-5.7.2-r1.ebuild)8
2 files changed, 8 insertions, 2 deletions
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 7c405e389265..93df5f371038 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -7,5 +7,5 @@ AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc7
AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
-EBUILD collectd-5.7.2-r1.ebuild 19380 BLAKE2B 8434344a6fb2d2ef491147acf41c25da7ee68365f59d2343ab5a04dd5582afdc243301c83258c6fea8596f138a3402ead7689ef4538dfaca88a51cc2541a1ed8 SHA512 f11772dd865aca3557e15659783ae990626a855dbb2c155400544c79d75e6b3f15550b3fdcdbfde83224667d6b01b1114fc4d296b533468e366eb1688e75e6da
+EBUILD collectd-5.7.2-r2.ebuild 19598 BLAKE2B 4b42c29dddb14f0348415335110744e215d041e3a112b35a71654bf0afa48e48ded21f389fa4d620f7efde4b65178c4c07b46b5948553983dd09e193570d21f7 SHA512 6417a2f8a86569b9487b1719ba50c738d0e86a0adb003fbe8238bd0ef9da99f0ee8ca8393c166927f103ee6b3339e476c2468cfbae633e3705e3492fc37eb0cc
MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild b/app-admin/collectd/collectd-5.7.2-r2.ebuild
index aa1d44699653..9adfa6322e16 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r2.ebuild
@@ -500,7 +500,7 @@ pkg_postinst() {
elog " ${caps_str}+EP"
elog
- local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+ local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
if [[ -e "${systemd_unit}" ]]; then
caps_str="${caps[*]}"
sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
@@ -509,6 +509,12 @@ pkg_postinst() {
elog "CapabilityBoundingSet in '${systemd_unit}'"
elog "updated to match capabilities set above."
elog
+ else
+ if has_version "sys-apps/systemd"; then
+ # Bug 596852
+ ewarn "Failed to update CapabilityBondingSet in '${systemd_unit}'"
+ ewarn "because unit was not found. Please file a bug about this."
+ fi
fi
fi
fi