Hello community, here is the log from the commit of package postgrey for openSUSE:Factory checked in at Fri Apr 1 10:04:30 CEST 2011. -------- --- postgrey/postgrey.changes 2011-01-17 13:28:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/postgrey/postgrey.changes 2011-03-31 10:46:05.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 31 08:45:55 UTC 2011 - chris@computersalat.de + +- cleanup init script (skeleton) + o added sleep 3s when restart + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgrey.spec ++++++ --- /var/tmp/diff_new_pack.cdvFmc/_old 2011-04-01 10:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cdvFmc/_new 2011-04-01 10:03:27.000000000 +0200 @@ -29,7 +29,7 @@ Group: Productivity/Networking/Email/Utilities Summary: Postfix greylisting policy server Version: 1.33 -Release: 1 +Release: 15 Url: http://postgrey.schweikert.ch/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://postgrey.schweikert.ch/pub/%name-%{version}.tar.bz2 ++++++ postgrey.init ++++++ --- /var/tmp/diff_new_pack.cdvFmc/_old 2011-04-01 10:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cdvFmc/_new 2011-04-01 10:03:27.000000000 +0200 @@ -31,24 +31,20 @@ ### END INIT INFO # +# Check for missing binaries (stale symlinks should not happen) +# Note: Special treatment of stop for LSB conformance POSTGREY_BIN=/usr/sbin/postgrey -POSTGREY_SYSCONFIG=/etc/sysconfig/postgrey +test -x $POSTGREY_BIN || { echo "$POSTGREY_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } -if [ ! -x $POSTGREY_BIN ] ; then - echo -n "Postfix greylisting server postgrey not installed ! " - exit 5 -fi - -if [ ! -r $POSTGREY_SYSCONFIG ]; then - echo "$POSTGREY_SYSCONFIG not existing"; - if [ x"$1" = x"stop" ]; then - exit 0 - else - exit 6 - fi -fi +# Check for existence of needed config file and read it +POSTGREY_SYSCONFIG=/etc/sysconfig/postgrey +test -r $POSTGREY_SYSCONFIG || { echo "$POSTGREY_SYSCONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } -# Load options file +# Read sysconfig . $POSTGREY_SYSCONFIG # glue all the sysconfig options to one - easier handling @@ -57,24 +53,28 @@ # Source SuSE config, only if exists with size greater zero test -s /etc/rc.status && . /etc/rc.status - +# Reset status of this service rc_reset case "$1" in start) - echo -n "Starting postgrey daemon" + echo -n "Starting postgrey daemon" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. - startproc "$POSTGREY_BIN" -d $POSTGREY_OPTIONS - rc_status -v - ;; + /sbin/startproc "$POSTGREY_BIN" -d $POSTGREY_OPTIONS + + # Remember status and be verbose + rc_status -v + ;; stop) - echo -n "Shutting down postgrey daemon" + echo -n "Shutting down postgrey daemon" ## Stop daemon with killproc(8) and if this fails ## set echo the return value. - killproc -TERM "$POSTGREY_BIN" - rc_status -v - ;; + /sbin/killproc -TERM "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v + ;; try-restart) $0 status >/dev/null && $0 restart # Remember status and be quiet @@ -83,31 +83,37 @@ restart) ## Stop the service and regardless of whether it was ## running or not, start it again. - $0 stop - $0 start + $0 stop + sleep 3s + $0 start # Remember status and be quiet - rc_status - ;; + rc_status + ;; force-reload) echo -n "Reload service postgrey not possible" rc_failed 3 + + # Remember status and be verbose rc_status -v ;; reload) ## Send daemon HUP signal with killproc(8) and if this ## fails set echo the return value. - killproc -HUP "$POSTGREY_BIN" - rc_status -v + /sbin/killproc -HUP "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v ;; status) - echo -n "Checking for service postgrey: " - checkproc "$POSTGREY_BIN" - rc_status -v - ;; + echo -n "Checking for service postgrey: " + /sbin/checkproc "$POSTGREY_BIN" + + # Remember status and be verbose + rc_status -v + ;; *) - echo "Usage: postgrey {start|stop|try-restart|restart|reload|status}" - exit 1 + echo "Usage: postgrey {start|stop|try-restart|restart|reload|status}" + exit 1 esac - rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org