rpms/autofs/FC-3 autofs-4.1.3-init-script-browse.patch, NONE, 1.1 autofs-4.1.3-submount-variable-propagation.patch, 1.1, 1.2 autofs.spec, 1.52, 1.53

Thu Mar 17 21:40:27 UTC 2005

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

Modified Files:
	autofs-4.1.3-submount-variable-propagation.patch autofs.spec 
Added Files:
	autofs-4.1.3-init-script-browse.patch 
Log Message:
* Thu Mar 17 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.3-110
- Fixed one off bug in the submount-variable-propagation patch.
  (bz #143074)
- Fixed a bug in the init script which wouldn't find the -browse
  option if it was preceded by another option. (fz #113494)



autofs-4.1.3-init-script-browse.patch:
 rc.autofs.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE autofs-4.1.3-init-script-browse.patch ---
--- autofs-4.1.3/samples/rc.autofs.in.orig	2005-03-02 14:08:02.892128400 -0500
+++ autofs-4.1.3/samples/rc.autofs.in	2005-03-02 14:24:22.390222056 -0500
@@ -232,9 +232,12 @@ function getmounts()
 		fi
 		# Dont even deal with conflicts between --ghost and [no]browse
 		# Its just insane to configure things like that.
-		if echo "$options" | grep -qE -- '\B-browse\b' ;
+		if echo "$options" | grep -q 'browse' ;
 		then
-		    startupoptions="$startupoptions --ghost"
+		    if echo "$options" | grep -qE -- '[ 	]+-browse' ||
+		       echo "$options" | grep -q -- ',browse' ;
+		    then
+			startupoptions="$startupoptions --ghost"
 		fi
 		# Check for verbose
 		if echo "$DAEMONOPTIONS $options" | \

autofs-4.1.3-submount-variable-propagation.patch:
 parse_sun.c |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletion(-)

Index: autofs-4.1.3-submount-variable-propagation.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-3/autofs-4.1.3-submount-variable-propagation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-4.1.3-submount-variable-propagation.patch	11 Feb 2005 22:44:09 -0000	1.1
+++ autofs-4.1.3-submount-variable-propagation.patch	17 Mar 2005 21:40:24 -0000	1.2
@@ -1,6 +1,7 @@
---- autofs-4.1.3/modules/parse_sun.c.child_args	2005-02-07 15:33:23.182045264 -0500
-+++ autofs-4.1.3/modules/parse_sun.c	2005-02-07 15:37:51.281287984 -0500
-@@ -70,6 +70,7 @@ static struct substvar
+diff -urN autofs-4.1.3/modules/parse_sun.c autofs-4.1.3.new/modules/parse_sun.c
+--- autofs-4.1.3/modules/parse_sun.c	Mon Sep 27 10:16:39 2004
++++ autofs-4.1.3.new/modules/parse_sun.c	Mon Sep 27 10:07:15 2004
+@@ -70,6 +70,7 @@
  
  /* Default context pattern */
  
@@ -8,17 +9,17 @@
  static struct parse_context default_context = {
  	NULL,			/* No mount options */
  	&sv_osvers,		/* The substvar predefined variables */
-@@ -376,7 +377,19 @@ int parse_init(int argc, const char *con
+@@ -376,7 +377,19 @@
  						*(sv->val++) = '\0';
  					else
  						sv->val = "";
 -
-+					/* we use 4 for the "-D", the "=", and the null */
++					/* we use 5 for the "-D", the "=", the ",", and the null */
 +					if (child_args) {
-+						child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 4);
++						child_args = realloc(child_args, strlen(child_args) + strlen(sv->def) + strlen(sv->val) + 5);
 +						strcat(child_args, ",");
 +					}
-+					else {
++					else { /* No comma, so only +4 */
 +						child_args = malloc(strlen(sv->def) + strlen(sv->val) + 4);
 +						*child_args = '\0';
 +					}
@@ -29,10 +30,13 @@
  					sv->next = ctxt->subst;
  					ctxt->subst = sv;
  				}
-@@ -566,6 +579,28 @@ static int sun_mount(const char *root, c
- 		options = noptions;
- 	}
+@@ -564,6 +577,29 @@
+ 			np[-1] = '\0';
  
+ 		options = noptions;
++	}
++
++
 +	if (child_args && !strcmp(fstype, "autofs")) {
 +		char *noptions;
 +		if (! options) {
@@ -53,8 +57,6 @@
 +		else {
 +			error(MODPREFIX "alloca failed for options");
 +		}
-+	}
-+
+ 	}
+ 
  	while (*name == '/') {
- 		name++;
- 		namelen--;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-3/autofs.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- autofs.spec	1 Mar 2005 19:20:38 -0000	1.52
+++ autofs.spec	17 Mar 2005 21:40:24 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.3
-%define release 106
+%define release 110
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -58,6 +58,7 @@
 Patch54: autofs-4.1.3-alt-master-ldap.patch
 Patch55: autofs-4.1.3-auto-smb-mount-fix.patch
 Patch56: autofs-4.1.3-check-nsswitch-submount.patch
+Patch57: autofs-4.1.3-init-script-browse.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -132,7 +133,7 @@
 %patch43 -p1 -b .yp-direct-lookup
 %patch44 -p1 -b .filestream-leak
 %patch45 -p1 -b .no-rmdir
-%patch46 -p1 
+%patch46 -p1
 %patch47 -p1 -b .cache-release
 %patch48 -p1 -b .non-replicated-ping
 %patch49 -p1 -b .program-map-extra-char
@@ -143,6 +144,7 @@
 %patch54 -p1 -b .alt-master-ldap
 %patch55 -p1 -b .auto-smb-mount
 %patch56 -p1 -b .check-nsswitch-submount
+%patch57 -p1 -b .init-script-browse
 
 cp $RPM_SOURCE_DIR/autofs.sysconfig .
 
@@ -197,7 +199,13 @@
 %{_libdir}/autofs/*
 
 %changelog
-* Mon Feb 28 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.3-102
+* Thu Mar 17 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.3-110
+- Fixed one off bug in the submount-variable-propagation patch.
+  (bz #143074)
+- Fixed a bug in the init script which wouldn't find the -browse
+  option if it was preceded by another option. (fz #113494)
+
+* Mon Feb 28 2005 Chris Feist <cfeist at redhat.com> - 1:4.1.3-100
 - When using ldap if auto.master doesn't exist we now check for auto_master.
   Addresses bz #130079
 - When using an auto.smb map we now remove the leading ':' from the path which


