Author: steve
Update of /cvs/pkgs/rpms/amavisd-new/EL-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11486
Modified Files: .cvsignore amavis-clamd.conf amavisd-conf.patch amavisd-new.spec sources Log Message: Sync with devel.
Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/EL-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Feb 2007 21:48:43 -0000 1.8 +++ .cvsignore 30 Dec 2007 04:46:07 -0000 1.9 @@ -1 +1 @@ -amavisd-new-2.4.5.tar.gz +amavisd-new-2.5.2.tar.gz
Index: amavis-clamd.conf =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/EL-5/amavis-clamd.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amavis-clamd.conf 26 Jan 2006 22:11:54 -0000 1.1 +++ amavis-clamd.conf 30 Dec 2007 04:46:07 -0000 1.2 @@ -1,5 +1,5 @@ # Use system logger. -LogSyslog +LogSyslog yes
# Specify the type of syslog messages - please refer to 'man syslog' # for facility names. @@ -11,7 +11,7 @@
# Remove stale socket after unclean shutdown. # Default: disabled -FixStaleSocket +FixStaleSocket yes
# Run as a selected user (clamd must be started by root). User amavis
amavisd-conf.patch:
Index: amavisd-conf.patch =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/EL-5/amavisd-conf.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- amavisd-conf.patch 10 Oct 2006 22:47:43 -0000 1.4 +++ amavisd-conf.patch 30 Dec 2007 04:46:07 -0000 1.5 @@ -1,7 +1,7 @@ ---- amavisd-new-2.4.3/amavisd.conf.orig 2006-10-01 19:02:13.000000000 -0500 -+++ amavisd-new-2.4.3/amavisd.conf 2006-10-10 17:46:45.000000000 -0500 -@@ -14,23 +14,23 @@ - # @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code +--- amavisd-new-2.5.1/amavisd.conf.orig 2007-05-31 07:09:55.000000000 -0500 ++++ amavisd-new-2.5.1/amavisd.conf 2007-06-22 16:35:04.000000000 -0500 +@@ -15,23 +15,23 @@ + # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
$max_servers = 2; # num of pre-forked children (2..15 is common), -m -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u @@ -14,7 +14,7 @@ -# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H +$MYHOME = '/var/spool/amavisd'; # a convenient default for other settings, -H $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T - $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR + $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. -$QUARANTINEDIR = '/var/virusmails'; # -Q +$QUARANTINEDIR = undef; # -Q # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine @@ -29,8 +29,8 @@ +$pid_file = "/var/run/amavisd/amavisd.pid"; # -P #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
- @local_domains_maps = ( [".$mydomain"] ); -@@ -77,11 +77,11 @@ + $log_level = 0; # verbosity 0..5, -d +@@ -110,11 +110,11 @@ # $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP; # defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16)
@@ -46,7 +46,7 @@ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
@addr_extension_virus_maps = ('virus'); -@@ -115,10 +115,10 @@ +@@ -148,10 +148,10 @@ # $notify_method = 'smtp:[127.0.0.1]:10025'; # $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
@@ -61,7 +61,7 @@
# $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl
-@@ -318,10 +318,10 @@ +@@ -353,10 +353,10 @@ # ['Sophos SAVI', &sophos_savi ],
# ### http://www.clamav.net/
Index: amavisd-new.spec =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/EL-5/amavisd-new.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- amavisd-new.spec 22 Feb 2007 21:10:55 -0000 1.16 +++ amavisd-new.spec 30 Dec 2007 04:46:07 -0000 1.17 @@ -1,9 +1,9 @@ -#%%define prerelease rc1 +#%%define prerelease rc2
Summary: Email filter with virus scanner and spamassassin support Name: amavisd-new -Version: 2.4.5 -Release: 1%{?prerelease:.%{prerelease}}%{?dist} +Version: 2.5.2 +Release: 2%{?prerelease:.%{prerelease}}%{?dist} License: GPL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ @@ -22,18 +22,30 @@ Requires: smtpdaemon Requires: /usr/sbin/clamd, /etc/clamd.d Requires: /usr/sbin/tmpwatch, /etc/cron.daily -Requires: file -Requires: bzip2 -Requires: gzip +Requires: /usr/bin/ar +Requires: altermime Requires: arj +Requires: bzip2 +Requires: cabextract Requires: cpio +Requires: file Requires: freeze +Requires: gzip Requires: lzop Requires: nomarch -Requires: cabextract -Requires: /usr/bin/ar +Requires: p7zip +Requires: tar # We probably should parse the fetch_modules() code in amavisd for this list. # These are just the dependencies that don't get picked up otherwise. +Requires: perl(Archive::Tar) +Requires: perl(Archive::Zip) +Requires: perl(Authen::SASL) +Requires: perl(Compress::Zlib) >= 1.35 +Requires: perl(Convert::TNEF) +Requires: perl(Convert::UUlib) +Requires: perl(DBD::SQLite) +Requires: perl(DBI) +Requires: perl(IO::Socket::INET6) Requires: perl(IO::Stringy) Requires: perl(MIME::Body) Requires: perl(MIME::Decoder::Base64) @@ -46,21 +58,17 @@ Requires: perl(Mail::Field) Requires: perl(Mail::Header) Requires: perl(Mail::Internet) +Requires: perl(Mail::SPF) Requires: perl(Mail::SpamAssassin) -Requires: perl(Archive::Tar) -Requires: perl(Archive::Zip) -Requires: perl(Convert::TNEF) -Requires: perl(Convert::UUlib) -Requires: perl(URI) Requires: perl(Net::DNS) Requires: perl(Net::LDAP) -Requires: perl(DBI) -Requires: perl(DBD::mysql) -Requires: perl(DBD::SQLite) Requires: perl(Razor2::Client::Version) -Requires: perl(Authen::SASL) -Requires: perl(Mail::SPF::Query) -Requires: perl(Compress::Zlib) >= 1.35 +Requires: perl(URI) +Requires(pre): /usr/sbin/useradd +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service BuildArch: noarch
%description @@ -118,21 +126,23 @@ rm -rf "$RPM_BUILD_ROOT"
%pre -if ! id amavis > /dev/null 2>&1 ; then - useradd -r -s /sbin/nologin -d /var/spool/amavisd amavis +if ! id amavis &>/dev/null ; then + /usr/sbin/useradd -r -s /sbin/nologin -d /var/spool/amavisd amavis fi
%preun if [ "$1" = 0 ]; then - chkconfig --del amavisd - chkconfig --del clamd.amavisd + /sbin/service amavisd stop 2>/dev/null || : + /sbin/chkconfig --del amavisd || : + /sbin/service clamd.amavisd stop 2>/dev/null || : + /sbin/chkconfig --del clamd.amavisd || : fi
%post -chkconfig --add amavisd -service amavisd condrestart -chkconfig --add clamd.amavisd -service clamd.amavisd condrestart +/sbin/chkconfig --add clamd.amavisd || : +/sbin/service clamd.amavisd condrestart || : +/sbin/chkconfig --add amavisd || : +/sbin/service amavisd condrestart || :
%files %defattr(-,root,root) @@ -156,6 +166,24 @@ %ghost /var/spool/amavisd/clamd.sock
%changelog +* Sun Aug 12 2007 Steven Pritchard steve@kspei.com 2.5.2-2 +- Fix pre/preun/post dependencies and improve scriptlets a bit. +- Drop dependencies on DBD::mysql and Mail::SPF::Query. +- Add dependencies on IO::Socket::INET6, Mail::SPF, and altermime. + +* Sun Jul 08 2007 Steven Pritchard steve@kspei.com 2.5.2-1 +- Update to 2.5.2. + +* Fri Jun 22 2007 Steven Pritchard steve@kspei.com 2.5.2-0.1.rc2 +- Update to 2.5.2-rc2. + +* Fri Jun 22 2007 Steven Pritchard steve@kspei.com 2.5.1-1 +- Update to 2.5.1. +- Fix amavis-clamd.conf (bug #237252). +- Update amavisd-conf.patch. +- Require p7zip and tar. +- Improve pre/preun/post scripts. + * Thu Feb 22 2007 Steven Pritchard steve@kspei.com 2.4.5-1 - Update to 2.4.5.
Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/amavisd-new/EL-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Feb 2007 21:48:43 -0000 1.8 +++ sources 30 Dec 2007 04:46:07 -0000 1.9 @@ -1 +1 @@ -eef8c03855f9e3a4c6c53c06006d77ea amavisd-new-2.4.5.tar.gz +52d227d442fac64916488b83d79806d7 amavisd-new-2.5.2.tar.gz
perl-devel@lists.fedoraproject.org