Version bump to latest.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

3 files changed, 98 insertions, 5 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index 7bb65efa9dc8..c1c6bb2b6c5d 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.31 2012/09/13 09:25:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.32 2012/09/13 18:00:29 scarabeus Exp $
+
+*cifs-utils-5.6 (13 Sep 2012)
+
+  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +cifs-utils-5.6.ebuild:
+  Version bump to latest.
 
   13 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   cifs-utils-5.5-r1.ebuild:
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index da555e26e463..03aa1fdc39f6 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -4,14 +4,26 @@ Hash: SHA256
 AUX cifs-utils-5.5-initialize_rc_var_properly.patch 1033 SHA256 c341bd479fd4e1587bf53db3e525b60f25368ba2860977235a64fa3988671ec9 SHA512 a81a7f36a11d43bdd1b08ed95aa87db1d6f4143a5f172aec1692d089cb4a8e0d0ab7b12a7cedd132182debe2e757c497a7840f3e7003467747712e2d1964617d WHIRLPOOL 157dc9c5939c4f2e4c1f399bb63a4a803af4727ad73df3117a7f674083bd17ba7df22810f6ebc771425010fbda7866b3f818b41d2a468b50d3ad0c15c34ab2da
 DIST cifs-utils-5.4.tar.bz2 381416 SHA256 f6c267e4cfb111ab47a6e85a802373475edaab31d76eab4e7927ea6fe82e7f7b SHA512 67057b8c6a1f0a204d14ef8f3e0b7338d6477d8a84af13d0a17ecf22b2d7fe2066e5bcd0b1d88257879b28ef11d4ea673b5c1c0c29f91aad97a830c8517e9632 WHIRLPOOL 8d756fa8fbbf2663ace6b15bbeff0f1877bc6b8119b241856660fb1b5bd6d72e009d16da472d302c3c895e30787fed2f79c1778fc28a9b116d39a17f70917f71
 DIST cifs-utils-5.5.tar.bz2 377435 SHA256 82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6
+DIST cifs-utils-5.6.tar.bz2 381098 SHA256 f1501a26a800a336baf53ba0ea383274361c86c4b50ec45c656b9810b84dc138 SHA512 dcf4fff6d55453a144e94af6606e33e86b2612aa03766d6b4f0a352ed3ac0032708e42d36ddf8efe4bf7f9288d9a64b4d1e5fd7068b59194e1caf7778df25d08 WHIRLPOOL cd361d071e8d14d4b92508a86bb497598850efcaab32fcfcc7a60e9a4bbed7efc33279c31b92cd2fec574b58fc9a552f1a11ba471358bbd52235697acd72d971
 EBUILD cifs-utils-5.4.ebuild 2516 SHA256 0b8f14096a92dc63894df9cf8e42edfcdc19a023eaf87c4bb8dd075c58de3f1e SHA512 5a91e688c0e819c0022732208de8cfe596bddbf1b7ed289a0677bc7eb7a571ce37b8d32c51f1fa0e783e598fee1946db8f9d8cadf64ec23b5076974afc5b7b41 WHIRLPOOL 30b9a98c79fa75f503dfd6a28f4a9401038574e976f871f9a0caa341c42778254a207c1dd348412bf3b43691fb2c4337da86be5d73e8f581893cdb4ef02a44bd
 EBUILD cifs-utils-5.5-r1.ebuild 2601 SHA256 8c5ee449611f96dab731b8c16e8f2e905c78c81681ed5c5edea279b6c0ccb97f SHA512 de1689c30174b15f44de0fb79a9b27e203f303b73bb2da97d9a42e695ef25c8d7d46ce912cc53c3a59d04218ebc00a0d40c5c0ba7bac087acce21bdc730f5788 WHIRLPOOL 2b5cebe39335350105dd5f5560e056c7ecaff07e4d386e6f29bb4fe53f29d5debbf7c522794f5f6850ccb332dec8cc8690f4fc61a968bca29ec1f20cbdfdebc3
-MISC ChangeLog 4911 SHA256 2421b02f810b55b09b6428bf326d4c5d9e9eac3fb2bd08fe218d13c20edf7a7e SHA512 417188608f79ff9bb6c05ef3f95ed0dd492a24bbdbc4746f3ba9208d005d7b058c559d1212a45770d693e803d3d9ba1803fb993d37cc8d6581003be0d3e0819f WHIRLPOOL 33763b38c36adbd9bef95f395b88c99a479b9639a331d9bb0e076cd1daf872bb458bcb9b45ca5332264bde0a399b8c346eb4605d46dd12f0d6c9d8cbfec4d847
+EBUILD cifs-utils-5.6.ebuild 2340 SHA256 376c0d62d8960f0fda0f6c654bd7bbe41a8fc8f81a391d6efd03362fcc8a8f66 SHA512 d3272d197520a4fb68a2af35a7f901e9168ff9ad987bb4804b73e695f9e72ff6232af6d8fbd1e49a145a5d3f3c22d7ba9412d66d021404a3660bd71c8facb38c WHIRLPOOL 353acf189e2eec392be1280a1abf784c3ec0d58c5ed6d1ed8c64abd0635329ee9977c9aaebd66af5c4e278242a90ef6c9633468a29bce119e248a2702f4602a7
+MISC ChangeLog 5049 SHA256 18af403387ac20e739553a93ecd54998217798b1fbf33105af70faa93748aefd SHA512 ebcaa4dd4b183f1c5279c95860755052b571a0186a6a5cfab6a140f5775eb9b99f86644681d13341e728c838c210911af262f70e00f8dced86d70cd2391ebb41 WHIRLPOOL a4e28254c3ce8d8cee513cdf1ba1674be82ee337250c84c2da3c5ae84b6cc28d9cf14626014f158a6bf46631d4a3b3a8508283cbf583ba36354ea7595218a961
 MISC metadata.xml 918 SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9 SHA512 cc02e740b458ddea020545a60ad8689027d3380fdceb64b50a8e120aad7c3293368aff072eae69e2892fab1e0a2d665b8292eb665ae55bc289f2d71999fba7ec WHIRLPOOL ba3913f7a3a782b8a7674e613e147f2bc8dee7e84c658d01214c9fb05be995da2cb797d292cf965d81da9bf0e03b53a007440df8c1a401365dfbc9832042f343
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBRpmEACgkQl5yvQNBFVTXIBwCfT7Tr2cbEDPmHHLRwEjKZE67j
-lmMAnjWUp+dDPsTwNGNAEDNUINyMFqz/
-=coaI
+iQIcBAEBCAAGBQJQUh9DAAoJEOSiRoyO7jvoaIAP/RTgs+f0KZMelwQTihLGUkI4
+sR41F+VGT3COA8ctcYZf2T1UvwYYrVtRbJANySWXqbKp5kWZN3DrO3++fuDKgjlg
+27+HIzvFkP0yY5bQsNblMOeD54uUlXcY5C2RPsHKL4LFw4FPtLFJd8Qc39yMtB6j
+XkpJnQ1WxoS9LzJFWgnjUMFDkeQoCIFTFD6KUKquY/PjKPBWnjwdeva59SophOih
+FsmPcEXo2usbZHbH0hobYNs9C2gAaYz1cWDAnHdc8JG1obOXecf7gL4jotXizBxU
+OsP6W4zaNmmz/a5Yv1rfipnxSzsrXalAGsiRtkuXfDcHYkkZ0FrjEXqbP4RqRNNO
+E4zXSBQH26IzqwesIU8/0/q6nrFIMuyVpcoBkZNE0AoWQRhbryHlm+iX24/MsPLl
++aHXhz9HP+oDWCCvrJ23oI05zUS9yxa7+gHNYgUeBhDiA0nKmTt2I0Nlj/f2X+9M
+GqkAA3LYynilEQg1YY1xphg7NoDix5UlPLfBlMXL+xs6BjdzRhhwMWFYCMxTRbac
+DC+Hf8xUNuj4PbL5Y0uslARER1ZvEOGK5N4Frc14zT6fZAavlYS42TCOBp1piHhJ
+UCi2BlpMSdfaXXjRfBK0DoaLd990SOtaBFdS/aT4dYhJQ2Wh6q5ZUxkVQ+qF0rQ1
+Nmm9dJv6cQEa5FZmIlKN
+=Uhbq
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.6.ebuild b/net-fs/cifs-utils/cifs-utils-5.6.ebuild
new file mode 100644
index 000000000000..b431e892b4b4
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-5.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 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.6.ebuild,v 1.1 2012/09/13 18:00:29 scarabeus 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"
+IUSE="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? ( 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 )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+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_prepare() {
+	# bug #424487
+	epatch "${FILESDIR}"/${P}-initialize_rc_var_properly.patch
+}
+
+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) \
+		--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no')
+		--disable-cifsidmap \
+		--disable-cifsacl
+}
+
+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
+}