Hello community,
here is the log from the commit of package amavisd-new
checked in at Mon Nov 3 18:27:15 CET 2008.
--------
--- amavisd-new/amavisd-new.changes 2008-09-01 11:59:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes 2008-10-28 15:12:23.859709000 +0100
@@ -1,0 +2,6 @@
+Tue Oct 28 15:10:21 CET 2008 - varkoly@suse.de
+
+- Require perl-Mail-DKIM
+- (bnc#439292) - amavisd.conf comes with wrong path to clamd socket
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
amavisd-new-suse.dif
New:
----
amavisd-new-suse.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amavisd-new.spec ++++++
--- /var/tmp/diff_new_pack.W17097/_old 2008-11-03 18:26:38.000000000 +0100
+++ /var/tmp/diff_new_pack.W17097/_new 2008-11-03 18:26:38.000000000 +0100
@@ -24,18 +24,18 @@
Group: Productivity/Networking/Security
Url: http://www.ijs.si/software/amavisd/
Obsoletes: amavisd-postfix amavis-postfix amavis-sendmail amavisd-sendmail
-Requires: gzip bzip2 lha unarj unrar zoo sharutils perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin file perl-BerkeleyDB
+Requires: gzip bzip2 lha unarj unrar zoo sharutils perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin file perl-BerkeleyDB perl-Mail-DKIM
PreReq: /usr/sbin/useradd /bin/hostname /bin/sed /bin/cp /bin/mv %insserv_prereq
AutoReqProv: on
Summary: High-Performance E-Mail Virus Scanner
Version: 2.6.1
-Release: 31
+Release: 41
Source0: amavisd-new-%{version}.tar.gz
Source1: sysconfig.amavis
Source2: rc.amavis
Source3: README.SuSE
Source4: RELEASE_NOTES.2.6.1
-Patch: amavisd-new-suse.dif
+Patch: amavisd-new-suse.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define avspool /var/spool/amavis
%define avquarantine /var/spool/amavis/virusmails
@@ -175,6 +175,9 @@
Mark Martinec
%changelog
+* Tue Oct 28 2008 varkoly@suse.de
+- Require perl-Mail-DKIM
+- (bnc#439292) - amavisd.conf comes with wrong path to clamd socket
* Mon Sep 01 2008 kukuk@suse.de
- Don't require unace, amavis does not know about it.
* Wed Aug 13 2008 crrodriguez@suse.de
++++++ amavisd-new-suse.diff ++++++
diff -ur amavisd-new-2.6.1-orig/amavisd-agent amavisd-new-2.6.1/amavisd-agent
--- amavisd-new-2.6.1-orig/amavisd-agent 2008-05-20 19:27:32.000000000 +0200
+++ amavisd-new-2.6.1/amavisd-agent 2008-10-28 11:28:30.000000000 +0100
@@ -50,7 +50,7 @@
my($dbfile) = 'snmp.db';
my($db_home) = # DB databases directory
- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
diff -ur amavisd-new-2.6.1-orig/amavisd-nanny amavisd-new-2.6.1/amavisd-nanny
--- amavisd-new-2.6.1-orig/amavisd-nanny 2008-05-20 19:27:43.000000000 +0200
+++ amavisd-new-2.6.1/amavisd-nanny 2008-10-28 11:28:30.000000000 +0100
@@ -58,7 +58,7 @@
my($dbfile) = 'nanny.db';
my($db_home) = # DB databases directory
- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
my($repeatcount); # -c, repeat count (when defined)
diff -ur amavisd-new-2.6.1-orig/amavisd-release amavisd-new-2.6.1/amavisd-release
--- amavisd-new-2.6.1-orig/amavisd-release 2008-03-17 15:43:33.000000000 +0100
+++ amavisd-new-2.6.1/amavisd-release 2008-10-28 11:28:30.000000000 +0100
@@ -79,7 +79,7 @@
$log_level = 1;
# $socketname = '127.0.0.1:9998';
- $socketname = '/var/amavis/amavisd.sock';
+ $socketname = '/var/spool/amavis/amavisd.sock';
sub sanitize_str {
my($str, $keep_eol) = @_;
diff -ur amavisd-new-2.6.1-orig/amavisd.conf amavisd-new-2.6.1/amavisd.conf
--- amavisd-new-2.6.1-orig/amavisd.conf 2008-06-29 02:35:24.000000000 +0200
+++ amavisd-new-2.6.1/amavisd.conf 2008-10-28 11:31:18.000000000 +0100
@@ -20,10 +20,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, used by SA, etc.
-$QUARANTINEDIR = '/var/virusmails'; # -Q
+$QUARANTINEDIR = '/var/spool/amavis/virusmails'; # -Q
# $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine
# $release_format = 'resend'; # 'attach', 'plain', 'resend'
# $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf'
@@ -360,10 +360,10 @@
# ['Sophos SAVI', \&sophos_savi ],
# ### http://www.clamav.net/
-# ['ClamAV-clamd',
-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-# qr/\bOK$/, qr/\bFOUND$/,
-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+ ['ClamAV-clamd',
+ \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd-socket"],
+ qr/\bOK$/, qr/\bFOUND$/,
+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
# # NOTE: run clamd under the same user as amavisd, or run it under its own
# # uid such as clamav, add user clamav to the amavis group, and then add
# # AllowSupplementaryGroups to clamd.conf;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org