Hello community, here is the log from the commit of package amavisd-new for openSUSE:Factory checked in at 2012-01-05 13:47:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amavisd-new (Old) and /work/SRC/openSUSE:Factory/.amavisd-new.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amavisd-new", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/amavisd-new/amavisd-new.changes 2011-11-05 10:53:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amavisd-new.new/amavisd-new.changes 2012-01-05 13:47:44.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 4 14:47:42 UTC 2012 - [email protected] + +- bnc#706257 - amavis failed to start during boot, however it is active + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.TtthYc/_old 2012-01-05 13:47:45.000000000 +0100 +++ /var/tmp/diff_new_pack.TtthYc/_new 2012-01-05 13:47:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amavisd-new # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: amavisd-new Summary: High-Performance E-Mail Virus Scanner -Version: 2.7.0 -Release: 1 License: GPL-2.0+ Group: Productivity/Networking/Security +Version: 2.7.0 +Release: 0 Url: http://www.ijs.si/software/amavisd/ -BuildRequires: sendmail sendmail-devel +BuildRequires: sendmail +BuildRequires: sendmail-devel Requires: gzip bzip2 unarj zoo sharutils file Requires: perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy Requires: perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog @@ -80,7 +79,6 @@ %package docs Summary: Documentation for the High-Performance E-Mail Virus Scanner Group: Documentation/Other -License: GPL-2.0+ Recommends: %{name} = %{version} %description docs ++++++ rc.amavis ++++++ --- /var/tmp/diff_new_pack.TtthYc/_old 2012-01-05 13:47:45.000000000 +0100 +++ /var/tmp/diff_new_pack.TtthYc/_new 2012-01-05 13:47:45.000000000 +0100 @@ -28,6 +28,38 @@ AMAVIS_PID=/var/spool/amavis/amavisd.pid AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock +# it's like checkproc, but works for scripts too: +checkproc_script() +{ + if [ "${1}" = "-p" ]; then + if [ -z "${2}" -o -z "${3}" ]; then + return 101 + fi + CHECK_PID=`cat "${2}"`; + if [ -e /proc/"${CHECK_PID}" ]; then + CHECK_EXE="${3}"; + FOUND=`cat /proc/"${CHECK_PID}"/cmdline | grep "${CHECK_EXE}"` + if [ -n "${FOUND}" ]; then + return 0; + else + return 1; + fi + else + return 3; + fi + elif [ -z "${2}" ]; then + CHECK_EXE="${1}"; + FOUND=`ps auxwww | grep "${CHECK_EXE}"` + if [ -n "${FOUND}" ]; then + return 0; + else + return 7; + fi + fi + + return 101; +} + # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x $AMAVISD_BIN || { echo "$AMAVIS_BIN not installed"; @@ -60,7 +92,7 @@ start) # ZMI 20100428 check for stale pid file if test -f $AMAVIS_PID ; then - checkproc -p $AMAVIS_PID amavisd + checkproc_script -p $AMAVIS_PID $AMAVISD_BIN if test $? -ge 1 ; then # pid file is stale, remove it echo -n "(stale amavisd pid file $AMAVIS_PID found, removing. Did amavisd crash?)" @@ -69,7 +101,7 @@ fi echo -n "Starting virus-scanner (amavisd-new): " $AMAVISD_BIN start - if ! checkproc amavisd; then + if ! checkproc_script $AMAVISD_BIN; then rc_failed 7 fi rc_status -v @@ -82,7 +114,7 @@ ;; stop) echo -n "Shutting down virus-scanner (amavisd-new): " - if checkproc amavisd; then + if checkproc_script $AMAVISD_BIN; then rc_reset $AMAVISD_BIN stop else @@ -117,12 +149,12 @@ ;; status) echo -n "Checking for service amavis (amavisd-new): " - checkproc -p $AMAVIS_PID amavisd + checkproc_script -p $AMAVIS_PID $AMAVISD_BIN rc_status -v if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then rc_reset echo -n "Checking for service amavis-milter: " - checkproc $AMAVIS_MILTER_BIN + checkproc_script $AMAVIS_MILTER_BIN rc_status -v fi ;; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
