17 files changed, 373 insertions, 174 deletions
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 56c772e55ecc..b12942ba66a4 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 748b056ceae2..a93fecb51c35 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -2,5 +2,5 @@ AUX autofs-5.1.9-c99.patch 2057 BLAKE2B 520c81142472e8be9a5e2fe462f51ae75807209d
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc
-EBUILD autofs-5.1.9-r1.ebuild 3264 BLAKE2B 06ca8dfd095378751454911ceea13b0901b853ea62378d0caf765cd59e74b695bdc253149cfe244ab77d615233b7b1d6a164b35f9bc14f6445f2062ad070a836 SHA512 fa7e92ca23218892350b6d29ff2ad8f896879932950df5cc3dede97fb61c4ad108a6f2393206eab6254149b31cee18e403d4d2872c535e1649a1c17815bde695
-MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
+EBUILD autofs-5.1.9-r1.ebuild 3214 BLAKE2B 82f63f0de7a8d28a1068390465ada8ec88da9b6978497659cb486a76382f01fda9327d06d1b82c54839b91692374241a024229d3c99df9eb4cb49a2a453a705c SHA512 dfbd2bda92e8cba7b4c642e02e85bf5d8c31ec7b6ce76f5462a2dabf6abffbbee0d6e66417e863980281c99b6fef260f8162f7d1dda9a28dddeea634175ec4a8
+MISC metadata.xml 798 BLAKE2B 4149f599e96493efa94a743c4f2701d346bf6b567cfcbb1a3413a09872955610bd00be82276a53f702270b9cfad4bcb9f39179d55df8c8923116043e4fed30c3 SHA512 e03ac237cb14bb8a17a15450a39d24c816214bda45c6423eef3ae0fc0494d9d9628da33d16324161e13b845f45304bb84cbf35cfd601313ccdff9f035b917174
diff --git a/net-fs/autofs/autofs-5.1.9-r1.ebuild b/net-fs/autofs/autofs-5.1.9-r1.ebuild
index 288f8613b4e9..b0d1f2d0093f 100644
--- a/net-fs/autofs/autofs-5.1.9-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.9-r1.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
+IUSE="ldap +libtirpc mount-locking sasl selinux systemd"
 
 # currently, sasl code assumes the presence of kerberosV
 RDEPEND="
 	net-libs/libnsl:=
 	>=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
 	ldap? (
 		>=net-nds/openldap-2.0:=
 		sasl? (
@@ -77,7 +76,7 @@ src_configure() {
 	local myeconfargs=(
 		--with-confdir=/etc/conf.d
 		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
+		--without-dmalloc
 		$(use_with ldap openldap)
 		$(use_with libtirpc)
 		$(use_with sasl)
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index fac959b9f41b..dda226dc4b9e 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Yixun Lan</name>
 	</maintainer>
 	<use>
-		<flag name="dmalloc">Enable debugging with the dmalloc library</flag>
 		<flag name="ldap">Install LDAP module</flag>
 		<flag name="libtirpc">Use TiRPC library instead of SunRPC</flag>
 		<flag name="mount-locking">
diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest
index 2d98382baf5c..6bd2d64a88c9 100644
--- a/net-fs/ksmbd-tools/Manifest
+++ b/net-fs/ksmbd-tools/Manifest
@@ -1,10 +1,5 @@
-AUX confd 163 BLAKE2B ea3a2a65e014d0d96bfb0789cd6756b44eeced76a0d295699d6e615ae0f9faca7d90d24d1834e63d0d3f0cd99eef35b43ff9f96182abbdf2a1b5d2bb15b6bdfc SHA512 52449136ba0c8b974602b235e7ed772050098b6b2535853e08fb4185bff808766c83667a551725bc2bf24c3922df3954d0a54382217c75d232107673d0dcacb3
-AUX initd 552 BLAKE2B 2357df024a9fd9b1334a41a6849fd3fd69f49676c3c4a9cf240a6181cb56c230b59afeadce2b37d84250d2e608e5e8109d8747f91449725ea517879d2e644683 SHA512 ae54b9cafee967fa3a5e313412725b91569c923e10b663bb7032cdc3401209e424d9e333e321ff1a8cb793aa545133e03978d8b5a4c8532836a861421ace7089
 AUX ksmbd.confd 237 BLAKE2B 7d66dc656344516421d5f043071e9a3063d2c4b5128a7a05ad5c11888b06d9f2f43ea54b404901719b8afa03623a65514bed0b3c6c5890b1d17d15eab9942bea SHA512 e314d1a520599dda148ff5aad8d0089950aceec1ec3fec6a34d4e60958e7668414b7234eea2fabdb9d544f67f385fca9dde24dddd265559339f08d949ba019dd
-AUX ksmbd.initd 749 BLAKE2B a1cc96354342d7f89194c9f836ddfe707b2545b1f2a425f8f7ccd28180d407e02a390c98731ef05c76b5ef42ac447d31cbe1d223ab057b6cebfd53e2694ab472 SHA512 5b38dbc8417f57aa9ba08c08cc5796f8316579389e3430efb410b3cc880657c27950cccaabe55f3fb826946d04448625561d165c90e344f1bab4f9084b15889b
 AUX ksmbd.initd-r1 760 BLAKE2B 9492e6ec06b5906cae8f16576e6a72a59510faa9ad606fd4e81b1c369311252c1308d91601b18f4ace8eff0a6128868562ec8de22f27e9dd4a89eefb887dfaca SHA512 64241b5f1a2925af82ee1c6ed46bc2e2953752a5c24b7f82ea5c1d9b2464f20176daccda23312d9ff1e4366871f3836e3091e9e2f725f1c5efc50472b36c425a
-DIST ksmbd-tools-3.4.8.tar.gz 88898 BLAKE2B 4bd4fa77e7d89de4f48427e6867807b27a9be91e4f27079d4a5b231c4925aef73489bced1e4569361105fe7e04671fa8d6f3394154b36072f9d4ec77fded7466 SHA512 f5372ea7fd4b754482374cdeefa011bebe32c37a26acc180c34c61f37cf08125b5b4626128cae413cd517a74af326188f3f9e7cf459308e4305d86e7c6702436
 DIST ksmbd-tools-3.5.2.tar.gz 463604 BLAKE2B f54ff13719dd7e7167d065a7aaf5393fc18f67611be0a22fc4914e6d2afd25e751db85c27ff3adde482e1d9c4192161b76dc92f9c066dcc41cae7c820510483c SHA512 20035501e63798f5a23d3d9502ff4a50b04f74a03154bc4bfdfabb37dcf106410cd1355c2612cc46a0e52742f8e213dad4862790661781691e77760c56f40386
-EBUILD ksmbd-tools-3.4.8.ebuild 1858 BLAKE2B d98239b60e460ea95603eada2f1e760a0a5fb8894407eab6754011615c6277e08ad0ddc88e615311cf766f389364d0d2d3d8ed977daae06da8eb5ab4b5eeef24 SHA512 ceb83be663fb00beebaaf35c8511788320111693c0fba3461357a6114a56399eedf64f43133bc5b5f8786b5fe83fc2215eab3118d1f2278605f89d8f2065ed2b
 EBUILD ksmbd-tools-3.5.2.ebuild 1727 BLAKE2B 969e5979d68e245d060b87960526a0ad046b94138785cce1292f02586259fba267df2513df71171931f067c2d41f7df902c2eed1f2d8eafc46dc58ec30102b36 SHA512 7f3cbfa3ab1f4fd2e6940417732a45b629982b3312c7e76a09c412f0eaa2b411b2cc560e199e5938eebeca0ded9eeddd39aefd5a7cd15cfdee18e78787782a4b
 MISC metadata.xml 651 BLAKE2B 7dab0b33504a2f28b7d1a43ec3c6e82b649187374578585b6de5717902d6a4018b05f609022f02e02fa045075c24cad6b4d19f94b26ef57a5154da38dbf86f98 SHA512 35b6ff9c755bc70ae4e40ca97e45bcf021e606c115a9c55858715cd27ae3af47991f6f72d8b58311ba6bd0d345cd533bbe848f44d3c289fdc23b490042bccdf1
diff --git a/net-fs/ksmbd-tools/files/confd b/net-fs/ksmbd-tools/files/confd
deleted file mode 100644
index 81248468d530..000000000000
--- a/net-fs/ksmbd-tools/files/confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/ksmbd: config file for /etc/init.d/ksmbd
-#
-
-# Full path to config file. /etc/ksmbd/smb.conf is default if not set.
-#KSMBD_CONF="/etc/ksmbd/smb.conf"
diff --git a/net-fs/ksmbd-tools/files/initd b/net-fs/ksmbd-tools/files/initd
deleted file mode 100644
index f65770ed44c6..000000000000
--- a/net-fs/ksmbd-tools/files/initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/smb.conf}"
-
-depend() {
-	need localmount 
-	use net 
-}
-
-description="ksmbd userspace daemon"
-
-command="/sbin/ksmbd.mountd"
-command_control="/sbin/ksmbd.control"
-command_args="-s"
-
-required_files="${KSMBD_CONF}"
-
-start_pre() {
-	/sbin/modprobe ksmbd || return 1
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	"${command_control}" -s
-	eend $?
-}
-
-stop_post() {
-	/sbin/modprobe -r -q ksmbd || return 0
-}
diff --git a/net-fs/ksmbd-tools/files/ksmbd.initd b/net-fs/ksmbd-tools/files/ksmbd.initd
deleted file mode 100644
index 86feb90b8da1..000000000000
--- a/net-fs/ksmbd-tools/files/ksmbd.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/ksmbd.conf}"
-KSMBD_OPTS="${KSMBD_OPTS:-}"
-
-depend() {
-	need localmount 
-	use net 
-}
-
-description="ksmbd userspace daemon"
-
-command="/sbin/ksmbd.mountd"
-command_control="/sbin/ksmbd.control"
-command_args="--config=${KSMBD_CONF} ${KSMBD_OPTS}"
-
-extra_started_commands="reload"
-
-required_files="${KSMBD_CONF}"
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME}"
-	"${command_control}" --reload
-	eend $?
-}
-
-start_pre() {
-	/sbin/modprobe -q ksmbd || return 0
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	"${command_control}" --shutdown
-	eend $?
-}
-
-stop_post() {
-	/sbin/modprobe -r -q ksmbd || return 0
-}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild
deleted file mode 100644
index b0ac39996c58..000000000000
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
-HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
-SRC_URI="https://github.com/cifsd-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libnl:3
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# we don't want to die() here to be able to build binpkgs
-	kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}"
-	CONFIG_CHECK="~SMB_SERVER"
-	ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work"
-	# use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	# TODO: add kerberos support, explicitly disable for now
-	# tools are expected to reside in /sbin, not /usr/sbin
-	econf \
-		--prefix="${EPREFIX:-}" \
-		--enable-krb5=no \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--with-rundir="${EPREFIX}/run" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	local DOCS=( README.md ksmbd.conf.example )
-	einstalldocs
-
-	insinto /etc/ksmbd
-	doins ksmbd.conf.example
-
-	newinitd "${FILESDIR}/ksmbd.initd" ksmbd
-	newconfd "${FILESDIR}/ksmbd.confd" ksmbd
-
-	dosym ksmbd.addshare /sbin/smbshareadd
-	dosym ksmbd.adduser /sbin/smbuseradd
-}
-
-pkg_postinst() {
-		local ver
-		for ver in ${REPLACING_VERSIONS}; do
-			if ver_test ${ver} -lt 3.4.6; then
-				ewarn "Upgrade from version <${CATEGORY}/${PN}-3.4.6 detected"
-				ewarn "${PN} config file moved to ${EPREFIX}/etc/ksmbd/ksmbd.conf"
-				ewarn "Please migrate from old ${EPREFIX}/etc/ksmbd/smb.conf"
-			fi
-		done
-		unset ver
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index d30c4d568de4..cc0dd008f62e 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -25,13 +25,16 @@ AUX systemd/openafs-server.service.conf 192 BLAKE2B 4ab26af2d366691de2447a142c1c
 AUX systemd/tmpfiles.d/openafs-client.conf 22 BLAKE2B 49b31e03b8ee512d6a2758cf946ff6bf650b25acc96ad043fed54868a4726647d0ff5a02fc697605d007c0ea95c2b1cb7e4cdffd01c515b99a5bf09c7244e5a8 SHA512 ee8daa10c6fac2d05085f74b0a807e27e327124380ae6e642f29bfe0b2f3b3909da3024a1c4f6b86a712e05ed05875d36c3b1cc06543a1f390f713a16a2baca6
 DIST openafs-1.8.13-doc.tar.bz2 3779824 BLAKE2B aab4d57df918061982614ea83b1b5de08d1b851e6a141957ae5c5f68f558994725eee6623479659729df92d6cb9058120179107058ab8974b36701420bfce48e SHA512 df95f26a24829f82f86896d20d47da2e9b5bcb7ecf9d24cb5ab0b956733e67d6bd2021bc4b52d6734ad1aacfd2e22a5a15a3acc5f14a401bb7f4f83f52251f1e
 DIST openafs-1.8.13-src.tar.bz2 15053864 BLAKE2B 83c62197b7825e46f733a593e096494a234607b0fa17ee30717b42740e1ebb13f43e11986cf39e950e79f867ed3ab40d1c80ab7aa79a153ffd9d8f3b1cde307a SHA512 f2b60b3942ba21a4f0fd837dfda1a9659ebe4d2f96edfbe7162e97faa8c5887fbea8fdef958af396356b78793f06e6744566a1aa6b70df2164c9ab37c06e2cd9
+DIST openafs-1.8.13.1-doc.tar.bz2 3781663 BLAKE2B f7bc8750456cd61cf1d2b5737fa4f0b3b319bfb79d0517ed82f551e31118313ea64baff738b8ad380a64d4f02bb8df1425af4ca8cfb690d7be31ec29c68d8866 SHA512 f297fa2e6d8dbff1566f11e54ba88b171e56e2fdfba373b0852f3036411c99c4e1e2cfd83705512fa1ff64ac2e6e008df15fd291208c9d15c53d393fac21c96f
+DIST openafs-1.8.13.1-src.tar.bz2 15046870 BLAKE2B aeed6e0a8caab9614e0980b362f806856bb3f3340865e9197986314f8219b14b78c38f0ff05d71169716de7614b10e318561377982969945a420bca4679ebd32 SHA512 705978208e69f43a87153c6c343722a0fc3d9aacbedfaca161f260dd0a8806b9dd23f81686dbd13b62ce9b787dbf860e60e035bed7e2d26ea21576b495764c41
 DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
 DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
 DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d0b95774ca77f40d8e9ca81f5d5bacff1966e637f3bd066181f2dcf182dbfffdf93521981745fe4dbfea142e6b17fcf574 SHA512 c229636ca4c7245d37fa25b02805982e3f667163ae312e14678117c60320ccce50230bf09e081167e789a76bad8fa39a88638cb439ab87954c93b6108004efa8
 DIST openafs-1.8.8.1-src.tar.bz2 14866119 BLAKE2B ae58a1d30fc8d72b4487700203c03e62fc15d0034a03516d4ea5b52c33970e8d9954e6b3c812a4633910c512d283c11431abbcb3868569d8d5ced1a69585263e SHA512 fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384
 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007
 DIST openafs-patches-20211212.tar.xz 13892 BLAKE2B 64582135ff3b81725cf0510d1157785b112f76197b8f50a947d22a82b8b55bebd163f2288b19d68a994f22c78bd90b6bfdad5f75383df1cac06d40feb72e8de8 SHA512 40a1a0d126ae194609da8a264c26b278b6081d95020bcbdb3a809952a70535fa551d1983e811e4ab9deaec06f061075906c2bbaf91e4354bff3520584e3fd336
-EBUILD openafs-1.8.13.ebuild 10783 BLAKE2B 06de2d90cba8abca4c90598fd1aafadb4a52d00f81efcdeb27aa8b1ec891a2c8f65d37bb0be30c52b0b5ac4a79b6551f1f8d230523f5e906a9bfd10d975f5424 SHA512 9efa215f68ddb2526869b543b8eb2318f0a8ef010536753ea82dfa328f6f4fd00bbba69555524203b699b1e0f070bcbee29f1c44832992b8448fe59e2e7c80f5
-EBUILD openafs-1.8.7.ebuild 10613 BLAKE2B 243cf09efb3b53f74ac96c9b15a9f26ca84a3a76866e334594942ac23f450b3ae7b38c64aa784346dcb7035223a83a2260a3bcc94a07811fbae125a06e7b372a SHA512 486d21e1b917475a4cbd4b210be0d985203fdea1360cf3b0fe47d3bc2309791e7c980192ccf2359d0c699286a8b101fd318ae4d1f7a01c66a6b05d0a1965ed96
-EBUILD openafs-1.8.8.1-r1.ebuild 10507 BLAKE2B 1ab828bdc461825f568a88eaec29e0f0b73d4bfaf82c33139387f95543b8f0e7bf6b877429d9977ecea9c9a236e372d41b3d46dddaf45c4ecac16a4cd095dcf5 SHA512 0fe5be63c36eeb4e1ff9569e67c18e2cf2aef378256920851a83e22fde799c9d4328cc3dccbe58450e58d1807e111e62248143b11811f4d97fa4cf6c0ccba89d
-MISC metadata.xml 1276 BLAKE2B 64acb1928c14c6129ebba32dd004021a472bbcb9a00625fec7ac06a3f12d8a0d084e43f2deeabd72c0bb3f73b853cb7c133318b50d86b7bbc81be72ffe200f91 SHA512 d8ebcfb8df0eb80ade7bf55170fdc9a20062981fd82793a60984b6eaa04639e6bc86cb8a9f7cc2ab2d18fc6da70f2570ddd535b64a6754d322f055c01144afc8
+EBUILD openafs-1.8.13-r1.ebuild 10795 BLAKE2B 3e784d72661abec3e260542a890002dd3ccd51f6334da4a0505da2d3fdeadc6c8463eb759d18cfe1c2a5a90341059a541f94d526d012a4ea95001b915ce4c856 SHA512 f48242cc8bfe4761b999f072b60d6535b3cf64ea4516e3d8a550fc64a7a2749e559e235cc8e5cec5d1880aae4f368193012ba760c4e692b452e6b5948c735a6b
+EBUILD openafs-1.8.13.1.ebuild 11102 BLAKE2B 33cc87bfeb441fb2f9e289211d176e675dcf254285ed6f4b88d4020de93ea46c4ece4c5a496aaddddd8656787836123c98e2d6a74d32b80b579bde30adfedad9 SHA512 b8f4b87433202668dfc5a062ca80c87b2a89de002abdb8defbaf042b07700c305dd395da3f63020902fb5bd93ae3cc0c5a8896b9895c43812d759982d4bcc4d7
+EBUILD openafs-1.8.7-r1.ebuild 10625 BLAKE2B 0b7dcd22683f5738d8325c948d96b502b865b893bde490b4b60a3f961ddde91a8f0cafbd3e0be7f91763ebe46676da7546faba9e5ef704274f942a585b92115b SHA512 c38318db3dc7ffd63065de47ed2c340fc1d29d70f4f367e1d62bc9c346ee54ad6de5a608078ce6ecf55079fcb467097ecbca06fe5156819cf27a5839d6f2ee3d
+EBUILD openafs-1.8.8.1-r2.ebuild 10519 BLAKE2B 4f0450b95ea50cf0572b5b5d4f0daf1d75ffbebbb2ef2509c6352a28bdb1cec1574acc631c0f05b9aea8365c91e7e5d1006b4f42f18c192afbae740c048ee3dc SHA512 26807f3d614dcf22d93756fa8374d72a1bbefb84dcd6e3c43a4b5dca9a888e62e06794485fdb60059b1c3ef0543b9473a30747845dc1be1b04246df821c369bc
+MISC metadata.xml 1519 BLAKE2B 94d953893d8287474f12680ba3b448c258e847a8c47605ea511ff220a99734c70633866fe226d02fa543a3ed70f8e38dc367d806f798229e53b40aba5dd157b3 SHA512 e1e0a04b01395696bb254a80f79b7fcd574c0a53352fd79e747c45f0d4298310613c3d2ed07b84fdb2f9a2d0d38a1e54942a2dcb694ab63869d6be1e3865d356
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index ccc902021cc8..ae8af51d80a4 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -1,7 +1,14 @@
 <?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>cwills@witznd.net</email>
+		<name>Cheyenne Wills</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 <use>
 	<flag name="apidoc">Build API documentation using <pkg>app-text/doxygen</pkg>.
 	May take a *long* time to build.</flag>
diff --git a/net-fs/openafs/openafs-1.8.13.ebuild b/net-fs/openafs/openafs-1.8.13-r1.ebuild
index 4bd2ca38310f..bf20909094ac 100644
--- a/net-fs/openafs/openafs-1.8.13.ebuild
+++ b/net-fs/openafs/openafs-1.8.13-r1.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	doc? (
 		dev-libs/libxslt
 		|| (
-			dev-java/fop
+			>=dev-java/fop-2.10-r1:0
 			app-text/dblatex
 			app-text/docbook-sgml-utils[jadetex]
 		)
diff --git a/net-fs/openafs/openafs-1.8.13.1.ebuild b/net-fs/openafs/openafs-1.8.13.1.ebuild
new file mode 100644
index 000000000000..86e2aeed829f
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.13.1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE="modules"
+inherit autotools linux-mod-r1 flag-o-matic pam systemd tmpfiles toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+KERNEL_LIMIT=6.12
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+	dev-lang/perl
+	app-alternatives/lex
+	app-alternatives/yacc
+	apidoc? (
+		app-text/doxygen[dot]
+		media-gfx/graphviz
+	)
+	doc? (
+		dev-libs/libxslt
+		|| (
+			>=dev-java/fop-2.10-r1:0
+			app-text/dblatex
+			app-text/docbook-sgml-utils[jadetex]
+		)
+	)
+	perl? ( dev-lang/swig )"
+DEPEND="
+	virtual/libcrypt:=
+	virtual/libintl
+	amd64? ( tsm? ( app-backup/tsm ) )
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.3
+	)
+	fuse? ( sys-fs/fuse:0= )
+	kauth? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+	ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-afs )"
+
+PATCHES=(
+	"${FILESDIR}"/0001-autoconf-use-AC_CHECK_TOOL-for-as-and-ld.patch
+	"${FILESDIR}"/0002-pam-paths.patch
+	"${FILESDIR}"/0003-fbsd.patch
+	"${FILESDIR}"/0004-sparc.patch
+	"${FILESDIR}"/0005-uname.patch
+	"${FILESDIR}"/0006-resolv.patch
+	"${FILESDIR}"/0007-afsauthent-symbols.patch
+	"${FILESDIR}"/0008-flags.patch
+	"${FILESDIR}"/0009-docbook2pdf.patch
+	"${FILESDIR}"/0010-libperl.patch
+	"${FILESDIR}"/0011-xbsa.patch
+	"${FILESDIR}"/0012-xml-dtd.patch
+	"${FILESDIR}"/0013-kernel-cc-ld.patch
+)
+# see https://bugs.gentoo.org/943641
+# Upstream performs uses customized autoconf routines to check for
+# the availability of various functions and the warnings/errors in
+# the config log for implicit function declarations are expected
+# and therefore are false positives.
+QA_CONFIG_IMPL_DECL_SKIP=("*")
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+pkg_pretend() {
+	if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}"
+		ewarn ""
+		ewarn "You are free to utilize eapply_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+		ewarn ""
+		ewarn "Alternatively, you may:"
+		ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it."
+		ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS."
+		ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited."
+	fi
+}
+
+pkg_setup() {
+	use kernel_linux && linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# build system is very delicate, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	_elibtoolize -c -f -i
+	eaclocal -I src/cf -I src/external/rra-c-util/m4 -I src/external/autoconf-archive/m4
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache || die
+}
+
+src_configure() {
+	# requires the --enable-static to avoid build errors.  This is
+	# currently an upstream limitation.
+	local myconf=(
+		--enable-static
+		--disable-strip-binaries
+		$(use_enable bitmap-later)
+		$(use_enable debug)
+		$(use_enable debug debug-locks)
+		$(use_enable debug debug-lwp)
+		$(use_enable fuse fuse-client)
+		$(use_enable kauth)
+		$(use_enable modules kernel-module)
+		$(use_enable namei namei-fileserver)
+		$(use_enable ncurses gtx)
+		$(use_enable pthreaded-ubik)
+		$(use_enable supergroups)
+		$(use_enable ubik-read-while-write)
+		$(use_with apidoc dot)
+		$(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets)
+		$(use_with kerberos krb5)
+		$(use_with perl swig)
+	)
+
+	# bug #861368
+	filter-lto
+
+	if use debug; then
+		use kauth && myconf+=( --enable-debug-pam )
+		use modules && myconf+=( --enable-debug-kernel )
+	fi
+
+	if use modules; then
+		if use kernel_linux; then
+			if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+				myconf+=( --enable-linux-d_splice_alias-extra-iput )
+			fi
+			myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+					  --with-linux-kernel-build="${KV_OUT_DIR}" )
+		fi
+	fi
+
+	use amd64 && use tsm && myconf+=( --enable-tivoli-tsm )
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	AFS_SYSKVERS=26 \
+	econf "${myconf[@]}"
+
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1
+	local d
+	if use doc; then
+		emake -C doc/xml/AdminGuide auagd000.pdf
+		emake -C doc/xml/AdminRef auarf000.pdf
+		emake -C doc/xml/QuickStartUnix auqbg000.pdf
+		emake -C doc/xml/UserGuide auusg000.pdf
+	fi
+	if use apidoc; then
+		doxygen doc/doxygen/Doxyfile || die "Failed to build doxygen files"
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${FILESDIR}/openrc"
+	local SYSTEMDDIR="${FILESDIR}/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	if use modules; then
+		if use kernel_linux; then
+			local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+			[[ -f ${srcdir}/libafs.ko ]] || die "Couldn't find compiled kernel module"
+			linux_domodule ${srcdir}/libafs.ko
+			modules_post_process
+		fi
+	fi
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	newins "${FILESDIR}/ThisCell.default" ThisCell
+	newins "${FILESDIR}/cacheinfo.default" cacheinfo
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use kauth; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump* || die
+
+	# avoid collision with mit_krb5's version of kpasswd
+	if use kauth; then
+		mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+	fi
+
+	# avoid collision with heimdal's pagsh
+	if has_version app-crypt/heimdal; then
+		mv "${ED}"/usr/bin/pagsh{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die
+	fi
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use kauth && doman src/pam/pam_afs.5
+	DOCS=( "${FILESDIR}/README.Gentoo" src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	rm -rf doc/txt/winnotes || die # unneeded docs
+	if use doc; then
+		DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING )
+		newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf
+		newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf
+		newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
+		newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
+	fi
+	use apidoc && DOCS+=( doc/doxygen/output/html )
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [[ -e "${EROOT}"/etc/openafs/${x} ]] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod-r1_pkg_postinst
+
+	tmpfiles_process openafs-client.conf
+
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+	elog
+	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_config() {
+	elog "Setting cache options for systemd."
+
+	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+	[[ ! -e "${SERVICED_FILE}" ]] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+	[[ -z ${CACHESIZE} ]] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+	if [[ ${CACHESIZE} -lt 131070 ]]; then
+		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+	elif [[ ${CACHESIZE} -lt 524288 ]]; then
+		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+	elif [[ ${CACHESIZE} -lt 1048576 ]]; then
+		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+	elif [[ ${CACHESIZE} -lt 2209715 ]]; then
+		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+	else
+		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+	fi
+
+	# Replace existing env var if exists, else append line
+	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+		die "Updating ${SERVICED_FILE} failed."
+}
diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7-r1.ebuild
index 14fcf5679111..4ece01979b10 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7-r1.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	doc? (
 		dev-libs/libxslt
 		|| (
-			dev-java/fop
+			>=dev-java/fop-2.10-r1:0
 			app-text/dblatex
 			app-text/docbook-sgml-utils[jadetex]
 		)
diff --git a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r2.ebuild
index 6dc1e1a99ab7..e6033dd205cd 100644
--- a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.8.1-r2.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
 	doc? (
 		dev-libs/libxslt
 		|| (
-			dev-java/fop
+			>=dev-java/fop-2.10-r1:0
 			app-text/dblatex
 			app-text/docbook-sgml-utils[jadetex]
 		)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 159f9333660f..f78c33aa3892 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -15,5 +15,5 @@ EBUILD samba-4.19.8.ebuild 11571 BLAKE2B 9087871b4022288746cf924b2d41c44d45dc9f9
 EBUILD samba-4.19.9.ebuild 11571 BLAKE2B dcf610987dc293a4f3051b93e91fa30f467fbccbebe981ae33a9a76a0c006fedfe02176c075a1e5d0d7493528fc43d23821762fbcc43044769e80af07cc7d6f2 SHA512 52913a3d63dc283ab92c4088753f6e29e84e8aa550de922ec009c83fbc57eb8978e9be18b5beba154aabf9885161793c0b4604cf9efa0b04e99c1374bc0a5e21
 EBUILD samba-4.20.5.ebuild 11595 BLAKE2B 79c8a23afb94f5bed1a32b856b5e89b54b3c3713639b3571a1763975dc4dfe2d5b234375990950d44e137a492dc35b828fba39e41eb1bef3e191cbd7ff02d2ca SHA512 51fe7569719547a3d303af99d0e8fba3ceef9d91080e858e88de4653fb3256a3bfd9cfe5153353db6c156d956289306cc9a8599f7fe67a97548cd2c5d60dcaf2
 EBUILD samba-4.21.0.ebuild 11493 BLAKE2B bed8e18ba4d322118e9f036505a1d8aa97f4d1689e7d69147f5510b0b15dbf1fd7533bacfd33a1c45e8df239afdfa42b07b4eddd6abc164826a18faa119b95c0 SHA512 9b4cb07847501ef8c191d062002c06026c86e39254d2eaae9b3c965a503623aad2d3ad1a7422850213ba36ab6787c1d8a2e308625ae2652db36eb88dad69a5d2
-EBUILD samba-4.21.1.ebuild 11589 BLAKE2B c9c298ceca07f548b06fedbc5571357d49cfad8e23ac198fb5a97e9dad683112bd1a2a526d85b31bfaa23c44f76f65bf02434da2d6ae9ad607e523dabd08f686 SHA512 e802280ccc42dbbf9fcc1199649c25b3a3897f8ebdab7d1fbcc92c28b820311f56639630c7f55dccfc50e7f80d8ca54f22c38be02845e4fdfac9a958c9082f6e
+EBUILD samba-4.21.1.ebuild 11631 BLAKE2B 6587f413b2cb86b6cd81ba7ab8996bd824de6eed8e48247ad1d522a817753c4d7a5f706bcf3468b64b25c2b1b20e82468a4a9b62bd9ed9739b021f86aa4caa07 SHA512 1f6f0395a7f00f4d4e66879df56e6970a2e76ce4525a6844f70ac5462b397ae0a634c9d5f53a174ef384364448490629527fcd5c4a0ae3d4bfd8efc3da842317
 MISC metadata.xml 2129 BLAKE2B 22716cc1235dc573023fe31c941bf999916a73bd0de504703c9e9f66b4a1a776e47b74dafe951d0bf04911dfa5e3d8d6354dd8e532fecdf0d51b02cf5eb30da5 SHA512 a6927d5243e95f31a896befa759fea648dd16c19a0a35935da525283a22d314faf5d515f23810026eab94e3bd3cec6431eb5aa3168be8989418f7d66452d92fb
diff --git a/net-fs/samba/samba-4.21.1.ebuild b/net-fs/samba/samba-4.21.1.ebuild
index 80aeecc1717a..71fd45394a02 100644
--- a/net-fs/samba/samba-4.21.1.ebuild
+++ b/net-fs/samba/samba-4.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -210,6 +210,9 @@ src_prepare() {
 		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
 		|| die
 
+	# bug #943942
+	append-cflags -std=gnu17
+
 	# WAF
 	multilib_copy_sources
 }