[amavisd-new] Update to upstream 2.9.0
Juan Orti
jorti at fedoraproject.org
Mon May 12 08:50:15 UTC 2014
commit c6bb948ef4681359664ef680f65b3129c95f27ae
Author: Juan Orti Alcaine <j.orti.alcaine at gmail.com>
Date: Mon May 12 10:48:22 2014 +0200
Update to upstream 2.9.0
- Update to upstream 2.9.0
- Enable and start timer units
- Rework amavisd-conf.patch
.gitignore | 1 +
amavisd-conf.patch => amavisd-new-2.9.0-conf.patch | 70 ++++++++++++--------
amavisd-new.spec | 18 ++++-
sources | 2 +-
4 files changed, 57 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9a91ae..13a6681 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
amavisd-new-2.8.0.tar.gz
/amavisd-new-2.8.1.tar.gz
+/amavisd-new-2.9.0.tar.xz
diff --git a/amavisd-conf.patch b/amavisd-new-2.9.0-conf.patch
similarity index 86%
rename from amavisd-conf.patch
rename to amavisd-new-2.9.0-conf.patch
index 5cb5e23..54cfc35 100644
--- a/amavisd-conf.patch
+++ b/amavisd-new-2.9.0-conf.patch
@@ -1,6 +1,40 @@
---- amavisd-new-2.8.0/amavisd.conf 2012-06-30 23:33:32.000000000 +0200
-+++ amavisd-new-2.8.0/amavisd.conf.conf 2013-12-02 16:24:05.000000000 +0100
-@@ -14,25 +14,25 @@
+commit 44707666dd30b5196e75002f1661da6b77e360f8
+Author: Juan Orti Alcaine <j.orti.alcaine at gmail.com>
+Date: Mon May 12 09:59:27 2014 +0200
+
+ amavisd-conf.patch
+
+diff --git a/amavisd-agent b/amavisd-agent
+index 1ebe2bb..b8271a3 100755
+--- a/amavisd-agent
++++ b/amavisd-agent
+@@ -53,7 +53,7 @@ use BerkeleyDB;
+
+ 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/amavisd/db';
+
+ my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+diff --git a/amavisd-nanny b/amavisd-nanny
+index 80b84dc..164549f 100755
+--- a/amavisd-nanny
++++ b/amavisd-nanny
+@@ -61,7 +61,7 @@ my($activettl) = 10*60; # stuck active children are sent a SIGTERM
+
+ 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/amavisd/db';
+ my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+
+diff --git a/amavisd.conf b/amavisd.conf
+index a09597f..25db750 100644
+--- a/amavisd.conf
++++ b/amavisd.conf
+@@ -14,25 +14,25 @@ use strict;
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
$max_servers = 2; # num of pre-forked children (2..30 is common), -m
@@ -33,7 +67,7 @@
#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
$log_level = 0; # verbosity 0..5, -d
-@@ -113,11 +113,11 @@
+@@ -116,11 +116,11 @@ $sa_local_tests_only = 0; # only tests which do not require internet access?
# $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)
@@ -49,7 +83,7 @@
$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
@addr_extension_virus_maps = ('virus');
-@@ -151,10 +151,10 @@
+@@ -154,10 +154,10 @@ $defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error
# $notify_method = 'smtp:[127.0.0.1]:10025';
# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
@@ -64,7 +98,7 @@
# $bad_header_quarantine_method = undef;
# $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
-@@ -335,9 +335,9 @@
+@@ -338,9 +338,9 @@ $banned_filename_re = new_RE(
['arj', \&do_unarj, ['unarj', 'arj'] ],
['arc', \&do_arc, ['nomarch', 'arc'] ],
['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
@@ -76,7 +110,7 @@
['tnef', \&do_tnef],
# ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
# ['sit', \&do_unstuff, 'unstuff'], # not safe
-@@ -375,16 +375,16 @@
+@@ -378,16 +378,16 @@ $banned_filename_re = new_RE(
# qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
# settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
@@ -103,25 +137,3 @@
# ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
# # note that Mail::ClamAV requires perl to be build with threading!
---- amavisd-new-2.8.0/amavisd-nanny 2009-06-25 19:57:13.000000000 +0200
-+++ amavisd-new-2.8.0/amavisd-nanny.conf 2012-07-08 01:00:58.000000000 +0200
-@@ -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/amavisd/db';
- my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
- my($repeatcount); # -c, repeat count (when defined)
-
---- amavisd-new-2.8.0/amavisd-agent 2009-06-18 21:17:30.000000000 +0200
-+++ amavisd-new-2.8.0/amavisd-agent.conf 2012-07-08 01:03:16.000000000 +0200
-@@ -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/amavisd/db';
-
- my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
- my($repeatcount); # -c, repeat count (when defined)
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 716defd..c5ae3cf 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,13 +2,13 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
-Version: 2.8.1
-Release: 3%{?prerelease:.%{prerelease}}%{?dist}
+Version: 2.9.0
+Release: 1%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
URL: http://www.ijs.si/software/amavisd/
-Source0: http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz
+Source0: http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.xz
Source2: amavis-clamd.conf
Source4: README.fedora
Source5: README.quarantine
@@ -19,7 +19,7 @@ Source11: amavisd-clean-tmp.service
Source12: amavisd-clean-tmp.timer
Source13: amavisd-clean-quarantine.service
Source14: amavisd-clean-quarantine.timer
-Patch0: amavisd-conf.patch
+Patch0: amavisd-new-2.9.0-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
# Don't source /etc/sysconfig/network in init script; the network check
@@ -184,6 +184,11 @@ exit 0
%systemd_post amavisd-clean-quarantine.service
%systemd_post amavisd-clean-quarantine.timer
+systemctl enable amavisd-clean-tmp.timer >/dev/null 2>&1 || :
+systemctl start amavisd-clean-tmp.timer >/dev/null 2>&1 || :
+systemctl enable amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
+systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
+
%post snmp
%systemd_post amavisd-snmp.service
@@ -226,6 +231,11 @@ exit 0
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Sun May 11 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.9.0-1
+- Update to version 2.9.0
+- Rework amavisd-conf.patch
+- Enable and start timer units
+
* Wed Mar 19 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.8.1-3
- Use systemd timer units instead of cronjobs
- Add PrivateDevices to service unit
diff --git a/sources b/sources
index 5cf05b1..a793937 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6f9abd1aac05521bdcb3754d09f5314 amavisd-new-2.8.1.tar.gz
+085518062e9df802f806230b800e075e amavisd-new-2.9.0.tar.xz
More information about the scm-commits
mailing list