rpms/autofs/devel autofs-4.1.4-auto.smb-cifs.patch, NONE, 1.1 autofs.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9751

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-auto.smb-cifs.patch 
Log Message:
- add patch to use "cifs" instead of smbfs and escape speces
  in share names (bz #163999, #187732).


autofs-4.1.4-auto.smb-cifs.patch:
 auto.smb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE autofs-4.1.4-auto.smb-cifs.patch ---
diff --git a/samples/auto.smb b/samples/auto.smb
index ad44fc0..d0abcd7 100755
--- a/samples/auto.smb
+++ b/samples/auto.smb
@@ -5,7 +5,7 @@
 # This file must be executable to work! chmod 755!
 
 key="$1"
-opts="-fstype=smbfs"
+opts="-fstype=cifs"
 
 for P in /bin /sbin /usr/bin /usr/sbin
 do
@@ -20,7 +20,7 @@ done
 
 $SMBCLIENT -gNL $key 2>/dev/null| awk -v key="$key" -v opts="$opts" -F'|' -- '
 	BEGIN	{ ORS=""; first=1 }
-	/Disk/	{ if (first) { print opts; first=0 }; print " \\\n\t /" $2, "://" key "/" $2 }
+	/Disk/	{ if (first) { print opts; first=0 }; sub(/ /, "\\ ", $2); print " \\\n\t /" $2, "://" key "/" $2 }
 	END 	{ if (!first) print "\n"; else exit 1 }
 	'
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- autofs.spec	11 Apr 2006 13:46:25 -0000	1.77
+++ autofs.spec	2 May 2006 08:58:16 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 18
+%define release 20
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -37,6 +37,7 @@
 Patch24: autofs-4.1.4-underscore_to_dot.patch
 Patch25: autofs-4.1.3-ldap-auto-master.patch
 Patch26: autofs-4.1.4-auto_net-escape-hash.patch
+Patch27: autofs-4.1.4-auto.smb-cifs.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -102,6 +103,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -155,6 +157,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue May 2 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-20
+- add patch to use "cifs" instead of smbfs and escape speces
+  in share names (bz #163999, #187732).
+
 * Tue Apr 11 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-18
 - Add patch to allow customization of arguments to the
   autofs-ldap-auto-master program (bz #187525).