6 files changed, 263 insertions, 71 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a26ad16d74cc..3a132efb2276 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6b880206794b..019c0d012758 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -7,6 +7,9 @@ AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea710635608
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
 DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
+DIST chrony-4.3-pre1.tar.gz 592966 BLAKE2B 26811ff6ebd55720cc39ce8cb9d4ddd2e70a9919dbc9a8416728bb81ad02b53dcb895a68aa696c4a063930661f533c5a219c98d67e3b93920351e7160022dca4 SHA512 6a97b11cd7604808aa57db8cd67ae854391ef2bca84bb0256c043464e33683e15682a8ebadec3d2fcca83203d2c731953dfd4972976fe193246ca4af7fb7e0e7
+DIST chrony-4.3-pre1.tar.gz.asc 833 BLAKE2B 40b80f6fdcc749077d1548e7861ff4f55dcfa8c8a84bd197d89f3f25626d5dd3a2b36dbb8b907f3f0f61444e1e3b908631529a7a1665f95b499c70c899249ade SHA512 3a9cd53fcd0f2842241817d5bdeb3c6151eec9e1d0864ae4a89a2d7b93924ac28be7d4f090a32b99ab4b229437d027c2663bb552433182a97eca347175138164
 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
-EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
+EBUILD chrony-4.3_pre1.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
+EBUILD chrony-9999.ebuild 6610 BLAKE2B 321b8fb250d5f8c9600196b98fbc1552c346da7c26653e7a122b8b8e31d45574da3e8272beb5df7a7837278e9b36e2b9f5e1f0b6781c71a272765bf2887cc3f8 SHA512 810ae6585376833b2bf91e84cc11fa8b36e00a2f6845e297fa81b567b217abddeedcc50ef09b32d7126cdaf3b49295c90ed6a1e027f91959537514fb1fcfb482
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.3_pre1.ebuild b/net-misc/chrony/chrony-4.3_pre1.ebuild
new file mode 100644
index 000000000000..c52e4bdbf30f
--- /dev/null
+++ b/net-misc/chrony/chrony-4.3_pre1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	libedit? ( dev-libs/libedit )
+	!libedit? ( sys-libs/readline:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	nts? ( net-libs/gnutls:= )
+	pps? ( net-misc/pps-tools )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	html? ( dev-ruby/asciidoctor )
+	nts? ( virtual/pkgconfig )
+	sechash? (
+		nettle? ( virtual/pkgconfig )
+		nss? ( virtual/pkgconfig )
+	)
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Needed for doc generation in 9999
+	REQUIRED_USE+=" html"
+	BDEPEND+=" virtual/w3m"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf-r3 "${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 2//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# Not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+
+		$(usex caps '' '--disable-linuxcaps')
+		$(usex cmdmon '' '--disable-cmdmon')
+		$(usex debug '--enable-debug' '')
+		$(usex ipv6 '' '--disable-ipv6')
+		$(usex libedit '' '--without-editline')
+		$(usex libtomcrypt '' '--without-tomcrypt')
+		$(usex nettle '' '--without-nettle')
+		$(usex nss '' '--without-nss')
+		$(usex ntp '' '--disable-ntp')
+		$(usex nts '' '--disable-nts')
+		$(usex nts '' '--without-gnutls')
+		$(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')
+
+		--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"
+
+		${EXTRA_ECONF}
+	)
+
+	# Print the ./configure call
+	edo ./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
+		# bug #711058
+		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=0
+	HAD_SECCOMP=0
+	HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=1
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=1
+	fi
+
+	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+		# This version introduced a new filter level: -F 2
+		# It's a limited set of seccomp filters designed to be 'bare minimum'
+		HAD_PRE_NEW_SECCOMP_LEVEL=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+			# bug #719876
+			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"
+		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	# See bug #783915 for general discussion on enabling seccomp filtering
+	# by default.
+	local show_seccomp_enable_msg=0
+
+	# Was seccomp disabled before and now enabled?
+	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	# Are we coming from an old version without the new 'minimal' filter?
+	# (-F 2)
+	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+		elog "To enable seccomp in a stricter mode, please modify:"
+		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
+	fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 57c2893c3532..c52e4bdbf30f 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit systemd tmpfiles toolchain-funcs
+inherit edo systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 	inherit git-r3
 else
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
@@ -65,7 +65,7 @@ BDEPEND="
 	)
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	# Needed for doc generation in 9999
 	REQUIRED_USE+=" html"
 	BDEPEND+=" virtual/w3m"
@@ -141,12 +141,11 @@ src_configure() {
 	)
 
 	# Print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
+	edo ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		# Uses w3m
 		emake -C doc man txt
 	fi
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 170361b29be9..b4a639ee6c6b 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,5 +1,3 @@
-DIST ytfzf-2.4.0.tar.gz 3253168 BLAKE2B e25bd13c01f5b035378dd6657358bc2ec67ff29f1db42fc8c07f0f820252efa4e6da6342265ea4107ec3179d317ac9742646a641a1c9e4e2a84360b39df6bf3d SHA512 9b66d8b56bb8a35baf04a5d34614882f8302e2f543d12182188438c50a76cca1182d7ac3a4a7a3d80d7c924478fd3af7968701e5d5ab8531a9d6f4ed5b731ece
 DIST ytfzf-2.4.1.tar.gz 3256903 BLAKE2B e95fc86d1ed2099aeb96d8daf808861e279865e17758dc8b0b5fa4c349dd819371012d13073f89b94469f1d69f00b66bb01860e3190e324baadc30e2cbae8074 SHA512 f0be168d5fd32cc75f95d0533a093cb9e3aa238d39e024271d69f078b974da51504bd1fd65a34378085a148f1ddae68f6c2fdc15c7a56c2353ec3d6695451771
-EBUILD ytfzf-2.4.0.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
 EBUILD ytfzf-2.4.1.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.4.0.ebuild b/net-misc/ytfzf/ytfzf-2.4.0.ebuild
deleted file mode 100644
index 36a2a31e9d01..000000000000
--- a/net-misc/ytfzf/ytfzf-2.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
-HOMEPAGE="https://github.com/pystardust/ytfzf/"
-SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X minimal"
-
-RDEPEND="
-	app-misc/jq
-	net-misc/curl[ssl]
-	virtual/awk
-	!minimal? (
-		X? ( media-gfx/ueberzug )
-		app-shells/fzf
-		media-video/mpv[lua]
-		net-misc/yt-dlp
-	)"
-
-src_prepare() {
-	default
-
-	sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	emake "${emakeargs[@]}" addons doc install
-	einstalldocs
-
-	rm -r "${ED}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	optfeature "external menu support" x11-misc/dmenu
-	optfeature "desktop notifications" x11-libs/libnotify
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that ${PN} supports many methods to display menus/thumbnails."
-		elog "This ebuild primarily covers defaults and major features, additional"
-		elog "dependencies may be needed for others. Set USE=minimal if want full"
-		elog "control over optional dependencies (e.g. fzf is optional if use dmenu)."
-	fi
-}