Hello community, here is the log from the commit of package amavisd-new checked in at Mon Nov 20 18:42:09 CET 2006. -------- --- amavisd-new/amavisd-new.changes 2006-10-20 10:36:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes 2006-11-20 11:47:51.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 20 11:47:16 CET 2006 - varkoly@suse.de + +- fixing bug 218230 - amavisd crashes on start + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amavisd-new.spec ++++++ --- /var/tmp/diff_new_pack.cHHBoa/_old 2006-11-20 18:41:51.000000000 +0100 +++ /var/tmp/diff_new_pack.cHHBoa/_new 2006-11-20 18:41:51.000000000 +0100 @@ -12,7 +12,7 @@ Name: amavisd-new BuildRequires: krb5 sendmail sendmail-devel -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Security URL: http://www.ijs.si/software/amavisd/ Obsoletes: amavisd-postfix amavis-postfix amavis-sendmail amavisd-sendmail @@ -21,7 +21,7 @@ Autoreqprov: on Summary: High-Performance E-Mail Virus Scanner Version: 2.4.3 -Release: 1 +Release: 13 Source0: amavisd-new-%{version}.tar.gz Source1: sysconfig.amavis Source2: rc.amavis @@ -66,16 +66,7 @@ install -m 755 amavisd-agent $RPM_BUILD_ROOT/usr/sbin/amavisd-agent install -m 755 amavisd-nanny $RPM_BUILD_ROOT/usr/sbin/amavisd-nanny install -m 755 amavisd-release $RPM_BUILD_ROOT/usr/sbin/amavisd-release -rm -f $RPM_BUILD_ROOT/etc/amavisd.conf -sed -e "s%^#*\$MYHOME[[:space:]]\+=.*%\$MYHOME = '%{avspool}';%" \ - -e "s%^#*\$QUARANTINEDIR[[:space:]]\+=.*%\$QUARANTINEDIR = '%{avquarantine}';%" \ - -e "s%^#*\$daemon_user[[:space:]]\+=.*%\$daemon_user = '%{avuser}';%" \ - -e "s%^#*\$daemon_group[[:space:]]\+=.*%\$daemon_group = '%{avgroup}';%" \ - -e "s%^#*[ ]*\$final_spam_destiny[[:space:]]\+=.*%\$final_spam_destiny = D_PASS;%" \ - -e "s%^\$sa_tag2_level_deflt[[:space:]]\+=.*%\$sa_tag2_level_deflt = 5.0;%" \ - -e "s%^\$spam_quarantine_to[[:space:]]\+=.*%\$spam_quarantine_to = undef;%" \ - -e "s%/var/run/clamav/clamd%127.0.0.1:3310%" \ - amavisd.conf > $RPM_BUILD_ROOT/etc/amavisd.conf +install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf install -m 755 $RPM_SOURCE_DIR/rc.amavis $RPM_BUILD_ROOT/etc/init.d/amavis ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/usr/sbin/rcamavis install -m 755 helper-progs/amavis $RPM_BUILD_ROOT/usr/sbin/amavis @@ -97,14 +88,13 @@ %post BAKSUFFIX=$(date +%Y-%m-%d) -AVCF=etc/amavisd.conf +AVCF=/etc/amavisd.conf +cp $AVCF $AVCF.NEW FQHN=$(hostname -f) if [ $1 -le 1 ]; then AVDOMAIN=$(echo $FQHN | sed 's/[^\.]*\.//') if [ -n "$AVDOMAIN" ]; then - rm -f $AVCF.NEW - sed -e "s%^#*\$mydomain[[:space:]]\+=.*%\$mydomain = '$AVDOMAIN';%" \ - $AVCF > $AVCF.NEW + perl -pi -e "s/mydomain =.*;/mydomain = '$AVDOMAIN';/" $AVCF.NEW if ! cmp -s $AVCF $AVCF.NEW ; then echo "setting \$mydomain to $AVDOMAIN in $AVCF" fi @@ -112,8 +102,7 @@ fi if [ -n "$FQHN" ]; then if ! grep ^\$myhostname $AVCF > /dev/null; then - sed -e "s%^#*[[:space:]]*\$myhostname[[:space:]]\+=.*%\$myhostname = '$FQHN';%" \ - $AVCF > $AVCF.NEW + sed -ie "s%^#*[[:space:]]*\$myhostname[[:space:]]\+=.*%\$myhostname = '$FQHN';%" $AVCF.NEW if ! cmp -s $AVCF $AVCF.NEW ; then echo "setting \$myhostname to $FQHN in $AVCF" fi @@ -176,6 +165,8 @@ %changelog -n amavisd-new +* Mon Nov 20 2006 - varkoly@suse.de +- fixing bug 218230 - amavisd crashes on start * Fri Oct 20 2006 - varkoly@suse.de - update to version 2.4.3 BUG FIXES AND WORKAROUNDS ++++++ amavisd-new-2.4.3.dif ++++++ --- /var/tmp/diff_new_pack.cHHBoa/_old 2006-11-20 18:41:52.000000000 +0100 +++ /var/tmp/diff_new_pack.cHHBoa/_new 2006-11-20 18:41:52.000000000 +0100 @@ -21,3 +21,36 @@ my($dbfile) = 'nanny.db'; my($wakeuptime) = 2; # seconds +--- amavisd.conf 2006-10-02 02:02:13.000000000 +0200 ++++ amavisd.conf 2006-11-20 11:42:21.000000000 +0100 +@@ -19,10 +19,10 @@ + + $mydomain = 'example.com'; # a convenient default for other settings + +-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H ++$MYHOME = '/var/spool/amavis'; # a convenient default for other settings, -H + $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T + $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR +-$QUARANTINEDIR = '/var/virusmails'; # -Q ++$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q + # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine + + # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R +@@ -117,7 +117,7 @@ + + # $final_virus_destiny = D_DISCARD; + # $final_banned_destiny = D_BOUNCE; +-# $final_spam_destiny = D_BOUNCE; ++$final_spam_destiny = D_PASS; + # $final_bad_header_destiny = D_PASS; + + # $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl +@@ -319,7 +319,7 @@ + + # ### http://www.clamav.net/ + # ['ClamAV-clamd', +-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], ++# \&ask_daemon, ["CONTSCAN {}\n", "127.0.0.1:3310"], + # qr/\bOK$/, qr/\bFOUND$/, + # qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], + # # NOTE: run clamd under the same user as amavisd, or run it under its own ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org