Version bump to 5.4 . Includes fixes for CVE-2012-1586, bug 410989

Package-Manager: portage-2.1.10.49/cvs/Linux i686

4 files changed, 20 insertions, 91 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index f18f18f53df5..a21e9536b7bd 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.19 2012/02/13 20:33:19 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.20 2012/04/23 20:34:29 vostorga Exp $
+
+*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)
 
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 74b821fc6e37..a1f5ba388a72 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.1.tar.bz2 366162 RMD160 3ca51ff3d61513a849e5713b1e10e225bea1b2a1 SHA1 f1c66f148a73e6c9e765fc1df13bd927f8dde5fe SHA256 67f8f9bfad7dc952bd4aa9b1c125d186e437d1e1e75c14992a1f6b7f142e7d3a
-DIST cifs-utils-5.3.tar.bz2 374762 RMD160 33df2d95a1577fa6e9074047a16cd9b3e3159128 SHA1 2e2e0fa4da19f6dcd160a2eb7984d1cf04d85b1d SHA256 68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32
-EBUILD cifs-utils-5.1.ebuild 2412 RMD160 97baf1e3b94e57ced2c96be2479c3356bb491eae SHA1 a181aff6afadb70d868fff885b6cae9a4eb81e57 SHA256 1af18c0a9fef844b65a26383d35057a7c92732c7121d4b0dcd7a8ad1617821b0
-EBUILD cifs-utils-5.3.ebuild 2412 RMD160 703078081989b65f33f32712045af1249557b226 SHA1 ac5cb3aa4b82f113e930102d617d0228e5f91619 SHA256 3dc86c7c2001c3b7f14c77e285c29c62951bce881302037a7498e23d2cfaf8e0
-MISC ChangeLog 3156 RMD160 b6cbf09410595aa0a5a931c10ddf2edae2bd47ab SHA1 4e6a504a3b50443d7754478cbd61727efaa84ff4 SHA256 9cc9ec13ea191e9833116ce23ad5d9827b10a1092d84219e10c16ef5b8d97f55
+DIST cifs-utils-5.4.tar.bz2 381416 RMD160 28066301aaa752055f1f69cc1b3d48e9c11ab93d SHA1 cbe89a4eb298113a926cb49d908a33f3484bdf73 SHA256 f6c267e4cfb111ab47a6e85a802373475edaab31d76eab4e7927ea6fe82e7f7b
+EBUILD cifs-utils-5.4.ebuild 2531 RMD160 2dee2d984763ef34d4e32f3470fd894105975a9d SHA1 dd6b71040948be8cc714218a0576794cc6996052 SHA256 151c339cdb8f4d4a240fe7d38161538bd8ef71a37a73d77b042e2caf0abe885e
+MISC ChangeLog 3384 RMD160 68dfd4fd156c3768da20375d624fcabbaacd4675 SHA1 a800f1676bfcee202d66b00ab90e21cd6a24ed51 SHA256 8099f427cad933fc3f6cefc5d8fece38f0540353815b190eda32355bcd1cd918
 MISC metadata.xml 918 RMD160 861365abb0b5753f8338843672c0677137ce30f7 SHA1 6de300978e721280dcb67e7e7c55681c3b44625c SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk85c5oACgkQKQaZ7OJe4zYlggCeLVoqlHYAx0vx9Q9RiGIJXz0k
-QesAn1DBAjtQ758GVooKyRsQpRvTe+MH
-=PCjg
+iEYEARECAAYFAk+VvNsACgkQKQaZ7OJe4zY/uQCfbYK4/bNh+Dn5kQgYAYYuPAmi
+c3UAoIaAuTItU+hWn1ei9KtXNeFt1SFW
+=+smp
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.1.ebuild b/net-fs/cifs-utils/cifs-utils-5.1.ebuild
deleted file mode 100644
index 5597c091d60f..000000000000
--- a/net-fs/cifs-utils/cifs-utils-5.1.ebuild
+++ /dev/null
@@ -1,80 +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.1.ebuild,v 1.3 2011/10/28 20:07:54 vostorga Exp $
-
-EAPI=4
-
-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 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 )"
-
-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() {
-	local myconf=''
-	if use "caps-ng"; then
-		myconf="${myconf} --with-libcap-ng=yes "
-	else
-		myconf="${myconf} --with-libcap-ng=no "
-	fi
-	myconf="${myconf} \
-		$(use_enable ads cifsupcall) \
-		$(use_with caps libcap) \
-		$(use_with caps-ng libcap-ng) \
-		$(use_enable creds cifscreds) \
-		$(use_enable upcall cifsupcall) \
-		--disable-cifsidmap \
-		--disable-cifsacl"
-	econf ${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc doc/linux-cifs-client-guide.odt
-}
-
-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 and CVE-2011-3585."
-	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.3.ebuild b/net-fs/cifs-utils/cifs-utils-5.4.ebuild
index 696c42bf37de..1922f74f82c8 100644
--- a/net-fs/cifs-utils/cifs-utils-5.3.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2012/02/13 20:33:19 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.4.ebuild,v 1.1 2012/04/23 20:34:29 vostorga Exp $
 
 EAPI=4
 
@@ -40,6 +40,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	#Getting rid of -Werror
+    sed -e "s/-Werror//" -i Makefile.in || die "sed failed"	
+}
+
 src_configure() {
 	local myconf=''
 	if use "caps-ng"; then
@@ -66,7 +71,7 @@ src_install() {
 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 and CVE-2011-3585."
+	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