summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-03-05 19:50:28 +0100
committerLars Wendler <polynomial-c@gentoo.org>2020-03-05 19:51:00 +0100
commit37dea0c5a7c3b80ed51400bd89b44268c959bbe2 (patch)
tree02d0bcc4a7b4aee844619bd7f5629ac744536ebd /net-misc/ntp
parentx11-apps/xkbcomp: Require >=libX11-1.6.9 (diff)
downloadgentoo-37dea0c5a7c3b80ed51400bd89b44268c959bbe2.tar.gz
gentoo-37dea0c5a7c3b80ed51400bd89b44268c959bbe2.tar.bz2
gentoo-37dea0c5a7c3b80ed51400bd89b44268c959bbe2.zip
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@gentoo.org>
Diffstat (limited to 'net-misc/ntp')
-rw-r--r--net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch13
-rw-r--r--net-misc/ntp/ntp-4.2.8_p14-r2.ebuild (renamed from net-misc/ntp/ntp-4.2.8_p14-r1.ebuild)1
2 files changed, 14 insertions, 0 deletions
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 000000000000..183b6d8d475a
--- /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
index a442cbc860d6..61130e1b1da0 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() {