net-fs/cifs-utils: clone upstream

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

8 files changed, 561 insertions, 3 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
new file mode 100644
index 0000000..dd1dcea
--- /dev/null
+++ b/net-fs/cifs-utils/ChangeLog
@@ -0,0 +1,318 @@
+# ChangeLog for net-fs/cifs-utils
+# 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
+
+  14 Dec 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  cifs-utils-6.1-r1.ebuild, cifs-utils-6.2.ebuild:
+  Move the samba dependency to the pdepend block. Non-mainainer commit.
+
+  11 Dec 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  cifs-utils-6.1-r1.ebuild, cifs-utils-6.2.ebuild:
+  Replace the RDEPEND with a PDEPEND - completely fix bug 489472. Non-maintainer
+  commit acknowledged by Patrick (bonsaikitten).
+
+  07 Dec 2013; Pacho Ramos <pacho@gentoo.org> cifs-utils-6.1-r1.ebuild:
+  x86 stable, bug #486312
+
+  15 Nov 2013; Rick Farina <zerochaos@gentoo.org> cifs-utils-6.1-r1.ebuild,
+  cifs-utils-6.2.ebuild:
+  acl use flag is default from profiles/releases/make.defaults and requires ads
+  use flag
+
+  22 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> cifs-utils-5.9-r1.ebuild,
+  cifs-utils-6.0.ebuild, cifs-utils-6.1-r1.ebuild, cifs-utils-6.2.ebuild,
+  metadata.xml:
+  Removed "upcall" USE flag as it provides the same features like "ads" USE
+  flag.
+
+  20 Oct 2013; Markus Meier <maekke@gentoo.org> cifs-utils-6.1-r1.ebuild:
+  arm stable, bug #486312
+
+  19 Oct 2013; Pacho Ramos <pacho@gentoo.org> cifs-utils-6.1-r1.ebuild:
+  amd64 stable, bug #486312
+
+  16 Oct 2013; Jeroen Roovers <jer@gentoo.org> cifs-utils-6.1-r1.ebuild:
+  Stable for HPPA (bug #486312).
+
+*cifs-utils-6.2 (07 Oct 2013)
+
+  07 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-6.1.ebuild,
+  +cifs-utils-6.2.ebuild:
+  Version bump. Removed old.
+
+*cifs-utils-6.1-r1 (21 Sep 2013)
+
+  21 Sep 2013; Pacho Ramos <pacho@gentoo.org> +cifs-utils-6.1-r1.ebuild,
+  +files/cifs-utils-6.1-hardcoded-path.patch:
+  Do not rely on hardcoded path to systemd-ask-password, bug #478538 by Dennis
+  Lichtenthäler
+
+*cifs-utils-6.1 (10 Jul 2013)
+
+  10 Jul 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -cifs-utils-5.6-r1.ebuild, -cifs-utils-5.8-r1.ebuild,
+  -cifs-utils-6.0-r1.ebuild, +cifs-utils-6.1.ebuild:
+  Non-maintainer commit: Version bump. Removed old. Really fixed bug #466364
+  this time.
+
+*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
+
+  13 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for s390, wrt bug #464356
+
+  13 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for sparc, wrt bug #464356
+
+  12 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for ia64, wrt bug #464356
+
+  12 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for alpha, wrt bug #464356
+
+  10 Apr 2013; Jeroen Roovers <jer@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for HPPA (bug #464356).
+
+  05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for arm, wrt bug #464356
+
+  05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for ppc64, wrt bug #464356
+
+  05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for ppc, wrt bug #464356
+
+  05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for x86, wrt bug #464356
+
+  05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.9-r1.ebuild:
+  Stable for amd64, wrt bug #464356
+
+*cifs-utils-6.0 (03 Apr 2013)
+
+  03 Apr 2013; Lars Wendler <polynomial-c@gentoo.org> +cifs-utils-6.0.ebuild:
+  Non-maintainer commit: Version bump.
+
+*cifs-utils-5.9-r1 (25 Feb 2013)
+
+  25 Feb 2013; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-5.9.ebuild,
+  +cifs-utils-5.9-r1.ebuild,
+  +files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch:
+  Mounting with credentials file fixed. Thanks to Michael Buchfink for
+  reporting this in bug #459040.
+
+*cifs-utils-5.9 (22 Feb 2013)
+
+  22 Feb 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -cifs-utils-5.5-r1.ebuild, +cifs-utils-5.9.ebuild:
+  Non-maintainer commit: Version bump. Removed old.
+
+  22 Feb 2013; Zac Medico <zmedico@gentoo.org> cifs-utils-5.8-r1.ebuild:
+  Fix for prefix and add ~arm-linux + ~x86-linux keywords.
+
+  01 Jan 2013; Raúl Porcel <armin76@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  s390/sh stable wrt #444672
+
+  30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Stable for alpha, wrt bug #444672
+
+  29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Stable for sparc, wrt bug #444672
+
+  17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Stable for ia64, wrt bug #444672
+
+  06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  cifs-utils-5.6-r1.ebuild:
+  x86 stable wrt bug #444672
+
+*cifs-utils-5.8-r1 (04 Dec 2012)
+
+  04 Dec 2012; Tiziano Müller <dev-zero@gentoo.org> +cifs-utils-5.8-r1.ebuild,
+  -cifs-utils-5.8.ebuild:
+  Fix linux-info eclass usage by calling its pkg_setup method. Don't install
+  empty dir.
+
+  01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  stable arm ppc64, bug #444672
+
+  29 Nov 2012; Brent Baude <ranger@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Marking cifs-utils-5.6-r1 ppc for bug 444672
+
+  29 Nov 2012; Jeroen Roovers <jer@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Stable for HPPA (bug #444672).
+
+  25 Nov 2012; <ago@gentoo.org> cifs-utils-5.6-r1.ebuild:
+  Stable for amd64, wrt bug #444672
+
+*cifs-utils-5.8 (25 Nov 2012)
+
+  25 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-5.4.ebuild,
+  +cifs-utils-5.8.ebuild:
+  non-maintainer commit: Version bump. Removed old.
+
+  29 Sep 2012; Raúl Porcel <armin76@gentoo.org> cifs-utils-5.5-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #433325
+
+  18 Sep 2012; Jeroen Roovers <jer@gentoo.org> cifs-utils-5.5-r1.ebuild:
+  Stable for HPPA (bug #433325).
+
+*cifs-utils-5.6-r1 (18 Sep 2012)
+
+  18 Sep 2012; Lars Wendler <polynomial-c@gentoo.org> -cifs-utils-5.6.ebuild,
+  +cifs-utils-5.6-r1.ebuild:
+  non-maintainer commit: Revbump to fix econf line in src_configure() (bug
+  #435366).
+
+  13 Sep 2012; Lars Wendler <polynomial-c@gentoo.org> cifs-utils-5.6.ebuild:
+  non-maintainer commit: Removed failing epatch command as patch is not
+  necessary for this version.
+
+*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:
+  Stable arm, bug #433325
+
+  09 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> cifs-utils-5.5-r1.ebuild:
+  Stable on amd64, x86, ppc and ppc64 wrt bug#433325.
+
+  07 Aug 2012; Raúl Porcel <armin76@gentoo.org> cifs-utils-5.4.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #420895
+
+  10 Jul 2012; Brent Baude <ranger@gentoo.org> cifs-utils-5.4.ebuild:
+  Marking cifs-utils-5.4 ppc64 for bug 420895
+
+  10 Jul 2012; Brent Baude <ranger@gentoo.org> cifs-utils-5.4.ebuild:
+  Marking cifs-utils-5.4 ppc for bug 420895
+
+  08 Jul 2012; Jeroen Roovers <jer@gentoo.org> cifs-utils-5.4.ebuild:
+  Stable for HPPA (bug #420895).
+
+*cifs-utils-5.5-r1 (04 Jul 2012)
+
+  04 Jul 2012; Lars Wendler <polynomial-c@gentoo.org> cifs-utils-5.4.ebuild,
+  -cifs-utils-5.5.ebuild, +cifs-utils-5.5-r1.ebuild,
+  +files/cifs-utils-5.5-initialize_rc_var_properly.patch:
+  non-maintainer commit: Added patch to 5.5 version so it mounts shares again.
+  Thanks to Martin Wegner for reporting this problem in bug #424487. Fixed
+  leading spaces in ebuilds.
+
+*cifs-utils-5.5 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +cifs-utils-5.5.ebuild:
+  Bump
+
+  20 Jun 2012; Markus Meier <maekke@gentoo.org> cifs-utils-5.4.ebuild:
+  arm stable, bug #420895
+
+  13 Jun 2012; Agostino Sarubbo <ago@gentoo.org> cifs-utils-5.4.ebuild:
+  Stable for amd64, wrt bug #420895
+
+  13 Jun 2012; Jeff Horelick <jdhore@gentoo.org> cifs-utils-5.4.ebuild:
+  marked x86 per bug 420895
+
+*cifs-utils-5.4 (23 Apr 2012)
+
+  23 Apr 2012; Víctor Ostorga <vostorga@gentoo.org> -cifs-utils-5.1.ebuild,
+  -cifs-utils-5.3.ebuild, +cifs-utils-5.4.ebuild:
+  Version bump to 5.4 . Includes fixes for CVE-2012-1586, bug 410989
+
+*cifs-utils-5.3 (13 Feb 2012)
+
+  13 Feb 2012; Víctor Ostorga <vostorga@gentoo.org> +cifs-utils-5.3.ebuild:
+  Version bump to 5.3
+
+  28 Oct 2011; Víctor Ostorga <vostorga@gentoo.org> cifs-utils-5.1.ebuild:
+  Disabling cifsidmap and cifsacl support, because they look for a 
+  non-existant wbclient.h bug 385475, fixing libcap-ng use flag
+
+  04 Oct 2011; Víctor Ostorga <vostorga@gentoo.org> cifs-utils-5.1.ebuild:
+  Dropping setuid flag, CVE-2011-3585  bug 385315
+
+  03 Oct 2011; Víctor Ostorga <vostorga@gentoo.org> -cifs-utils-5.0.ebuild:
+  Cleaning up vulnerable versions, CVE-2011-2724, bug 382263
+
+*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
+
+  07 Aug 2011; Raúl Porcel <armin76@gentoo.org> cifs-utils-5.0.ebuild:
+  Add ~ia64/~s390/~sh/~sparc wrt #358401
+
+  15 Jul 2011; Matt Turner <mattst88@gentoo.org> cifs-utils-5.0.ebuild:
+  Added ~mips, bug 358401
+
+  30 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> -cifs-utils-4.8.1.ebuild,
+  cifs-utils-5.0.ebuild:
+  Fixing DEPEND on !<net-fs/samba-3.6_rc2 bug #364225
+
+  02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> cifs-utils-5.0.ebuild:
+  Keyword ~arm, bug 358401
+
+  02 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> cifs-utils-5.0.ebuild:
+  Using use_with in the caps-ng use flag case, thanks to leio for the heads up
+
+*cifs-utils-5.0 (02 Jun 2011)
+
+  02 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> +cifs-utils-5.0.ebuild:
+  Version bump to 5.0
+
+  09 May 2011; Víctor Ostorga <vostorga@gentoo.org>
+  cifs-utils-4.8.1.ebuild:
+  Shining up checking of CIFS kernel parameter, thanks to Jeremy Olexa
+  <darkside@gentoo.org> bug #364679
+
+  27 Apr 2011; Víctor Ostorga <vostorga@gentoo.org>
+  cifs-utils-4.8.1.ebuild:
+  Replacing eerror to ewarn, and dropping die bug #364679
+
+  31 Mar 2011; Jeroen Roovers <jer@gentoo.org> cifs-utils-4.8.1.ebuild:
+  Marked ~hppa (bug #358401).
+
+  27 Mar 2011; Tobias Klausmann <klausman@gentoo.org> cifs-utils-4.8.1.ebuild:
+  Keyworded on alpha, bug #358401
+
+  10 Mar 2011; Víctor Ostorga <vostorga@gentoo.org>
+  cifs-utils-4.8.1.ebuild:
+  Fixing dependency on sys-apps/keyutils when using creds useflag, thanks to
+  Gil Desmarais <gil.desmarais+bugs.gentoo.org@gmail.com> bug 355667
+
+  22 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  cifs-utils-4.8.1.ebuild:
+  Marked ~ppc wrt #355997. Thanks to hiyuh <hiyuh.root@gmail.com> for report
+  and testing.
+
+*cifs-utils-4.8.1 (28 Jan 2011)
+
+  28 Jan 2011; Víctor Ostorga <vostorga@gentoo.org>
+  +cifs-utils-4.8.1.ebuild, +metadata.xml:
+  Initial import, ebuild based on work from Ewoud Kohl van Wijngaarden
+  <gentoo@kohlvanwijngaarden.nl> and Sebastiaan <s.breedveld@erasmusmc.nl>
+  bug 308655
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
new file mode 100644
index 0000000..bd7e531
--- /dev/null
+++ b/net-fs/cifs-utils/Manifest
@@ -0,0 +1,7 @@
+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-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8
+EBUILD cifs-utils-6.3-r1.ebuild 2855 SHA256 d37c5ef175c836647e5cffc8550e66691c2a0fa09307ec082213146368512fc2 SHA512 b010ece1ee7427cf0cb030fa96f933d46eb6296d1cedc4d360184fdf807fe151776eae4f384d87eed4340e5193a250bc24b8090531b4f4500365efb64aef565c WHIRLPOOL ade14b83eb2d5ef6ac29c13e82973f0a092c98a0337b76d82770a850d8764abd2e58742a5e25c5280b84b7ff34d72f72505dc9df014459dd0858665bd1119fe6
+MISC ChangeLog 11771 SHA256 ef0dfaa8549f52f6f6a4bfe0d0f2c3166008bc3712cf11eb048c99a6431ca390 SHA512 12eaf13ed934e2de2fbf483a8d8013a064e68a7c44171953d798be92775ee81c27b1e02f5eb6323d94a85e6a0a5732872a9d069c78d92f5bbfde89276f7ac23e WHIRLPOOL 08ef51ebbe7fd793625feb5c49b169c7f19f77b36aef929393d7ac22f7887a1cecf3a18f4967c9f8f4c0548141b55199a172f570b0a4ec17c3aa55c18a4b4a6b
+MISC metadata.xml 894 SHA256 8d598e43e3e8ffcdca076aeecc8d7748574b9b10b0edcb7f29870c5765dac849 SHA512 351c7e517aeaac819858716a196364f033aa384d70dd8128a2e92d4b300ea451416cace7bcb8feeeffeb57264042d02fd814be3fdc8fc305b86f57e51158724f WHIRLPOOL ae8a5e246350bf67577855da35d3d100bd0485f4885cb2f46ca7a0ec3cc3eb6020a188bb0d08793f231adfd7c0b2fef6fe66d5c61a009a6c3aa4989df35d1299
diff --git a/net-fs/cifs-utils/cifs-utils-6.3-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.3-r1.ebuild
new file mode 100644
index 0000000..f861b5c
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.3-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+}
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch b/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch
new file mode 100644
index 0000000..2faa853
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch
@@ -0,0 +1,38 @@
+From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Thu, 14 Jun 2012 10:59:18 -0400
+Subject: [PATCH 1/1] mount.cifs: set rc to 0 in libcap toggle_dac_capability
+
+Thus spake Jochen:
+
+The mount.cifs program from the cifs-utils package 5.5 did not work on
+my Linux system. It just exited without an error message and did not
+mount anything.
+
+[...]
+
+I think, when this variable rc is now used in this function, it has also
+to be properly initialized there.
+
+Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ mount.cifs.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index a1b0454..6f3f382 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -495,7 +495,7 @@ free_caps:
+ static int
+ toggle_dac_capability(int writable, int enable)
+ {
+-	int rc;
++	int rc = 0;
+ 	cap_t caps;
+ 	cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
+ 
+-- 
+1.7.0.4
+
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
new file mode 100644
index 0000000..d06ae01
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch
@@ -0,0 +1,31 @@
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 13 Jan 2013 03:02:01 +0000 (-0500)
+Subject: mount.cifs: set parsed_info->got_user when a cred file supplies a username
+X-Git-Url: https://gitweb.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=1a01f7c4b90695211d12291d7a24bec05b1f2922
+
+mount.cifs: set parsed_info->got_user when a cred file supplies a username
+
+commit 85d18a1ed introduced a regression when using a credentials file.
+It set the username in the parsed mount info properly, but didn't set
+the "got_user" flag in it.
+
+Also, fix an incorrect strlcpy length specifier in open_cred_file.
+
+Reported-by: "Mantas M." <grawity@gmail.com>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index c7c3055..40b77e9 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
+ 		switch (parse_cred_line(line_buf + i, &temp_val)) {
+ 		case CRED_USER:
+ 			strlcpy(parsed_info->username, temp_val,
+-				sizeof(parsed_info->domain));
++				sizeof(parsed_info->username));
++			parsed_info->got_user = 1;
+ 			break;
+ 		case CRED_PASS:
+ 			i = set_password(parsed_info, temp_val);
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
new file mode 100644
index 0000000..c2e2ea2
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
@@ -0,0 +1,44 @@
+From 4e315f6a02a4edb259b33bcf0665eba259fee2f2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 30 Jul 2013 10:00:26 +0200
+Subject: [PATCH] Do not rely on hardcoded path to systemd-ask-password.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Relying on hardcoded /bin/systemd-ask-password path breaks systemd that
+install systemd-ask-password in /usr/bin. Since both paths are supposed
+to be in ${PATH} and popen() passes the command to shell, just pass
+'systemd-ask-password' and let the shell find it.
+
+Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ mount.cifs.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index e76beee..7206dcb 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -1626,7 +1626,7 @@ drop_child_privs(void)
+ }
+ 
+ /*
+- * If systemd is running and /bin/systemd-ask-password --
++ * If systemd is running and systemd-ask-password --
+  * is available, then use that else fallback on getpass(..)
+  *
+  * Returns: @input or NULL on error
+@@ -1649,7 +1649,7 @@ get_password(const char *prompt, char *input, int capacity)
+ 		FILE *ask_pass_fp = NULL;
+ 
+ 		cmd = ret = NULL;
+-		if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
++		if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
+ 			ask_pass_fp = popen (cmd, "re");
+ 			free (cmd);
+ 		}
+-- 
+1.7.0.4
+
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
new file mode 100644
index 0000000..a31a339
--- /dev/null
+++ b/net-fs/cifs-utils/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>samba</herd>
+	<maintainer>
+		<email>samba@gentoo.org</email>
+		<name>Samba Team</name>
+	</maintainer>
+	<longdescription>The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package</longdescription>
+	<use>
+		<flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag>
+		<flag name="caps">libcap support</flag>
+		<flag name="caps-ng">libcap-ng support</flag>
+		<flag name="creds">cifs credentials support</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/keyutils/keyutils-1.5.8-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.8-r1.ebuild
index d69974d..a33ff35 100644
--- a/sys-apps/keyutils/keyutils-1.5.8-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.8-r1.ebuild
@@ -72,12 +72,11 @@ multilib_src_test() {
 	# older versions already installed in the system.
 	LD_LIBRARY_PATH=${BUILD_DIR} \
 	PATH="${BUILD_DIR}:${PATH}" \
-	CC="${CC:-$(tc-getCC)}" AR="${AR:-$(tc-getAR)}" emake -j1 test || die
+	CC="${CC:-$(tc-getCC)}" AR="${AR:-$(tc-getAR)}" emake -j1 test
 }
 
 multilib_src_install() {
-	CC="${CC:-$(tc-getCC)}" AR="${AR:-$(tc-getAR)}" \
-		emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${ED}" install
 	dodoc README
 	multilib_is_native_abi && \
 		gen_usr_ldscript -a keyutils