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

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

5 files changed, 79 insertions, 8 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/Manifest b/net-fs/cifs-utils/Manifest
index eedf2d0d1081..d7124a2fb6aa 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX cifs-utils-5.5-initialize_rc_var_properly.patch 1033 RMD160 9fa7c75e935e000b125b8a884eb7d39baa94497a SHA1 c8b6b9252e8f06573103ded7907f397814f3372f SHA256 c341bd479fd4e1587bf53db3e525b60f25368ba2860977235a64fa3988671ec9
 DIST cifs-utils-5.4.tar.bz2 381416 RMD160 28066301aaa752055f1f69cc1b3d48e9c11ab93d SHA1 cbe89a4eb298113a926cb49d908a33f3484bdf73 SHA256 f6c267e4cfb111ab47a6e85a802373475edaab31d76eab4e7927ea6fe82e7f7b
 DIST cifs-utils-5.5.tar.bz2 377435 RMD160 712bd107ed39701f9a820ba0cff969cb53643c28 SHA1 355886c4b5bf9c4ac50756d6ec745aee3044d428 SHA256 82719a7988025eec87846d581a7b913368419d33deaafbecafd519fcb194d5c6
-EBUILD cifs-utils-5.4.ebuild 2525 RMD160 a170af5bbed031bc520b17faac898eccd96c5cc9 SHA1 052d6b58328b5ba63dc14765fd5ef24049024a81 SHA256 e2c6a6a87c78fa963db0a71488a6b312863d5fc50a6823b723d31f882cac5907
-EBUILD cifs-utils-5.5.ebuild 2529 RMD160 d13ebbd977fb5e86dc3e0669c2f447b136954f5f SHA1 7718a2be3977a978eebd1222813d7c1e101d1294 SHA256 a8d23400bdeb7f81fe8578e4e87fab8ac1abfe5141aec9898f6812cccbe1ab02
-MISC ChangeLog 3803 RMD160 6c907a0372ec2b436f929628c03861fae88e4938 SHA1 1d11ae862db138a951dc1498a23f1e46a6984d3e SHA256 af2b0978ab962f94342c1117c1a83cec826b99f827606c5c124356a6e88024e6
+EBUILD cifs-utils-5.4.ebuild 2528 RMD160 464c969ac26563b46a103817e54ea7a2cde1a046 SHA1 60a80aabde332413c82941c7d2efbc86039f5ef6 SHA256 caf0fc4b5c8acefd620830dd225b83c5880f475e673d545746dc67f1e4e99b14
+EBUILD cifs-utils-5.5-r1.ebuild 2610 RMD160 22987a91e925215314c9ce90c54687d1857bf4a9 SHA1 12314c15ea387592304fb3ce54a1add43f41169e SHA256 13186daaf3811d0894ec43415d344eaddf35ccf96151bb096da134cf2a4a8b39
+MISC ChangeLog 4214 RMD160 8f545e72facf5b31466c70a2510a686b30337d74 SHA1 bcddfa4ca9e639820b4bfb91e757aceacfcfa34d SHA256 b885079dcc86f015e5b9b4875b368cc9b8400cdda45cca285b67ce6f501b8eb8
 MISC metadata.xml 918 RMD160 861365abb0b5753f8338843672c0677137ce30f7 SHA1 6de300978e721280dcb67e7e7c55681c3b44625c SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJP8+IsAAoJEPiazRVxLXTFZBwQAOIaM2aRsEei8d5qY27o1eEQ
+e2LJvop0mIKeatZ/6YZ0V5wmuaD8Rfk5ySlL0La6mE+k5FRz5HVlowPpN5Urvha3
+pZVLRYnS6ftbvpUNZkf8m45sEWnYEg+Dp8YQ0SO7q5lvMEZTqqJMvzBnzoWFu0Yl
+yyx10ZRuv0mNO0kEuzYf1wM/MKzoxu7wCrIIwzIVN+fAhqiwTit5KvP4OhrJvexg
+0GeVk1IAFweq+Q0V9V+tRtosIz4AUW2eamySyY9iEAQMU6mg5pzW9dcyB/3JC15D
+Hl5h/aU3bILXnLYirsrDt1u7mzdGgV1LWVk5l7jLQ3UEM5AEK67Ak7Yu5BIFGdKU
+3h+I2nPgD0O/yyOPK1aob376So0KsOhiTuEWNclrVBzXvO6tvjoNSS5ANgRUxY7r
+tEHhWE7zoylqPiJKqcPBdBA1zxnBMaNg4OotemgPsY4BEh84K2YLOFqURiud95JU
+r3CtuQ6MoeKFETm10/06uYuDHxf+YrapKWH8kQWv+C0iISqrzY/qj53C56Nl4oNj
+fKCIfj5fozxTsG0zHxAoHrRkq/lf3PGHxHFGVsvEhrhprwR7+0PGvSTClmgbIgV/
+BcIKNvaRflgPDBBOFBwm6q3NmJ4FrGOxlR2SPnZmNLuG90a+VjbNYEl4EdCSri5K
+lLOvw9ErCCeEVlTc2gUW
+=Jz1U
+-----END PGP SIGNATURE-----
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
+