rpms/autofs/devel autofs-5.0.3-mount-thread-create-cond-handling.patch, 1.2, 1.3 autofs-5.0.3-nss-source-any.patch, 1.1, 1.2 autofs.spec, 1.242, 1.243

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11483

Modified Files:
	autofs-5.0.3-mount-thread-create-cond-handling.patch 
	autofs-5.0.3-nss-source-any.patch autofs.spec 
Log Message:
* Mon May 12 2008 Ian Kent <ikent at redhat.com> - 5.0.3-16
- update patches, documentation and comments only change.


autofs-5.0.3-mount-thread-create-cond-handling.patch:

Index: autofs-5.0.3-mount-thread-create-cond-handling.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.3-mount-thread-create-cond-handling.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autofs-5.0.3-mount-thread-create-cond-handling.patch	17 Apr 2008 06:57:10 -0000	1.2
+++ autofs-5.0.3-mount-thread-create-cond-handling.patch	14 May 2008 05:54:39 -0000	1.3
@@ -1,6 +1,5 @@
-diff -up autofs-5.0.3/daemon/indirect.c.mount-thread-create-cond-handling autofs-5.0.3/daemon/indirect.c
---- autofs-5.0.3/daemon/indirect.c.mount-thread-create-cond-handling	2008-04-14 10:52:47.000000000 +0800
-+++ autofs-5.0.3/daemon/indirect.c	2008-04-14 10:53:04.000000000 +0800
+--- autofs-5.0.3.orig/daemon/indirect.c
++++ autofs-5.0.3/daemon/indirect.c
 @@ -660,7 +660,7 @@ static void mount_mutex_unlock(void *arg
  
  static void *do_mount_indirect(void *arg)
@@ -128,9 +127,8 @@
  
  	return 0;
  }
-diff -up autofs-5.0.3/daemon/direct.c.mount-thread-create-cond-handling autofs-5.0.3/daemon/direct.c
---- autofs-5.0.3/daemon/direct.c.mount-thread-create-cond-handling	2008-04-14 10:52:47.000000000 +0800
-+++ autofs-5.0.3/daemon/direct.c	2008-04-14 10:53:04.000000000 +0800
+--- autofs-5.0.3.orig/daemon/direct.c
++++ autofs-5.0.3/daemon/direct.c
 @@ -1217,7 +1217,7 @@ static void mount_mutex_unlock(void *arg
  
  static void *do_mount_direct(void *arg)
@@ -298,3 +296,13 @@
  
  	return 0;
  }
+--- autofs-5.0.3.orig/CHANGELOG
++++ autofs-5.0.3/CHANGELOG
+@@ -11,6 +11,7 @@
+ - add missing check for zero length NIS key (Wengang Wang).
+ - init SASL callbacks on every ldap lookup library load.
+ - fix incorrect match of map type name when included in map name.
++- fix incorrect pthreads condition handling for mount requests.
+  
+ 14/01/2008 autofs-5.0.3
+ -----------------------

autofs-5.0.3-nss-source-any.patch:

Index: autofs-5.0.3-nss-source-any.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.3-nss-source-any.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.3-nss-source-any.patch	12 May 2008 06:13:46 -0000	1.1
+++ autofs-5.0.3-nss-source-any.patch	14 May 2008 05:54:39 -0000	1.2
@@ -7,15 +7,24 @@
 a source that isn't supported by autofs.
 ---
 
+ CHANGELOG       |    1 +
  lib/nss_parse.y |   31 ++++++++++++++++---------------
  lib/nss_tok.l   |   22 ++++++++++++----------
- 2 files changed, 28 insertions(+), 25 deletions(-)
+ 3 files changed, 29 insertions(+), 25 deletions(-)
 
 
-diff --git a/lib/nss_parse.y b/lib/nss_parse.y
-index 90b7d25..fa6958a 100644
---- a/lib/nss_parse.y
-+++ b/lib/nss_parse.y
+--- autofs-5.0.3.orig/CHANGELOG
++++ autofs-5.0.3/CHANGELOG
+@@ -13,6 +13,7 @@
+ - fix incorrect match of map type name when included in map name.
+ - fix incorrect pthreads condition handling for mount requests.
+ - add check for exports automatically mounted by NFS kernel client.
++- update nsswitch parser to ignore nsswitch sources that aren't supported.
+  
+ 14/01/2008 autofs-5.0.3
+ -----------------------
+--- autofs-5.0.3.orig/lib/nss_parse.y
++++ autofs-5.0.3/lib/nss_parse.y
 @@ -64,7 +64,6 @@ char strval[128];
  %token <strval> SOURCE
  %token <strval> STATUS
@@ -87,10 +96,8 @@
  	return(0);
  }
  
-diff --git a/lib/nss_tok.l b/lib/nss_tok.l
-index c435b63..1aede97 100644
---- a/lib/nss_tok.l
-+++ b/lib/nss_tok.l
+--- autofs-5.0.3.orig/lib/nss_tok.l
++++ autofs-5.0.3/lib/nss_tok.l
 @@ -62,13 +62,13 @@ extern unsigned int nss_automount_found;
  
  %option nounput
@@ -116,7 +123,7 @@
  %%
  
  ^{automount}: {
-@@ -101,6 +99,14 @@ other		[[:alnum:]@$%^&*()-+_":;?,<>./'{}~`]+
+@@ -101,6 +99,14 @@ other		[[:alnum:]@$%^&*()-+_":;?,<>./'{}
  		return SOURCE;
  	}
  
@@ -131,7 +138,7 @@
  	{status} {
  		strcpy(nss_lval.strval, nss_text);
  		return STATUS;
-@@ -112,15 +118,11 @@ other		[[:alnum:]@$%^&*()-+_":;?,<>./'{}~`]+
+@@ -112,15 +118,11 @@ other		[[:alnum:]@$%^&*()-+_":;?,<>./'{}
  	}
  
  	"["	{ return LBRACKET; }


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- autofs.spec	12 May 2008 06:13:46 -0000	1.242
+++ autofs.spec	14 May 2008 05:54:39 -0000	1.243
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 14
+Release: 16
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -22,7 +22,7 @@
 Patch10: autofs-5.0.2-init-cb-on-load.patch
 Patch11: autofs-5.0.3-map-type-in-map-name.patch
 Patch12: autofs-5.0.3-mount-thread-create-cond-handling.patch
-Patch13: autofs-5.0.3-nfs4-nohide-check.patch
+Patch13: autofs-5.0.3-check-for-kernel-automount.patch
 Patch14: autofs-5.0.3-nss-source-any.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs
@@ -131,6 +131,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Mon May 12 2008 Ian Kent <ikent at redhat.com> - 5.0.3-16
+- update patches, documentation and comments only change.
+
 * Mon May 12 2008 Ian Kent <ikent at redhat.com> - 5.0.3-14
 - check for nohide mounts (bz 442618).
 - ignore nsswitch sources that aren't supported (bz 445880).