From 567618736c18d909b20ab8376cd7a23f90f0a77e Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Jun 14 2011 03:00:59 +0000 Subject: * Tue Jun 14 2011 Ian Kent - 1:5.0.5-38 - fix lsb service name in init script (bz692963). --- diff --git a/autofs-5.0.5-fix-lsb-service-name-in-init-script.patch b/autofs-5.0.5-fix-lsb-service-name-in-init-script.patch new file mode 100644 index 0000000..52f491f --- /dev/null +++ b/autofs-5.0.5-fix-lsb-service-name-in-init-script.patch @@ -0,0 +1,40 @@ +autofs-5.0.5 - fix lsb service name in init script + +From: Ian Kent + +The "Provides:" in the init script header incorrectly uses $autofs +instead of autofs. This isn't correct as using names starting with +a $ is reserved for standards-defined facilities. +--- + + redhat/autofs.init.in | 2 +- + samples/rc.autofs.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + + +diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in +index 4a915ec..86b7eb4 100644 +--- a/redhat/autofs.init.in ++++ b/redhat/autofs.init.in +@@ -8,7 +8,7 @@ + # description: Automounts filesystems on demand + # + ### BEGIN INIT INFO +-# Provides: $autofs ++# Provides: autofs + # Required-Start: $network $ypbind + # Required-Stop: $network $ypbind + # Default-Start: 3 4 5 +diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in +index ae2e907..0306ef6 100644 +--- a/samples/rc.autofs.in ++++ b/samples/rc.autofs.in +@@ -7,7 +7,7 @@ + # + # + ### BEGIN INIT INFO +-# Provides: $autofs ++# Provides: autofs + # Required-Start: $network $ypbind + # Required-Stop: $network $ypbind + # Default-Start: 3 4 5 diff --git a/autofs.spec b/autofs.spec index 01d5add..adc264f 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: 37%{?dist} +Release: 38%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -76,6 +76,7 @@ Patch64: autofs-5.0.5-fix-mountd-vers-retry.patch 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 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 @@ -185,6 +186,7 @@ echo %{version}-%{release} > .version %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -237,6 +239,9 @@ fi %{_libdir}/autofs/ %changelog +* Tue Jun 14 2011 Ian Kent - 1:5.0.5-38 +- fix lsb service name in init script (bz692963). + * Fri Mar 18 2011 Ian Kent - 1:5.0.5-37 - replace GPLv3 code with GPLv2 equivalent.