gentoo auto-resync : 08:04:2024 - 12:31:06

6 files changed, 114 insertions, 138 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 8a41ef50a3b5..fddaf1df3fbf 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest
index 6f625c16e535..2d98382baf5c 100644
--- a/net-fs/ksmbd-tools/Manifest
+++ b/net-fs/ksmbd-tools/Manifest
@@ -2,10 +2,9 @@ AUX confd 163 BLAKE2B ea3a2a65e014d0d96bfb0789cd6756b44eeced76a0d295699d6e615ae0
 AUX initd 552 BLAKE2B 2357df024a9fd9b1334a41a6849fd3fd69f49676c3c4a9cf240a6181cb56c230b59afeadce2b37d84250d2e608e5e8109d8747f91449725ea517879d2e644683 SHA512 ae54b9cafee967fa3a5e313412725b91569c923e10b663bb7032cdc3401209e424d9e333e321ff1a8cb793aa545133e03978d8b5a4c8532836a861421ace7089
 AUX ksmbd.confd 237 BLAKE2B 7d66dc656344516421d5f043071e9a3063d2c4b5128a7a05ad5c11888b06d9f2f43ea54b404901719b8afa03623a65514bed0b3c6c5890b1d17d15eab9942bea SHA512 e314d1a520599dda148ff5aad8d0089950aceec1ec3fec6a34d4e60958e7668414b7234eea2fabdb9d544f67f385fca9dde24dddd265559339f08d949ba019dd
 AUX ksmbd.initd 749 BLAKE2B a1cc96354342d7f89194c9f836ddfe707b2545b1f2a425f8f7ccd28180d407e02a390c98731ef05c76b5ef42ac447d31cbe1d223ab057b6cebfd53e2694ab472 SHA512 5b38dbc8417f57aa9ba08c08cc5796f8316579389e3430efb410b3cc880657c27950cccaabe55f3fb826946d04448625561d165c90e344f1bab4f9084b15889b
-DIST ksmbd-tools-3.4.4.tar.gz 75481 BLAKE2B 84c215b0ccad01956185d42b858eb0de6a3407fc32c59628964ab38a2946fe5123fc73cc06cb04e8864199751f26e509ae5f6ebf6f5e7eb5f1fb8f21a4452a48 SHA512 b7be00e38eb126a0d5b8b3d9dde7c997b4012b29604d899a5f2fe3a77a3c30ac5d4bf00b7fc88d57150fd574af38bd2823c736d272a2cd596d40ccbe14a15320
-DIST ksmbd-tools-3.4.6.tar.gz 86976 BLAKE2B 2f18d41a5ef84d1d5293cab2dc51147649d723117f31b4a0360ff314d98544624c6c0280b11ec2df260514981995bdbac598347063fb6576447c511e88134c4e SHA512 396423a43ccb02fafb721717a36ea1efdc8449414cf9f7737cf44bafd991cde0a5d31689b5f43f96924357df058c1b5fbf90369b9aec2b293ae1a7b68c256d27
+AUX ksmbd.initd-r1 760 BLAKE2B 9492e6ec06b5906cae8f16576e6a72a59510faa9ad606fd4e81b1c369311252c1308d91601b18f4ace8eff0a6128868562ec8de22f27e9dd4a89eefb887dfaca SHA512 64241b5f1a2925af82ee1c6ed46bc2e2953752a5c24b7f82ea5c1d9b2464f20176daccda23312d9ff1e4366871f3836e3091e9e2f725f1c5efc50472b36c425a
 DIST ksmbd-tools-3.4.8.tar.gz 88898 BLAKE2B 4bd4fa77e7d89de4f48427e6867807b27a9be91e4f27079d4a5b231c4925aef73489bced1e4569361105fe7e04671fa8d6f3394154b36072f9d4ec77fded7466 SHA512 f5372ea7fd4b754482374cdeefa011bebe32c37a26acc180c34c61f37cf08125b5b4626128cae413cd517a74af326188f3f9e7cf459308e4305d86e7c6702436
-EBUILD ksmbd-tools-3.4.4.ebuild 1420 BLAKE2B 4ded069126e3ea307c7b81c7952d70f4157b4b851fde4ee2aee8700b16b2c03548d226075fb091dda4452fd291030409e537be05d0d040d5a59d97ffabcf3439 SHA512 8625d4f2457aee52fa4ddbfaf08905fa0c40baa66130197631ff2e355300defcc7250606166def82191cabb9c1ff116875432a0ea08cbaed7d64440e0811f184
-EBUILD ksmbd-tools-3.4.6-r1.ebuild 1816 BLAKE2B c90439f39e06615efa5465100686912a3a1bcacc9db699d4d330cc70bfdf77fe1e676ba6a4a21330f8d2d4f6380bcb61dc312e16ef872aee2d28c623ea88747a SHA512 7a82f6e28a6228c92d52c80f0cf9facb42d27d77fad44320b28b40b0babc07a8b282de451e9d24d9842cbf5d9961c2e6322ea3b382f173340ce0adc0fb0c5d71
+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/ksmbd.initd-r1 b/net-fs/ksmbd-tools/files/ksmbd.initd-r1
new file mode 100644
index 000000000000..82375f1ad8d3
--- /dev/null
+++ b/net-fs/ksmbd-tools/files/ksmbd.initd-r1
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 2021-2024 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="/usr/sbin/ksmbd.mountd"
+command_control="/usr/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.4.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
deleted file mode 100644
index 727d4cd275f0..000000000000
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022 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 recide in /sbin, not /usr/sbin
-	econf --prefix="${EPREFIX}/" --enable-krb5=no
-}
-
-src_install() {
-	default
-
-	local DOCS=( README README.md Documentation/configuration.txt smb.conf.example )
-	einstalldocs
-
-	insinto /etc/ksmbd
-	doins smb.conf.example
-
-	newinitd "${FILESDIR}/initd" ksmbd
-	newconfd "${FILESDIR}/confd" ksmbd
-
-	dosym ksmbd.addshare /sbin/smbshareadd
-	dosym ksmbd.adduser /sbin/smbuseradd
-
-	systemd_dounit ksmbd.service
-}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild
deleted file mode 100644
index 3cc23c1bbc48..000000000000
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild
+++ /dev/null
@@ -1,74 +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 \
-		--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/ksmbd-tools/ksmbd-tools-3.5.2.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild
new file mode 100644
index 000000000000..c8ff8da17db4
--- /dev/null
+++ b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson systemd
+
+DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
+HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
+SRC_URI="https://github.com/cifsd-team/ksmbd-tools/releases/download/${PV}/${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_configure() {
+	local emesonargs=(
+		-Drundir="${EPREFIX}"/run
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		# TODO: add kerberos support, explicitly disable for now
+		-Dkrb5=disabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	local DOCS=( README.md ksmbd.conf.example )
+	einstalldocs
+
+	insinto /etc/ksmbd
+	doins ksmbd.conf.example
+
+	newinitd "${FILESDIR}/ksmbd.initd-r1" ksmbd
+	newconfd "${FILESDIR}/ksmbd.confd" ksmbd
+
+	dosym ksmbd.addshare /usr/sbin/smbshareadd
+	dosym ksmbd.adduser /usr/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
+}