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

(Portage version: 2.1.10.49/cvs/Linux i686)

3 files changed, 14 insertions, 83 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/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