rpms/spamass-milter/FC-4 spamass-milter-wrapper, NONE, 1.1 spamass-milter.spec, 1.4, 1.5
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Sun Aug 7 10:27:19 UTC 2005
Author: pghmcfc
Update of /cvs/extras/rpms/spamass-milter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25571
Modified Files:
spamass-milter.spec
Added Files:
spamass-milter-wrapper
Log Message:
resync with devel
--- NEW FILE spamass-milter-wrapper ---
#!/bin/bash
#
# spamass-milter-wrapper - wrapper script for spamass-milter
#
# This script backgrounds itself and then runs spamass-milter in a loop.
# If the daemon exits then the script restarts it automatically.
#
wrapper_dir=$(dirname "$0")
daemon=spamass-milter
(
while :
do
# start the daemon in the foreground
$wrapper_dir/$daemon "$@"
milter_status=$?
milter_date=$(date)
# exit if we're shutting down
[ -f /etc/nologin ] && exit
sleep 1
# exit if we're deliberately stopped
[ ! -f /var/lock/subsys/spamass-milter ] && exit
# otherwise, send a notification about the daemon crash
# and then restart
sleep 9
(
echo "$daemon exited at $milter_date with status $milter_status"
echo "You may wish to check /var/log/messages and/or /var/log/maillog"
) | mail -s "$daemon on `hostname` restarted" root
done
) >& /dev/null &
disown -ar
Index: spamass-milter.spec
===================================================================
RCS file: /cvs/extras/rpms/spamass-milter/FC-4/spamass-milter.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spamass-milter.spec 16 Jun 2005 12:52:54 -0000 1.4
+++ spamass-milter.spec 7 Aug 2005 10:27:16 -0000 1.5
@@ -1,12 +1,13 @@
Summary: Sendmail milter for spamassassin
Name: spamass-milter
Version: 0.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://savannah.nongnu.org/projects/spamass-milt/
-Source: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz
+Source0: http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.gz
+Source1: spamass-milter-wrapper
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: spamassassin, sendmail-devel
@@ -26,16 +27,21 @@
%prep
%setup -q
+%{__cp} %{SOURCE1} .
%{__sed} -i -e 's at local:/var/run/sendmail/spamass.sock at unix:/var/run/spamass-milter/spamass-milter.sock@' README
%{__cat} <<EOF >spamass-milter.sysconfig
### Override for your different local config
#SOCKET=%{_localstatedir}/run/spamass-milter/spamass-milter.sock
-### Default parameters for spamass-milter are:
-### -f (work in the background)
+### Standard parameters for spamass-milter are:
### -P %{_localstatedir}/run/spamass-milter.pid (PID file)
-### you may add another parameters here, see spamass-milter(1)
+###
+### Note that the -f parameter for running the milter in the background
+### is not required because the milter runs in a wrapper script that
+### backgrounds itself
+###
+### You may add another parameters here, see spamass-milter(1)
#EXTRA_FLAGS="-m -r 15"
EOF
@@ -77,7 +83,7 @@
echo -n $"Starting $desc ($prog): "
touch $pidfile
chown sa-milt:sa-milt $pidfile
- daemon --user sa-milt %{_sbindir}/$prog -p $SOCKET -P $pidfile -f $EXTRA_FLAGS
+ daemon --user sa-milt %{_sbindir}/${prog}-wrapper -p $SOCKET -P $pidfile $EXTRA_FLAGS
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch %{_localstatedir}/lock/subsys/spamass-milter
@@ -96,6 +102,7 @@
restart() {
stop
+ sleep 2
start
}
@@ -137,6 +144,7 @@
%{__install} -D -m0755 spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter
%{__install} -D -m0644 spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter
%{__install} -d -m0700 %{buildroot}%{_localstatedir}/run/spamass-milter
+%{__install} -m0755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
%pre
%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/run/spamass-milter \
@@ -160,26 +168,30 @@
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog NEWS README
-%doc %{_mandir}/man1/spamass-milter.1*
+%{_mandir}/man1/spamass-milter.1*
%config(noreplace) %{_sysconfdir}/sysconfig/spamass-milter
%{_initrddir}/spamass-milter
%{_sbindir}/spamass-milter
+%{_sbindir}/spamass-milter-wrapper
%dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter
%changelog
-* Thu Jun 16 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-7%{?dist}
+* Mon Aug 1 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-8
+- Run the milter in a wrapper script that restarts it if it scrashes
+
+* Thu Jun 16 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-7
- Bump and rebuild due to transient build system failure
-* Wed Jun 15 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-6%{?dist}
+* Wed Jun 15 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-6
- Adjust initscript chkconfig values so it starts before sendmail
-* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-5%{?dist}
+* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-5
- Help the configure script find sendmail
-* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-4%{?dist}
+* Mon Jun 13 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-4
- Bump and rebuild
-* Mon Jun 06 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-3%{?dist}
+* Mon Jun 06 2005 Paul Howarth <paul at city-fan.org> - 0.3.0-3
- Use Extras standard buildroot
- Unpack tarball quietly
- Create account sa-milt and run the milter using that instead of root
More information about the fedora-extras-commits
mailing list