Accepting request 44346 from network:samba:STABLE

Copy from network:samba:STABLE/cifs-utils based on submit request 44346 from user sjayaraman

OBS-URL: https://build.opensuse.org/request/show/44346
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=10

cifs-fix-cred-option-parsing

@@ -1,25 +0,0 @@
-commit d3743bbfd82b058b68c1bcf6e3341966a3d9f707
-Author: Jeff Layton <jlayton@samba.org>
-Date:   Sun May 30 07:47:26 2010 -0400
-References: bnc#618877
-
-    mount.cifs: fix parsing of "cred=" option
-    
-    When the mount option parsing was cleaned up recently, the detection of
-    the "cred=" option was dropped.
-    
-    Signed-off-by: Jeff Layton <jlayton@samba.org>
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index 326b94e..65754c0 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -800,6 +800,8 @@ static int parse_opt_token(const char *token)
- 		return OPT_UNC;
- 	if (strncmp(token, "dom", 3) == 0 || strncmp(token, "workg", 5) == 0)
- 		return OPT_DOM;
-+	if (strncmp(token, "cred", 4) == 0)
-+		return OPT_CRED;
- 	if (strncmp(token, "uid", 3) == 0)
- 		return OPT_UID;
- 	if (strncmp(token, "gid", 3) == 0)

cifs-utils-4.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8287996c59609d3042691ae412d289995d63e7eaf561117f0b9a1ba421ecf25b
-size 321737

cifs-utils-4.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21799212bc9ececc2bcc1b4208be1ee672585fead392fe0eaec14b97521bdf83
+size 322843

cifs-utils.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  2 08:33:32 UTC 2010 - sjayaraman@suse.de
+
+- Update to cifs-utils 4.6.
+  + adds documentation for the fsc option.
+  + mount.cifs deals with the _netdev, mand, and nomand options correctly now.
+  + changes how mount.cifs handles the MS_MANDLOCK flag.
+  + makes cifs.upcall prefer the creduid= upcall option to uid=
+
 -------------------------------------------------------------------
 Wed Jul  7 08:02:22 UTC 2010 - sjayaraman@suse.de
 

cifs-utils.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package cifs-utils (Version 4.5)
+# spec file for package cifs-utils (Version 4.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
 
 Name:           cifs-utils
-Version:        4.5
-Release:        2
+Version:        4.6
+Release:        1
 License:        GPLv3+
 Group:          System/Filesystems
 Url:            http://www.samba.org/linux-cifs/cifs-utils/
@@ -28,7 +28,6 @@ Source:         %{name}-%{version}.tar.bz2
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
-Patch1:         cifs-fix-cred-option-parsing	
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -54,7 +53,6 @@ the Linux CIFS filesystem.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}