gentoo auto-resync : 06:10:2022 - 01:20:42

12 files changed, 361 insertions, 23 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8372386a263f..452d06b70303 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index fedc91416d7b..a36741a82321 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -25,7 +25,9 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
+DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
 DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0
 EBUILD dhcp-4.4.2_p1-r2.ebuild 8410 BLAKE2B bce58f30a590a98a8d5d61076ae43d5783ab2daa6095456e4253b671d94f2012072d4525ec8e7fff2adc641496ba519aa06d438d66ab969c37cbe0a3a4f339cf SHA512 e6fe16ac2fc57f9eaa9bdafc2af75fec1053cb6191a79d1b09064cdf77c0a88e0f7254d5b97e3a1a72477814d2d57d26cc2719eef543b2c538f3d62b802fbacc
 EBUILD dhcp-4.4.3-r1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
+EBUILD dhcp-4.4.3_p1.ebuild 8534 BLAKE2B 74abdb1e4b5b61a60a81635efe42db161f851cf219c041be04a4c306c03dfe4675fdc9dfdc05fb285f3594a0fe7b6b21c1ed8122a111871a9cbeb356e23a128a SHA512 2d24aed63de63687328361c50dd996a195dd655845f71cc47e22bdab81a58fd43ea51a863f8c77b4790088eae5bb2f4c60b5932e3291004fb349dd0e04f23f6e
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
new file mode 100644
index 000000000000..0cd58207062a
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="https://www.isc.org/dhcp"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
+
+DEPEND="
+	acct-group/dhcp
+	acct-user/dhcp
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap:=
+		ssl? ( dev-libs/openssl:= )
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+PATCHES=(
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+	# Enable dhclient to equery NTP servers
+	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+	# Enable dhclient to get extra configuration from stdin
+	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	# bug #265531
+	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+	# bug #296921
+	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+	# bug #437108
+	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+	# bug #480636
+	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+	# bug #471142
+	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+	# bug #559832
+	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
+
+	# Possible upstream candidates
+)
+
+src_prepare() {
+	default
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client || die
+			cp doc/ja_JP.eucJP/dhcp* common || die
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -r doc/ja_JP.eucJP || die
+
+	# make the bind build work - do NOT make "binddir" local!
+	binddir="${S}/bind"
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch
+	# Only use the relevant subdirs now that ISC
+	#removed the lib/export structure in bind.
+	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
+		-i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	# Breaks with -O3 because of reliance on undefined behaviour
+	# bug #787935
+	append-flags -fno-strict-aliasing
+
+	# bug #720806, bug #801592
+	if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then
+		append-libs -latomic
+	fi
+
+	local myeconfargs=(
+		--enable-paranoia
+		--enable-early-chroot
+		--sysconfdir=${e}
+		--with-randomdev=/dev/random
+		$(use_enable ipv6 dhcpv6)
+		$(use_with ldap)
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+		LIBS="${LIBS}"
+	)
+	econf "${myeconfargs[@]}"
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that. bug #383837.
+	cd bind/bind-*/ || die
+	local el
+	eval econf \
+		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+		--with-randomdev=/dev/random \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# Build local bind cruft first
+	emake -C bind/bind-*/lib install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	docinto html
+	dodoc doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# Move the client to /
+		dodir /sbin
+		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+
+	diropts -m0750 -o dhcp -g dhcp
+	keepdir /var/lib/dhcp
+}
+
+pkg_preinst() {
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if use server ; then
+		tmpfiles_process dhcpd.conf
+	fi
+
+	if use client ; then
+		ewarn "The client and relay functionality will be removed in the next release!"
+		ewarn "Upstream have decided to discontinue this functionality."
+	fi
+
+	if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index a6309066ffda..01cde9dda6e9 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,4 +1,5 @@
 AUX liveice-2000530-build.patch 990 BLAKE2B a1406d01255445b87a10e6bbd89aaf94a94539315304209ec18fdff88c62288323f2f5b5306e42671d02ed13d0d74d28f883a06bddea921572404775d38060f6 SHA512 8004c5d99aebb76b70158abdbc95550d858d74790882be531c7472a349dec104fe7f54a38f616106004385412bda159b01426a0a71606e9c7b1b3e58bcd9cef1
+AUX liveice-2000530-clang16.patch 880 BLAKE2B 68218724d40b81e032811949d28937f1c81849783ac7601200bb99a55afb56dfc5e8177b59527730361514d95ab4b2235d5a6f5fe0b892c2ab36894cec7cc465 SHA512 aa011d32bde8733f43601e5f0208766aa3105379083c595986e9bda72097a7097d4adaa832e84b713335da1fbaab10b1036e0f7d415b24ce5f26cda56244af06
 DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r2.ebuild 710 BLAKE2B 87c8a40be04e4f33745fd20cbd41b91196df7ef20ef33a9ff237a8ca387f8588cfd651af4f001117d004b3607f8c590b6acc230ccea71458451282bd5c0301b1 SHA512 4d4c34d96d1ff30a4d246c9b39266a0b704df8c452c16f60cb6ae5fb315f03249aae9ba89bb49db290ff99ba2152f5ff8d67f1543a52af6452bc2925145c81d5
+EBUILD liveice-2000530-r3.ebuild 926 BLAKE2B 6570a32aeacab2da4becf2feb7d7f87c621924bd9c2266b81f61530e66a66a9d2605c9041be5d8c9c029250b307a45256d840e0df6e07ba1fa0f79c42b1b2d63 SHA512 f65a0101831888d0362367d2a312d5798638a6ca422fbd25fd5cf036aef39ae65bd90dd3f8f2153bf26fecb5e8b50693f3f457372d945d0f4af3c3d685aab9fa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/liveice/files/liveice-2000530-clang16.patch b/net-misc/liveice/files/liveice-2000530-clang16.patch
new file mode 100644
index 000000000000..6d1964a9c097
--- /dev/null
+++ b/net-misc/liveice/files/liveice-2000530-clang16.patch
@@ -0,0 +1,37 @@
+Also issues with implicit basename(3), but that is handled from the ebuild.
+https://bugs.gentoo.org/861644
+https://bugs.gentoo.org/870838
+--- a/mixer.c
++++ b/mixer.c
+@@ -29,4 +29,5 @@
+ #include "audio_proc.h"
+ #include "controls.h"
++#include "url.h"
+ 
+ 
+@@ -40,4 +41,5 @@
+ #include <time.h>
+ 
++int parse_file_metadata(char *filename,char **title,char **artist,char **album,char **url);
+ 
+ short audio_buffer[BUF_SIZE];  
+--- a/mixer.h
++++ b/mixer.h
+@@ -157,2 +157,3 @@
+ void write_logfile(cptr ch);
+ void execute_update_script(cptr ch);
++void shout_streamer(void);
+--- a/streams.c
++++ b/streams.c
+@@ -32,4 +32,5 @@
+ #include "serverlib.h"
+ #include "audio_proc.h"
++#include "mixer.h"
+ 
+ #ifdef SOUNDCARD_SUPPORT
+--- a/url.h
++++ b/url.h
+@@ -11,2 +11,3 @@
+ int string_contains(char *string,char *seek);
+ void strtoupper(char *string);
++char *url_encode(char *str, char **result_p);
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r3.ebuild
index cc73e827d6ac..d00733459f71 100644
--- a/net-misc/liveice/liveice-2000530-r2.ebuild
+++ b/net-misc/liveice/liveice-2000530-r3.ebuild
@@ -1,13 +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 autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Live Source Client For IceCast"
-HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -15,21 +16,28 @@ KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	media-sound/lame
-	media-sound/mpg123"
+	media-sound/mpg123
+	sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_prepare() {
 	default
+
 	eautoreconf
-	tc-export CC
 }
 
 src_configure() {
+	tc-export CC
 	append-flags -fcommon
-	default
+
+	# seems to expect GNU's basename, but use simple builtin my_basename
+	# rather than assume by forcing either -D_GNU_SOURCE or <libgen.h>
+	econf ac_cv_func_basename=no #870838
 }
 
 src_install() {
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
index aee358e6704d..f556b203f1e5 100644
--- a/net-misc/netkit-bootparamd/Manifest
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -3,5 +3,5 @@ AUX 0.17-libtirpc.patch 455 BLAKE2B 2adcdb678d54f486dc4c2b4efa37851c334331d95293
 AUX bootparamd.confd 29 BLAKE2B a2697cebfe9e2c7a9617b2624b70d0615b4ad920d034dbd0f5a5dc66a8183e802747015befa07e9a310c5618dba770c263307c157fd6f6402ebaa570c9fd4a79 SHA512 4f2e6cfef21053bc3a37fada11e77338de57a9e034963c9e91bdc8d6829df29e6b5d69eda3531e67ea3c03599f22da28bb3f7f64a282cc6a2e63927236c1765e
 AUX bootparamd.initd 502 BLAKE2B ebc4d4c3381c1003924c402415aea4ad820e24f38520b4f0bc41643dc3f24642e8010907ae1451f7286607ab387d256e9e74f43ca53c5f3677e876956d0a686f SHA512 9326e3a3dfca43cd7233a289b1f58c22db22aabc2136cba2d61a4bdab17652f9d031e4eddc877126aa09e08e048e63ba9fcf4219f9dbbf55d6787e03d5ee2548
 DIST netkit-bootparamd_0.17.orig.tar.gz 13934 BLAKE2B d828175594b0aae60c5284d4f02c73b4bb91cee2601dc52c6cbfb21e02779825a03567de7dbcc945246104889b7b4bc74f0429b508bda082a365a1d605e213e5 SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca
-EBUILD netkit-bootparamd-0.17-r4.ebuild 1455 BLAKE2B 8f37551bf585a8eb851ff177548536e6c655c88b962bb61a700461a3e81abcd913dc74a88ce8d5d7429fea7a73953b4c9150e74ecffe834a82970c73711cf9a3 SHA512 342611e76ec7cce48dfcef1d0c309774eb49c9af25dc78573c7e500247510767d8f5fc5a139961e2e60e37205bbefed8f8c1b961b1c37abdab96cb0e5f9f3c8b
+EBUILD netkit-bootparamd-0.17-r4.ebuild 1454 BLAKE2B cb36308c62f7fe7186037150233352d2a780c52b13d94df3bdd4ae1ea016f3e6742c14899fb8b51b654eb3b94c703ec27121c42c625ef722202481396b6e617a SHA512 a48c201c0aa38f861ed0e5677a404814d5ebdb3c17079763d335e75fcc7c47a770f93d8567ff1a5f161a27a2d09d946e8de0dc533eb1030ff16372ff4013d9b9
 MISC metadata.xml 268 BLAKE2B 91c62a36cbf68e44d577a77084141c8505ad6f4f4d0455c4e68aa99e758518505c09161acc56f77de536d94e05b22ed8f6eff2f61d4a1744e1e752d24ba785f1 SHA512 e08f7d0f198f125c9a66e8503eab99802b27d5bd5c2cfd99c03d9acc3bcc67e404c44945dd4271fed3257b123492ead2492cbce645dbf383ffc0b684a5050bb1
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
index 1211f35aa210..3ecbe4ece85c 100644
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Netkit - bootparamd"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
 SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="BSD GPL-2"
diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest
index eaaa6bff6880..e822d98af01a 100644
--- a/net-misc/netkit-bootpd/Manifest
+++ b/net-misc/netkit-bootpd/Manifest
@@ -1,4 +1,4 @@
 AUX netkit-bootpd-2.4.patch 19727 BLAKE2B a28eacff207bb59a4975830b8bbf5ba11a98d739ac3a5b172bc96beeb557eb231474f009744f2136c208c042e24eeaca82e57be40511774252fc7440327c3b00 SHA512 251fb2652c808bbfc18d4d1cdbe746aa3f52f09a53e3c09de426ab94ea6b016d6861e88f45f2cb0740fb5be3a76b6156a772f27d17221eb9f792ab3454c3282d
 DIST bootpd-2.4.tar.gz 99765 BLAKE2B ce435b562433e6cf2cc1ef0fe51b17d7d4b62c347749c6cff98af82f4af8934e23f19fa8f278e34497aea31b75b437a7bc3d59608454ac8eb42f0fd4c76da042 SHA512 aaed30b724c660973e2efac8c18ead48caf1e8e5e35d4af6c6476080c32f8ce8c8722fd1c18d864e557301d37615cbb313e2ab0140da8963fbd23d5000e60379
-EBUILD netkit-bootpd-2.4-r1.ebuild 734 BLAKE2B d5260b0cf7d0837b735df9b12f500fdbc769990e6b6afd6fe3fa310b5843da5fa994147eb91fe5a606a0558b5a2d7a09c6e34ccf71f0f1cf6f9a54a299ef23ac SHA512 2cb42cadb332d6154afd88108626945b39c1775b7cae51e9f95ada57806853675935b1368f6080dec5a68eda0d90d4d8f7790d612c2e15ca8368e4e1522ceb18
+EBUILD netkit-bootpd-2.4-r1.ebuild 733 BLAKE2B f82bf5f7c1a5810b584a26973a810c14ddc9dd7bfb176d6e8d27e712e572d9fbacc66726c2dbdc84ca124ecb7bb246ac1fad277fdd0b97629c39630142792cad SHA512 08c4bb7eb8dddb963474d64c7945f738f8b122d253f7d574186bc6c81ce7b984b4050fd716028776b043635020a7db7f82c8e58fb20905a0275ad36ce1c8d774
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
index cb70f0e56efd..9cee1a5627b7 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit toolchain-funcs
 MY_P=${P/netkit-}
 
 DESCRIPTION="Netkit - bootp"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/${MY_P}.tar.gz"
+HOMEPAGE="http://ftp.linux.org.uk/pub/linux/Networking/netboot/"
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netboot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index ba2f20a74266..4281d0f17e87 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -3,5 +3,5 @@ AUX netkit-telnetd-0.17-r13-gentooification.patch 880 BLAKE2B 2727806eb103efa78d
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
-EBUILD netkit-telnetd-0.17-r13.ebuild 1771 BLAKE2B bca2a62c19be5fdd448ae7d0d43f3cc54f0474f3cea409968450c718a4184e1a774ba48342bed1ea56ddfbe652aa22c96bf29a61a6a5d602191bcd6f1bccb851 SHA512 77ddc3534bcf398be752f304bae1a52dab22f37154a0dba6ca363084ae6678f54bda627d0c9ca99a70c107edb28526c1f696aaa6befc7b6a8f15a8429c48383c
+EBUILD netkit-telnetd-0.17-r13.ebuild 1594 BLAKE2B c59ad22438c1d5583187aa0920c1b3f682ca3a64fa591e737823da78e737f1d0ad11eaa9d2363a6a7d28a7df922284674a1303777022f4e3a3f8e2e0d2cf05fa SHA512 0c5ed8f45a6ceafe03ac6d26ad1bdc465042c40e7cfd2804ead9398e652783b11b6cba239e685875b35d231ba1d0d064dc998450af1b80865ad20a0f043025ec
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
index d7586da721f5..5859b09f298b 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -7,14 +7,10 @@ inherit cmake
 
 PATCHLEVEL=42
 DESCRIPTION="Standard Linux telnet client and server"
-#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-# This might be the best HOMEPAGE now?
-HOMEPAGE="https://launchpad.net/netkit-telnet"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
 # http://packages.debian.org/stablesource/netkit-telnet
 # http://packages.debian.org/testing/source/netkit-telnet
-# No upstream mirror exists anymore?
-# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
-SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
 	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz"
 
 LICENSE="BSD"