gentoo auto-resync : 17:04:2024 - 12:04:27

5 files changed, 4 insertions, 151 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f17626f828aa..e52784cde5de 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index e19a371f9b9a..12d4a6ea80ca 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,9 +2,7 @@ AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece
 AUX cifs-utils-6.15-musl.patch 2215 BLAKE2B 251be73f341d4573aa509915e364680fc6d85ed720ad5682812cd6ba418a64bd7c397bd742cd999cea52fda0e07d668e796383f034c5ccb1639764f93d050e9e SHA512 902deb413bbc7f34d9933fcae9c48c73bb2fb2aaca22b5ef3efd394bb2d550456548c08087db41a96a60f3e1ed945127ba242dc980b286dbf3abad1b0694c605
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 AUX cifs-utils-7.0-no-clobber-fortify-source.patch 315 BLAKE2B e67a4ca264bbc4372b8a80b1da562ec31b6869c5dae065edc9e37a127de50e08e588bdcce1a5a1505df9b6bc128aee3bd34fd991a5330ae13e93880345a7a0d1 SHA512 75b729fb09df77ec77d2a028f15acbaea5e7ccec185dad72789d13c3dd0b8b48f6654e2f28b7f22f2117cf0b60d2b869a5c4f554d8d3ed4e83a0d3bd5e8abe40
-DIST cifs-utils-6.15.tar.bz2 416592 BLAKE2B 8af926bf255c5b3a66bf52ccca99632aacb9ed1c83ad7db5543b32df2f3bcd4be9a9cd17b744ec115d1568d07084e2bd2d03849aa9ab97cff2862f39bcf137b8 SHA512 eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510
 DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb
-EBUILD cifs-utils-6.15-r1.ebuild 3676 BLAKE2B fdcd0fc55b34ab18e7d39eb1747f12c0322ffa752d19be022beeb6d8a3adecf8bd8b6e49cd5ef8e082d76599f4d663e0e1b2f049b85566e8e8934583df050295 SHA512 975af336c63fba48273c56d5d8b834de358466b7cf593d553b294265d5867ecb917efbd9e679c4b830adeb88093606c30862995d6aed09fbf2c3cdbf09d4ef61
-EBUILD cifs-utils-7.0-r1.ebuild 3724 BLAKE2B 1abf0558936dfa8422d6f9fcbd3d03f61ddf2ba8d4d644ed6ae4447fb5e6772a6c4b462b8ecf3737a005c4d3bdf2acb54fa9528094678c8c3ec05df820510c78 SHA512 8e9a73d8da62a5831c64cd4f2901e25ba852ea9e5eebd15aa0fcbc078fcf14e7f1fdd494e39e6c34e987cd740cff41c93d7374be2c906e954222993cd0731259
-EBUILD cifs-utils-7.0.ebuild 3676 BLAKE2B fdcd0fc55b34ab18e7d39eb1747f12c0322ffa752d19be022beeb6d8a3adecf8bd8b6e49cd5ef8e082d76599f4d663e0e1b2f049b85566e8e8934583df050295 SHA512 975af336c63fba48273c56d5d8b834de358466b7cf593d553b294265d5867ecb917efbd9e679c4b830adeb88093606c30862995d6aed09fbf2c3cdbf09d4ef61
+EBUILD cifs-utils-7.0-r1.ebuild 3724 BLAKE2B 4b991faad65ff3bf418788762095df722038dbf8509747ff1ba0402d846da4a46a6a516a0d080f89794305d4df17a6a60b0099600813e06d689a1e9e74c30f11 SHA512 79103a140c39abe74abee5c7268c84927076dde0a89cd515a13628352d01a7d767c225d645b55b9d19e36f7eae7f5b369e40b8fade34f78c3c8c553269c24ca7
+EBUILD cifs-utils-7.0.ebuild 3676 BLAKE2B 596c7dd752fa33110c6f10c41f7b8c36de1bae1c00050ae4ec2dc1881b92d9fdf171ade6a798233e28cc25c76dc81f7e4efec04cfbaeeb7438c97edea9bda999 SHA512 1257bc3942b0bfae3aaf1676c437c3153c85d9bf2133400be60c6e734ea3fa3c33dd5eedcd9e9c030266169ad46d1a131926d27732e723ef22749d4778886ad3
 MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89
diff --git a/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild
deleted file mode 100644
index 469484d3dbd1..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils https://git.samba.org/cifs-utils.git/?p=cifs-utils.git"
-SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
-IUSE="+acl +ads +caps creds pam +python systemd"
-
-RDEPEND="
-	ads? (
-		sys-apps/keyutils:=
-		sys-libs/talloc
-		virtual/krb5
-	)
-	caps? ( sys-libs/libcap-ng )
-	creds? ( sys-apps/keyutils:= )
-	pam? (
-		sys-apps/keyutils:=
-		sys-libs/pam
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils"
-PDEPEND="
-	acl? ( >=net-fs/samba-4.0.0_alpha1 )
-"
-
-REQUIRED_USE="
-	acl? ( ads )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594
-	"${FILESDIR}/${PN}-6.15-musl.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if has_version app-crypt/heimdal ; then
-		# https://bugs.gentoo.org/612584
-		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug #927809
-	filter-flags -fno-semantic-interposition
-
-	local myeconfargs=(
-		--enable-man
-		--enable-smbinfo
-		$(use_enable acl cifsacl cifsidmap)
-		$(use_enable ads cifsupcall)
-		$(use_with caps libcap)
-		$(use_enable creds cifscreds)
-		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
-		$(use_enable python pythontools)
-		# mount.cifs can get passwords from systemd
-		$(use_enable systemd)
-	)
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -empty -delete || die
-
-	if use acl ; then
-		dodir /etc/cifs-utils
-		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
-			/etc/cifs-utils/idmap-plugin
-		dodir /etc/request-key.d
-		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
-			> "${ED}/etc/request-key.d/cifs.idmap.conf"
-	fi
-
-	if use ads ; then
-		dodir /etc/request-key.d
-		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.upcall.conf"
-		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.spnego.conf"
-	fi
-
-	dobashcomp bash-completion/smbinfo
-	use python && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use acl ; then
-		einfo "The cifs.idmap utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
-		einfo "This enables you to get and set CIFS acls."
-	fi
-
-	if use ads ; then
-		einfo "The cifs.upcall utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
-		einfo "This enables you to mount DFS shares."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
index 6e303af03995..aa0f9fee761f 100644
--- a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1
 
diff --git a/net-fs/cifs-utils/cifs-utils-7.0.ebuild b/net-fs/cifs-utils/cifs-utils-7.0.ebuild
index 469484d3dbd1..95cf49c09822 100644
--- a/net-fs/cifs-utils/cifs-utils-7.0.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1