rpms/autofs/devel autofs-5.0.4-fix-bad-token-declare.patch, NONE, 1.1 autofs.spec, 1.270, 1.271

[Ian Kent]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24312

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.4-fix-bad-token-declare.patch 
Log Message:
* Wed Feb 25 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-17
- fix bad token declaration in master map parser.


autofs-5.0.4-fix-bad-token-declare.patch:

--- NEW FILE autofs-5.0.4-fix-bad-token-declare.patch ---
autofs-5.0.4 - fix bad token declaration

From: Ian Kent <raven at themaw.net>

Fix an incorrect %token declaration in the master map parser.
In some rare cases this can cause the timeout sent from the tokenizer
to the parser to always be zero.
---

 CHANGELOG          |    1 +
 lib/master_parse.y |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/CHANGELOG b/CHANGELOG
index 0ce2a56..fdde400 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@
 - cleanup configure defines for libtirpc.
 - add WITH_LIBTIRPC to -V status report.
 - add nfs mount protocol default configuration option.
+- fix bad token declaration in master map parser.
 
 4/11/2008 autofs-5.0.4
 -----------------------
diff --git a/lib/master_parse.y b/lib/master_parse.y
index 3e598d9..454a2ed 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -122,7 +122,7 @@ static int master_fprintf(FILE *, char *, ...);
 %token <strtype> MAPNULL
 %token <strtype> MAPXFN
 %token <strtype> MAPNAME
-%token <inttype> NUMBER
+%token <longtype> NUMBER
 %token <strtype> OPTION
 
 %start file


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- autofs.spec	25 Feb 2009 02:34:12 -0000	1.270
+++ autofs.spec	25 Feb 2009 03:45:10 -0000	1.271
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 16
+Release: 17
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -36,6 +36,7 @@
 Patch24: autofs-5.0.4-libxml2-workaround-fix.patch
 Patch25: autofs-5.0.4-configure-libtirpc-fix.patch
 Patch26: autofs-5.0.4-add-nfs-mount-proto-default-conf-option.patch
+Patch27: autofs-5.0.4-fix-bad-token-declare.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 libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -103,6 +104,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -155,6 +157,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Feb 25 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-17
+- fix bad token declaration in master map parser.
+
 * Wed Feb 25 2009 Ian Kent <ikent at redhat.com> - 1:5.0.4-16
 - correct mkdir command in %%install section, bz481132.