rpms/autofs/FC-6 autofs-5.0.1-cmd-global-options.patch, 1.1, 1.2 autofs.spec, 1.177, 1.178

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs-5.0.1-cmd-global-options.patch autofs.spec 
Log Message:
* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.28
- fix command option patch.


autofs-5.0.1-cmd-global-options.patch:
 daemon/automount.c  |   21 +++++++++++++++++++--
 man/automount.8.in  |    6 ++++++
 modules/parse_sun.c |   24 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

Index: autofs-5.0.1-cmd-global-options.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs-5.0.1-cmd-global-options.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.1-cmd-global-options.patch	16 Apr 2007 10:19:56 -0000	1.1
+++ autofs-5.0.1-cmd-global-options.patch	16 Apr 2007 10:35:52 -0000	1.2
@@ -1,5 +1,5 @@
---- autofs-5.0.1/modules/parse_sun.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
-+++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 17:47:48.000000000 +0800
+--- autofs-5.0.1/modules/parse_sun.c.cmd-global-options	2007-04-16 18:30:43.000000000 +0800
++++ autofs-5.0.1/modules/parse_sun.c	2007-04-16 18:30:43.000000000 +0800
 @@ -42,6 +42,8 @@ int parse_version = AUTOFS_PARSE_VERSION
  static struct mount_mod *mount_nfs = NULL;
  static int init_ctr = 0;
@@ -52,8 +52,8 @@
  	debug(LOGOPT_NONE,
  	      MODPREFIX "init gathered global options: %s", ctxt->optstr);
  
---- autofs-5.0.1/daemon/automount.c.cmd-global-options	2007-04-16 17:46:58.000000000 +0800
-+++ autofs-5.0.1/daemon/automount.c	2007-04-16 17:55:04.000000000 +0800
+--- autofs-5.0.1/daemon/automount.c.cmd-global-options	2007-04-16 18:30:43.000000000 +0800
++++ autofs-5.0.1/daemon/automount.c	2007-04-16 18:31:18.000000000 +0800
 @@ -46,6 +46,8 @@ const char *libdir = AUTOFS_LIB_DIR;	/* 
  const char *mapdir = AUTOFS_MAP_DIR;	/* Location of mount maps */
  const char *confdir = AUTOFS_CONF_DIR;	/* Location of autofs config file */
@@ -89,7 +89,7 @@
  		{"version", 0, 0, 'V'},
  		{0, 0, 0, 0}
  	};
-@@ -1454,6 +1459,8 @@ int main(int argc, char *argv[])
+@@ -1454,10 +1459,12 @@ int main(int argc, char *argv[])
  	timeout = defaults_get_timeout();
  	ghost = defaults_get_browse_mode();
  	logging = defaults_get_logging();
@@ -98,6 +98,11 @@
  	foreground = 0;
  
  	opterr = 0;
+-	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fV", long_options, NULL)) != EOF) {
++	while ((opt = getopt_long(argc, argv, "+hp:t:vdD:fVO:", long_options, NULL)) != EOF) {
+ 		switch (opt) {
+ 		case 'h':
+ 			usage();
 @@ -1491,6 +1498,16 @@ int main(int argc, char *argv[])
  			show_build_info();
  			exit(0);
@@ -116,7 +121,7 @@
  		case ':':
  			printf("%s: Ambiguous or unknown options\n", program);
 --- autofs-5.0.1/man/automount.8.in.cmd-global-options	2007-01-04 12:33:40.000000000 +0900
-+++ autofs-5.0.1/man/automount.8.in	2007-04-16 17:55:58.000000000 +0800
++++ autofs-5.0.1/man/automount.8.in	2007-04-16 18:30:43.000000000 +0800
 @@ -49,6 +49,12 @@ Define a global macro substitution varia
  are over-ridden macro definitions of the same name specified in
  mount entries.


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- autofs.spec	16 Apr 2007 10:19:56 -0000	1.177
+++ autofs.spec	16 Apr 2007 10:35:52 -0000	1.178
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 %define version 5.0.1
-%define release 0.rc3.27
+%define release 0.rc3.28
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -149,6 +149,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.28
+- fix command option patch.
+
 * Mon Apr 16 2007 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc3.27
 - add configuration variable to control appending of global options (bz 214684).
 - add command option to set a global mount options string (bz 214684).