Added patch to 5.5 version so it mounts shares again (bug #424487).

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

4 files changed, 55 insertions, 5 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index ddffa8adc59a..67a56b9daf2f 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,15 @@
 # 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.24 2012/06/28 08:15:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.25 2012/07/04 06:26:46 polynomial-c Exp $
+
+*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)
 
diff --git a/net-fs/cifs-utils/cifs-utils-5.4.ebuild b/net-fs/cifs-utils/cifs-utils-5.4.ebuild
index cedce8ed7089..ffeb77208dc0 100644
--- a/net-fs/cifs-utils/cifs-utils-5.4.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.4.ebuild,v 1.5 2012/06/20 20:17:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.4.ebuild,v 1.6 2012/07/04 06:26:46 polynomial-c Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	#Getting rid of -Werror
-    sed -e "s/-Werror//" -i Makefile.in || die "sed failed"
+	sed -e "s/-Werror//" -i Makefile.in || die "sed failed"
 }
 
 src_configure() {
diff --git a/net-fs/cifs-utils/cifs-utils-5.5.ebuild b/net-fs/cifs-utils/cifs-utils-5.5-r1.ebuild
index 54124210a8ec..4d442128f73f 100644
--- a/net-fs/cifs-utils/cifs-utils-5.5.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-5.5-r1.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.5.ebuild,v 1.1 2012/06/28 08:15:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.5-r1.ebuild,v 1.1 2012/07/04 06:26:46 polynomial-c Exp $
 
 EAPI=4
 
@@ -41,8 +41,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #424487
+	epatch "${FILESDIR}"/${P}-initialize_rc_var_properly.patch
+
 	#Getting rid of -Werror
-    sed -e "s/-Werror//" -i Makefile.in || die "sed failed"
+	sed -e "s/-Werror//" -i Makefile.in || die "sed failed"
 }
 
 src_configure() {
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 000000000000..2faa853e0a58
--- /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
+