9 files changed, 287 insertions, 18 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a485f37216b4..7b220a0cf652 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 3a969ecc40a0..0f99156903b4 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -3,8 +3,8 @@ AUX linuxptp-3.1.1-user_cpp.patch 329 BLAKE2B e99f87e5e8c42ac3eff67b8fea87994718
 AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844194512511ce99407cc88da7a2c83e019b20571098eba3f2297c1a1fe54da47f8fb5e07a58c20a007a2 SHA512 55f048ae44eb43894aad957b35842b0b21aa27e922be85bd286847281f8716bdde9b8187ca90d90d31c9d4587de4c35eebaf0e47498f9b950279037e03069086
 AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
-DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec
 DIST linuxptp-4.0.tgz 250862 BLAKE2B 2c790e35677ee443b39130459b51e9b7237ec780f6e9774028e3c956de6e962ae8272157bf5e6bea847a098654b8cf9621a907b57c38778d55383182ec2d63aa SHA512 763de5654f0426f2f489223e02fb3dd39a3a830751b366406657efe33bb923b5b38edada7b62de3efed6d257d5d386ece0d42a5eb92da5e5d443eac9b32e105d
-EBUILD linuxptp-3.1.1-r1.ebuild 1244 BLAKE2B 3d3fd5c5fd85addbaddfec4e4344722ac57bc9ebb91699c501ed0ce9e36e9f48eb45e63b0d4c049c7aa717b7ec2cbf6dfa46283df39b239a48086eb39a3f3aa6 SHA512 92dd2c98a1391bf8a6ce22d8bcd354f705a83e38352a1175c240770705fc0251f65bf8276282b08a53ec565bf5abba3264db4a59cb0c516f45260eb4228a550a
+DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae
 EBUILD linuxptp-4.0.ebuild 1240 BLAKE2B fe28e6be6b601885d0172ddde0ebb2dd9ce0cb74bae9df3b62a2b270ed1298cb18cadce448da2357fbf844001a2590df191ffffe1d1ade761e0b70dd47c77e41 SHA512 2abdbcbabbdc8b49c0447d2a5e1395f48cbf84df9f17865126ff228df64c5261ce98562082db7cf8deaa09b9b55967486b3f7b3370b506392456aa6f43ada823
+EBUILD linuxptp-4.1.ebuild 1241 BLAKE2B d7900407df59dd26f86588e2ee63ec6db597e5c7c50fe5078bf12faadf7eedc35fe2ec0eb2b0b5e65977a5a6ad850fe6bc91eb12cf35aa4c59192af240aea674 SHA512 3bea6af0e7d08bebe89d7bab08ff3559dd8b53ad6e5405b47f2e0b2f694b494a325bfe30d4634c3cc915bee769843b52de63cd15c814bb3875f34dd3f1103c00
 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837
diff --git a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild b/net-misc/linuxptp/linuxptp-4.1.ebuild
index de162a29e0a7..482409416297 100644
--- a/net-misc/linuxptp/linuxptp-3.1.1-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,12 +6,12 @@ EAPI=8
 inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
-HOMEPAGE="http://linuxptp.sourceforge.net/"
+HOMEPAGE="https://linuxptp.nwtime.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
 
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index ca21775292c6..60cea098c471 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -6,7 +6,10 @@ AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0d
 AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1
+DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9
+DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28
 EBUILD ntpsec-1.2.2-r1.ebuild 4200 BLAKE2B f25db8aec77555d859bd08933209e92012123684318ddd3b5c6103aaba01393a8ef646ac1b4f0171e20c35a460652d32280aea0fba82f4571f82b67b6b56cd72 SHA512 2cc6c90cb7c425a92a79c9f229798661d8dfbf1d6da31be5a8101fdaed9a73deffe380cffee9c780468f9c1424ef08d08c894f27f2fb61da93e7f48675dabfc8
 EBUILD ntpsec-1.2.2.ebuild 4154 BLAKE2B 3186a4d177797a8604bb16d43d17e08cdec277dffe16969834c5388b7c104c46c1ba49b990fca652843462c3af8646b9dd5dbdf13c312f762425526639047d69 SHA512 90a7eab1ec891da5290747a23dce0fda8787cdf509eb547f209fec40def2d61b93fa783df0caacb3d7a72fe5956f098f6ac9a67e92617b5db6d8afbacf044be4
-EBUILD ntpsec-9999.ebuild 4200 BLAKE2B f25db8aec77555d859bd08933209e92012123684318ddd3b5c6103aaba01393a8ef646ac1b4f0171e20c35a460652d32280aea0fba82f4571f82b67b6b56cd72 SHA512 2cc6c90cb7c425a92a79c9f229798661d8dfbf1d6da31be5a8101fdaed9a73deffe380cffee9c780468f9c1424ef08d08c894f27f2fb61da93e7f48675dabfc8
+EBUILD ntpsec-1.2.2a.ebuild 4407 BLAKE2B a1a2599fc700424d2a0abbe15616724480c6b0976011cb1c4d5ac51553493300bb2fd4004ffe6fbaa4c49c815aea38fc44548cd0d3ff93abbe53bbcf98e97eac SHA512 b938dcfaa511e5ebdadb7a493bb48e2c2b1f1f19492d61618bd8761814f3d033bf912e3c98c20400d394e43588e506935f719d6212e02ca9a279eadddf0a36fe
+EBUILD ntpsec-9999.ebuild 4407 BLAKE2B a1a2599fc700424d2a0abbe15616724480c6b0976011cb1c4d5ac51553493300bb2fd4004ffe6fbaa4c49c815aea38fc44548cd0d3ff93abbe53bbcf98e97eac SHA512 b938dcfaa511e5ebdadb7a493bb48e2c2b1f1f19492d61618bd8761814f3d033bf912e3c98c20400d394e43588e506935f719d6212e02ca9a279eadddf0a36fe
 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
new file mode 100644
index 000000000000..38002f1e3d1d
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ntpsec.asc
+	inherit verify-sig
+	SRC_URI="
+		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
+		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea modem local
+)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-libs/libcap
+	libbsd? ( dev-libs/libbsd:0= )
+	seccomp? ( sys-libs/libseccomp )
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+	ntpviz? (
+		media-fonts/liberation-fonts
+		sci-visualization/gnuplot
+	)
+"
+BDEPEND+="
+	>=app-text/asciidoc-8.6.8
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
+)
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript || die
+	if ! use libbsd ; then
+		eapply "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	filter-lto
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	myconf=(
+		--notests
+		--nopyc
+		--nopyo
+		--enable-pylib ext
+		--refclock="${CLOCKSTRING}"
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	distutils-r1_src_configure
+}
+
+python_configure() {
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+python_compile() {
+	waf-utils_src_compile --notests
+}
+
+python_test() {
+	waf-utils_src_compile check
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a logrotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+python_install() {
+	waf-utils_src_install --notests
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index f377b0352861..38002f1e3d1d 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -13,13 +14,23 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ntpsec.asc
+	inherit verify-sig
+	SRC_URI="
+		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
+		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
 HOMEPAGE="https://www.ntpsec.org/"
 
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
 	shm pps hpgps zyfer arbiter nmea modem local
@@ -27,30 +38,37 @@ NTPSEC_REFCLOCK=(
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
 IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
+DEPEND="
+	${PYTHON_DEPS}
 	dev-libs/openssl:=
 	dev-python/psutil[${PYTHON_USEDEP}]
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
 	seccomp? ( sys-libs/libseccomp )
 	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
+	rclock_pps? ( net-misc/pps-tools )
+"
+RDEPEND="
+	${DEPEND}
 	!net-misc/ntp
 	!net-misc/openntpd
 	acct-group/ntp
 	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
+	ntpviz? (
+		media-fonts/liberation-fonts
+		sci-visualization/gnuplot
+	)
+"
+BDEPEND+="
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
-	sys-devel/bison"
+	sys-devel/bison
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
@@ -74,7 +92,6 @@ src_prepare() {
 }
 
 src_configure() {
-	is-flagq -flto* && filter-flags -fuse-linker-plugin
 	filter-lto
 
 	local string_127=""
@@ -138,7 +155,7 @@ src_install() {
 	chmod 770 "${ED}"/var/lib/ntp
 	keepdir /var/lib/ntp
 
-	# Install a log rotate script
+	# Install a logrotate script
 	mkdir -pv "${ED}"/etc/logrotate.d
 	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
 
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index d7457bbc34d8..74f5ab9486d1 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,7 @@
+AUX zsync-0.6.2-musl-off_t-fix.patch 326 BLAKE2B 9907bac0ca55ebae23318555a0b150fb780049e8843070280158b7a4402c0b4c61befeeb457d1348b7bc0378007986e556c8129a0ec060589b72e40ccad0988f SHA512 f7d64eef956d6afb7018dbd368b4aeb63a0a14c7ba44a60153ce64a12a494463dc94c1325bdf8eac38ad2ac41166aaba80ea84f10ae4e68bf506b9c19407406d
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
 EBUILD zsync-0.6.2-r2.ebuild 1078 BLAKE2B 15822b79f5e8a7c46624f8a12c7f466264689b609899af6a9d819062f1d4ef549c0267f5a02469f2c2648442c75f49c0971df59dde286680302ffff0ab6e3bb4 SHA512 8d4fd032dca7d9bb4de29aff16297ccca060c92fbd66d7bf81ae2612d7e888c04abc2e6e5847811c07801f4e9703bbdd6f9aa185d62ca9badc3c306f78564e61
+EBUILD zsync-0.6.2-r3.ebuild 1143 BLAKE2B 589c2168f69913a69414eaf584af3c7fc2af0091fac675b8cc2c4dc824ac3d12e6c080ffaf3a59b8fbbe3ff74def28383c7e2df50339be614e91f3506d6e1651 SHA512 2c63cf82ab11b6a074d43892ebc45c61534b9d8903495aeb2f50690149e782506062b07f0c6015fcddd4b9314a456d4e3cb38e862ebc349a056564062eeffe1b
 MISC metadata.xml 1324 BLAKE2B 6a0cf68e98964abcd423f9d5d9e293c5d4c152b1ed2fc98ab805927d2f0dcdda6a07e2a16bbe590bbbe23590e1fae99e4c618680d4db3864d7cec20b175a6656 SHA512 99151fb2267583e7f3174087a2758aebfcfbcb81196af87c7d4f84c847806f08ad35a361fbc3ade104a60fcd555b5110712b8569a9993bbfd0574992eb36704c
diff --git a/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch
new file mode 100644
index 000000000000..277f23b425cc
--- /dev/null
+++ b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/libzsync/sha1.h b/libzsync/sha1.h
+index 3946505..8840570 100644
+--- a/libzsync/sha1.h
++++ b/libzsync/sha1.h
+@@ -11,9 +11,10 @@
+ 
+ #include "config.h"
+ 
+-#ifdef HAVE_INTTYPES_H
++#if defined(HAVE_INTTYPES_H) && defined(__GLIBC__)
+ #include <inttypes.h>
+ #else
++#include <stdint.h>
+ #include <sys/types.h>
+ #endif
+ 
diff --git a/net-misc/zsync/zsync-0.6.2-r3.ebuild b/net-misc/zsync/zsync-0.6.2-r3.ebuild
new file mode 100644
index 000000000000..08e57393fa50
--- /dev/null
+++ b/net-misc/zsync/zsync-0.6.2-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+ZLIB_PV=1.2.3
+ZLIB_P="zlib-${ZLIB_PV}"
+
+DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm"
+HOMEPAGE="http://zsync.moria.org.uk/"
+SRC_URI="
+	http://zsync.moria.org.uk/download/${P}.tar.bz2
+	http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2
+	http://www.zlib.net/${ZLIB_P}.tar.bz2"
+ZLIB_S="${WORKDIR}/${ZLIB_P}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.2-musl-off_t-fix.patch
+)
+
+src_prepare() {
+	default
+	# Move old zlib-1.2.11 out the way
+	mv "${S}"/zlib zlib-1.2.11-modified || die
+
+	cd "${ZLIB_S}" || die
+	# I am not sure how many other zlib patches we will need to port as well
+	# This covers the security vuln in 1.2.11
+	eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch
+	rm Makefile || die
+
+	cd "${S}" || die
+	cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die
+	ln -s "${ZLIB_P}-modified" zlib || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin zsync zsyncmake
+	dodoc NEWS README
+	doman doc/zsync.1 doc/zsyncmake.1
+}