diff --git a/fetchmail.changes b/fetchmail.changes index 38fb6a7..8fe19fe 100644 --- a/fetchmail.changes +++ b/fetchmail.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 30 17:49:47 CEST 2008 - pcerny@suse.cz + +- added option to specify polling interval to init script + ------------------------------------------------------------------- Fri Mar 28 18:31:11 CET 2008 - pcerny@suse.cz diff --git a/fetchmail.init b/fetchmail.init index 9deb680..82deb69 100644 --- a/fetchmail.init +++ b/fetchmail.init @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (c) 1995-2002 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 1995-2008 SuSE Linux AG, Nuernberg, Germany. # All rights reserved. # # Author: Stanislav Brabec @@ -109,6 +109,14 @@ case "$1" in rc_status ;; start) + if [ $# -ge 2 ]; then + if echo "$2" | grep -E "^[0-9]+$" >& /dev/null ; then + FETCHMAIL_POLLING_INTERVAL="$2" + else + echo "Invalid polling interval specified: '$2', using default: $FETCHMAIL_POLLING_INTERVAL" + fi + fi + echo -n "Starting fetchmail" ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. @@ -136,7 +144,7 @@ case "$1" in fi $0 status if test $? = 0; then - $0 restart + $0 restart "$2" else rc_reset # Not running is not a failure. fi @@ -147,7 +155,7 @@ case "$1" in ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop - $0 start + $0 start "$2" # Remember status and be quiet rc_status @@ -208,7 +216,7 @@ case "$1" in test $FETCHMAIL_CONFIG -nt /var/run/fetchmail.pid || test $FETCHMAIL_RC -nt /var/run/fetchmail.pid && echo reload ;; *) - echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload}" + echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload} [polling interval]" exit 1 ;; esac diff --git a/fetchmail.spec b/fetchmail.spec index 57be4dd..c9cdaed 100644 --- a/fetchmail.spec +++ b/fetchmail.spec @@ -17,7 +17,7 @@ License: GPL v2 or later; Other uncritical OpenSource License; Public Dom Group: Productivity/Networking/Email/Utilities AutoReqProv: on Version: 6.3.8 -Release: 113 +Release: 123 Source: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: %{name}.logrotate @@ -161,6 +161,8 @@ rm -rf $RPM_BUILD_ROOT %{py_sitedir}/fetchmailconf.* %changelog +* Wed Apr 30 2008 pcerny@suse.cz +- added option to specify polling interval to init script * Fri Mar 28 2008 pcerny@suse.cz - additional fix for bnc#246829 [fetchmail-6.3.8-starttls.patch -> @@ -356,7 +358,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Nov 29 2000 bjacke@suse.de - updated to 5.6.0 - adjust README to new boot concept -* Fri Nov 10 2000 bjacke@suse.de +* Sat Nov 11 2000 bjacke@suse.de - updated to version 5.5.5 - switched to long names - added README.SuSE