Revbump to EAPI-5. Added a patch to default enable libcap-ng and some additionaly tweaks in the ebuild (bug #466364). Reworked caps USE flag logic

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 124 insertions, 16 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index aa7e6b2c6c32..9d867665983f 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.62 2013/04/14 11:43:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.63 2013/04/22 08:04:20 polynomial-c Exp $
+
+*cifs-utils-6.0-r1 (22 Apr 2013)
+
+  22 Apr 2013; Lars Wendler <polynomial-c@gentoo.org>
+  +cifs-utils-6.0-r1.ebuild:
+  Revbump to EAPI-5. Added a patch by Torsten Kurbad to default enable
+  libcap-ng and some additionaly tweaks in the ebuild (bug #466364). Reworked
+  USE flag logic. Now "caps" USE flag controls both caps implementations and
+  "caps-ng" is the switch between one of them.
 
   14 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
   Stable for sh, wrt bug #464356
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 0e71d497b512..27c9261cfa5a 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cifs-utils-5.5-initialize_rc_var_properly.patch 1033 SHA256 c341bd479fd4e1587bf53db3e525b60f25368ba2860977235a64fa3988671ec9 SHA512 a81a7f36a11d43bdd1b08ed95aa87db1d6f4143a5f172aec1692d089cb4a8e0d0ab7b12a7cedd132182debe2e757c497a7840f3e7003467747712e2d1964617d WHIRLPOOL 157dc9c5939c4f2e4c1f399bb63a4a803af4727ad73df3117a7f674083bd17ba7df22810f6ebc771425010fbda7866b3f818b41d2a468b50d3ad0c15c34ab2da
 AUX cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch 1165 SHA256 b501c3a0665df177ea3faa682db98a559c736eddb2ef2eb91746ecedc60f8100 SHA512 a479ed28f9266bb0b2ef416d442c37d818c9ed7f141467c28c67e03cc27366cf5f75a8ed7ad8380407419981efa8d40bb8722b50a28bcfedade692d4d95918d8 WHIRLPOOL 91ee78b340e4d76fd3e98130db50599714a8042270df660650b54032e90a39c986f8050f9e7c21551360487b2e3114e759c5f6cdd58e1d68d4039f1c6fdacaf7
@@ -10,23 +10,24 @@ DIST cifs-utils-6.0.tar.bz2 388957 SHA256 f7bc15cc09082eee5e6c9647e826aaa5e73da4
 EBUILD cifs-utils-5.6-r1.ebuild 2241 SHA256 b9e1f2c8566f0019bbd4cbe16fc1f59949085d411bcb9dd6e3be734eef865ffd SHA512 794b054724de4000a708f990da0fb5e22664afabd97f959451ecf718d9d70b12c751baaf8ac83da6ea8bac224c201c8bdae1427a1551de8bf1aef93162e5a67f WHIRLPOOL 55f335e49bd330a465452a0878583f663e98fcdf442775e520e5f0cef10673f06921fe6ef8dbc42022d3cd39830ca08419ef37ca81959007174346fff6e307a6
 EBUILD cifs-utils-5.8-r1.ebuild 2422 SHA256 0c757b7e52494f0971d9f1299dce4ab3659d555024f3710f91df1e448cf4f885 SHA512 ed0bc7fe00ef49dc6f4bd80226f02137968229029778eea8f93083924185c19a11e039d869286d1573407ad70dafb4df61eb8d578d7a21052d1a6bd799fe19c1 WHIRLPOOL 7844050d7278a526a7fa9ae50842deb218111c75ff316a9b130a1384cd5afbeb693ea1600bd1545c6bb2bd6e786f765a13175413d476f6d4db9e342e6b17bdac
 EBUILD cifs-utils-5.9-r1.ebuild 2575 SHA256 21e256c3b483c2d282937fd15620aa74aa368fa39ccccad18cae2b2cf76557af SHA512 9e480f8af0d5caff4a54b070fb5205c9bad6b736c80cdfeabe6fce8fa06b99826a7a8d7468db1146f3d2e07a0f83c568c6eadb0a2d78787cc166595345f34511 WHIRLPOOL 49db5cd5c3867db296b4e748ee80ab6fadeee209ee225ea0e78a998b07fd66241414e8b57aa6500d1fa6ef3ec715a4b02272062d75884f20a76808065003e20f
+EBUILD cifs-utils-6.0-r1.ebuild 3003 SHA256 3ccb6453ab7a457315f4a70823d958ad42b823df64b1b728c55e64a61ca6be1f SHA512 011337e3cbf63b1a1184c3e9ae96a5b6e9eb8143540a947639edf7b7f1bb2409b28790567e8e06ba409353ebca2b094f94589636b2e5b0ccd8c9b12d108e8ee5 WHIRLPOOL f748a7c2517e9997ac42a0c60bdf1ef67782b6374e5cd91f3b8074a9d1a54b2546a388d28b0577914388b9e4d086ae8d6400f0231ef1911ec313e38bb1a21ab4
 EBUILD cifs-utils-6.0.ebuild 2482 SHA256 4c392ba6766a4fd9050fe637851d2e0655d7a716277e47186d5591502334c8ff SHA512 e763120e47a1b910f28e84c8a78afc09263a5d1a632440569d03562d8c38715f50c27f0e74d6e8bb56ea3fa4c678f0e98316687a1c98f344e3715e00fce5672c WHIRLPOOL ad86f96710df9b44e9fed26c3edeee3ef7f56a0286436d1e7cf98d9632481678f16e065d2fdb481b042e035d7ab36b9fba82c17b2a4ed909f6b33054c368a9fe
-MISC ChangeLog 9098 SHA256 058de193642884cd335c7895f3b351d5a2e096e1323ff00a039778ee2ac00d27 SHA512 127825c7d6cb9ede1b9159826998a9eb088a93b4dfabb81e3c25bad54bcc7c321cb05d4ce49bd8d14e7169349f42c02fd542310148e8f7cd1c6334f896201a59 WHIRLPOOL 36f83a001a3c839f9c23f68554f5985fc2a9ad058b1dcc5440b5eefa9a7446ee976cd30732263daef1180020b027c1536b8ca76a91cd942fae572b47f28065ef
+MISC ChangeLog 9498 SHA256 6f3305103c12498b2cf405d255681cbf1f9a700c1e49725747efb30209b5c814 SHA512 c6214741967fe6e93ddafd03390ad3fc5625de4ada0d45615d7ad1f55384dcfa9e03d2a87d8045adde26218964f839c50cd7f1055522ab6d383c70d8b305907d WHIRLPOOL 30b8346862d7cd0bdcd7c4f141b835d5698dbc9f773e80802dae1025bf839d4e8525f8fbd2ab7760d5b83108f394e423721c2a5073850f59b1e6c11613ab2c68
 MISC metadata.xml 918 SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9 SHA512 cc02e740b458ddea020545a60ad8689027d3380fdceb64b50a8e120aad7c3293368aff072eae69e2892fab1e0a2d665b8292eb665ae55bc289f2d71999fba7ec WHIRLPOOL ba3913f7a3a782b8a7674e613e147f2bc8dee7e84c658d01214c9fb05be995da2cb797d292cf965d81da9bf0e03b53a007440df8c1a401365dfbc9832042f343
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRapWxAAoJELp701BxlEWfkU0QAICp0ReCIiMJGkD6UPEqadAs
-TCHSw1PJlIO4VL3GDDTV6enPuzG3bvmjBPJLj47WrdfkmOTpk64GFIMe71VfI9RV
-I3LURBWQRKoW4wH7apbHS9fTtuTqU/dmpy2NdlWeZmyZusD7A/6qNgbd9y9FaRNa
-DAQmgpfrJsCldVQ9DoflX9YYWCehYOKkEUCr5kdVK0AQfDvlZ1OatAropNUYQ//8
-xJL2F2/cBYzDJ2J4rdq+zFt0KCl68mW4jt8pKi/RAv2qOYAQuhVlxZ7GhnbEMhh+
-rMZ6EUihZenZA4Ovddf/yqAz5BHNq3p+eN7NZ5gs5LmnR1k0Rf7Jcg0s1/fc6e+8
-KjNcCkjWXFwt0snDXXahPqNcOSq2FI/DY+yHJQjUhcY7WnsNY7a5SCoOG0HRyqu0
-yTTDL5mr4yTP42oyhwgD10xoCkAjauB+MgqYeOT8AbMc19TVFeTpS8+hXGd53QDT
-rwBO4OnDcShly2TRNz4ID20SrZ0DdQNe/m6SzuOZSgcULRaSvOkCRDJrJ7wubUmn
-kfeCdeuOu3chW5sqJbmyneYimjZp6SFYiw5+Yv2iwyusmHgOZml21peUQmw0ltKV
-+WDISgpALyab4/TvUYEHj1wZqHYR9fZO081AUGwuk2EekG+/XGVdkn18yo6lc6P9
-tj6yCkyJA47bW8zn6Q0b
-=iK4O
+iQIcBAEBCAAGBQJRdO8FAAoJEPiazRVxLXTF8t8QAKS4kyyNpG0SmjTG7/8GxVTy
+v+Ggx35wa+P8TRARgDI/xPOrkNAuqHHe8q69pZPPBgpu+2jqYrUxBofCQg6QDoyN
+X3WNPdqZR472MyJtquHGzmKJ5yXHTQWCunzkV8+IlFgTJRDo3YktaDvs8riUQbvM
+ICdGT/uYwkfsYF/NOlXevs2ye6goIERbiDotHwwP6cjcS6xVB1JbNTzUpGczbA3M
+RzREmbKsEthCYkdBYqmrzDf6X03oENYTkZ91fuBtfOPdpMGQaS4gjKMUseUnU14u
+yKxfKovJJhqmbfRZzMWr91pvLI6vC9rjaU88A8FvOZGeYknF8YSZXcNLO48yK/YM
+m6/N54dq4exJ5W+VgUSuTEX8NaJSbxuKjO6na1A/glT5MrNER0BwXh0tYiqMhpqK
+2mzKDSX276G21YkYEivvc/324p4wjMUHsrCrojuD6+gdqv6uo3wRfrFKQuJHT9NW
+W4blC03o38QDvITNmcm9xKt88+/n1JNwsQEkqzRp5H+bRMcCqJ9ZBsR53tM133m6
+yT/h/zQl6QGM6AsxHYQdsdT6Y8Kas9kJWBA/tctkinRzulPIty6xUaq2kDOnx6Nu
+Lkej1EWFwxxfK6l4jmxxOEnPNI5rzzvUjf+cb1sJZv9hqI4qyCIwF28NLQ6dVVAJ
+eJIUJvhq6l/aNuxzGcuD
+=A6eZ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-6.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.0-r1.ebuild
new file mode 100644
index 000000000000..e4ae96cccaa3
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.0-r1.ebuild,v 1.1 2013/04/22 08:04:20 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils linux-info multilib
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_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 ~arm-linux ~x86-linux"
+IUSE="acl ads +caps +caps-ng creds upcall"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
+	caps? ( !caps-ng? ( sys-libs/libcap ) )
+	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
+	creds? ( sys-apps/keyutils )
+	upcall? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 )"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="acl? ( upcall )"
+
+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_configure() {
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf \
+		$(use_enable acl cifsacl cifsidmap) \
+		$(use_enable ads cifsupcall) \
+		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
+		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
+		$(use_enable creds cifscreds) \
+		$(use_enable upcall cifsupcall)
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -print0 | xargs --null rmdir \
+		--ignore-fail-on-non-empty &>/dev/null
+
+	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"
+	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
+}