gentoo resync : 25.08.2020

4 files changed, 2 insertions, 173 deletions

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 223ef88652ed..8a2c3d93a759 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,7 +1,6 @@
 AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472b3645d4c4291701cce041e862eac6b625e3707c872aba3bf59c9223fafc33b7ecd7bc3a50fa517c3ac2fbe SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
-AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 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
@@ -19,10 +18,7 @@ AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b4933
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
 AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
-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
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
-EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175
-EBUILD ntp-4.2.8_p15.ebuild 4553 BLAKE2B 9e5e9f42b36e041e504ea8ea6dc433c0f3c12e6e7bfca4ef62564da58eb0dd7d2107a7a56049128a8daad1c12d274e25a826d5335f3b209987873646ae85fc0e SHA512 70512d21242d8da475c7bd739b7d3c03f211258b0a4f5bf68adb15928b9798616ba64b20c7192dff897c2d9fadc4b2fe78070801f4adf20b0150b5dc1b6b60b5
+EBUILD ntp-4.2.8_p15.ebuild 4545 BLAKE2B 5010fdac23ee0d6398987ce0d1455dd233fbd65c56a5bea7c01a2bac8310117810d1f831e362d69c1117f826e12ae373a2c702f7cd6503a44be073d8d0844c33 SHA512 2ce600932e6a1d83257c250caa763f4e9357ce2b2b183c70645b2e58ce90a9015836bf2a61b6be6ca79c03549d7a0d07a59047456f85dff98802282588139261
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
deleted file mode 100644
index d2ed719d8ff7..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ntp-4.2.8p14/include/ntp_config.h.psl
-+++ ntp-4.2.8p14/include/ntp_config.h
-@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
-  * Poll Skew List
-  */
- 
--psl_item psl[17-3+1];		/* values for polls 3-17 */
-+extern psl_item psl[17-3+1];	/* values for polls 3-17 */
- 				/* To simplify the runtime code we */
- 				/* don't want to have to special-case */
- 				/* dealing with a default */
---- ntp-4.2.8p14/ntpd/ntp_config.c.psl
-+++ ntp-4.2.8p14/ntpd/ntp_config.c
-@@ -202,6 +202,8 @@ int	cryptosw;		/* crypto command called
- 
- extern char *stats_drift_file;	/* name of the driftfile */
- 
-+psl_item psl[17-3+1];        /* values for polls 3-17 */
-+
- #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
- /*
-  * backwards compatibility flags
diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
deleted file mode 100644
index 2b72249e9970..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs flag-o-matic systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-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= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-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
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${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
-	"${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch
-)
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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"
-
-	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
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	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
-	fi
-	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
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		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 \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 026c16b562c7..57803acb8487 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.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 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= )