gentoo auto-resync : 14:11:2023 - 04:26:45

11 files changed, 718 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1552fd151d02..6e3d01352cb5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 0d8f48522f5f..8a8b6469f1fc 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,9 @@
+AUX 10.0.5/0001-control-fix-hangup-non-privsep-builds.patch 688 BLAKE2B 16983efd39db7bce4cf0680a37e0b19e6a2983af0add1951d03c1440f42b1885bf4e1639d5c7fc17ce42fe6e26af7d0a5a1e2f6053800fdf6459adf67f78bd5e SHA512 555804f1c0b7e5ad6dd95315a57ed77ef6c162bbeb80e7d7fc9d70c9b71e3b2e619e4ceace3018d5745fe28d49967d71bd346eb69703936237ebb031b23a9384
+AUX 10.0.5/0002-dhcpcd-detach-from-launcher.patch 2431 BLAKE2B d55f402f4820b7d853f6380b2b7bd8e053a61090f4832be525ed05a69e60c2761353b5e42cadcb14056da33cac01bc7df05328d46ec4df11ca2cff8e80895f69 SHA512 9941bb9f8f34a49e904664a3ed0952447ad9accf81db5d5c3290704defd71cbd4d19742c4b92e14ba63accafd06b2947de01b7730ef6ac2e73b92584dda512f4
+AUX 10.0.5/0003-control-abort-control-recv-path-hangup.patch 2592 BLAKE2B 48321916c9bbca4f8db7e54f005626dedb2e54fd78eeb8fd9b0251766feb652b2bfd39c2453c62158f8b7cafbc1343524d63526ff1ba6f5cc0d60204f5fef538 SHA512 6bbdda6979cf16e7471875372dae5f7f13382ff604b3e83d93857787b646f9ed5891d1a8f5462d8055681fec4eb97dae67540f48d3f31a64335c2570eab35dda
+AUX 10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch 8772 BLAKE2B ec0c000fe60582dc9d7f2b7d2686dd84eb740d92bd44d1da3af4bca67b0db3f0dd548f4b8a1f3ad5dd4413276267084e7d0da1c181b7fda39dd667e3cd3df2c5 SHA512 e76e37c08a854d4d99bfcbb468aa8b9e83a220812c937e32dca5e6ba66d3aa147bc3f3da25d64b8bafdf1fdbf7fc5c9a46ad336a812e0bac65165bf3435e7471
+AUX 10.0.5/0005-fix-privsep-builds-for-prior.patch 589 BLAKE2B 951aa4e4ad7f441c958a4ebe9341616a5041b99cd68f669a6e4bfab6882de7f55a7fafa9a7c75295e77ef38fd823ba44ee8385bc0920e383b515ac7bc89562da SHA512 275337e99543eadeeb8804e1a8f5ec8ccbef9e922a3a25536c3cd69ca0a60cacdda26bbf8103adab46fafd0e2f6e9a6b75dcbec3b6146823ad611b6c9614914c
+AUX 10.0.5/0006-fix-unused-var-warning.patch 1148 BLAKE2B 2f4a800e55aec46d834777649357a0e4137261d0b7ca342d53b08fdfde69ffe7654478978145c6400feb82f9d1a05598319ccb6e5421da94155829512315fcba SHA512 e8a0874f5a216e101a3adb9f56c12b798263a300f13a9b34ff3ce9b6276f43dc50f39d59977f38ea9abcaa24c49753add19add10589fe185f85dde8451820287
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760 SHA512 f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560
@@ -6,6 +12,7 @@ DIST dhcpcd-10.0.5.tar.xz 269696 BLAKE2B 52435e2afa4fa5563b629af3f69b149b87de750
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
 EBUILD dhcpcd-10.0.3.ebuild 4649 BLAKE2B e00e857c44168096c3530004d32bb62250681d686b17954b46bd6993f32ca963d4369ae79ee9d15afc90c53b9e1d7c3f71b2a819278c44e12b59d1cb08a8affb SHA512 3596770f90d6b49b1c677538cbe1b34b482a886a322050f664d90ec6851b839b3294a57144d8e7c1f93530db3e4120b95d11ded5c568162c6ac0510ec9dcbfdf
 EBUILD dhcpcd-10.0.4.ebuild 4657 BLAKE2B d4ff3321b12fef8beb4242a119134c77e073bf380e65b61e632fb271844fce0a3dd693977c2f5798adadbb78c6c8c0cd1743f44214fec51f3908e033f7926cab SHA512 b279bd58bcf9ddd41c208354a62a53b75f8a95d5978db85d4ef03a09bd9b2e98261a7b16cb37883df8536ff05c2a205a8459dcce7f8fe82dc148c539b2cd1093
+EBUILD dhcpcd-10.0.5-r1.ebuild 4692 BLAKE2B c7ea56981f3ba29f780b5ad543eba1ca1a2caaef8d90106ef5795f46619642bd4e4d6c00b75e3d68f5c92aa0dfc1659a4cf4d49625a88e11450c4faab4773d2d SHA512 4a68986c67c021ef96d1f0b928265b5fd7fc2cb44beead5f8e3adfbeab677dbdbae64e69a1a259358647a425a56b57124e05f41e89c3e9563c3c1730fb360cf9
 EBUILD dhcpcd-10.0.5.ebuild 4657 BLAKE2B d4ff3321b12fef8beb4242a119134c77e073bf380e65b61e632fb271844fce0a3dd693977c2f5798adadbb78c6c8c0cd1743f44214fec51f3908e033f7926cab SHA512 b279bd58bcf9ddd41c208354a62a53b75f8a95d5978db85d4ef03a09bd9b2e98261a7b16cb37883df8536ff05c2a205a8459dcce7f8fe82dc148c539b2cd1093
 EBUILD dhcpcd-9.5.1.ebuild 4610 BLAKE2B e74ed2bcac66ce60354b6a1d5fe606b91c87057db2e23dd31fd1035aa5ab05042053c62d04b406c5ff9c1b96a2e196a60a8df699c7755319ca50a58f627e684e SHA512 88976827203f49c28d45cb0dfd65b1f71e881e53c617e3cc131f6886197cfcc50dfaa6d0d1a2e6e678e12f9964aa50f70d102475bcbcc9431e6d5f4c98c5120b
 EBUILD dhcpcd-9999.ebuild 4657 BLAKE2B d4ff3321b12fef8beb4242a119134c77e073bf380e65b61e632fb271844fce0a3dd693977c2f5798adadbb78c6c8c0cd1743f44214fec51f3908e033f7926cab SHA512 b279bd58bcf9ddd41c208354a62a53b75f8a95d5978db85d4ef03a09bd9b2e98261a7b16cb37883df8536ff05c2a205a8459dcce7f8fe82dc148c539b2cd1093
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild
new file mode 100644
index 000000000000..437899bb6d47
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2 BSD ISC MIT"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="udev? ( virtual/udev )"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/10.0.5
+)
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch b/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch
new file mode 100644
index 000000000000..632cf402fc94
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch
@@ -0,0 +1,23 @@
+https://github.com/NetworkConfiguration/dhcpcd/issues/262
+https://github.com/NetworkConfiguration/dhcpcd/commit/584b52db330a96471ff9301b85ce47ebb065a8a4
+
+From 584b52db330a96471ff9301b85ce47ebb065a8a4 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 12 Nov 2023 11:30:01 +0000
+Subject: [PATCH] control: Fix hangup for non privsep builds
+
+Fix related to #262.
+--- a/src/control.c
++++ b/src/control.c
+@@ -113,8 +113,9 @@ control_handle_read(struct fd_list *fd)
+ 	ssize_t bytes;
+ 
+ 	bytes = read(fd->fd, buffer, sizeof(buffer) - 1);
+-	if (bytes == -1) {
++	if (bytes == -1)
+ 		logerr(__func__);
++	if (bytes == -1 || bytes == 0) {
+ 		control_hangup(fd);
+ 		return;
+ 	}
+
diff --git a/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch b/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch
new file mode 100644
index 000000000000..44de6a83f843
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch
@@ -0,0 +1,69 @@
+https://github.com/NetworkConfiguration/dhcpcd/issues/262
+https://github.com/NetworkConfiguration/dhcpcd/commit/21d020b00e60e71b1300d89815f914145d7372f6
+
+From 21d020b00e60e71b1300d89815f914145d7372f6 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Sun, 12 Nov 2023 12:16:53 +0000
+Subject: [PATCH] dhcpcd: Detach from launcher before stopping root process
+
+This fixes non privsep builds where the launcher reports dhcpcd
+hungup. Unsure why this happens, but it should not be a problem.
+
+While here, shutdown has no effect on non STREAM sockets and
+remove the silly error logging in fork_cb that we read an
+error. We already printed the error so this makes no sense.
+
+Hopefully fixes #262.
+--- a/src/dhcpcd.c
++++ b/src/dhcpcd.c
+@@ -395,7 +395,6 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
+ 		logerr("write");
+ 	ctx->options |= DHCPCD_DAEMONISED;
+ 	// dhcpcd_fork_cb will close the socket
+-	shutdown(ctx->fork_fd, SHUT_RDWR);
+ #endif
+ }
+ 
+@@ -1877,8 +1876,6 @@ dhcpcd_fork_cb(void *arg, unsigned short events)
+ 	if (ctx->options & DHCPCD_FORKED) {
+ 		if (exit_code == EXIT_SUCCESS)
+ 			logdebugx("forked to background");
+-		else
+-			logerrx("exited with code %d", exit_code);
+ 		eloop_exit(ctx->eloop, exit_code);
+ 	} else
+ 		dhcpcd_signal_cb(exit_code, ctx);
+@@ -2738,8 +2735,19 @@ main(int argc, char **argv, char **envp)
+ 	if (ps_stopwait(&ctx) != EXIT_SUCCESS)
+ 		i = EXIT_FAILURE;
+ #endif
+-	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED))
++	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) {
+ 		loginfox(PACKAGE " exited");
++#ifdef USE_SIGNALS
++		/* Detach from the launch process.
++		 * This *should* happen after we stop the root process,
++		 * but for some reason non privsep builds get a zero length
++		 * read in dhcpcd_fork_cb(). */
++		if (ctx.fork_fd != -1) {
++			if (write(ctx.fork_fd, &i, sizeof(i)) == -1)
++				logerr("%s: write", __func__);
++		}
++#endif
++	}
+ #ifdef PRIVSEP
+ 	if (ps_root_stop(&ctx) == -1)
+ 		i = EXIT_FAILURE;
+@@ -2753,12 +2761,6 @@ main(int argc, char **argv, char **envp)
+ 	setproctitle_fini();
+ #endif
+ #ifdef USE_SIGNALS
+-	if (ctx.options & DHCPCD_STARTED) {
+-		/* Try to detach from the launch process. */
+-		if (ctx.fork_fd != -1 &&
+-		    write(ctx.fork_fd, &i, sizeof(i)) == -1)
+-			logerr("%s: write", __func__);
+-	}
+ 	if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP))
+ 		_exit(i); /* so atexit won't remove our pidfile */
+ #endif
diff --git a/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch b/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch
new file mode 100644
index 000000000000..de4ee353ccf3
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch
@@ -0,0 +1,105 @@
+https://github.com/NetworkConfiguration/dhcpcd/issues/262
+https://github.com/NetworkConfiguration/dhcpcd/commit/3b4c71859c45b9405f96a5ee8fce04bd3014b2d0
+
+From 3b4c71859c45b9405f96a5ee8fce04bd3014b2d0 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 13 Nov 2023 10:24:15 +0000
+Subject: [PATCH] control: Abort control recv path on hangup
+
+This fixes a crash when we try and re-use it in another function.
+--- a/src/control.c
++++ b/src/control.c
+@@ -106,7 +106,7 @@ control_hangup(struct fd_list *fd)
+ 	control_free(fd);
+ }
+ 
+-static void
++static int
+ control_handle_read(struct fd_list *fd)
+ {
+ 	char buffer[1024];
+@@ -117,7 +117,7 @@ control_handle_read(struct fd_list *fd)
+ 		logerr(__func__);
+ 	if (bytes == -1 || bytes == 0) {
+ 		control_hangup(fd);
+-		return;
++		return -1;
+ 	}
+ 
+ #ifdef PRIVSEP
+@@ -129,21 +129,23 @@ control_handle_read(struct fd_list *fd)
+ 		fd->flags &= ~FD_SENDLEN;
+ 		if (err == -1) {
+ 			logerr(__func__);
+-			return;
++			return 0;
+ 		}
+ 		if (err == 1 &&
+ 		    ps_ctl_sendargs(fd, buffer, (size_t)bytes) == -1) {
+ 			logerr(__func__);
+ 			control_free(fd);
++			return -1;
+ 		}
+-		return;
++		return 0;
+ 	}
+ #endif
+ 
+ 	control_recvdata(fd, buffer, (size_t)bytes);
++	return 0;
+ }
+ 
+-static void
++static int
+ control_handle_write(struct fd_list *fd)
+ {
+ 	struct iovec iov[2];
+@@ -170,7 +172,7 @@ control_handle_write(struct fd_list *fd)
+ 			logerr("%s: write", __func__);
+ 		}
+ 		control_hangup(fd);
+-		return;
++		return -1;
+ 	}
+ 
+ 	TAILQ_REMOVE(&fd->queue, data, next);
+@@ -183,7 +185,7 @@ control_handle_write(struct fd_list *fd)
+ #endif
+ 
+ 	if (TAILQ_FIRST(&fd->queue) != NULL)
+-		return;
++		return 0;
+ 
+ #ifdef PRIVSEP
+ 	if (IN_PRIVSEP_SE(fd->ctx) && !(fd->flags & FD_LISTEN)) {
+@@ -196,9 +198,9 @@ control_handle_write(struct fd_list *fd)
+ 	if (eloop_event_add(fd->ctx->eloop, fd->fd, ELE_READ,
+ 	    control_handle_data, fd) == -1)
+ 		logerr("%s: eloop_event_add", __func__);
++	return 0;
+ }
+ 
+-
+ static void
+ control_handle_data(void *arg, unsigned short events)
+ {
+@@ -207,10 +209,14 @@ control_handle_data(void *arg, unsigned short events)
+ 	if (!(events & (ELE_READ | ELE_WRITE | ELE_HANGUP)))
+ 		logerrx("%s: unexpected event 0x%04x", __func__, events);
+ 
+-	if (events & ELE_WRITE && !(events & ELE_HANGUP))
+-		control_handle_write(fd);
+-	if (events & ELE_READ)
+-		control_handle_read(fd);
++	if (events & ELE_WRITE && !(events & ELE_HANGUP)) {
++		if (control_handle_write(fd) == -1)
++			return;
++	}
++	if (events & ELE_READ) {
++		if (control_handle_read(fd) == -1)
++			return;
++	}
+ 	if (events & ELE_HANGUP)
+ 		control_hangup(fd);
+ }
+
diff --git a/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch b/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch
new file mode 100644
index 000000000000..331f60e739a1
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch
@@ -0,0 +1,286 @@
+https://github.com/NetworkConfiguration/dhcpcd/issues/262
+https://github.com/NetworkConfiguration/dhcpcd/commit/ea53344a2430736124bf9fa62acb0d3107acd58f
+
+From ea53344a2430736124bf9fa62acb0d3107acd58f Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 13 Nov 2023 10:29:58 +0000
+Subject: [PATCH] dhcpcd: Remove stdio callback and detach on daemonise
+
+For some reason, the stdio callback is extremely flaky on
+*some* Linux based distributions making it very hard to debug some
+things.
+Removing it is fine because we now enforce that we have file descriptors
+for stdin, stdout and stdrr on launch and dup them to /dev/null on daemonise.
+
+It's also interesting to see behavioural differences between
+some socketpair implementations that emit a HANGUP and some don't.
+
+As such, we now close the fork socket on daemonise once more AND
+in the fork_cb depending on if we hangup or read zero first.
+
+Fixes #262
+--- a/src/dhcpcd.c
++++ b/src/dhcpcd.c
+@@ -364,7 +364,7 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
+ 	errno = ENOSYS;
+ 	return;
+ #else
+-	int i;
++	int exit_code;
+ 
+ 	if (ctx->options & DHCPCD_DAEMONISE &&
+ 	    !(ctx->options & (DHCPCD_DAEMONISED | DHCPCD_NOWAITIP)))
+@@ -385,16 +385,19 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
+ 		return;
+ 
+ #ifdef PRIVSEP
+-	ps_daemonised(ctx);
++	if (IN_PRIVSEP(ctx))
++		ps_daemonised(ctx);
++	else
+ #else
+-	dhcpcd_daemonised(ctx);
++		dhcpcd_daemonised(ctx);
+ #endif
+ 
+-	i = EXIT_SUCCESS;
+-	if (write(ctx->fork_fd, &i, sizeof(i)) == -1)
+-		logerr("write");
+-	ctx->options |= DHCPCD_DAEMONISED;
+-	// dhcpcd_fork_cb will close the socket
++	eloop_event_delete(ctx->eloop, ctx->fork_fd);
++	exit_code = EXIT_SUCCESS;
++	if (write(ctx->fork_fd, &exit_code, sizeof(exit_code)) == -1)
++		logerr(__func__);
++	close(ctx->fork_fd);
++	ctx->fork_fd = -1;
+ #endif
+ }
+ 
+@@ -1814,30 +1817,6 @@ dhcpcd_readdump(struct dhcpcd_ctx *ctx)
+ 	    dhcpcd_readdump0, ctx);
+ }
+ 
+-static void
+-dhcpcd_stderr_cb(void *arg, unsigned short events)
+-{
+-	struct dhcpcd_ctx *ctx = arg;
+-	char log[BUFSIZ];
+-	ssize_t len;
+-
+-	if (events & ELE_HANGUP)
+-		eloop_exit(ctx->eloop, EXIT_SUCCESS);
+-
+-	if (!(events & ELE_READ))
+-		return;
+-
+-	len = read(ctx->stderr_fd, log, sizeof(log) - 1);
+-	if (len == -1) {
+-		if (errno != ECONNRESET)
+-			logerr(__func__);
+-		return;
+-	}
+-
+-	log[len] = '\0';
+-	fprintf(stderr, "%s", log);
+-}
+-
+ static void
+ dhcpcd_fork_cb(void *arg, unsigned short events)
+ {
+@@ -1928,7 +1907,7 @@ main(int argc, char **argv, char **envp)
+ 	ssize_t len;
+ #if defined(USE_SIGNALS) || !defined(THERE_IS_NO_FORK)
+ 	pid_t pid;
+-	int fork_fd[2], stderr_fd[2];
++	int fork_fd[2];
+ #endif
+ #ifdef USE_SIGNALS
+ 	int sig = 0;
+@@ -2013,22 +1992,17 @@ main(int argc, char **argv, char **envp)
+ 	TAILQ_INIT(&ctx.ps_processes);
+ #endif
+ 
+-	/* Check our streams for validity */
+-	ctx.stdin_valid =  fcntl(STDIN_FILENO,  F_GETFD) != -1;
+-	ctx.stdout_valid = fcntl(STDOUT_FILENO, F_GETFD) != -1;
+-	ctx.stderr_valid = fcntl(STDERR_FILENO, F_GETFD) != -1;
++	logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID;
+ 
+-	/* Even we if we don't have input/outputs, we need to
+-	 * ensure they are setup for shells. */
+-	if (!ctx.stdin_valid)
++	/* Ensure we have stdin, stdout and stderr file descriptors.
++	 * This is important as we do run scripts which expect these. */
++	if (fcntl(STDIN_FILENO,  F_GETFD) == -1)
+ 		dup_null(STDIN_FILENO);
+-	if (!ctx.stdout_valid)
++	if (fcntl(STDOUT_FILENO,  F_GETFD) == -1)
+ 		dup_null(STDOUT_FILENO);
+-	if (!ctx.stderr_valid)
++	if (fcntl(STDERR_FILENO,  F_GETFD) == -1)
+ 		dup_null(STDERR_FILENO);
+-
+-	logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID;
+-	if (ctx.stderr_valid)
++	else
+ 		logopts |= LOGERR_ERR;
+ 
+ 	i = 0;
+@@ -2398,17 +2372,13 @@ main(int argc, char **argv, char **envp)
+ 	loginfox(PACKAGE "-" VERSION " starting");
+ 
+ 	// We don't need stdin past this point
+-	if (ctx.stdin_valid)
+-		dup_null(STDIN_FILENO);
++	dup_null(STDIN_FILENO);
+ 
+ #if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK)
+ 	if (!(ctx.options & DHCPCD_DAEMONISE))
+ 		goto start_manager;
+ 
+-	if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1 ||
+-	    (ctx.stderr_valid &&
+-	    xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, stderr_fd) == -1))
+-	{
++	if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1) {
+ 		logerr("socketpair");
+ 		goto exit_failure;
+ 	}
+@@ -2429,22 +2399,6 @@ main(int argc, char **argv, char **envp)
+ 		    dhcpcd_fork_cb, &ctx) == -1)
+ 			logerr("%s: eloop_event_add", __func__);
+ 
+-		/*
+-		 * Redirect stderr to the stderr socketpair.
+-		 * Redirect stdout as well.
+-		 * dhcpcd doesn't output via stdout, but something in
+-		 * a called script might.
+-		 */
+-		if (ctx.stderr_valid) {
+-			if (dup2(stderr_fd[1], STDERR_FILENO) == -1 ||
+-			    (ctx.stdout_valid &&
+-			    dup2(stderr_fd[1], STDOUT_FILENO) == -1))
+-				logerr("dup2");
+-			close(stderr_fd[0]);
+-			close(stderr_fd[1]);
+-		} else if (ctx.stdout_valid)
+-			dup_null(STDOUT_FILENO);
+-
+ 		if (setsid() == -1) {
+ 			logerr("%s: setsid", __func__);
+ 			goto exit_failure;
+@@ -2478,19 +2432,6 @@ main(int argc, char **argv, char **envp)
+ 		    dhcpcd_fork_cb, &ctx) == -1)
+ 			logerr("%s: eloop_event_add", __func__);
+ 
+-		if (ctx.stderr_valid) {
+-			ctx.stderr_fd = stderr_fd[0];
+-			close(stderr_fd[1]);
+-#ifdef PRIVSEP_RIGHTS
+-			if (ps_rights_limit_fd(ctx.stderr_fd) == 1) {
+-				logerr("ps_rights_limit_fd");
+-				goto exit_failure;
+-			}
+-#endif
+-			if (eloop_event_add(ctx.eloop, ctx.stderr_fd, ELE_READ,
+-			    dhcpcd_stderr_cb, &ctx) == -1)
+-				logerr("%s: eloop_event_add", __func__);
+-		}
+ #ifdef PRIVSEP
+ 		if (IN_PRIVSEP(&ctx) && ps_managersandbox(&ctx, NULL) == -1)
+ 			goto exit_failure;
+@@ -2602,6 +2543,7 @@ main(int argc, char **argv, char **envp)
+ 		if (ifp->active == IF_ACTIVE_USER)
+ 			break;
+ 	}
++
+ 	if (ifp == NULL) {
+ 		if (ctx.ifc == 0) {
+ 			int loglevel;
+@@ -2735,24 +2677,22 @@ main(int argc, char **argv, char **envp)
+ 	if (ps_stopwait(&ctx) != EXIT_SUCCESS)
+ 		i = EXIT_FAILURE;
+ #endif
+-	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) {
++	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED))
+ 		loginfox(PACKAGE " exited");
+-#ifdef USE_SIGNALS
+-		/* Detach from the launch process.
+-		 * This *should* happen after we stop the root process,
+-		 * but for some reason non privsep builds get a zero length
+-		 * read in dhcpcd_fork_cb(). */
+-		if (ctx.fork_fd != -1) {
+-			if (write(ctx.fork_fd, &i, sizeof(i)) == -1)
+-				logerr("%s: write", __func__);
+-		}
+-#endif
+-	}
+ #ifdef PRIVSEP
+ 	if (ps_root_stop(&ctx) == -1)
+ 		i = EXIT_FAILURE;
+ 	eloop_free(ctx.ps_eloop);
+ #endif
++
++#ifdef USE_SIGNALS
++	/* If still attached, detach from the launcher */
++	if (ctx.options & DHCPCD_STARTED && ctx.fork_fd != -1) {
++		if (write(ctx.fork_fd, &i, sizeof(i)) == -1)
++			logerr("%s: write", __func__);
++	}
++#endif
++
+ 	eloop_free(ctx.eloop);
+ 	logclose();
+ 	free(ctx.logfile);
+@@ -2760,6 +2700,7 @@ main(int argc, char **argv, char **envp)
+ #ifdef SETPROCTITLE_H
+ 	setproctitle_fini();
+ #endif
++
+ #ifdef USE_SIGNALS
+ 	if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP))
+ 		_exit(i); /* so atexit won't remove our pidfile */
+--- a/src/dhcpcd.h
++++ b/src/dhcpcd.h
+@@ -116,10 +116,6 @@ struct passwd;
+ struct dhcpcd_ctx {
+ 	char pidfile[sizeof(PIDFILE) + IF_NAMESIZE + 1];
+ 	char vendor[256];
+-	bool stdin_valid;	/* It's possible stdin, stdout and stderr */
+-	bool stdout_valid;	/* could be closed when dhcpcd starts. */
+-	bool stderr_valid;
+-	int stderr_fd;	/* FD for logging to stderr */
+ 	int fork_fd;	/* FD for the fork init signal pipe */
+ 	const char *cffile;
+ 	unsigned long long options;
+--- a/src/privsep.c
++++ b/src/privsep.c
+@@ -172,8 +172,7 @@ ps_dropprivs(struct dhcpcd_ctx *ctx)
+ 	 * Obviously this won't work if we are using a logfile
+ 	 * or redirecting stderr to a file. */
+ 	if ((ctx->options & DHC_NOCHKIO) == DHC_NOCHKIO ||
+-	    (ctx->logfile == NULL &&
+-	    (!ctx->stderr_valid || isatty(STDERR_FILENO) == 1)))
++	    (ctx->logfile == NULL && isatty(STDERR_FILENO) == 1))
+ 	{
+ 		if (setrlimit(RLIMIT_FSIZE, &rzero) == -1)
+ 			logerr("setrlimit RLIMIT_FSIZE");
+@@ -305,14 +304,11 @@ ps_rights_limit_stdio(struct dhcpcd_ctx *ctx)
+ 	const int iebadf = CAPH_IGNORE_EBADF;
+ 	int error = 0;
+ 
+-	if (ctx->stdin_valid &&
+-	    caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1)
++	if (caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1)
+ 		error = -1;
+-	if (ctx->stdout_valid &&
+-	    caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1)
++	if (caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1)
+ 		error = -1;
+-	if (ctx->stderr_valid &&
+-	    caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1)
++	if (caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1)
+ 		error = -1;
+ 
+ 	return error;
diff --git a/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch b/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch
new file mode 100644
index 000000000000..bafabfcb0275
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch
@@ -0,0 +1,20 @@
+https://github.com/NetworkConfiguration/dhcpcd/commit/8d12632c670f02d8a685e80c8abad7049d3dd18f
+
+From 8d12632c670f02d8a685e80c8abad7049d3dd18f Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 13 Nov 2023 15:54:50 +0000
+Subject: [PATCH] Fix privsep builds for prior.
+
+--- a/src/dhcpcd.c
++++ b/src/dhcpcd.c
+@@ -388,9 +388,8 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx)
+ 	if (IN_PRIVSEP(ctx))
+ 		ps_daemonised(ctx);
+ 	else
+-#else
+-		dhcpcd_daemonised(ctx);
+ #endif
++		dhcpcd_daemonised(ctx);
+ 
+ 	eloop_event_delete(ctx->eloop, ctx->fork_fd);
+ 	exit_code = EXIT_SUCCESS;
diff --git a/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch b/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch
new file mode 100644
index 000000000000..9672dc5b9570
--- /dev/null
+++ b/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch
@@ -0,0 +1,37 @@
+https://github.com/NetworkConfiguration/dhcpcd/commit/6788608eb0fcd32fd23974100cdd42d3174cb8d1
+
+From 6788608eb0fcd32fd23974100cdd42d3174cb8d1 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Mon, 13 Nov 2023 16:05:04 +0000
+Subject: [PATCH] Fix an unused var warning for capsicum for prior
+
+--- a/src/privsep.c
++++ b/src/privsep.c
+@@ -299,7 +299,7 @@ ps_rights_limit_fdpair(int fd[])
+ }
+ 
+ static int
+-ps_rights_limit_stdio(struct dhcpcd_ctx *ctx)
++ps_rights_limit_stdio()
+ {
+ 	const int iebadf = CAPH_IGNORE_EBADF;
+ 	int error = 0;
+@@ -452,7 +452,7 @@ ps_startprocess(struct ps_process *psp,
+ 			ctx->ps_log_root_fd = -1;
+ 		}
+ #ifdef PRIVSEP_RIGHTS
+-		if (ps_rights_limit_stdio(ctx) == -1) {
++		if (ps_rights_limit_stdio() == -1) {
+ 			logerr("ps_rights_limit_stdio");
+ 			goto errexit;
+ 		}
+@@ -666,7 +666,7 @@ ps_managersandbox(struct dhcpcd_ctx *ctx, const char *_pledge)
+ #ifdef PRIVSEP_RIGHTS
+ 	if ((ctx->pf_inet_fd != -1 &&
+ 	    ps_rights_limit_ioctl(ctx->pf_inet_fd) == -1) ||
+-	     ps_rights_limit_stdio(ctx) == -1)
++	     ps_rights_limit_stdio() == -1)
+ 	{
+ 		logerr("%s: cap_rights_limit", __func__);
+ 		return -1;
+
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index bd19502ed8b9..b239ff84b2aa 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -293,4 +293,4 @@ DIST zerotier-1.12.2.tar.gz 12431815 BLAKE2B c67889ce1f2479553382f43d58163168606
 EBUILD zerotier-1.10.1.ebuild 1343 BLAKE2B 0547025346e58df3cd0a3991ae7e10d38d4be889815a00f15955d6dad7b5c646b24255558893752b9d253526797bc35ed3b8eff047e022a63428ffdc61ab06de SHA512 62eb9da4d3ada5f379f380d86b4db4e8bbfadb10727655fdd78b77e12eabd118d1ab0f55fd410af992387019d6aa9ae179a20ea0895bfd40e887c660bcbacf61
 EBUILD zerotier-1.10.6.ebuild 5899 BLAKE2B d0f79bfca0ddc4f68bfb5758349cd3d6acc9bae3f7435c46ec347f19c65fe26d68e776015a12f4ab935652a928d9443d6ac824401f70689ba5999e9859161c8e SHA512 570850268019bcf85af37766eb0657ec83e1e10a35331f759cc1828e410478fd4ca7beb1f804247b8aa3989f8f34f09b657b076baf3f3602abb136df7773066f
 EBUILD zerotier-1.12.2.ebuild 5775 BLAKE2B 4e126418d217269b7e7ae3db35349fe2c79943f8b9c3a4ef61b65a29ce98aae08a502974b235a7b89ff9f76a7a2f2f2865598e35c91cbadce2c2a77101fd9370 SHA512 0e6f25efb2d1a9f48e180237daf1306882f09dee2237cf775474519e064844d0470702939f0a4679b20f53518c34660a581be833b6a794ee81e8dddd32e309a6
-MISC metadata.xml 437 BLAKE2B fea864d7223156676a2a4fb5e08358e629d8d90bac85ea5ebd3ab7dddaecfab06506434b4babd652822a68a31e8213b927367c1ccdd5a482836b56ea928c753d SHA512 1c1b68c5a45910769dd273c1edf826c00762b0a6557126867d9a971eb95545de80b66a62d200265e38f06fb7ffbed1f17f2da2f785984df4526064ed479c2714
+MISC metadata.xml 785 BLAKE2B df628a201bf07f63d4951eded084571d79eb3e0ecf8c23e3cec482a77ae797684283b78eaa151ccdc0f0b81acb271ffc8ad6efcfe001d90638c225cd4d6b3f24 SHA512 7837455eaa97ec60aadd97d4c68a4036c08f8acf178be8ede544faeac3e015c20bacd52c78d50a377b63df86003f160530e0b6ff60a825083f5d953edae987b8
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index e4e359db5b2a..8d51524c8d3c 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>parona@protonmail.com</email>
+		<name>Alfred Wingate</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<changelog>https://github.com/zerotier/ZeroTierOne/raw/master/RELEASE-NOTES.md</changelog>
 		<remote-id type="github">zerotier/ZeroTierOne</remote-id>