From 4faf8917174499ca019cdb1d79f33b78203e5752 Mon Sep 17 00:00:00 2001
From: Victor Ostorga <vostorga@gentoo.org>
Date: Mon, 3 Oct 2011 15:02:18 +0000
Subject: [PATCH] Cleaning up vulnerable versions CVE-2011-2724 bug 382263

Package-Manager: portage-2.1.10.11/cvs/Linux i686
---
 net-fs/cifs-utils/ChangeLog             |  5 +-
 net-fs/cifs-utils/Manifest              | 10 ++--
 net-fs/cifs-utils/cifs-utils-5.0.ebuild | 73 -------------------------
 3 files changed, 8 insertions(+), 80 deletions(-)
 delete mode 100644 net-fs/cifs-utils/cifs-utils-5.0.ebuild

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index 953b2aacca0c..46d55ce38479 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.15 2011/09/26 17:32:43 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.16 2011/10/03 15:02:17 vostorga Exp $
+
+  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)
 
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index aa73a3f4cbd2..6b505ebfd3b1 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST cifs-utils-5.0.tar.bz2 355658 RMD160 cab81e167300291d17fe5c742016cc3cf1f2d3af SHA1 3b92df032dcef129c21a2f8f96658add2ec0cca4 SHA256 3ae57eb4edef2bb2e71616d80f010750a3da85d722ba5c651789d2398e1c814f
 DIST cifs-utils-5.1.tar.bz2 366162 RMD160 3ca51ff3d61513a849e5713b1e10e225bea1b2a1 SHA1 f1c66f148a73e6c9e765fc1df13bd927f8dde5fe SHA256 67f8f9bfad7dc952bd4aa9b1c125d186e437d1e1e75c14992a1f6b7f142e7d3a
-EBUILD cifs-utils-5.0.ebuild 2193 RMD160 8ae663dd06a951e9cf46954b8d3d3150ce3a605b SHA1 6f59b3ceb844f6f86923c7c7a4724fc951d72165 SHA256 a626d5d88bb310b19d2138315658de6a3f4452993c08c3ba5e95278021333769
 EBUILD cifs-utils-5.1.ebuild 2330 RMD160 72ccab340c04a4dcf9cb1aa8b414607ce47e92ca SHA1 b70c90ca7df1b647c85772c7585a2f6bb47f5d07 SHA256 8ec838f81463be8d26a47993e1abb0b7f34a2d104d74bbaf7bd3358f06d5cd85
-MISC ChangeLog 2550 RMD160 dc39cdb04b83ea5500c6c2a9e257838374a218be SHA1 797acb89153171df81c7a5fb3cd80cdb17bae505 SHA256 aaf14395b55f24246f90653b635edf350be1cd42a5b6323827a88705e76d0e7d
+MISC ChangeLog 2689 RMD160 ff8e48e9a0efc04bbc29438fbbc31dfbe42799f2 SHA1 3988b48f876c65c8d624ea9c4b232d5f39cd2a22 SHA256 d2ad84f8e15968f762cedfc05af5736c6f43139605abfc491324c2fa8e0147c7
 MISC metadata.xml 980 RMD160 b628cc657f81e3acfacd0bc05621b85fb6558ac0 SHA1 a5108db6eb2997a730fbeca1955c2e1c53c10ac8 SHA256 b2a38280bf5d6d96943c7365ab23eab83ca508db2c0d80eca949780efd221390
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6At0EACgkQKQaZ7OJe4zZwSACgmEklWBP+5rv54ale7cqwiB0q
-nDAAn0NKnMzxrXpQfOUKquRJrqBxAa4Y
-=tYpK
+iEYEARECAAYFAk6JzoAACgkQKQaZ7OJe4zbTvwCghZUk3UtJVgxae5K0fKf4hmVd
+Jj0AnR5mD6S1M4N+EAb9ukHjJ22ysLRL
+=yk9O
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.0.ebuild b/net-fs/cifs-utils/cifs-utils-5.0.ebuild
deleted file mode 100644
index 9e364cc56849..000000000000
--- a/net-fs/cifs-utils/cifs-utils-5.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 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.0.ebuild,v 1.7 2011/08/09 13:42:37 xarthisius Exp $
-
-EAPI=2
-
-inherit eutils confutils linux-info
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://www.samba.org/linux-cifs/cifs-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 setuid"
-
-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}"
-
-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)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	# Set set-user-ID bit of mount.cifs
-	if use setuid ; then
-		chmod u+s "${D}"/sbin/mount.cifs
-	fi
-	dodoc doc/linux-cifs-client-guide.odt
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	if use setuid ; then
-		ewarn "Setting SETUID bit for mount.cifs."
-		ewarn "However, there may be severe security implications. Also see:"
-		ewarn "http://samba.org/samba/security/CVE-2009-2948.html"
-	fi
-
-	# 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
-}
-- 
2.26.2