diff --git a/autofs-5.0.1-allow-dot-in-master-macro.patch b/autofs-5.0.1-allow-dot-in-master-macro.patch new file mode 100644 index 0000000..87e3f44 --- /dev/null +++ b/autofs-5.0.1-allow-dot-in-master-macro.patch @@ -0,0 +1,13 @@ +diff --git a/lib/master_tok.l b/lib/master_tok.l +index a5d6066..c15ef68 100644 +--- a/lib/master_tok.l ++++ b/lib/master_tok.l +@@ -89,7 +89,7 @@ NL \r?\n + CONT \\\n{OPTWS} + + OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=([[:alnum:]_\-])+)*)+) +-MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-])+) ++MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-\.])+) + SLASHIFYSTR (--(no-)?slashify-colons) + NUMBER [0-9]+ + diff --git a/autofs.spec b/autofs.spec index 52a3065..b599b5f 100644 --- a/autofs.spec +++ b/autofs.spec @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.1 -Release: 9 +Release: 10 Epoch: 1 License: GPL Group: System Environment/Daemons @@ -27,6 +27,7 @@ Patch14: autofs-5.0.1-cmd-global-options.patch Patch15: autofs-5.0.1-localfs-label-check.patch Patch16: autofs-5.0.1-disable-exports-check.patch Patch17: autofs-5.0.1-cmd-global-options-fix.patch +Patch18: autofs-5.0.1-allow-dot-in-master-macro.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 Conflicts: kernel < 2.6.17 @@ -85,6 +86,7 @@ echo %{version}-%{release} > .version %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -137,6 +139,9 @@ fi %{_libdir}/autofs/ %changelog +* Mon May 7 2007 Ian Kent - 5.0.1-10 +- fix master map lexer to admit "." in macro values. + * Tue Apr 17 2007 Ian Kent - 5.0.1-9 - upstream fix for filesystem is local check. - disable exports access control check (bz 203277).