gentoo auto-resync : 04:10:2023 - 23:52:39

3 files changed, 156 insertions, 0 deletions

diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 09b32e630010..1bac2d6d661d 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,8 +1,10 @@
 AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26
 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 3605 BLAKE2B 90b3a82bee565cfe8b5ece1a62bcbfa77d7aa368ca4613dc098d7c706a4816f7553aa794b62dd18b8ea9a1e34179f80091b152bdd955c6ca5a9c49ca43f4555b SHA512 8c2ed76fcf96288e0b9245df9a877180893abdeddcac88bf60056acc4db23c17701e999ba670894df8b8be8b79d908930def120557f8fdbc0d48343f0f7580d8
+EBUILD cifs-utils-7.0-r1.ebuild 3667 BLAKE2B 3154138ea3fad81e52112c157abe1a44682e2c0d70287a5adcd0f65c0181d0ac191d1b375b204e0e1e4543af1bba1dc6fe09c7cd7ced93ac4c5d936252c9de4a SHA512 7d037dd8b78a5448e7ba2ac4301344df1510fcf89964afbc03b340e050f9ca31745091fc22203bd20516270fdce0084e47dbc4f61edc47f333f5f72f3065ed5a
 EBUILD cifs-utils-7.0.ebuild 3605 BLAKE2B 90b3a82bee565cfe8b5ece1a62bcbfa77d7aa368ca4613dc098d7c706a4816f7553aa794b62dd18b8ea9a1e34179f80091b152bdd955c6ca5a9c49ca43f4555b SHA512 8c2ed76fcf96288e0b9245df9a877180893abdeddcac88bf60056acc4db23c17701e999ba670894df8b8be8b79d908930def120557f8fdbc0d48343f0f7580d8
 MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89
diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
new file mode 100644
index 000000000000..0dc48d00b48e
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2023 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 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"
+	"${FILESDIR}/${PN}-7.0-no-clobber-fortify-source.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() {
+	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/files/cifs-utils-7.0-no-clobber-fortify-source.patch b/net-fs/cifs-utils/files/cifs-utils-7.0-no-clobber-fortify-source.patch
new file mode 100644
index 000000000000..07661cf9dd02
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-7.0-no-clobber-fortify-source.patch
@@ -0,0 +1,11 @@
+Don't clobber toolchain defaults.
+
+https://bugs.gentoo.org/890278
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS)
++AM_CFLAGS = -Wall -Wextra $(PIE_CFLAGS) $(RELRO_CFLAGS)
+ ACLOCAL_AMFLAGS = -I aclocal
+ 
+ root_sbindir = $(ROOTSBINDIR)