diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 11d28b6..d991e84 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -15,7 +15,6 @@ Group: System Environment/Libraries # make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and builds a # new tarball. Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz -Source4: saslauthd.init Source5: saslauthd.service Source7: sasl-mechlist.c Source8: sasl-checkpass.c @@ -160,15 +159,6 @@ Summary: GS2 support for Cyrus SASL The %{name}-gs2 package contains the Cyrus SASL plugin which supports the GS2 authentication scheme. -%package sysvinit -Summary: The SysV initscript to manage the cyrus SASL authd. -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} - -%description sysvinit -The %{name}-sysvinit package contains the SysV init script to manage -the cyrus SASL authd when running a legacy SysV-compatible init system. - ### @@ -322,7 +312,6 @@ install -m755 -d $RPM_BUILD_ROOT/run/saslauthd # Install the init script for saslauthd and the init script's config file. install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig -install -m755 -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd @@ -440,9 +429,6 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %{_mandir}/man3/* %{_sbindir}/sasl2-shared-mechlist -%files sysvinit -/etc/rc.d/init.d/saslauthd - %changelog * Mon Dec 10 2012 Petr Lautrbach 2.1.25-2 - always use the current external Berkeley DB when linking diff --git a/saslauthd.init b/saslauthd.init deleted file mode 100755 index 6983e8d..0000000 --- a/saslauthd.init +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/bash -# -# saslauthd Start/Stop the SASL authentication daemon -# -# chkconfig: - 65 10 -# description: Saslauthd is a server process which handles plaintext \ -# authentication requests on behalf of the cyrus-sasl library. -# processname: saslauthd - -### BEGIN INIT INFO -# Provides: saslauthd -# Required-Start: $local_fs $network -# Required-Stop: $local_fs $network -# Short-Description: Start/Stop the SASL authentication daemon -# Description: Saslauthd is a server process which handles plaintext -# authentication requests on behalf of the cyrus-sasl library. -### END INIT INFO - -# Source function library. -. /etc/init.d/functions - -# Source our configuration file for these variables. -SOCKETDIR=/var/run/saslauthd -MECH=shadow -FLAGS= -if [ -f /etc/sysconfig/saslauthd ] ; then - . /etc/sysconfig/saslauthd -fi - -RETVAL=0 - -# Set up some common variables before we launch into what might be -# considered boilerplate by now. -prog=saslauthd -path=/usr/sbin/saslauthd -lockfile=/var/lock/subsys/$prog -pidfile=/var/run/saslauthd/saslauthd.pid - -start() { - [ -x $path ] || exit 5 - echo -n $"Starting $prog: " - daemon $DAEMONOPTS $path -m $SOCKETDIR -a $MECH $FLAGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status -p $pidfile $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - start - ;; - stop) - rh_status_q || exit 0 - stop - ;; - restart) - restart - ;; - reload) - rh_status_q || exit 7 - reload - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac - -exit $?