[autofs/f15] * Wed Nov 30 2011 Ian Kent <ikent at redhat.com> - 1:5.0.5-39 - fix lsb service name in init script 2 (

[Ian Kent]

commit caddf913e76cc91af9466ad5ef00a99817af2c4e
Author: Ian Kent <raven at themaw.net>
Date:   Fri Dec 2 16:51:20 2011 +0800

    * Wed Nov 30 2011 Ian Kent <ikent at redhat.com> - 1:5.0.5-39
    - fix lsb service name in init script 2 (bz712504).

 ...0.6-fix-lsb-service-name-in-init-script-2.patch |   45 ++++++++++++++++++++
 autofs.spec                                        |    7 +++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch b/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch
new file mode 100644
index 0000000..15ff157
--- /dev/null
+++ b/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch
@@ -0,0 +1,45 @@
+autofs-5.0.6 - fix lsb service name in init script 2
+
+From: Ian Kent <raven at themaw.net>
+
+The "Required-Start:" and "Required-Stop:" in the init script header
+incorrectly uses $ypbind instead of ypbind. This isn't correct as
+using names starting with a $ is reserved for standards-defined
+facilities.
+---
+
+ redhat/autofs.init.in |    4 ++--
+ samples/rc.autofs.in  |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+
+diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
+index 86b7eb4..48d387d 100644
+--- a/redhat/autofs.init.in
++++ b/redhat/autofs.init.in
+@@ -9,8 +9,8 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: autofs
+-# Required-Start: $network $ypbind
+-# Required-Stop: $network $ypbind
++# Required-Start: $network ypbind
++# Required-Stop: $network ypbind
+ # Default-Start: 3 4 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: Automounts filesystems on demand
+diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
+index 0306ef6..35667ba 100644
+--- a/samples/rc.autofs.in
++++ b/samples/rc.autofs.in
+@@ -8,8 +8,8 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: autofs
+-# Required-Start: $network $ypbind
+-# Required-Stop: $network $ypbind
++# Required-Start: $network ypbind
++# Required-Stop: $network ypbind
+ # Default-Start: 3 4 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: Automounts filesystems on demand
diff --git a/autofs.spec b/autofs.spec
index ccddb16..5ec729c 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.5
-Release: 38%{?dist}
+Release: 39%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -77,6 +77,7 @@ Patch65: autofs-5.0.5-fix-expire-race.patch
 Patch66: autofs-5.0.5-add-lsb-force-reload-and-try-restart.patch
 Patch67: autofs-5.0.5-replace-gplv3-code.patch
 Patch68: autofs-5.0.5-fix-lsb-service-name-in-init-script.patch
+Patch69: autofs-5.0.6-fix-lsb-service-name-in-init-script-2.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
 Conflicts: cyrus-sasl-lib < 2.1.23-9
@@ -187,6 +188,7 @@ echo %{version}-%{release} > .version
 %patch66 -p1
 %patch67 -p1
 %patch68 -p1
+%patch69 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -239,6 +241,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Wed Nov 30 2011 Ian Kent <ikent at redhat.com> - 1:5.0.5-39
+- fix lsb service name in init script 2 (bz712504).
+
 * Tue Jun 14 2011 Ian Kent <ikent at redhat.com> - 1:5.0.5-38
 - use weight only for server selection.
 - fix isspace() wild card substition.