gentoo resync : 23.09.2020

2 files changed, 198 insertions, 0 deletions

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index c259fd33830f..a47b1b15a9a4 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -6,7 +6,9 @@ AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
+DIST chrony-4.0-pre4.tar.gz 544660 BLAKE2B d7f25a980a8cfd9c56fdf4f8ab3dc63594a428e0a18a5bb3b93488ea4db16201e67589ac8a0d966dea4a06c7ff9c4dfa5a1adc3a77849f69d594305e5961a1c8 SHA512 81471682b091851f79dfe08315a016c01199b850a1cc6289a3f3d6f56df2ab415266e156900f2e9d60804197097ff8bb89bf7c8072a90a05d6f257b5368e5939
 EBUILD chrony-3.5.1-r1.ebuild 4761 BLAKE2B d0bf0aa6403b9f4d691d41a4fd77de3b2de15783ebb445c403ffd3777e3888ecc659e05f131a2b0465e20c5f64c4f6e9084680ed01bc75f410b93caf13b84f49 SHA512 b2cfbab377cc697cd8903708dd870b7bda141a32b9a5f4f4a155efa93dd6ccd5af815c98005a074e039b3645938c3c684ee9d0afb418de6236ddf8db903394df
 EBUILD chrony-4.0_pre3.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
+EBUILD chrony-4.0_pre4.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
 EBUILD chrony-9999.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
 MISC metadata.xml 1744 BLAKE2B a30c56ac26aca1450ed5654e496132b47eb498694a2c5da6bcdd55f974f9379835aca68dc4293cf07a13aae0d1507b3b1db473bbb5fe32e02f82f403ae069420 SHA512 4bf5ef57e61ac80f7c45662125a6b5000072edf698be5c48333ce2a286950627381afad062df12268eb4e628a00d48f37e401aa79bd6e43a7e87a74c605a7176
diff --git a/net-misc/chrony/chrony-4.0_pre4.ebuild b/net-misc/chrony/chrony-4.0_pre4.ebuild
new file mode 100644
index 000000000000..b5c97cbbd863
--- /dev/null
+++ b/net-misc/chrony/chrony-4.0_pre4.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +seccomp +sechash selinux
+"
+REQUIRED_USE="
+	?? ( libedit readline )
+	sechash? ( nettle )
+"
+RESTRICT=test
+CDEPEND="
+	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+	libedit? ( dev-libs/libedit )
+	nettle? ( dev-libs/nettle:= )
+	readline? ( >=sys-libs/readline-4.1-r4:= )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="
+	${CDEPEND}
+	html? ( dev-ruby/asciidoctor )
+	pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+)
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
+
+	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp; then
+		sed -i \
+			-e 's/ -F 0//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	local CHRONY_EDITLINE
+	# ./configure legend:
+	# --disable-readline : disable line editing entirely
+	# --without-readline : do not use sys-libs/readline (enabled by default)
+	# --without-editline : do not use dev-libs/libedit (enabled by default)
+	if ! use readline && ! use libedit; then
+		CHRONY_EDITLINE='--disable-readline'
+	else
+		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+	fi
+
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
+	# not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+		$(usex caps '' --disable-linuxcaps)
+		$(usex cmdmon '' --disable-cmdmon)
+		$(usex ipv6 '' --disable-ipv6)
+		$(usex nettle '' --without-nettle)
+		$(usex ntp '' --disable-ntp)
+		$(usex phc '' --disable-phc)
+		$(usex pps '' --disable-pps)
+		$(usex refclock '' --disable-refclock)
+		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
+		$(usex sechash '' --disable-sechash)
+		${CHRONY_EDITLINE}
+		${EXTRA_ECONF}
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+		--without-nss
+		--without-tomcrypt
+	)
+
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		fowners ntp:ntp /var/{lib,log}/chrony
+		fperms 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=false
+
+	if has_version 'net-misc/chrony[caps]'; then
+		HAD_CAPS=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
+		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+		ewarn "This is necessary for chrony to drop privileges"
+	fi
+}