Version bump. Removed old. Really fixed bug #466364 this time

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 25 insertions, 157 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index 9d867665983f..b28330b3dc91 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,14 @@
 # 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.63 2013/04/22 08:04:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.64 2013/07/10 15:25:25 polynomial-c Exp $
+
+*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)
 
diff --git a/net-fs/cifs-utils/cifs-utils-5.6-r1.ebuild b/net-fs/cifs-utils/cifs-utils-5.6-r1.ebuild
deleted file mode 100644
index 6dc911c1b331..000000000000
--- a/net-fs/cifs-utils/cifs-utils-5.6-r1.ebuild
+++ /dev/null
@@ -1,71 +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-5.6-r1.ebuild,v 1.10 2013/01/01 19:05:38 armin76 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_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
-}
diff --git a/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild b/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild
deleted file mode 100644
index f4ad8e6a371d..000000000000
--- a/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild
+++ /dev/null
@@ -1,81 +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-5.8-r1.ebuild,v 1.2 2013/02/22 09:04:02 zmedico 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 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() {
-	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) \
-		$(use_enable upcall cifsupcall) \
-		--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \
-		--disable-cifsidmap \
-		--disable-cifsacl
-}
-
-src_install() {
-	default
-
-	# remove empty directory
-	use upcall || rmdir "${ED}/usr/sbin"
-}
-
-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.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.1.ebuild
index e4ae96cccaa3..423211a2e939 100644
--- a/net-fs/cifs-utils/cifs-utils-6.0-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.1.ebuild,v 1.1 2013/07/10 15:25:25 polynomial-c Exp $
 
 EAPI=5
 
@@ -12,16 +12,28 @@ 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"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~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 )
+	acl? ( || (
+		=net-fs/samba-3.6*[winbind]
+		>=net-fs/samba-4.0.0_alpha1
+	) )
+	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 )"
+	upcall? (
+		sys-apps/keyutils
+		sys-libs/talloc
+		virtual/krb5
+	)"
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="acl? ( upcall )"