commit:     37dea0c5a7c3b80ed51400bd89b44268c959bbe2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 18:50:28 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 18:51:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dea0c5

net-misc/ntp: Revbump to fix ntpd startup with USE="caps"

Closes: https://bugs.gentoo.org/711530
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch     | 13 +++++++++++++
 .../{ntp-4.2.8_p14-r1.ebuild => ntp-4.2.8_p14-r2.ebuild}    |  1 +
 2 files changed, 14 insertions(+)

diff --git a/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch 
b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch
new file mode 100644
index 00000000000..183b6d8d475
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/711530
+
+--- ntp-4.2.8p14/ntpd/ntpd.c
++++ ntp-4.2.8p14/ntpd/ntpd.c
+@@ -1189,7 +1189,7 @@
+                *  drop privileges in this case.
+                */
+               cap_t caps;
+-              caps = 
cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
++              caps = 
cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
+               if ( ! caps) {
+                       msyslog( LOG_ERR, "cap_from_text() failed: %m" );
+                       exit(-1);

diff --git a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild 
b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
similarity index 98%
rename from net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
rename to net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index a442cbc860d..61130e1b1da 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
        "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
        "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+       "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 )
 
 src_prepare() {

Reply via email to