diff options
Diffstat (limited to 'net-misc/ntp')
| -rw-r--r-- | net-misc/ntp/Manifest | 9 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p14-add_cap_ipc_lock.patch | 13 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p13-r2.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p13.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p14-r2.ebuild (renamed from net-misc/ntp/ntp-4.2.8_p13-r1.ebuild) | 34 |
5 files changed, 38 insertions, 22 deletions
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index eab5db1b4a36..4ccb278c8d04 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -6,6 +6,7 @@ AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 AUX ntp-4.2.8_p12-libressl-2.8.patch 741 BLAKE2B 8b5542b216710da46a59d2cefa82142bfe1590ca351833c5a3b91fd3c14c37ddfbcee89aa819a9b254f3ba9f3ef8997aa81c881fc04a71da0c2bb1e727be5215 SHA512 4b8e2b79c0922a5a2d9eb1857679996fffc0dc807e01221c0b5be7a547fe700f715899d66f946a6626848bca89973b807b3b171b7cc3ae153d238a2da64f49e1 +AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff0184005d3ea24f239a1d3e2b63a5a7e9eef8f385a72fcd9370a2e68031a7c54bf3ef28e8c26c97c0298 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c @@ -22,7 +23,9 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075 -EBUILD ntp-4.2.8_p13-r1.ebuild 4495 BLAKE2B 2fb958de52ac85e7af5cbe20b1fac82b8a33415239ac96bfbf94b73efa042b49fcb3c55e8c122470cbcc499147050a7906dba6452cffa35d21c7ea3363e183ea SHA512 16db38e303bcfa94d79e838b84bd332036384e69c8a2f1c806fbe9acabc067ecec5077a701fa227b88639f79d6fc02962d9f30487f0aa3b5cf8ef88f955a5e84 -EBUILD ntp-4.2.8_p13-r2.ebuild 4546 BLAKE2B 028b33ad5444fee81b17541344646840f0e706201abdea75275571d93a437a00f638da5c02da57041ef10e71c43f4e5d29033ea471f95230370dd07363febdec SHA512 90c66fcc4fab35213e2c48874a1a90f0fa1ac5bceea1ea6bdcd447a98fb750a988d41c27d6a6e61866dc9ee81eb8ba83e26ae7d97b501b2d308fbd47bb28ca80 -EBUILD ntp-4.2.8_p13.ebuild 4483 BLAKE2B c7f84b00bc604050d58f17a3ed8856d51cb3763509232d0f3221f7c062e938a0aeaae723a4dac8251a907bd4580b6f4e47c1b7109be899c6ae04c62ebec0122b SHA512 5b2c40c77e8c6ff15804a14a5c43035a3b2d8ca7c16e5f81d16fe716da169130dacb03d6a80493a705e87b3c80421cf6b51883e500db3ebc37402a5b473e7ee5 +DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1 +DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8 +EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914 +EBUILD ntp-4.2.8_p13.ebuild 4481 BLAKE2B 35a95ffdd991d752d7163afebde84df0069c7c61495ce8bf62f98a217c35570d8f03470e8096891b219b7e9b1ed3b578db99a91228e0b78644c4237149c69bd9 SHA512 cae546394d68a3f5ccbe2d08f419de01ad596b33ebbf660c5c4f3afeb89651cc0bc3e607d18ab32652a60663e4391a8baf0e0a421b229f3234d93d0f7ede4cec +EBUILD ntp-4.2.8_p14-r2.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 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_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild index 2150ef08bd90..a50710aa1a3e 100644 --- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild index 1a92b7b4bcec..8fb052e8771e 100644 --- a/net-misc/ntp/ntp-4.2.8_p13.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild index d3cc13c50464..b2cbb8b926a9 100644 --- a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools toolchain-funcs flag-o-matic user systemd +inherit autotools toolchain-funcs flag-o-matic systemd MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -13,10 +13,10 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" -CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) +COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) @@ -26,9 +26,13 @@ CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} +BDEPEND="virtual/pkgconfig + acct-group/ntp + acct-user/ntp" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + acct-group/ntp + acct-user/ntp selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec @@ -43,13 +47,9 @@ 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 ) -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - src_prepare() { default append-cppflags -D_GNU_SOURCE #264109 @@ -90,14 +90,14 @@ src_install() { default # move ntpd/ntpdate to sbin #66671 dodir /usr/sbin - mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin" + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" dodoc INSTALL WHERE-TO-START doman "${WORKDIR}"/man/*.[58] insinto /etc doins "${FILESDIR}"/ntp.conf - use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726 + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd newconfd "${FILESDIR}"/ntpd.confd ntpd newinitd "${FILESDIR}"/ntp-client.rc ntp-client @@ -105,9 +105,9 @@ src_install() { newinitd "${FILESDIR}"/sntp.rc sntp newconfd "${FILESDIR}"/sntp.confd sntp if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die keepdir /var/lib/ntp use prefix || fowners ntp:ntp /var/lib/ntp @@ -122,7 +122,7 @@ src_install() { systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service if use caps ; then sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ - "${D%/}$(systemd_get_systemunitdir)"/ntpd.service \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ || die fi systemd_enable_ntpunit 60-ntpd ntpd.service |