Version bump. Removed old

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

4 files changed, 130 insertions, 99 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index e89faacadd1c..dd1dceabe7b8 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.75 2013/12/24 16:55:46 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.76 2014/01/11 21:39:28 polynomial-c Exp $
+
+*cifs-utils-6.3 (11 Jan 2014)
+
+  11 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-6.0.ebuild,
+  +cifs-utils-6.3.ebuild:
+  Version bump. Removed old.
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-6.1-r1.ebuild:
   Stable for ppc64, wrt bug #486312
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index f76a3d06ce74..b7cb8339fafd 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,33 +1,33 @@
 -----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
 AUX cifs-utils-6.1-hardcoded-path.patch 1513 SHA256 2a0415b1452f3033c8322ed102b9acafbab9640f936254002d1bc493a0e6d7d5 SHA512 3ad0fbea11cd6a4bf6072e1131ccf87b0b81a9c869e2ee199f655ebc974c5e79f87694aa162ce2911767b6689f3b7530895b835d920575b5c37ac8fcd8cf4aad WHIRLPOOL 8684a3a3de491f9bc17070c8ad9d53bad14f5af62692e805bdd548bd4ad731096c01ce580b9800b053fcf583ee7af4166cfe00761f207934fa75b0223b22da76
 DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90
-DIST cifs-utils-6.0.tar.bz2 388957 SHA256 f7bc15cc09082eee5e6c9647e826aaa5e73da41646541bb7a50f53f78a6ef8bc SHA512 38ec543110743ace17019d383927f362e55f9d1ad260f897ee443917f7acd6eae1b098f935d5cff077141d7710106378062a9ead6c39c8b15335a6d3af0d3d12 WHIRLPOOL 2a66218c9d31e34a3e7d42e682afa6792cf20601f0e7aca723ba62c0644628426736478f79db32a373318614577a936bb4b407f33e894857f280bb1272354d4d
 DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1
 DIST cifs-utils-6.2.tar.bz2 392856 SHA256 34676e374ee139ce1b6566ed1802c55f92b5d74cc58417a4989df7438ff2cd33 SHA512 dc7060d3da65b706ce491a0c1fd113440f93787b79b29fa6207f96b538a2403f54e5e780418e0ad0b65e14eb45d3b0d50439253266c9d12b0d9f772954031ea6 WHIRLPOOL 5c3414babce753916e1d5660ac5b607c2791fc323d1736e07bd392b71bd3a660ca37257af7f61baed1df5188047d336d7330ae7c9c0980407f0ade74c14d2bc5
+DIST cifs-utils-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8
 EBUILD cifs-utils-5.9-r1.ebuild 2481 SHA256 41f3c1edaea4542178c93fa889b2b88bab9b3330d3751dbdf8b8e9ccfa0f8c26 SHA512 a8ba06aab690449f5d57e63f64f1010744bdcad7bb827b163dbba54c6f041679dcf47d191ceca785a0b8e9f1a1f53d638b993033991f02dd18afefef6fdfb33c WHIRLPOOL 4e9ac7b70e33fc7a21507207624ea8d8ba531e11a383745d25dd84ec6c65eb49beb0b85624b864d49c9bf55a0ea629639e4d77e01d16af5de72026c6815e5c99
-EBUILD cifs-utils-6.0.ebuild 2379 SHA256 7c38f07a707eba179910f100ed78a87a3ae26c0fdc3c34410577f00f9f4a92c1 SHA512 ee5a5a1b8375e2d3654cd0ee68f178aaaf112fc2a35ad2445107c6692a1eff2476c5c37d10da048eb7e09ca9363d9c33a6a39b74ef3191db46c0a7375b8217ce WHIRLPOOL 10266603917ba755138064a640f11ced6ba38dd0e985623506bdbf4596a4c9107a89124252188ce297f1f62642f9f8ea3ea762ea322f7de235fd6ef07aee9f58
 EBUILD cifs-utils-6.1-r1.ebuild 3089 SHA256 b9ccde9490ebd0eddffa30b090a9e9f2aab5f82b17148c47a88b09ce45773b36 SHA512 7599330da3ac9071fd7f0ee236f4a7ca2610653d9c4ac6370181f1933f285b02d5a1e470ee708e4c4f5df53e24025781c2e4ff74b07b2078ffa8c73bdd8a149a WHIRLPOOL 6baed657e1f1b5f62afe475d00914dc8d260b9045d6b72ada75c6198452a74ab16a61b8fe900298e50d92afede0f7ca8f07a3c2cc79f6506858024f67e810593
 EBUILD cifs-utils-6.2.ebuild 2961 SHA256 e1aab0cc9b5949161068df14e6de8e7879caeff03eb959c1efb6638485a04ec8 SHA512 4d1e6a80336ac438c1f0b9d043bc87e590ab249d8785ac689b57b3134878abd5fdddfcc26e835ba2a059b23f92877e7bec25482bcabaafc45a5cb55bbff7ca77 WHIRLPOOL f462ee4eec20a769262035f654017a647cd6bd584e96876597179d3cd895af3d696fac1a1769a5afdd78b4bcdc4ba1e8e69b4d9f810cbe4711813c21fcda401d
-MISC ChangeLog 11597 SHA256 42aeee80e6f1f5fd20d9c2837dd5d7390a062c81d723c39150ffdca732cde1a3 SHA512 c98d4ae1c2bb84c1096b9e0c7938120b38be9fa7cc555b13c23482ecdee6584a44f6ee27275b073228c71790d72bebac35cd9ac1dd4f76f3271a39e72234bf34 WHIRLPOOL a63c70650d29b9eb3c5226cc15c8f1e5aec0e351d5d4dfb72b27ab3ed1d8dddfb0351e709bda2035fce69e2f82fa4a21fe15caf21ed01ac21df25ea71bf5d7eb
+EBUILD cifs-utils-6.3.ebuild 2962 SHA256 5e3e0f304dd593e19b988b69d949e26f63741a9097dfc74211ffb8fe937f5a8d SHA512 eb85bc999b3cce13229feaf0e9da91bfe9d5e4d9c950f3dc61708684831cfb4bc2a428edff0f748f25844a878eb01ec347f80ca3c1c7345a78ad6ef1876eb90e WHIRLPOOL b758d1ce5ff2f71035fb3159266c1b1215c9f91b2702a55a72039432933b6a4958ad802eb2aa2e70fdbbaa4049040fb702e9ba55665f8c3fe9e2865bd5095c35
+MISC ChangeLog 11771 SHA256 ef0dfaa8549f52f6f6a4bfe0d0f2c3166008bc3712cf11eb048c99a6431ca390 SHA512 12eaf13ed934e2de2fbf483a8d8013a064e68a7c44171953d798be92775ee81c27b1e02f5eb6323d94a85e6a0a5732872a9d069c78d92f5bbfde89276f7ac23e WHIRLPOOL 08ef51ebbe7fd793625feb5c49b169c7f19f77b36aef929393d7ac22f7887a1cecf3a18f4967c9f8f4c0548141b55199a172f570b0a4ec17c3aa55c18a4b4a6b
 MISC metadata.xml 894 SHA256 8d598e43e3e8ffcdca076aeecc8d7748574b9b10b0edcb7f29870c5765dac849 SHA512 351c7e517aeaac819858716a196364f033aa384d70dd8128a2e92d4b300ea451416cace7bcb8feeeffeb57264042d02fd814be3fdc8fc305b86f57e51158724f WHIRLPOOL ae8a5e246350bf67577855da35d3d100bd0485f4885cb2f46ca7a0ec3cc3eb6020a188bb0d08793f231adfd7c0b2fef6fe66d5c61a009a6c3aa4989df35d1299
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSubugAAoJELp701BxlEWfYn8QALus9QuVk6XEPTF2Bhj0lKFP
-qXKxzeN8DFcIsFRH5oGMwSA/dFqg5zZqjlk0OhgKbScDOo8IP6EeWpizef+733zz
-LXE0DSiLqTAppO0xzWa7wCzmYXe/5RhxH4kh5nY1glHvIUqJweTdW2we2Jt4R/U6
-hgPgEaR845ElODc46XkPZON2ANTL1mgXMnBLuEpVkirohwCsLn13rvWFQTA07zf2
-S/JngcIOHn/ifBl29/U1dHthspGIzCLaEYzDCfjw0X/8HsSYPEQwAqsfnzbVsYCZ
-RcfJbiyCGRKdGYVZ5s5jI/EZ6NM9EI9lRbfXzWjRAYlhSSY+qesbDDmToKaM2QGK
-BzzDutTQY1mB/ToyQyEatDdQCUrvJqqwo66cz5plw1YOt3GCa9SU0gnRiVUAji9x
-EEX94hGIqycVYY6AVeUc9UT6Q7ZmJrwFF70LTS6zEYYV9+tPTS+Z2V+l8FiY/cRg
-zVmTdCtW+s3cnBc6PWL4DP+FcpCWiovBrmui10EPC7XFG1j4ChvHqA6AojrCIgrP
-quhBXgFWmezApZWkMAoMNBqp19jLIOvdITCepkHChDUxluD69Gmu+TacfJWu3Ev3
-ZAg2TESyTOyca4DaafPxWuVmPQopNvvHJKw36RviNW1I/5lPikzVZDa1L4vxYZJe
-5A1GFmGdslOWdXRfcSKR
-=mblc
+iQIcBAEBCAAGBQJS0boRAAoJEPiazRVxLXTFkb0P/39Ko921p8p5JkkqneusRJgw
+ewj9ho7HlHnJsJDs40gl7JHlo23Mcp8hXKk18SSYNfVWaMIsUFcQOScT9Or0+E76
+u+FEcYZDC632wswBZszZoAiPxTduOa+qyOYuWFdiL4qDLwWR8xOhrm8f2NGaqTnp
+okILb/eguprDc4GGmLFcZE7dLo9TRj2WHX/Co9jBVTYj2OW4QImJfoPPjAnRgMTP
+Gdd02Bl5R9snjBgIMMPwjX+djC9gOyI/jqhTHzPxs3y86aoeS6tphZHrhkFJFGa5
+D3UL1NwihioH6yHIr34WTmx8O1odPqQYsucHuPNhklywHZoozlkO7y35Q8tZKmNh
+VujG1xrMokXWAr3rB92zVQXtsa/tN0pR+KpYD74Gtd3hVP+2AErSqM+R/OO2Eo4L
+K96LSnQas+l31SBCEwrbe1ZI6BXuMey1aXEHa5F1BVl7ko0uUMoWuRKA7SNuE1XF
+KoTIWh8S3tk3fQ+W/D8/uHD65Nidsjdd9eqf5e9C1cBf1rraw4e4eyrAhUIJQDTr
+EaVNIcu9CehZ8PAoAQd6Ad3Y2Toj9dxbEq5Jbj82Sppt60V83yIYxHk+XF7DyZiS
+GLlZI9cIzjMOxomoNlkvkwzFSsyliKE26Jg6MoBDdIJKcrFXLEQPD4q6Vjp3Nl4I
+ec7Z4YOmSWlO8yUcufSW
+=KntY
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-6.0.ebuild b/net-fs/cifs-utils/cifs-utils-6.0.ebuild
deleted file mode 100644
index f4542896aba0..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.ebuild,v 1.2 2013/10/22 10:46:10 polynomial-c Exp $
-
-EAPI=4
-
-inherit eutils confutils linux-info
-
-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="ads +caps caps-ng creds"
-
-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 )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="^^ ( caps caps-ng )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_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() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable ads cifsupcall) \
-		$(use_with caps libcap) \
-		$(use_with caps-ng libcap-ng) \
-		$(use_enable creds cifscreds) \
-		--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \
-		--disable-cifsidmap \
-		--disable-cifsacl
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -print0 | xargs --null rmdir \
-		--ignore-fail-on-non-empty &>/dev/null
-}
-
-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 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/cifs-utils-6.3.ebuild b/net-fs/cifs-utils/cifs-utils-6.3.ebuild
new file mode 100644
index 000000000000..4f98286c09ce
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 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.3.ebuild,v 1.1 2014/01/11 21:39:28 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="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~arm-linux ~x86-linux"
+IUSE="+acl +ads +caps +caps-ng creds"
+
+DEPEND="!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	ads? (
+		sys-apps/keyutils
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( !caps-ng? ( sys-libs/libcap ) )
+	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
+	creds? ( sys-apps/keyutils )"
+PDEPEND="${DEPEND}
+	acl? ( || (
+		=net-fs/samba-3.6*[winbind]
+		>=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_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)
+}
+
+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
+}