Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/, net-misc/ntp/files/
Date: Thu, 05 Mar 2020 18:51:12
Message-Id: 1583434260.37dea0c5a7c3b80ed51400bd89b44268c959bbe2.polynomial-c@gentoo
1 commit: 37dea0c5a7c3b80ed51400bd89b44268c959bbe2
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 18:50:28 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 18:51:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dea0c5
7
8 net-misc/ntp: Revbump to fix ntpd startup with USE="caps"
9
10 Closes: https://bugs.gentoo.org/711530
11 Package-Manager: Portage-2.3.92, Repoman-2.3.20
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch | 13 +++++++++++++
15 .../{ntp-4.2.8_p14-r1.ebuild => ntp-4.2.8_p14-r2.ebuild} | 1 +
16 2 files changed, 14 insertions(+)
17
18 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
19 new file mode 100644
20 index 00000000000..183b6d8d475
21 --- /dev/null
22 +++ b/net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch
23 @@ -0,0 +1,13 @@
24 +https://bugs.gentoo.org/711530
25 +
26 +--- ntp-4.2.8p14/ntpd/ntpd.c
27 ++++ ntp-4.2.8p14/ntpd/ntpd.c
28 +@@ -1189,7 +1189,7 @@
29 + * drop privileges in this case.
30 + */
31 + cap_t caps;
32 +- caps = cap_from_text("cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
33 ++ caps = cap_from_text("cap_ipc_lock,cap_sys_time,cap_setuid,cap_setgid,cap_sys_chroot,cap_net_bind_service=pe");
34 + if ( ! caps) {
35 + msyslog( LOG_ERR, "cap_from_text() failed: %m" );
36 + exit(-1);
37
38 diff --git a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
39 similarity index 98%
40 rename from net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
41 rename to net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
42 index a442cbc860d..61130e1b1da 100644
43 --- a/net-misc/ntp/ntp-4.2.8_p14-r1.ebuild
44 +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
45 @@ -47,6 +47,7 @@ PATCHES=(
46 "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
47 "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
48 "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
49 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
50 )
51
52 src_prepare() {