gentoo resync : 18.05.2019

2 files changed, 121 insertions, 0 deletions

diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 443c3191288c..b963fc3d2ab3 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,6 +2,8 @@ AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672
 AUX cifs-utils-6.7-talloc.patch 857 BLAKE2B 3ffefe40f18db87992bf3a2816bba690251f3dc93f78e998acfebbff450c20072679e4ee7fdb9fe22e835d4a7cf8f3bb43cef887fa54d7a70d6bbbf7dd8ef1b8 SHA512 c1e64736ec7735213a66b9c2514667244e5dd78531c899b7e10ff93acfed8395ad970b9b2dac929d7894feff3cfc0f46c6693df244557dbb9d2f2f8939ccc8f5
 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e
 DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13
+DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.7.ebuild 3226 BLAKE2B 4d0edab2d12ea2d8046995001c8c2bdc2d7ad580d901743e5fb5e104ae706768dd8f9ff0534b2b82cd6c5f36edba92d45b955e9602496befdc7bb1f561b51f68 SHA512 11d2651a795e9ff441bb4f80d02a6b568ad566190390477cc67dc5baf92fec15f8a1e195b291b2828bdb30b5dece1236ecffa907d5ef8c86a728ca43a0ec63bb
 EBUILD cifs-utils-6.8-r1.ebuild 3038 BLAKE2B c716960106acaa8a7cad9f4cb74ef9d5ae1c7df906728afb557baf909415fa78952bb06b83009c14eac739b03300ba40e67e6f6931969171f66640d2cd5b67ce SHA512 d5fd7ff2d03f6e21c413011855b61a79a64c2f9bcc90a7db4e4d0b49e863bac42e56b656765a78d172bdbf1071d89220d9ddb43b2ccb4071e40c842a1004855d
+EBUILD cifs-utils-6.9.ebuild 3006 BLAKE2B da015779271df5eeb6e043c3fc1c8e664444d640fae362a38a3e94489bb6d27825786f642f54eb820b54eca42e74d82a196b375cd8e79bd36e1083be789781fa SHA512 59d26ea7a68cfea6c8cf0ce0954ca58a925098e0809ceb93c7e9e8d5c75ed68c71c671e7d94d7d5d8f0ed9adc67ef49dafdae5bc1903f47cbe43e5c4d56dffd5
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.9.ebuild b/net-fs/cifs-utils/cifs-utils-6.9.ebuild
new file mode 100644
index 000000000000..c757b0aed04f
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info multilib pam
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="+acl +ads +caps creds pam"
+
+RDEPEND="
+	!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	sys-apps/keyutils
+	ads? (
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+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
+}
+
+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-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))
+	)
+	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
+}
+
+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
+}