From 965058196f44550f3bc491dd85064071e085b776 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 13 Feb 2025 00:12:52 +0000
Subject: gentoo auto-resync : 13:02:2025 - 00:12:52

---
 net-misc/Manifest.gz                               | Bin 53650 -> 53654 bytes
 net-misc/dhcpcd/Manifest                           |  13 +-
 net-misc/dhcpcd/dhcpcd-10.0.10.ebuild              | 172 --------------------
 net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild            | 170 --------------------
 net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild            | 178 ---------------------
 net-misc/dhcpcd/dhcpcd-10.0.8.ebuild               | 176 --------------------
 net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild            | 173 ++++++++++++++++++++
 net-misc/dhcpcd/dhcpcd-10.2.0.ebuild               | 172 ++++++++++++++++++++
 net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch    |  46 ------
 .../dhcpcd/files/dhcpcd-10.0.6-rebinding.patch     |  46 ------
 .../files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch   |  28 ++++
 net-misc/smbc/Manifest                             |   4 +-
 net-misc/smbc/files/0001-Fix-signal-handlers.patch | 104 ++++++++++++
 .../smbc/files/0002-Fix-Wformat-security.patch     | 150 +++++++++++++++++
 net-misc/smbc/smbc-1.2.2-r3.ebuild                 |  49 ------
 net-misc/smbc/smbc-1.2.2-r4.ebuild                 |  54 +++++++
 net-misc/zssh/Manifest                             |   2 +-
 net-misc/zssh/zssh-1.5c-r3.ebuild                  |   2 -
 18 files changed, 689 insertions(+), 850 deletions(-)
 delete mode 100644 net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
 delete mode 100644 net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild
 delete mode 100644 net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild
 delete mode 100644 net-misc/dhcpcd/dhcpcd-10.0.8.ebuild
 create mode 100644 net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
 create mode 100644 net-misc/dhcpcd/dhcpcd-10.2.0.ebuild
 delete mode 100644 net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch
 delete mode 100644 net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch
 create mode 100644 net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch
 create mode 100644 net-misc/smbc/files/0001-Fix-signal-handlers.patch
 create mode 100644 net-misc/smbc/files/0002-Fix-Wformat-security.patch
 delete mode 100644 net-misc/smbc/smbc-1.2.2-r3.ebuild
 create mode 100644 net-misc/smbc/smbc-1.2.2-r4.ebuild

(limited to 'net-misc')

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a913b48117a1..ea4818d96349 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 9d75ade232ea..b6e32d13b4ca 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,16 +1,11 @@
-AUX dhcpcd-10.0.6-crash.patch 1598 BLAKE2B 149cd9ab0372ba507505d1d30707e18ef69b7db583211e86bd48c2fabcde62003356735813789d4f021bdc1636291b0469601fbd2be33f79f84ba17147968f84 SHA512 dfe49bb7d872ffc27ece3d59635cc5a81975181065ae0c54576195637266b24653832c05146bf2e6c0e9f772faf1920c09f234d40b0bf57c8eabf50d0a9818ae
 AUX dhcpcd-10.0.6-fix-lib-check.patch 340 BLAKE2B 6e9f881e64676477b100bb65d4962ac4de360a21e938e79c294cd8f8cb837bbe30cdcfa8ca84b3d9558fcf3d5109ba04704c2e4bb269ba2526deed51fec0bf11 SHA512 66ac97580ae066afb4e46b15161a8331140c010764f7932218ce03112bed4bf52e316f58fbb7919c38052ce6ef2a4c36768103aa01f146161cf94169cb8ccacd
-AUX dhcpcd-10.0.6-rebinding.patch 1351 BLAKE2B 5bf20cc11f82082b9aed01279c2071d948cb4308e935289b2ff7022cd146b4e600cd35dfe63d08006311769b1816cbadb0fcfe7cecaecec64d25fc1f0ddc450f SHA512 c657af1001ea7dbfcd3a6c502667cda3eb164ee532e2083976ab5a46cdc4ab0a0812fd828f0bb98dd6bf326ecdaa3ef16f4d545580c59c63f8aad0e893651427
+AUX dhcpcd-10.1.0-seccomp-glibc-2.41.patch 870 BLAKE2B 1ea71a1a5b9d3483139617bea790ad70a989e28256afd2c2a73b0048bbfdefd1f164b548b59caf47269fba5ef6deb379c9ee6d790149a02559b6ea2334992e3b SHA512 acfce6d1966347b1b7797c96d499fe28e3a7e97c1961ab10f3fc7023826af18bcfcef7731e42444b78c5404870b75b9790eac529f346a1a68ae03f3366e91171
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
-DIST dhcpcd-10.0.10.tar.xz 272732 BLAKE2B 2ecf52009f3fd4442863e1927a8d9e777ee6f34ff4d50a6f1e67821fb23fd12221df1e3a0a04ea0874df8feac15785772b4aa75af407f74448e442db36410e30 SHA512 87c836731637c134a95ea91d9a3d5c682e6e7f3340961f2995fc84931ff9b2a4c0073aca872a98738dc76005eb1159c42f1044fb0998891386784df299786349
-DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004
-DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4
 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04
-EBUILD dhcpcd-10.0.10.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
-EBUILD dhcpcd-10.0.6-r2.ebuild 4908 BLAKE2B bc0e0e9861b2be679817a74bd7ff749038dd04f8653d7ca13732602c3184ff9728b1b6efcfb411972e77e425f444cc01b084dc95cc4310e82da32667151e1d36 SHA512 480c9c9c4d74bd0ff52e3efb339d73abb2ba2b2fc8373e6f6f2aa2075d628d6e230b0d707f5bbaf6581b86759bc561c708bf962f1e6a6cfe07f53cf267e5269a
-EBUILD dhcpcd-10.0.6-r3.ebuild 5147 BLAKE2B 9fefbb6c238edf8124d7a015954f6e3aab60870fe91664c705d2df6ee5a8e9694b542cee7fece90927ebbdb50ff249d5cbc6c928eac9938475b36fbc07280ea7 SHA512 8a3b7fb39663b07481239d2de7d4b8d6449e38b7f8024c280c97cdbbf1da59a031c1d23ee24fbc9af37565efe67eb8c3bf56e64568f761e26ddada8a76bcf388
-EBUILD dhcpcd-10.0.8.ebuild 5055 BLAKE2B 84dd290736fd5df2b1eee34233f906938928d2346e84e83893153db86a6bb66827913ff1e48eac5f47ff4d122a3c32e3782a977e7129c3e751d4466cb34d6ce3 SHA512 2905b9d6f5a8c12a801423972da34f6a0edf568ab48814b8d4cdfea9bc1e660d67444cd52162efc8cccabd3962d6be915c7bfb0dd69a4d1c501166d6f77a068c
+DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff
+EBUILD dhcpcd-10.1.0-r1.ebuild 4976 BLAKE2B 1f6d2267d9f45879b23321b23e61bf94d45ebee8636d2f3e7d2c0952205f00f136b234f59858f7d342b53977b7702a452f0bb64e46ab97978123c714e07b6abf SHA512 f986c753abd83ebacb0083d85dc747d5266807b73db634498279ac88e0316b807bee99a9ecaf1bfef5217d207160a6a4c6e710cb2cb6c93db915e1b1f658e0d6
 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
+EBUILD dhcpcd-10.2.0.ebuild 4935 BLAKE2B 2a5789402ae1b1f4b6a049ca45f98ebddb10a45c4d8753d60346e6ee69287b2d99bc566fa1573d6d97c281b9e1912f85d84e395a7f5d011198e20af417313951 SHA512 902a31842e545c59ff3955706306066cd34b0d8b46a8e588370c4943df64415845a080672458c4233c9188474342c6965a8b1c3da64c9954c2f608687a743cef
 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
deleted file mode 100644
index 4a63060cb6be..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd optfeature 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 ~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="
-	app-crypt/libmd
-	udev? ( virtual/udev )
-"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# These don't exist on Linux/glibc (bug #900264)
-	memset_explicit
-	memset_s
-	setproctitle
-	strtoi
-	consttime_memequal
-	SHA256_Init
-	hmac
-	# These may exist on some glibc versions, but the checks fail due to
-	# -Werror / undefined reference no matter what. bug #924825
-	arc4random
-	arc4random_uniform
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
-)
-
-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
-
-	optfeature "lookup-hostname hook" net-dns/bind-tools
-}
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild
deleted file mode 100644
index da71fc81b647..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2024 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 ~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
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# These don't exist on Linux/glibc (bug #900264)
-	memset_explicit
-	memset_s
-	setproctitle
-	strtoi
-	consttime_memequal
-	SHA256_Init
-	hmac
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.6-rebinding.patch
-	"${FILESDIR}"/${PN}-10.0.6-crash.patch
-)
-
-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/dhcpcd-10.0.6-r3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild
deleted file mode 100644
index 06b17e02b53a..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 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 ~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="
-	app-crypt/libmd
-	udev? ( virtual/udev )
-"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# These don't exist on Linux/glibc (bug #900264)
-	memset_explicit
-	memset_s
-	setproctitle
-	strtoi
-	consttime_memequal
-	SHA256_Init
-	hmac
-	# These may exist on some glibc versions, but the checks fail due to
-	# -Werror / undefined reference no matter what. bug #924825
-	arc4random
-	arc4random_uniform
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.6-rebinding.patch
-	"${FILESDIR}"/${PN}-10.0.6-crash.patch
-	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
-)
-
-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/dhcpcd-10.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild
deleted file mode 100644
index ba52c3873ac8..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 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 ~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="
-	app-crypt/libmd
-	udev? ( virtual/udev )
-"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# These don't exist on Linux/glibc (bug #900264)
-	memset_explicit
-	memset_s
-	setproctitle
-	strtoi
-	consttime_memequal
-	SHA256_Init
-	hmac
-	# These may exist on some glibc versions, but the checks fail due to
-	# -Werror / undefined reference no matter what. bug #924825
-	arc4random
-	arc4random_uniform
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
-)
-
-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/dhcpcd-10.1.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
new file mode 100644
index 000000000000..008dcac7a8fa
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd optfeature 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 ~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="
+	app-crypt/libmd
+	udev? ( virtual/udev )
+"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# These don't exist on Linux/glibc (bug #900264)
+	memset_explicit
+	memset_s
+	setproctitle
+	strtoi
+	consttime_memequal
+	SHA256_Init
+	hmac
+	# These may exist on some glibc versions, but the checks fail due to
+	# -Werror / undefined reference no matter what. bug #924825
+	arc4random
+	arc4random_uniform
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
+	"${FILESDIR}"/${P}-seccomp-glibc-2.41.patch
+)
+
+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
+
+	optfeature "lookup-hostname hook" net-dns/bind-tools
+}
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild
new file mode 100644
index 000000000000..fcfca62700dc
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd optfeature 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 ~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="
+	app-crypt/libmd
+	udev? ( virtual/udev )
+"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# These don't exist on Linux/glibc (bug #900264)
+	memset_explicit
+	memset_s
+	setproctitle
+	strtoi
+	consttime_memequal
+	SHA256_Init
+	hmac
+	# These may exist on some glibc versions, but the checks fail due to
+	# -Werror / undefined reference no matter what. bug #924825
+	arc4random
+	arc4random_uniform
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
+)
+
+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
+
+	optfeature "lookup-hostname hook" net-dns/bind-tools
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch
deleted file mode 100644
index 5b61e3ca37ef..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/NetworkConfiguration/dhcpcd/issues/179
-https://github.com/NetworkConfiguration/dhcpcd/issues/283
-https://bugzilla.redhat.com/2262996
-https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25
-
-From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
-Date: Fri, 16 Feb 2024 17:15:35 +0100
-Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295)
-
-dhcp_handlebootp handled zero sized packets correctly, but
-dhcp_redirect_dhcp did not have such protection. Move size check before
-both of them. Size when called from dhcp_packet is checked by
-is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be
-added.
-
-Fixes #283
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len,
- {
- 	size_t v;
- 
--	if (len < offsetof(struct bootp, vend)) {
--		logerrx("%s: truncated packet (%zu) from %s",
--		    ifp->name, len, inet_ntoa(*from));
--		return;
--	}
--
- 	/* Unlikely, but appeases sanitizers. */
- 	if (len > FRAMELEN_MAX) {
- 		logerrx("%s: packet exceeded frame length (%zu) from %s",
-@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg)
- 		logerr(__func__);
- 		return;
- 	}
-+
-+	if (iov->iov_len < offsetof(struct bootp, vend)) {
-+		logerrx("%s: truncated packet (%zu) from %s",
-+		    ifp->name, iov->iov_len, inet_ntoa(from->sin_addr));
-+		return;
-+	}
-+
- 	state = D_CSTATE(ifp);
- 	if (state == NULL) {
- 		/* Try re-directing it to another interface. */
diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch
deleted file mode 100644
index 6457368f1150..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/920652#c2
-https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663
-
-From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 24 Dec 2023 12:07:25 +0000
-Subject: [PATCH] DHCP: DECLINE address on ARP defend failure
-
-Also, drop the lease.
-This should get us a new address from the DHCP server when we
-re-enter DISCOVER to avoid looping on the same address and fail
-again.
----
- src/dhcp.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/dhcp.c b/src/dhcp.c
-index 014ce6cf..a58e1db2 100644
---- a/src/dhcp.c
-+++ b/src/dhcp.c
-@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg)
- static void
- dhcp_decline(struct interface *ifp)
- {
-+	struct dhcp_state *state = D_STATE(ifp);
- 
-+	// Set the expired state so we send over BPF as this could be
-+	// an address defence failure.
-+	state->added |= STATE_EXPIRED;
- 	send_message(ifp, DHCP_DECLINE, NULL);
- }
- #endif
-@@ -2098,8 +2102,12 @@ static void
- dhcp_arp_defend_failed(struct arp_state *astate)
- {
- 	struct interface *ifp = astate->iface;
-+	struct dhcp_state *state = D_STATE(ifp);
- 
-+	if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC)))
-+		dhcp_decline(ifp);
- 	dhcp_drop(ifp, "EXPIRED");
-+	dhcp_unlink(ifp->ctx, state->leasefile);
- 	dhcp_start1(ifp);
- }
- #endif
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch
new file mode 100644
index 000000000000..6b69b47176d2
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch
@@ -0,0 +1,28 @@
+https://github.com/NetworkConfiguration/dhcpcd/commit/e9e40400003db2e4f12dba85acabbaf2212a520f
+
+From e9e40400003db2e4f12dba85acabbaf2212a520f Mon Sep 17 00:00:00 2001
+From: Scott Shambarger <devel@shambarger.net>
+Date: Sat, 7 Dec 2024 16:37:28 +0000
+Subject: [PATCH] linux: Allow the __NR_rt_sigprocmask syscall
+
+Fixes recent glibc changes to getrandom() used by arc4random().
+Fixes #421.
+---
+ src/privsep-linux.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 8357904c..e3485a2e 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -409,6 +409,9 @@ static struct sock_filter ps_seccomp_filter[] = {
+ #ifdef __NR_recvmsg
+ 	SECCOMP_ALLOW(__NR_recvmsg),
+ #endif
++#ifdef __NR_rt_sigprocmask
++	SECCOMP_ALLOW(__NR_rt_sigprocmask),
++#endif
+ #ifdef __NR_rt_sigreturn
+ 	SECCOMP_ALLOW(__NR_rt_sigreturn),
+ #endif
+
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index 95a8b09a898f..b07433753787 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,8 +1,10 @@
+AUX 0001-Fix-signal-handlers.patch 2313 BLAKE2B e10dd427ee36d1ae539000b8ff8873c294db53970cd84f9268e903ec65c3d7b0fc8d035eae083cfa6666e2302eaeabb1104d6ccbbf3e3c32c92a0e1c33594fc4 SHA512 dd582723c65466d0357e7e9424cba46076097c8c6a3a8cdf5c88aadf9dfc1fe47d66f3ca90e1b2a3b11b5f01132bcac03ca6068152e5da835f47a18173ca119e
+AUX 0002-Fix-Wformat-security.patch 4797 BLAKE2B 0e1e94aa3c5ebe67cfac3d7ae83bce337dda421f8f231352c867e8b4da84d7f09e48c9cb05dc1136c0136d62953fc8f426c61643a94189cb5638c0e9c6a95249 SHA512 1f033fed62e652453e74ddb1f92c1198d8e79f63dbcb48c3e5e80f259117f3ada025f9ab04bf18379e727bc4fdae5d6eec75548ea2f26aee19c67f72ae913cda
 AUX smbc-1.2.2-cflags.patch 323 BLAKE2B cd95f0d01e1a0f000c362544420fb55e9fed0b2786a05c2ecf90ce8066ea94c4e0e949f8b9cbdac2471ea2e5599675a51c2176c1c2a303eb3d04160d959935dc SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9
 AUX smbc-1.2.2-multiple-definitions-gcc10.patch 2191 BLAKE2B e0cb38b0799d87d78c152bd7227dd8c73e074deff608cb7ec870dc90574118f4558e6bc5c7a417a1e8154a52a9787a8873ab413c3825053c04c39b221bfedab2 SHA512 3ce7d6b76cba3abcf52a4efb2e4cc012788a3f1c182cc046a2395d3fd9f42f3d0fea49854ca02840af8eb5093684c51f973c09437957b0df6f779b258251e7ae
 AUX smbc-1.2.2-samba4-includes.patch 2402 BLAKE2B 966fcbf20522e8bd5fdb349e65551c9d37cffe091800c6c29e3b10d74dfba512e31e43a2841c05e1cb1ab9222f0009d1f301cc6e01ec960d2fcc9b3fe972b8a6 SHA512 0cd27c9c4b2ab8b749ee779b7fcba4a321979602ebabd29c65dfef15f2d7fec3ffd38efeef5868fc0cfc44412b83b5f37acf21586fae3b2ee7cd8879d0ee3dba
 AUX smbc-1.2.2-size_t.patch 551 BLAKE2B c4cd80f4af3285cdca7e6a5c9812742d6a662856bb986f11d395a5d4a44e3210c1087c976b4e0055768401b99fda6de081c330a1429a901fb4adcd461108934f SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa
 AUX smbc-1.2.2-tinfo.patch 480 BLAKE2B 6b882d6f2b39b7b0876b632382c6ab073918fe3e1d37ec908c8d3d460b3d4ad0fd671a33675bf543ce4304ace59d6b58851ab786bd1bbcca055933f021864557 SHA512 b210ad4e3607429131f5ba6b3fc79ea179cb4c5cc0316ca327f82f59aceac1a0e1157d5376cd374b0142458ee8e821ce33d07ee47e9c7dd8481d9c2e3ed4f70b
 DIST smbc-1.2.2.tgz 977908 BLAKE2B 481bf7e16b8f6d89abd62e619a13a8692ce1f3ed169a1b3c35864a2a66f2cf10753d7d4151f95acc3428ad628b5888a12f452836297d18f9c8b3ce1d17550010 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84
-EBUILD smbc-1.2.2-r3.ebuild 1056 BLAKE2B 5748d83baee8a2b19e257161e2c8d59d4a5c0defcb64f0552189a72c911dc019f7fafcd33a42f5910ce817aafd0af505cf95de73eb962dee0d2d5fefbb6049e5 SHA512 49287f420c7a74b5b5ac31325528a0af5787d2c9e3c4d676fd30aeb5471432c570fa4286a4240b1e68ce8a18857e406da2be4bedfef836dbfae4d70c9e968dbb
+EBUILD smbc-1.2.2-r4.ebuild 1155 BLAKE2B b64c14904d226ad3961e0c7db990373db8f2596cf48be67f1bcae1034b8e0a01acda2bf94e10a00116512d1231d10358364a9877390dd37b1e9cfc81d111f604 SHA512 bad5d94c5c31d0aa887beec613ba714346e100e34514ff3e3009f0ea114bc541b51f1d6ebb594204fb958efed4c4c07cf698f792d528cad0ac9b42d224b947cc
 MISC metadata.xml 654 BLAKE2B 76fc9dd16ca740785c49b93f5591c22b8807acac539de44e8308ebb72c1d89bf530a4771ab776ba3f99a9ea1772b68affc563e5737089e6a396b5de96048c228 SHA512 de2aabeb6f8eebf8cdbae578e7fbbfc7e98561093fa2cd2c8263d1bc164be57536ec1bdbfc89c4af9316f9aafa231f997f52e4f6b0d6079f4a94470bff418050
diff --git a/net-misc/smbc/files/0001-Fix-signal-handlers.patch b/net-misc/smbc/files/0001-Fix-signal-handlers.patch
new file mode 100644
index 000000000000..3e4ece3bef0c
--- /dev/null
+++ b/net-misc/smbc/files/0001-Fix-signal-handlers.patch
@@ -0,0 +1,104 @@
+From 1d9dc54aea5a36aa43ce3bb5d5a013121fbd25ab Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 16:04:02 +0000
+Subject: [PATCH 1/2] Fix signal handlers
+
+They need to take an argument but we don't use it.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/smbc.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/smbc.c b/src/smbc.c
+index 41a3d28..86349d0 100644
+--- a/src/smbc.c
++++ b/src/smbc.c
+@@ -251,9 +251,9 @@ void RwinRedrawWithData();
+ void RcompareTwoIndexFile(int RfdNew, int RfdOld, int RfdMessage);
+ int RtryDownloadUpload();
+ void RtryLockFileAndCreateIndexFile();
+-void RsigAlarm();
+-void RsigTerm();
+-void RsigSEGV();
++void RsigAlarm(int unused);
++void RsigTerm(int unused);
++void RsigSEGV(int unused);
+ char *RgetSmallPath(char *Rhost);
+ 
+ //-------------------------------------------------------------
+@@ -1196,7 +1196,7 @@ RmanageList()
+     {
+       if (!RdownloadListTmp) {
+         RDBG("smbc: RmanageList RpaintList - error expected next record\n"); 
+-        RsigTerm();
++        RsigTerm(0);
+       }
+       mvwhline(RwinCol1, ++Rk, 0, 32, 1);
+       mvwhline(RwinCol2, Rk, 0, 32, 1);
+@@ -1354,7 +1354,7 @@ RmanageList()
+   }
+ 
+   void 
+-  RsigAlarmManageWindow() 
++  RsigAlarmManageWindow(int unused) 
+   {
+     RDBG("RmanageList : RsigAlarmManageWindow alarm\n");
+     RdoWindowResizeDownloadList();
+@@ -5543,7 +5543,7 @@ RcreateFindListIndex(int Isave, char *Igroup, char *Ihost, char *Ipath, char *Id
+ }
+ 
+ void 
+-RsigTerm()
++RsigTerm(int unused)
+ {
+   int Ri;
+ 
+@@ -5602,7 +5602,7 @@ RsigTerm()
+ }
+ 
+ void 
+-RsigCHLD()
++RsigCHLD(int unused)
+ {
+   waitpid(RchildId, NULL, WNOHANG);
+ }
+@@ -6393,7 +6393,7 @@ RsendWinpopupInput(char *RgroupInput)
+ }
+ 
+ void 
+-RsigSEGV()
++RsigSEGV(int unused)
+ {
+   int Rres = errno;
+ 
+@@ -6404,7 +6404,7 @@ RsigSEGV()
+   RDBG("\n");
+   RDBG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+   Rerror = 1;
+-  RsigTerm();
++  RsigTerm(0);
+   exit(Rres);
+ }
+ 
+@@ -6819,7 +6819,7 @@ RtryDownloadUpload()
+ }
+ 
+ void 
+-RsigAlarm()
++RsigAlarm(int unused)
+ {
+   char RinsertChar = 1;
+ 
+@@ -8220,7 +8220,7 @@ RDBG("smbc: main 100\n");
+  Rfree(RfileNameMessagePrim);
+  Rfree(RsmbcLockFile);
+  RDBG("----stop 2----\n");
+- RsigTerm();
++ RsigTerm(0);
+  RfreeDebug();
+  return(0);
+ }
+-- 
+2.48.1
+
diff --git a/net-misc/smbc/files/0002-Fix-Wformat-security.patch b/net-misc/smbc/files/0002-Fix-Wformat-security.patch
new file mode 100644
index 000000000000..357856b0516d
--- /dev/null
+++ b/net-misc/smbc/files/0002-Fix-Wformat-security.patch
@@ -0,0 +1,150 @@
+From 0f514db1868a34839a673257543a00383a5183df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 12 Feb 2025 16:07:23 +0000
+Subject: [PATCH 2/2] Fix -Wformat-security
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/dulist.c |  2 +-
+ src/fnet.c   | 14 +++++++-------
+ src/smbc.c   | 16 ++++++++--------
+ 3 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/dulist.c b/src/dulist.c
+index 23c0024..c353acc 100644
+--- a/src/dulist.c
++++ b/src/dulist.c
+@@ -200,7 +200,7 @@ RShowAllItemsFromDUlist(int RnrDulist)
+         Rstraddtoend(&RstrT, "/");
+         Rstraddtoend(&RstrT, Rdls->filename);
+         Rstraddtoend(&RstrT, "\n");
+-        printf(to_scr(RstrT));
++        printf("%s", to_scr(RstrT));
+         Rfree(RstrT);
+         RfreeOneTTdownloadAndGoToFirst(&Rdls);
+       }
+diff --git a/src/fnet.c b/src/fnet.c
+index cc401af..7c35d2e 100644
+--- a/src/fnet.c
++++ b/src/fnet.c
+@@ -184,7 +184,7 @@ void
+ refreshw(WINDOW *win, char *buf)
+ {
+   werase(win);
+-  mvwprintw(win, 1, 1, buf);
++  mvwprintw(win, 1, 1, "%s", buf);
+ }
+ 
+ int 
+@@ -407,7 +407,7 @@ RmvwprintwCenter(WINDOW *win, int i, char *str)
+   int y, x;
+ 
+   getmaxyx(win, y, x);
+-  mvwprintw(win, i, x/2-strlen(str)/2, str);
++  mvwprintw(win, i, x/2-strlen(str)/2, "%s", str);
+   wrefresh(win);
+ }
+ 
+@@ -427,7 +427,7 @@ refreshTxtInWin(WINDOW *win, int y, int x, char *buf, int winSize, int startidx,
+     wattron(win, COLOR_PAIR(colorPair));
+   mvwhline(win, y, x+xDelta, ' ', winSize-xDelta);
+   wattron(win, attr);
+-  mvwprintw(win, y, x+xDelta, str+startidx);
++  mvwprintw(win, y, x+xDelta, "%s", str+startidx);
+   wattroff(win, attr);
+   if (colorPair != -1) 
+     wattroff(win, COLOR_PAIR(colorPair));
+@@ -474,7 +474,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+   Rstr = strdup(Rbuf+startidx);
+   Rstr[xCursor-startidx] = 0;
+   RDBG("fnet refreshTxtInWinCursor 1: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-  mvwprintw(win, y, x, Rstr);
++  mvwprintw(win, y, x, "%s", Rstr);
+   Rprinted = strlen(Rstr);
+   Rfree(Rstr);
+    
+@@ -500,7 +500,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+     RDBG("fnet refreshTxtInWinCursor 23\n");
+   }
+   RDBG("fnet refreshTxtInWinCursor 29: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-  mvwprintw(win, y, x+Rprinted, Rstr);
++  mvwprintw(win, y, x+Rprinted, "%s", Rstr);
+   Rfree(Rstr);
+   wattroff(win, A_REVERSE);
+   Rprinted++;
+@@ -514,7 +514,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta
+     if (winSize-Rprinted < strlen(Rstr))
+        Rstr[winSize-Rprinted] = 0;
+     RDBG("fnet refreshTxtInWinCursor 3: Rstr = \""); RDBG(Rstr); RDBG("\"\n");
+-    mvwprintw(win, y, x+Rprinted, Rstr);
++    mvwprintw(win, y, x+Rprinted, "%s", Rstr);
+     Rfree(Rstr);
+   }
+ 
+@@ -929,7 +929,7 @@ Rmvwprintw(WINDOW *win, int y, int x, const char *fmt)
+   }
+   RDBG("fnet: RmvwprintwAddPercent fmt = |"); RDBG((char *)fmt); RDBG("|\n");
+   RDBG("fnet: RmvwprintwAddPercent Rc1 = |"); RDBG(Rc1); RDBG("|\n");
+-  mvwprintw(win, y, x, Rc1);
++  mvwprintw(win, y, x, "%s", Rc1);
+   Ri = strlen(Rc1);
+   Rfree(Rc1);
+   RDBG("fnet: RmvwprintwAddPercent end\n");
+diff --git a/src/smbc.c b/src/smbc.c
+index 86349d0..d2fbb07 100644
+--- a/src/smbc.c
++++ b/src/smbc.c
+@@ -2174,7 +2174,7 @@ RwinRedraw()
+   mvwhline(RwinLeftTop, 0, 0, 0, RxHalf-2);
+   mvwhline(RwinRightTop, 0, 0, 0, RxHalf-2);
+   mvwprintw(RwinHead, 0, 0,"Samba Commander %s", VERSION);
+-  mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), Rm108);
++  mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), "%s", Rm108);
+   mvwhline(RwinLeft, 2, 1, 0, RxHalf-2);
+   mvwhline(RwinLeft, 2, 1, 0, RxHalf-2);
+   mvwvline(RwinLeftList, 0, 1, 0, RmainWinY-6);
+@@ -3615,9 +3615,9 @@ RreadRcfile()
+   Rstraddtoend(&Rfile, "/.smbc/smbcrc");
+   if (access(Rfile, F_OK) != 0) 
+   {
+-    printf(Rm242, Rfile);
+-    printf(Rm243);
+-    printf(Rm244);
++    printf("%s", Rm242, Rfile);
++    printf("%s", Rm243);
++    printf("%s", Rm244);
+     return;
+   }
+   Rfd = open(Rfile, O_RDONLY);
+@@ -5575,8 +5575,8 @@ RsigTerm(int unused)
+   endwin();
+   if (!Ri) 
+   {
+-    printf(Rm156);
+-    printf(Rm157);
++    printf("%s", Rm156);
++    printf("%s", Rm157);
+   }
+   if ((RmainWinX < 80) || (RmainWinY < 25)) 
+     printf(Rm158, RmainWinX, RmainWinY);
+@@ -5589,7 +5589,7 @@ RsigTerm(int unused)
+   if (Rerror) 
+   {
+     printf("**********************************************************\n");
+-    printf(Rm159);
++    printf("%s", Rm159);
+     printf("**********************************************************\n");
+   }
+ 
+@@ -6990,7 +6990,7 @@ main(int argc,char *argv[])
+  {
+    fprintf(stderr, Rm175, errno);
+    if (errno == 2) 
+-     fprintf(stderr, Rm176);
++     fprintf(stderr, "%s", Rm176);
+    exit(0);
+  }
+ 
+-- 
+2.48.1
+
diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild
deleted file mode 100644
index 67bb75f96311..000000000000
--- a/net-misc/smbc/smbc-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Text mode (ncurses) SMB network commander. Features: resume and UTF-8"
-HOMEPAGE="https://sourceforge.net/projects/smbc/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls debug"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="dev-libs/popt
-	net-fs/samba
-	sys-libs/ncurses
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-size_t.patch
-	"${FILESDIR}"/${P}-samba4-includes.patch
-	"${FILESDIR}"/${P}-multiple-definitions-gcc10.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	# for some reason some build 32bit x86 objects are bundled
-	rm src/*.o
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with debug)
-}
-
-src_install() {
-	default
-	mkdir -p "${D}/usr/share/doc"
-	mv -v "${D}/usr/share/"{${PN},doc/${PF}} || die
-}
diff --git a/net-misc/smbc/smbc-1.2.2-r4.ebuild b/net-misc/smbc/smbc-1.2.2-r4.ebuild
new file mode 100644
index 000000000000..6799dc8a4a58
--- /dev/null
+++ b/net-misc/smbc/smbc-1.2.2-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Text mode (ncurses) SMB network commander. Features: resume and UTF-8"
+HOMEPAGE="https://sourceforge.net/projects/smbc/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls debug"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/popt
+	net-fs/samba
+	sys-libs/ncurses:=
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-size_t.patch
+	"${FILESDIR}"/${P}-samba4-includes.patch
+	"${FILESDIR}"/${P}-multiple-definitions-gcc10.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/0001-Fix-signal-handlers.patch
+	"${FILESDIR}"/0002-Fix-Wformat-security.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	# for some reason some build 32bit x86 objects are bundled
+	rm src/*.o
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with debug)
+}
+
+src_install() {
+	default
+	mkdir -p "${D}/usr/share/doc"
+	mv -v "${D}/usr/share/"{${PN},doc/${PF}} || die
+}
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index 951c1055e9ad..d0c2cdad2b5a 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -1,5 +1,5 @@
 AUX zssh-1.5a-gentoo-include.diff 320 BLAKE2B b5ba88091ba1804f22f735ef3d2229a70f24bdddb11a02c128d2c31cccf44a79b532e2455b4f03fc5e273889716e293c3dac2c7a33cf838b8350eed68e752f1d SHA512 447a1aeb095907473ef18a6b2bc6a1a4bfc9baf7ed532382a636ea044667c2f7cbd86c8d0e20ffea7c9751cb9c50249d3085bf65aee7ab7fab5362aae27d8ba5
 AUX zssh-1.5c-C23.patch 4594 BLAKE2B 0e7df641be495e0bdde0ef0183cd58793f3329140ea1358386b939e980d6b7db1ffed854ded98a560230de89c9ae9267d6eda013febb45c99eff5846bfa27c14 SHA512 9773f929c789395d88504aaa95405e74d6a1838add709928ad6dcef1d58006ed19610c4c950448063ed5a5a6e7151c79d197e9038d7433b994efc7781c64734c
 DIST zssh-1.5c.tgz 344964 BLAKE2B 35b41125ec7a49cae741666516b17e3f0b22b159d0fc2b490565e8eaef366bb4b418895ad028822647a4b946577b2ef9dc588e9dbfe657ce7c1c8300207ca603 SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd
-EBUILD zssh-1.5c-r3.ebuild 924 BLAKE2B 615c181f751fa570f102d63611bcc05909653d8a003f00353f306fd4ca06f1ca649a988367eddc3321150c648590a1b61d66a0cb06d694d4b3dbcf759b26a994 SHA512 22b34b59c4bbff448712004e9a956ef4f05d2b2c13e0b87d5aa7fbaf49adc957bbd11119660ac15fd6808b7bb69f34a5a5c24aaf747bb3edab84ba9e31e83c13
+EBUILD zssh-1.5c-r3.ebuild 831 BLAKE2B 7be6ee6eecdd5d365084965c380307c166a072c213f1d4fe617f907f92edebe22194717d986c01a39928472def61dd52bc22827abf4a87ebe1c7a39764f7fe6d SHA512 ff95a4f4c2b489c3901c73e6a21645b0dc82b7bc086f15028992b2ae88db43d4445cc3487a2f69e25b3185ca318180f82da953cea63878b9c1e9c4616c33c51e
 MISC metadata.xml 242 BLAKE2B 0219a28d20cce3e716b2e6737277182560a5b292d94b89a3b57385d14393ab6b28a6aac667aac11ff744c6be8042a411c6aef63b2fddf60c40024d6a35e0f2ab SHA512 1214868537bf0006e32453e2962570693e6e18474c468ebe7bc00bf9fb2e6c60775644ebf02471af8fa8e326332ca51f05a2d47b04f7fdbe1d0ad63400b74211
diff --git a/net-misc/zssh/zssh-1.5c-r3.ebuild b/net-misc/zssh/zssh-1.5c-r3.ebuild
index c675342be7fd..ac5836450a27 100644
--- a/net-misc/zssh/zssh-1.5c-r3.ebuild
+++ b/net-misc/zssh/zssh-1.5c-r3.ebuild
@@ -39,9 +39,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR CC RANLIB
-	#actually, nls isn't supported in this software, but in bundled lrzsz
 	econf \
-		$(use_enable nls) \
 		$(use_enable readline)
 }
 
-- 
cgit v1.2.3