1 |
commit: 010d17c7b421a0fa06ecd2430913f04ea5f47562 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 8 14:14:24 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 8 14:54:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=010d17c7 |
7 |
|
8 |
net-misc/chrony: add notice when switching USE=caps -> USE=-caps |
9 |
|
10 |
Closes: https://bugs.gentoo.org/740550 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
net-misc/chrony/chrony-4.0-r1.ebuild | 12 ++++++++---- |
15 |
net-misc/chrony/chrony-9999.ebuild | 12 ++++++++---- |
16 |
2 files changed, 16 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild |
19 |
index d663e9cb680..4a9997a20a5 100644 |
20 |
--- a/net-misc/chrony/chrony-4.0-r1.ebuild |
21 |
+++ b/net-misc/chrony/chrony-4.0-r1.ebuild |
22 |
@@ -188,10 +188,14 @@ pkg_preinst() { |
23 |
pkg_postinst() { |
24 |
tmpfiles_process chronyd.conf |
25 |
|
26 |
- if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then |
27 |
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" |
28 |
- ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" |
29 |
- ewarn "This is necessary for chrony to drop privileges" |
30 |
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then |
31 |
+ if use caps && ! ${HAD_CAPS} ; then |
32 |
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" |
33 |
+ ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" |
34 |
+ ewarn "This is necessary for chrony to drop privileges" |
35 |
+ elif ! use caps && ! ${HAD_CAPS} ; then |
36 |
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" |
37 |
+ fi |
38 |
fi |
39 |
|
40 |
if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then |
41 |
|
42 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
43 |
index d663e9cb680..4a9997a20a5 100644 |
44 |
--- a/net-misc/chrony/chrony-9999.ebuild |
45 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
46 |
@@ -188,10 +188,14 @@ pkg_preinst() { |
47 |
pkg_postinst() { |
48 |
tmpfiles_process chronyd.conf |
49 |
|
50 |
- if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then |
51 |
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" |
52 |
- ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" |
53 |
- ewarn "This is necessary for chrony to drop privileges" |
54 |
+ if [[ -n "${REPLACING_VERSIONS}" ]] ; then |
55 |
+ if use caps && ! ${HAD_CAPS} ; then |
56 |
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" |
57 |
+ ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" |
58 |
+ ewarn "This is necessary for chrony to drop privileges" |
59 |
+ elif ! use caps && ! ${HAD_CAPS} ; then |
60 |
+ ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" |
61 |
+ fi |
62 |
fi |
63 |
|
64 |
if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then |