diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 738c9e0..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -amavisd-new-2.4.5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d790bca --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +amavisd-new-2.5.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 52b2219..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: amavisd-new -# $Id$ -NAME := amavisd-new -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/amavis-clamd.conf b/amavis-clamd.conf index b621a37..0449325 100644 --- a/amavis-clamd.conf +++ b/amavis-clamd.conf @@ -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 @@ PidFile /var/run/amavisd/clamd.pid # Remove stale socket after unclean shutdown. # Default: disabled -FixStaleSocket +FixStaleSocket yes # Run as a selected user (clamd must be started by root). User amavis diff --git a/amavisd-conf.patch b/amavisd-conf.patch index b5f82aa..7a10d80 100644 --- a/amavisd-conf.patch +++ b/amavisd-conf.patch @@ -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/ diff --git a/amavisd-new.spec b/amavisd-new.spec index 949bdf3..db342d2 100644 --- a/amavisd-new.spec +++ b/amavisd-new.spec @@ -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: 4%{?prerelease:.%{prerelease}}%{?dist} License: GPL Group: Applications/System URL: http://www.ijs.si/software/amavisd/ @@ -18,22 +18,35 @@ Patch0: amavisd-conf.patch Patch1: amavisd-init.patch Patch2: amavisd-condrestart.patch Patch3: amavisd-db.patch +Patch4: amavisd-sa_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root/ 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 +59,17 @@ Requires: perl(MIME::Head) 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 @@ -77,6 +86,7 @@ which could cause a mail loss. %patch1 -p1 %patch2 -p0 %patch3 -p0 +%patch4 -p1 install -m644 %{SOURCE4} %{SOURCE5} README_FILES/ sed -i -e 's,/var/amavis/amavisd.sock\>,/var/spool/amavisd/amavisd.sock,' \ @@ -118,24 +128,25 @@ mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/ 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) %doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO %doc README_FILES test-messages amavisd.conf-* %dir %{_sysconfdir}/amavisd/ @@ -148,14 +159,38 @@ service clamd.amavisd condrestart %{_sbindir}/amavisd %{_sbindir}/clamd.amavisd %{_bindir}/amavisd-* -%dir %attr(700,amavis,amavis) /var/spool/amavisd -%dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp -%dir %attr(700,amavis,amavis) /var/spool/amavisd/db -%dir %attr(700,amavis,amavis) /var/spool/amavisd/quarantine +%dir %attr(750,amavis,amavis) /var/spool/amavisd +%dir %attr(750,amavis,amavis) /var/spool/amavisd/tmp +%dir %attr(750,amavis,amavis) /var/spool/amavisd/db +%dir %attr(750,amavis,amavis) /var/spool/amavisd/quarantine %dir %attr(755,amavis,amavis) /var/run/amavisd %ghost /var/spool/amavisd/clamd.sock %changelog +* Mon Nov 30 2015 Juan Orti Alcaine 2.5.2-4 +- Add patch to fix Spamassassin (rhbz#1286589) + +* Thu Aug 07 2014 Juan Orti Alcaine 2.5.2-3 +- Change permissions of /var/spool/amavisd folders to 750 + +* Sun Aug 12 2007 Steven Pritchard 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 2.5.2-1 +- Update to 2.5.2. + +* Fri Jun 22 2007 Steven Pritchard 2.5.2-0.1.rc2 +- Update to 2.5.2-rc2. + +* Fri Jun 22 2007 Steven Pritchard 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 2.4.5-1 - Update to 2.4.5. diff --git a/amavisd-sa_fix.patch b/amavisd-sa_fix.patch new file mode 100644 index 0000000..23ada10 --- /dev/null +++ b/amavisd-sa_fix.patch @@ -0,0 +1,13 @@ +diff --git a/amavisd b/amavisd +index bc2f365..58273aa 100755 +--- a/amavisd ++++ b/amavisd +@@ -17971,7 +17971,7 @@ sub call_spamassassin($$$) { + my($self,$msginfo,$lines) = @_; + my($mail_obj,$per_msg_status); + my($which_section) = 'SA prepare'; +- my($data_representation) = 'GLOB'; # pass data as ARRAY or a GLOB to SA ++ my($data_representation) = 'ARRAY'; # pass data as ARRAY or a GLOB to SA + my($saved_umask) = umask; my($saved_pid) = $$; + my($spamassassin_obj) = $self->{'spamassassin_obj'}; + my($sa_version) = $self->sa_version; diff --git a/sources b/sources index 44f79cb..d1f83c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eef8c03855f9e3a4c6c53c06006d77ea amavisd-new-2.4.5.tar.gz +52d227d442fac64916488b83d79806d7 amavisd-new-2.5.2.tar.gz