Moving to EAPI 4, adding upcall use flag, which enable cifsidmap, forcing user to choice either caps or caps-ng support

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 93 insertions, 9 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index 97a1678bb69a..953b2aacca0c 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.14 2011/08/09 13:42:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.15 2011/09/26 17:32:43 vostorga Exp $
+
+*cifs-utils-5.1 (26 Sep 2011)
+
+  26 Sep 2011; Víctor Ostorga <vostorga@gentoo.org> +cifs-utils-5.1.ebuild:
+  Moving to EAPI 4, adding upcall use flag, which enable cifsidmap, forcing
+  user to choice either caps or caps-ng support
 
   09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> cifs-utils-5.0.ebuild:
   Marked ~ppc64 wrt #358401
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 346ff0313304..aa73a3f4cbd2 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST cifs-utils-5.0.tar.bz2 355658 RMD160 cab81e167300291d17fe5c742016cc3cf1f2d3af SHA1 3b92df032dcef129c21a2f8f96658add2ec0cca4 SHA256 3ae57eb4edef2bb2e71616d80f010750a3da85d722ba5c651789d2398e1c814f
+DIST cifs-utils-5.1.tar.bz2 366162 RMD160 3ca51ff3d61513a849e5713b1e10e225bea1b2a1 SHA1 f1c66f148a73e6c9e765fc1df13bd927f8dde5fe SHA256 67f8f9bfad7dc952bd4aa9b1c125d186e437d1e1e75c14992a1f6b7f142e7d3a
 EBUILD cifs-utils-5.0.ebuild 2193 RMD160 8ae663dd06a951e9cf46954b8d3d3150ce3a605b SHA1 6f59b3ceb844f6f86923c7c7a4724fc951d72165 SHA256 a626d5d88bb310b19d2138315658de6a3f4452993c08c3ba5e95278021333769
-MISC ChangeLog 2319 RMD160 b48312f379fbe09919bc4d0eee9bdba7434b8caa SHA1 d1d6110fc762554c7bf67721c25397f351355301 SHA256 6ffb951953f3101915688d8a0edb3c9455103217f639b850d95c95b5195ab0d9
-MISC metadata.xml 911 RMD160 5e81306d8b310d6419f3f71f9655408e48b7e42a SHA1 0706cd0798a3e821ed33f416d696ba217c56e12d SHA256 1ebd173f9ef7b7ed86b9fa19f537cc7edbb3656599467ab5a03054298d63711e
+EBUILD cifs-utils-5.1.ebuild 2330 RMD160 72ccab340c04a4dcf9cb1aa8b414607ce47e92ca SHA1 b70c90ca7df1b647c85772c7585a2f6bb47f5d07 SHA256 8ec838f81463be8d26a47993e1abb0b7f34a2d104d74bbaf7bd3358f06d5cd85
+MISC ChangeLog 2550 RMD160 dc39cdb04b83ea5500c6c2a9e257838374a218be SHA1 797acb89153171df81c7a5fb3cd80cdb17bae505 SHA256 aaf14395b55f24246f90653b635edf350be1cd42a5b6323827a88705e76d0e7d
+MISC metadata.xml 980 RMD160 b628cc657f81e3acfacd0bc05621b85fb6558ac0 SHA1 a5108db6eb2997a730fbeca1955c2e1c53c10ac8 SHA256 b2a38280bf5d6d96943c7365ab23eab83ca508db2c0d80eca949780efd221390
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5BOVMACgkQIiMqcbOVdxQa4gP+MaOb2ChqvzKRaXIYlLVWaVKU
-QYymqvm8EKr2VAXUnKyTjoPRvIUjtIGvcZb/JlKtaUKyj5Ul7VUeUGWNVpajl8Vf
-n46WUEeS+6SbPc2TFPZRHpBdHZaZCnXtjHePJnXO4+2LoRekCwsKUHcV/WMo7AJM
-rqJUNMIvj1q6Q7JKFCs=
-=6JGo
+iEYEARECAAYFAk6At0EACgkQKQaZ7OJe4zZwSACgmEklWBP+5rv54ale7cqwiB0q
+nDAAn0NKnMzxrXpQfOUKquRJrqBxAa4Y
+=tYpK
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.1.ebuild b/net-fs/cifs-utils/cifs-utils-5.1.ebuild
new file mode 100644
index 000000000000..cc4283abcb10
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-5.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.1.ebuild,v 1.1 2011/09/26 17:32:43 vostorga Exp $
+
+EAPI=4
+
+inherit eutils confutils linux-info
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="http://www.samba.org/linux-cifs/cifs-utils/"
+SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ads +caps caps-ng creds setuid upcall"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
+	caps? ( sys-libs/libcap )
+	caps-ng? ( sys-libs/libcap-ng )
+	creds? ( sys-apps/keyutils )
+	upcall? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="^^ ( caps caps-ng )"
+
+pkg_setup() {
+	confutils_use_conflict caps caps-ng
+	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_configure() {
+	econf \
+		$(use_enable ads cifsupcall) \
+		$(use_with caps libcap) \
+		$(use_with caps-ng libcap-ng) \
+		$(use_enable creds cifscreds) \
+		$(use_enable upcall cifsupcall)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	# Set set-user-ID bit of mount.cifs
+	if use setuid ; then
+		chmod u+s "${D}"/sbin/mount.cifs
+	fi
+	dodoc doc/linux-cifs-client-guide.odt
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	if use setuid ; then
+		ewarn "Setting SETUID bit for mount.cifs."
+		ewarn "However, there may be severe security implications. Also see:"
+		ewarn "http://samba.org/samba/security/CVE-2009-2948.html"
+	fi
+
+	# Inform about upcall usage
+	if use ads ; then
+		ewarn "Using mount.cifs in combination with keyutils"
+		ewarn "in order to mount DFS shares, you need to add"
+		ewarn "the following line to /etc/request-key.conf:"
+		ewarn "  create dns_resolver * * /usr/sbin/cifs.upcall %k"
+		ewarn "Otherwise, your DFS shares will not work properly."
+	fi
+}
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index f5b753cac313..5b4290260c48 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -13,5 +13,6 @@
 		<flag name="caps-ng">libcap-ng support</flag>
 		<flag name="creds">cifs credentials support</flag>
 		<flag name="setuid">Seting SETUID bit for mount.cifs</flag>
+		<flag name="upcall">Create cifs.idmap binary; idmap support</flag>
 	</use>
 </pkgmetadata>