jorti pushed to amavisd-new (epel7). "Update to version 2.10.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 14 07:17:38 UTC 2015
From 20d69c4539ce726f49247eae723dca7cb9454012 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Wed, 20 Aug 2014 15:09:46 +0200
Subject: Add ExecReload and Wants=postfix.service to systemd unit
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 1771fbb..44d996a 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.9.1
-Release: 2%{?prerelease:.%{prerelease}}%{?dist}
+Release: 3%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -235,6 +235,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Wed Aug 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.9.1-3
+- Add ExecReload and Wants=postfix.service to systemd unit
+
* Sun Aug 03 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.9.1-2
- Add patch to fix releasing mail from sql quarantine
diff --git a/amavisd.service b/amavisd.service
index fc3e928..b7d15bd 100644
--- a/amavisd.service
+++ b/amavisd.service
@@ -3,6 +3,7 @@ Description=Amavisd-new is an interface between MTA and content checkers.
Documentation=http://www.ijs.si/software/amavisd/#doc
After=network.target
Wants=clamd at amavisd.service
+Wants=postfix.service
[Service]
Type=forking
@@ -10,6 +11,7 @@ User=amavis
Group=amavis
PIDFile=/var/run/amavisd/amavisd.pid
ExecStart=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf
+ExecReload=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf reload
Restart=on-failure
PrivateTmp=true
PrivateDevices=true
--
cgit v0.10.2
From 260a13ba446746e6e724503385ed06e1f4fe2da0 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Mon, 20 Oct 2014 10:22:35 +0200
Subject: Update to 2.10.0-rc2
diff --git a/.gitignore b/.gitignore
index 9b70741..6ebf46e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ amavisd-new-2.8.0.tar.gz
/amavisd-new-2.8.1.tar.gz
/amavisd-new-2.9.0.tar.xz
/amavisd-new-2.9.1.tar.xz
+/amavisd-new-2.10.0-rc2.tar.xz
diff --git a/amavisd-new-2.10.0-conf.patch b/amavisd-new-2.10.0-conf.patch
new file mode 100644
index 0000000..fc4d197
--- /dev/null
+++ b/amavisd-new-2.10.0-conf.patch
@@ -0,0 +1,139 @@
+commit f7532ce0714440ed6649a7794eb97c9f6191789e
+Author: Juan Orti Alcaine <juan.orti at miceliux.com>
+Date: Mon Oct 20 10:15:29 2014 +0200
+
+ amavisd-new-2.10.0-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 d023e10..eecd17d 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
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
+
+ $mydomain = 'example.com'; # a convenient default for other settings
+
+-# $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, used by SA, etc.
+-$QUARANTINEDIR = '/var/virusmails'; # -Q
++$QUARANTINEDIR = undef; # -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'
+
+ # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R
+
+-# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
++$db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
+ # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S
+-# $lock_file = "$MYHOME/var/amavisd.lock"; # -L
+-# $pid_file = "$MYHOME/var/amavisd.pid"; # -P
++$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
++$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
+ #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
+
+ $log_level = 0; # verbosity 0..5, -d
+@@ -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)
+
+-$virus_admin = "virusalert\@$mydomain"; # notifications recip.
++$virus_admin = undef; # notifications recip.
+
+-$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender
+-$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender
+-$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
++$mailfrom_notify_admin = undef; # notifications sender
++$mailfrom_notify_recip = undef; # notifications sender
++$mailfrom_notify_spamadmin = undef; # notifications sender
+ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
+
+ @addr_extension_virus_maps = ('virus');
+@@ -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!
+
+-# $final_virus_destiny = D_DISCARD;
+-# $final_banned_destiny = D_DISCARD;
+-# $final_spam_destiny = D_PASS; #!!! D_DISCARD / D_REJECT
+-# $final_bad_header_destiny = D_PASS;
++$final_virus_destiny = D_DISCARD;
++$final_banned_destiny = D_BOUNCE;
++$final_spam_destiny = D_DISCARD; #!!! D_DISCARD / D_REJECT
++$final_bad_header_destiny = D_BOUNCE;
+ # $bad_header_quarantine_method = undef;
+
+ # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
+@@ -339,9 +339,9 @@ $banned_filename_re = new_RE(
+ ['arj', \&do_unarj, ['unarj', 'arj'] ],
+ ['arc', \&do_arc, ['nomarch', 'arc'] ],
+ ['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
+- ['doc', \&do_ole, 'ripole'],
++# ['doc', \&do_ole, 'ripole'], # no ripole package so far
+ ['cab', \&do_cabextract, 'cabextract'],
+- ['tnef', \&do_tnef_ext, 'tnef'],
++# ['tnef', \&do_tnef_ext, 'tnef'], # use internal do_tnef() instead
+ ['tnef', \&do_tnef],
+ # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
+ # ['sit', \&do_unstuff, 'unstuff'], # not safe
+@@ -379,16 +379,16 @@ $banned_filename_re = new_RE(
+ # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
+ # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
+
+-# ### http://www.clamav.net/
+-# ['ClamAV-clamd',
+-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
+-# qr/\bOK$/m, qr/\bFOUND$/m,
+-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+-# # 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;
+-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+-# # this entry; when running chrooted one may prefer a socket under $MYHOME.
++ ### http://www.clamav.net/
++ ['ClamAV-clamd',
++ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd.amavisd/clamd.sock"],
++ qr/\bOK$/m, qr/\bFOUND$/m,
++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
++ # 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;
++ # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
++ # this entry; when running chrooted one may prefer a socket under $MYHOME.
+
+ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
+ # # note that Mail::ClamAV requires perl to be build with threading!
diff --git a/amavisd-new-2.9.0-conf.patch b/amavisd-new-2.9.0-conf.patch
deleted file mode 100644
index 54cfc35..0000000
--- a/amavisd-new-2.9.0-conf.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-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
--$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
--$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
-+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
-+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
-
- $mydomain = 'example.com'; # a convenient default for other settings
-
--# $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, used by SA, etc.
--$QUARANTINEDIR = '/var/virusmails'; # -Q
-+$QUARANTINEDIR = undef; # -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'
-
- # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R
-
--# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
-+$db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
- # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S
--# $lock_file = "$MYHOME/var/amavisd.lock"; # -L
--# $pid_file = "$MYHOME/var/amavisd.pid"; # -P
-+$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
-+$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
- #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
-
- $log_level = 0; # verbosity 0..5, -d
-@@ -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)
-
--$virus_admin = "virusalert\@$mydomain"; # notifications recip.
-+$virus_admin = undef; # notifications recip.
-
--$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender
--$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender
--$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
-+$mailfrom_notify_admin = undef; # notifications sender
-+$mailfrom_notify_recip = undef; # notifications sender
-+$mailfrom_notify_spamadmin = undef; # notifications sender
- $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
-
- @addr_extension_virus_maps = ('virus');
-@@ -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!
-
--# $final_virus_destiny = D_DISCARD;
--# $final_banned_destiny = D_DISCARD;
--# $final_spam_destiny = D_PASS; #!!! D_DISCARD / D_REJECT
--# $final_bad_header_destiny = D_PASS;
-+$final_virus_destiny = D_DISCARD;
-+$final_banned_destiny = D_BOUNCE;
-+$final_spam_destiny = D_DISCARD; #!!! D_DISCARD / D_REJECT
-+$final_bad_header_destiny = D_BOUNCE;
- # $bad_header_quarantine_method = undef;
-
- # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
-@@ -338,9 +338,9 @@ $banned_filename_re = new_RE(
- ['arj', \&do_unarj, ['unarj', 'arj'] ],
- ['arc', \&do_arc, ['nomarch', 'arc'] ],
- ['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
-- ['doc', \&do_ole, 'ripole'],
-+# ['doc', \&do_ole, 'ripole'], # no ripole package so far
- ['cab', \&do_cabextract, 'cabextract'],
-- ['tnef', \&do_tnef_ext, 'tnef'],
-+# ['tnef', \&do_tnef_ext, 'tnef'], # use internal do_tnef() instead
- ['tnef', \&do_tnef],
- # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
- # ['sit', \&do_unstuff, 'unstuff'], # not safe
-@@ -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
-
--# ### http://www.clamav.net/
--# ['ClamAV-clamd',
--# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
--# qr/\bOK$/m, qr/\bFOUND$/m,
--# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
--# # 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;
--# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
--# # this entry; when running chrooted one may prefer a socket under $MYHOME.
-+ ### http://www.clamav.net/
-+ ['ClamAV-clamd',
-+ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd.amavisd/clamd.sock"],
-+ qr/\bOK$/m, qr/\bFOUND$/m,
-+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
-+ # 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;
-+ # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
-+ # this entry; when running chrooted one may prefer a socket under $MYHOME.
-
- # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
- # # note that Mail::ClamAV requires perl to be build with threading!
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 44d996a..e559eaf 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,9 +1,9 @@
-#%%define prerelease rc2
+%global prerelease rc2
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
-Version: 2.9.1
-Release: 3%{?prerelease:.%{prerelease}}%{?dist}
+Version: 2.10.0
+Release: 0.1%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -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-new-2.9.0-conf.patch
+Patch0: amavisd-new-2.10.0-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
# Don't source /etc/sysconfig/network in init script; the network check
@@ -27,9 +27,6 @@ Patch2: amavisd-condrestart.patch
# and it can't be relied upon to exist in recent Fedora builds. Mail
# sent upstream to amavis-users ML 2013-05-10. -adamw
Patch3: amavisd-new-2.8.0-init_network.patch
-# Fix bug #1121552
-# http://lists.amavis.org/pipermail/amavis-users/2014-June/002957.html
-Patch4: amavisd-new-2.9.1-release_mail_from_sql_quarantine.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: systemd
@@ -130,7 +127,6 @@ alerting purposes.
%patch1 -p1
%patch2 -p0
%patch3 -p1
-%patch4 -p1
install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -e 's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -235,6 +231,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent
%changelog
+* Mon Oct 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-0.1.rc2
+- Update to 2.10.0-rc2
+
* Wed Aug 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.9.1-3
- Add ExecReload and Wants=postfix.service to systemd unit
diff --git a/sources b/sources
index d81113a..77899e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b83d60b49855943c297743db0029218 amavisd-new-2.9.1.tar.xz
+f43dbf102e3f028e43b6d2b7d2f5cc03 amavisd-new-2.10.0-rc2.tar.xz
--
cgit v0.10.2
From 2d3042c8b3fe436271673792c8ede865c871a702 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Thu, 23 Oct 2014 12:33:47 +0200
Subject: Update to 2.10.0 and several fixes
- Update to 2.10.0
- Replace IO::Socket::INET6 with IO::Socket::IP
- Review perl dependencies minimum version
- Add subpackages amavisd-new-zeromq and amavisd-new-snmp-zeromq
diff --git a/.gitignore b/.gitignore
index 6ebf46e..32bff5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ amavisd-new-2.8.0.tar.gz
/amavisd-new-2.9.0.tar.xz
/amavisd-new-2.9.1.tar.xz
/amavisd-new-2.10.0-rc2.tar.xz
+/amavisd-new-2.10.0.tar.xz
diff --git a/amavis-mc.service b/amavis-mc.service
new file mode 100644
index 0000000..4dcdc1d
--- /dev/null
+++ b/amavis-mc.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Amavisd-new master supervisor process for communicating through 0MQ sockets
+Documentation=http://www.ijs.si/software/amavisd/#doc
+After=network.target
+Before=amavisd.service
+
+[Service]
+Type=forking
+User=amavis
+Group=amavis
+PIDFile=/var/run/amavisd/amavis-mc.pid
+ExecStart=/usr/sbin/amavis-mc -P /var/run/amavisd/amavis-mc.pid
+Restart=on-failure
+PrivateTmp=true
+PrivateDevices=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/amavisd-new.spec b/amavisd-new.spec
index e559eaf..d3ea75b 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,9 +1,9 @@
-%global prerelease rc2
+#%%global prerelease rc2
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.10.0
-Release: 0.1%{?prerelease:.%{prerelease}}%{?dist}
+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
@@ -19,6 +19,8 @@ Source11: amavisd-clean-tmp.service
Source12: amavisd-clean-tmp.timer
Source13: amavisd-clean-quarantine.service
Source14: amavisd-clean-quarantine.timer
+Source15: amavis-mc.service
+Source16: amavisd-snmp-zmq.service
Patch0: amavisd-new-2.10.0-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
@@ -51,19 +53,23 @@ Requires: unzoo
# 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(Archive::Zip) >= 1.14
Requires: perl(Authen::SASL)
Requires: perl(Compress::Zlib) >= 1.35
+Requires: perl(Compress::Raw::Zlib) >= 2.017
Requires: perl(Convert::TNEF)
Requires: perl(Convert::UUlib)
Requires: perl(Crypt::OpenSSL::RSA)
Requires: perl(DBD::SQLite)
Requires: perl(DBI)
+Requires: perl(Digest::MD5) >= 2.22
Requires: perl(Digest::SHA)
Requires: perl(Digest::SHA1)
-Requires: perl(IO::Socket::INET6)
+Requires: perl(File::LibMagic)
+Requires: perl(IO::Socket::IP)
Requires: perl(IO::Socket::SSL)
Requires: perl(IO::Stringy)
+Requires: perl(MIME::Base64)
Requires: perl(MIME::Body)
Requires: perl(MIME::Decoder::Base64)
Requires: perl(MIME::Decoder::Binary)
@@ -72,19 +78,22 @@ Requires: perl(MIME::Decoder::NBit)
Requires: perl(MIME::Decoder::QuotedPrint)
Requires: perl(MIME::Decoder::UU)
Requires: perl(MIME::Head)
-Requires: perl(Mail::DKIM)
+Requires: perl(MIME::Parser)
+Requires: perl(Mail::DKIM) >= 0.31
Requires: perl(Mail::Field)
Requires: perl(Mail::Header)
-Requires: perl(Mail::Internet)
+Requires: perl(Mail::Internet) >= 1.58
Requires: perl(Mail::SPF)
Requires: perl(Mail::SpamAssassin)
Requires: perl(Net::DNS)
Requires: perl(Net::LDAP)
+Requires: perl(Net::LibIDN)
Requires: perl(Net::SSLeay)
-Requires: perl(Net::Server)
+Requires: perl(Net::Server) >= 2.0
Requires: perl(NetAddr::IP)
Requires: perl(Razor2::Client::Version)
Requires: perl(Socket6)
+Requires: perl(Time::HiRes) >= 1.49
Requires: perl(Unix::Syslog)
Requires: perl(URI)
Requires(pre): shadow-utils
@@ -101,6 +110,25 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
+%package zeromq
+Group: Applications/System
+Summary: Support for communicating through 0MQ sockets
+Requires: %{name} = %{version}-%{release}
+Requires: perl(ZMQ::Constants)
+Requires: perl(ZMQ::LibZMQ3)
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+%package snmp-zeromq
+Group: Applications/System
+Summary: Exports amavisd SNMP data and communicates through 0MQ sockets
+Requires: %{name}-zeromq = %{version}-%{release}
+Requires: perl(NetSNMP::OID)
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
%description
amavisd-new is a high-performance and reliable interface between mailer
(MTA) and one or more content checkers: virus scanners, and/or
@@ -121,6 +149,22 @@ exports data to a SNMP server running on a host (same or remote), making
them available to SNMP clients (such a Cacti or mrtg) for monitoring or
alerting purposes.
+%description zeromq
+This package adds support for monitoring and communicating with amavisd
+and auxiliary services among themselves through 0MQ sockets (also called ZMQ
+or ZeroMQ, or Crossroads I/O or XS). This method offers similar features
+as current services amavisd-nanny, amavisd-agent and amavisd-snmp-subagent,
+but use message passing paradigm instead of communicating through a shared
+Berkeley database. This avoids locking contention, so the gain can be
+significant for a busy amavisd setup with lots of child processes.
+
+%description snmp-zeromq
+This package contains the program amavisd-snmp-subagent-zmq, which can be
+used as a SNMP AgentX, exporting amavisd statistical counters database
+(snmp.db) as well as a child process status database (nanny.db) to a
+SNMP daemon supporting the AgentX protocol (RFC 2741), such as NET-SNMP.
+It supports communicating through 0MQ sockets.
+
%prep
%setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
%patch0 -p1
@@ -138,9 +182,12 @@ rm -rf $RPM_BUILD_ROOT
install -D -p -m 755 amavisd $RPM_BUILD_ROOT%{_sbindir}/amavisd
install -D -p -m 755 amavisd-snmp-subagent $RPM_BUILD_ROOT%{_sbindir}/amavisd-snmp-subagent
+install -D -p -m 755 amavisd-snmp-subagent-zmq $RPM_BUILD_ROOT%{_sbindir}/amavisd-snmp-subagent-zmq
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -p -m 755 amavisd-{agent,nanny,release} $RPM_BUILD_ROOT%{_bindir}/
+install -p -m 755 amavisd-{agent,nanny,release,signer,status,submit} $RPM_BUILD_ROOT%{_bindir}/
+install -p -m 755 amavis-mc $RPM_BUILD_ROOT%{_sbindir}/
+install -p -m 755 amavis-services $RPM_BUILD_ROOT%{_bindir}/
install -D -p -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_unitdir}/amavisd.service
install -D -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/amavisd-snmp.service
@@ -148,6 +195,8 @@ install -D -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_unitdir}/amavisd-clean-tmp.se
install -D -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/amavisd-clean-tmp.timer
install -D -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/amavisd-clean-quarantine.service
install -D -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_unitdir}/amavisd-clean-quarantine.timer
+install -D -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/amavis-mc.service
+install -D -p -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/amavisd-snmp-zmq.service
install -D -p -m 644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/amavisd.conf
install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/amavisd.conf
@@ -177,6 +226,12 @@ exit 0
%preun snmp
%systemd_preun amavisd-snmp.service
+%preun zeromq
+%systemd_preun amavis-mc.service
+
+%preun snmp-zeromq
+%systemd_preun amavisd-snmp-zmq.service
+
%post
%systemd_post amavisd.service
%systemd_post amavisd-clean-tmp.service
@@ -192,6 +247,12 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%post snmp
%systemd_post amavisd-snmp.service
+%post zeromq
+%systemd_post amavis-mc.service
+
+%post snmp-zeromq
+%systemd_post amavisd-snmp-zmq.service
+
%postun
%systemd_postun_with_restart amavisd.service
%systemd_postun_with_restart amavisd-clean-tmp.service
@@ -202,10 +263,16 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%postun snmp
%systemd_postun_with_restart amavisd-snmp.service
+%postun zeromq
+%systemd_postun_with_restart amavis-mc.service
+
+%postun snmp-zeromq
+%systemd_postun_with_restart amavisd-snmp-zmq.service
+
%files
%defattr(-,root,root,-)
-%doc AAAREADME.first LDAP.schema LDAP.ldif LICENSE RELEASE_NOTES
-%doc README_FILES test-messages amavisd.conf-*
+%doc AAAREADME.first LDAP.schema LDAP.ldif LICENSE RELEASE_NOTES TODO INSTALL
+%doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf
%dir %{_sysconfdir}/amavisd/
%{_unitdir}/amavisd.service
%{_unitdir}/amavisd-clean-tmp.service
@@ -215,7 +282,11 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
%config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
%{_sbindir}/amavisd
-%{_bindir}/amavisd-*
+%{_bindir}/amavisd-agent
+%{_bindir}/amavisd-nanny
+%{_bindir}/amavisd-release
+%{_bindir}/amavisd-signer
+%{_bindir}/amavisd-submit
%dir %attr(750,amavis,amavis) %{_localstatedir}/spool/amavisd
%dir %attr(750,amavis,amavis) %{_localstatedir}/spool/amavisd/tmp
%dir %attr(750,amavis,amavis) %{_localstatedir}/spool/amavisd/db
@@ -230,7 +301,23 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_unitdir}/amavisd-snmp.service
%{_sbindir}/amavisd-snmp-subagent
+%files zeromq
+%{_unitdir}/amavis-mc.service
+%{_sbindir}/amavis-mc
+%{_bindir}/amavisd-status
+%{_bindir}/amavis-services
+
+%files snmp-zeromq
+%{_unitdir}/amavisd-snmp-zmq.service
+%{_sbindir}/amavisd-snmp-subagent-zmq
+
%changelog
+* Thu Oct 23 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-1
+- Update to 2.10.0
+- Replace IO::Socket::INET6 with IO::Socket::IP
+- Review perl dependencies minimum version
+- Add subpackages amavisd-new-zeromq and amavisd-new-snmp-zeromq
+
* Mon Oct 20 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-0.1.rc2
- Update to 2.10.0-rc2
diff --git a/amavisd-snmp-zmq.service b/amavisd-snmp-zmq.service
new file mode 100644
index 0000000..d3faae3
--- /dev/null
+++ b/amavisd-snmp-zmq.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Exports amavisd SNMP data and communicates through 0MQ sockets
+After=network.target
+After=amavis-mc.service
+After=amavisd.service
+
+[Service]
+Type=forking
+User=amavis
+Group=amavis
+PIDFile=/var/run/amavisd/amavisd-snmp-subagent-zmq.pid
+ExecStart=/usr/sbin/amavisd-snmp-subagent-zmq -P /var/run/amavisd/amavisd-snmp-subagent-zmq.pid
+Restart=on-failure
+PrivateTmp=true
+PrivateDevices=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sources b/sources
index 77899e4..bfb0a64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f43dbf102e3f028e43b6d2b7d2f5cc03 amavisd-new-2.10.0-rc2.tar.xz
+a343a5201663b26519f3db53b6d8be3c amavisd-new-2.10.0.tar.xz
--
cgit v0.10.2
From 10b6fdb4006a9c8a2434b8d627664807649daf5e Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Sat, 25 Oct 2014 23:08:35 +0200
Subject: Fix imports when SQL is used and improve conf patch
diff --git a/amavisd-new-2.10.0-conf.patch b/amavisd-new-2.10.0-conf.patch
index fc4d197..a98823e 100644
--- a/amavisd-new-2.10.0-conf.patch
+++ b/amavisd-new-2.10.0-conf.patch
@@ -1,6 +1,46 @@
-commit f7532ce0714440ed6649a7794eb97c9f6191789e
+commit 45e7e93efb71dfe3d1f1ca93636c592e17689b09
Author: Juan Orti Alcaine <juan.orti at miceliux.com>
-Date: Mon Oct 20 10:15:29 2014 +0200
+Date: Sat Oct 25 22:48:40 2014 +0200
+
+ Fix running user in amavis-mc and amavisd-signer
+
+diff --git a/amavis-mc b/amavis-mc
+index 88d9701..f6f8081 100755
+--- a/amavis-mc
++++ b/amavis-mc
+@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level
+
+ ### USER CONFIGURABLE:
+
+-$daemon_user = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user = 'amavis';
++$daemon_group = 'amavis';
+
+-$pid_file = '/var/amavis/amavis-mc.pid';
++$pid_file = '/var/run/amavisd/amavis-mc.pid';
+
+ $log_level = 0;
+ $syslog_ident = 'amavis-mc';
+diff --git a/amavisd-signer b/amavisd-signer
+index f154646..3042b7c 100755
+--- a/amavisd-signer
++++ b/amavisd-signer
+@@ -86,8 +86,8 @@ $VERSION = 1.001; # 20100730
+ # Please adjust the following settings as necessary:
+ #
+
+-$daemon_user = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user = 'amavis';
++$daemon_group = 'amavis';
+ # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef
+
+ # $daemonize = 1;
+
+commit 587b25f96031ab8ef4d8eab78065c2fa2a469df9
+Author: Juan Orti Alcaine <juan.orti at miceliux.com>
+Date: Sat Oct 25 22:44:00 2014 +0200
amavisd-new-2.10.0-conf.patch
diff --git a/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch b/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
new file mode 100644
index 0000000..009f123
--- /dev/null
+++ b/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
@@ -0,0 +1,14 @@
+diff --git a/amavisd b/amavisd
+index 278f0dd..97e3204 100755
+--- a/amavisd
++++ b/amavisd
+@@ -26474,7 +26474,8 @@ BEGIN {
+ import Amavis::rfc2821_2822_Tools;
+ import Amavis::Util qw(ll do_log do_log_safe min max minmax add_entropy
+ untaint untaint_inplace format_time_interval
+- truncate_utf_8 orcpt_encode idn_to_ascii
++ truncate_utf_8 orcpt_encode
++ idn_to_utf8 idn_to_ascii mail_addr_idn_to_ascii
+ safe_encode safe_encode_utf8 safe_decode_mime
+ snmp_count ccat_split ccat_maj);
+ import Amavis::Lookup qw(lookup lookup2);
diff --git a/amavisd-new.spec b/amavisd-new.spec
index d3ea75b..b81d8b1 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.10.0
-Release: 1%{?prerelease:.%{prerelease}}%{?dist}
+Release: 2%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -29,6 +29,8 @@ Patch2: amavisd-condrestart.patch
# and it can't be relied upon to exist in recent Fedora builds. Mail
# sent upstream to amavis-users ML 2013-05-10. -adamw
Patch3: amavisd-new-2.8.0-init_network.patch
+# Patch5: http://lists.amavis.org/pipermail/amavis-users/2014-October/003259.html
+Patch5: amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: systemd
@@ -171,6 +173,7 @@ It supports communicating through 0MQ sockets.
%patch1 -p1
%patch2 -p0
%patch3 -p1
+%patch5 -p1
install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -e 's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -312,6 +315,10 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent-zmq
%changelog
+* Sat Oct 25 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-2
+- Improve conf patch to fix amavis-mc daemon
+- Add patch to fix imports when SQL is used
+
* Thu Oct 23 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-1
- Update to 2.10.0
- Replace IO::Socket::INET6 with IO::Socket::IP
--
cgit v0.10.2
From 4dbc21cc696663c77f51f77fe03de1bc344e44c2 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Mon, 27 Oct 2014 11:08:16 +0100
Subject: Update to 2.10.1
diff --git a/.gitignore b/.gitignore
index 32bff5c..90cd2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ amavisd-new-2.8.0.tar.gz
/amavisd-new-2.9.1.tar.xz
/amavisd-new-2.10.0-rc2.tar.xz
/amavisd-new-2.10.0.tar.xz
+/amavisd-new-2.10.1.tar.xz
diff --git a/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch b/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
deleted file mode 100644
index 009f123..0000000
--- a/amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/amavisd b/amavisd
-index 278f0dd..97e3204 100755
---- a/amavisd
-+++ b/amavisd
-@@ -26474,7 +26474,8 @@ BEGIN {
- import Amavis::rfc2821_2822_Tools;
- import Amavis::Util qw(ll do_log do_log_safe min max minmax add_entropy
- untaint untaint_inplace format_time_interval
-- truncate_utf_8 orcpt_encode idn_to_ascii
-+ truncate_utf_8 orcpt_encode
-+ idn_to_utf8 idn_to_ascii mail_addr_idn_to_ascii
- safe_encode safe_encode_utf8 safe_decode_mime
- snmp_count ccat_split ccat_maj);
- import Amavis::Lookup qw(lookup lookup2);
diff --git a/amavisd-new.spec b/amavisd-new.spec
index b81d8b1..c847021 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,8 +2,8 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
-Version: 2.10.0
-Release: 2%{?prerelease:.%{prerelease}}%{?dist}
+Version: 2.10.1
+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
@@ -29,8 +29,6 @@ Patch2: amavisd-condrestart.patch
# and it can't be relied upon to exist in recent Fedora builds. Mail
# sent upstream to amavis-users ML 2013-05-10. -adamw
Patch3: amavisd-new-2.8.0-init_network.patch
-# Patch5: http://lists.amavis.org/pipermail/amavis-users/2014-October/003259.html
-Patch5: amavisd-new-2.10.0-missing_import_when_sql_is_in_use.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: systemd
@@ -173,7 +171,6 @@ It supports communicating through 0MQ sockets.
%patch1 -p1
%patch2 -p0
%patch3 -p1
-%patch5 -p1
install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
sed -e 's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i amavisd-release
@@ -315,6 +312,10 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent-zmq
%changelog
+* Mon Oct 27 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-1
+- Update to 2.10.1
+- Patch5 merged upstream
+
* Sat Oct 25 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.0-2
- Improve conf patch to fix amavis-mc daemon
- Add patch to fix imports when SQL is used
diff --git a/sources b/sources
index bfb0a64..434a13e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a343a5201663b26519f3db53b6d8be3c amavisd-new-2.10.0.tar.xz
+adb0c64ac6a91249ddeb4ed97747d755 amavisd-new-2.10.1.tar.xz
--
cgit v0.10.2
From feca78178de73b7b2fa33d2fca905faf5973a2d3 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Thu, 26 Feb 2015 12:57:09 +0100
Subject: Replaced requirement to cpio by pax (upstream recommendation)
Amavisd-New reports otherwise: WARN: Using cpio instead of pax can be a security risk; please add: $pax='pax'; to amavisd.conf and check that the pax(1) utility is available on the system!
diff --git a/amavisd-new.spec b/amavisd-new.spec
index c847021..5013f94 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.10.1
-Release: 1%{?prerelease:.%{prerelease}}%{?dist}
+Release: 2%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -40,7 +40,7 @@ Requires: altermime
Requires: arj
Requires: bzip2
Requires: cabextract
-Requires: cpio
+Requires: pax
Requires: file
Requires: freeze
Requires: gzip
@@ -312,6 +312,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent-zmq
%changelog
+* Thu Feb 26 2015 Robert Scheck <robert at fedoraproject.org> 2.10.1-1
+- Replaced requirement to cpio by pax (upstream recommendation)
+
* Mon Oct 27 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-1
- Update to 2.10.1
- Patch5 merged upstream
--
cgit v0.10.2
From 9b6eff661d7755f57327d3875115c7a6697a34e9 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Thu, 9 Apr 2015 20:18:49 +0200
Subject: Use license macro
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 5013f94..c17f90a 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.10.1
-Release: 2%{?prerelease:.%{prerelease}}%{?dist}
+Release: 3%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -271,8 +271,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
-%doc AAAREADME.first LDAP.schema LDAP.ldif LICENSE RELEASE_NOTES TODO INSTALL
+%doc AAAREADME.first LDAP.schema LDAP.ldif RELEASE_NOTES TODO INSTALL
%doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf
+%license LICENSE
%dir %{_sysconfdir}/amavisd/
%{_unitdir}/amavisd.service
%{_unitdir}/amavisd-clean-tmp.service
@@ -312,7 +313,10 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent-zmq
%changelog
-* Thu Feb 26 2015 Robert Scheck <robert at fedoraproject.org> 2.10.1-1
+* Thu Apr 09 2015 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-3
+- Use license macro
+
+* Thu Feb 26 2015 Robert Scheck <robert at fedoraproject.org> 2.10.1-2
- Replaced requirement to cpio by pax (upstream recommendation)
* Mon Oct 27 2014 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-1
--
cgit v0.10.2
From 8708bcdb5e69d5b872fd4fca0e7497d93d8fa6c8 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <juan.orti at miceliux.com>
Date: Mon, 27 Apr 2015 12:49:31 +0200
Subject: Move amavisd socket to /var/run/amavisd
diff --git a/amavisd-new-2.10.0-conf.patch b/amavisd-new-2.10.0-conf.patch
deleted file mode 100644
index a98823e..0000000
--- a/amavisd-new-2.10.0-conf.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-commit 45e7e93efb71dfe3d1f1ca93636c592e17689b09
-Author: Juan Orti Alcaine <juan.orti at miceliux.com>
-Date: Sat Oct 25 22:48:40 2014 +0200
-
- Fix running user in amavis-mc and amavisd-signer
-
-diff --git a/amavis-mc b/amavis-mc
-index 88d9701..f6f8081 100755
---- a/amavis-mc
-+++ b/amavis-mc
-@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level
-
- ### USER CONFIGURABLE:
-
--$daemon_user = 'vscan';
--$daemon_group = 'vscan';
-+$daemon_user = 'amavis';
-+$daemon_group = 'amavis';
-
--$pid_file = '/var/amavis/amavis-mc.pid';
-+$pid_file = '/var/run/amavisd/amavis-mc.pid';
-
- $log_level = 0;
- $syslog_ident = 'amavis-mc';
-diff --git a/amavisd-signer b/amavisd-signer
-index f154646..3042b7c 100755
---- a/amavisd-signer
-+++ b/amavisd-signer
-@@ -86,8 +86,8 @@ $VERSION = 1.001; # 20100730
- # Please adjust the following settings as necessary:
- #
-
--$daemon_user = 'vscan';
--$daemon_group = 'vscan';
-+$daemon_user = 'amavis';
-+$daemon_group = 'amavis';
- # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef
-
- # $daemonize = 1;
-
-commit 587b25f96031ab8ef4d8eab78065c2fa2a469df9
-Author: Juan Orti Alcaine <juan.orti at miceliux.com>
-Date: Sat Oct 25 22:44:00 2014 +0200
-
- amavisd-new-2.10.0-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 d023e10..eecd17d 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
--$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
--$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
-+$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
-+$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
-
- $mydomain = 'example.com'; # a convenient default for other settings
-
--# $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, used by SA, etc.
--$QUARANTINEDIR = '/var/virusmails'; # -Q
-+$QUARANTINEDIR = undef; # -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'
-
- # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R
-
--# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
-+$db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
- # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S
--# $lock_file = "$MYHOME/var/amavisd.lock"; # -L
--# $pid_file = "$MYHOME/var/amavisd.pid"; # -P
-+$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
-+$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
- #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
-
- $log_level = 0; # verbosity 0..5, -d
-@@ -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)
-
--$virus_admin = "virusalert\@$mydomain"; # notifications recip.
-+$virus_admin = undef; # notifications recip.
-
--$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender
--$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender
--$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
-+$mailfrom_notify_admin = undef; # notifications sender
-+$mailfrom_notify_recip = undef; # notifications sender
-+$mailfrom_notify_spamadmin = undef; # notifications sender
- $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
-
- @addr_extension_virus_maps = ('virus');
-@@ -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!
-
--# $final_virus_destiny = D_DISCARD;
--# $final_banned_destiny = D_DISCARD;
--# $final_spam_destiny = D_PASS; #!!! D_DISCARD / D_REJECT
--# $final_bad_header_destiny = D_PASS;
-+$final_virus_destiny = D_DISCARD;
-+$final_banned_destiny = D_BOUNCE;
-+$final_spam_destiny = D_DISCARD; #!!! D_DISCARD / D_REJECT
-+$final_bad_header_destiny = D_BOUNCE;
- # $bad_header_quarantine_method = undef;
-
- # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
-@@ -339,9 +339,9 @@ $banned_filename_re = new_RE(
- ['arj', \&do_unarj, ['unarj', 'arj'] ],
- ['arc', \&do_arc, ['nomarch', 'arc'] ],
- ['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
-- ['doc', \&do_ole, 'ripole'],
-+# ['doc', \&do_ole, 'ripole'], # no ripole package so far
- ['cab', \&do_cabextract, 'cabextract'],
-- ['tnef', \&do_tnef_ext, 'tnef'],
-+# ['tnef', \&do_tnef_ext, 'tnef'], # use internal do_tnef() instead
- ['tnef', \&do_tnef],
- # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
- # ['sit', \&do_unstuff, 'unstuff'], # not safe
-@@ -379,16 +379,16 @@ $banned_filename_re = new_RE(
- # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
- # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
-
--# ### http://www.clamav.net/
--# ['ClamAV-clamd',
--# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
--# qr/\bOK$/m, qr/\bFOUND$/m,
--# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
--# # 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;
--# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
--# # this entry; when running chrooted one may prefer a socket under $MYHOME.
-+ ### http://www.clamav.net/
-+ ['ClamAV-clamd',
-+ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd.amavisd/clamd.sock"],
-+ qr/\bOK$/m, qr/\bFOUND$/m,
-+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
-+ # 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;
-+ # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
-+ # this entry; when running chrooted one may prefer a socket under $MYHOME.
-
- # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
- # # note that Mail::ClamAV requires perl to be build with threading!
diff --git a/amavisd-new-2.10.1-conf.patch b/amavisd-new-2.10.1-conf.patch
new file mode 100644
index 0000000..54eb252
--- /dev/null
+++ b/amavisd-new-2.10.1-conf.patch
@@ -0,0 +1,181 @@
+commit f866c3623452349bfb6e7c505e44b4ed0f444c54
+Author: Juan Orti Alcaine <juan.orti at miceliux.com>
+Date: Mon Apr 27 12:37:24 2015 +0200
+
+ amavisd-new-2.10.1-conf.patch
+
+diff --git a/amavis-mc b/amavis-mc
+index 88d9701..f6f8081 100755
+--- a/amavis-mc
++++ b/amavis-mc
+@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level
+
+ ### USER CONFIGURABLE:
+
+-$daemon_user = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user = 'amavis';
++$daemon_group = 'amavis';
+
+-$pid_file = '/var/amavis/amavis-mc.pid';
++$pid_file = '/var/run/amavisd/amavis-mc.pid';
+
+ $log_level = 0;
+ $syslog_ident = 'amavis-mc';
+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-signer b/amavisd-signer
+index f154646..3042b7c 100755
+--- a/amavisd-signer
++++ b/amavisd-signer
+@@ -86,8 +86,8 @@ $VERSION = 1.001; # 20100730
+ # Please adjust the following settings as necessary:
+ #
+
+-$daemon_user = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user = 'amavis';
++$daemon_group = 'amavis';
+ # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef
+
+ # $daemonize = 1;
+diff --git a/amavisd.conf b/amavisd.conf
+index d023e10..2ce88ff 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
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g
+
+ $mydomain = 'example.com'; # a convenient default for other settings
+
+-# $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, used by SA, etc.
+-$QUARANTINEDIR = '/var/virusmails'; # -Q
++$QUARANTINEDIR = undef; # -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'
+
+ # $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R
+
+-# $db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
++$db_home = "$MYHOME/db"; # dir for bdb nanny/cache/snmp databases, -D
+ # $helpers_home = "$MYHOME/var"; # working directory for SpamAssassin, -S
+-# $lock_file = "$MYHOME/var/amavisd.lock"; # -L
+-# $pid_file = "$MYHOME/var/amavisd.pid"; # -P
++$lock_file = "/var/run/amavisd/amavisd.lock"; # -L
++$pid_file = "/var/run/amavisd/amavisd.pid"; # -P
+ #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
+
+ $log_level = 0; # verbosity 0..5, -d
+@@ -52,7 +52,7 @@ $enable_dkim_signing = 1; # load DKIM signing code, keys defined by dkim_key
+ @mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
+ 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
+
+-$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter
++$unix_socketname = "/var/run/amavisd/amavisd.sock"; # amavisd-release or amavis-milter
+ # option(s) -p overrides $inet_socket_port and $unix_socketname
+
+ $inet_socket_port = 10024; # listen on this local TCP port(s)
+@@ -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)
+
+-$virus_admin = "virusalert\@$mydomain"; # notifications recip.
++$virus_admin = undef; # notifications recip.
+
+-$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender
+-$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender
+-$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
++$mailfrom_notify_admin = undef; # notifications sender
++$mailfrom_notify_recip = undef; # notifications sender
++$mailfrom_notify_spamadmin = undef; # notifications sender
+ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
+
+ @addr_extension_virus_maps = ('virus');
+@@ -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!
+
+-# $final_virus_destiny = D_DISCARD;
+-# $final_banned_destiny = D_DISCARD;
+-# $final_spam_destiny = D_PASS; #!!! D_DISCARD / D_REJECT
+-# $final_bad_header_destiny = D_PASS;
++$final_virus_destiny = D_DISCARD;
++$final_banned_destiny = D_BOUNCE;
++$final_spam_destiny = D_DISCARD; #!!! D_DISCARD / D_REJECT
++$final_bad_header_destiny = D_BOUNCE;
+ # $bad_header_quarantine_method = undef;
+
+ # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl
+@@ -339,9 +339,9 @@ $banned_filename_re = new_RE(
+ ['arj', \&do_unarj, ['unarj', 'arj'] ],
+ ['arc', \&do_arc, ['nomarch', 'arc'] ],
+ ['zoo', \&do_zoo, ['zoo', 'unzoo'] ],
+- ['doc', \&do_ole, 'ripole'],
++# ['doc', \&do_ole, 'ripole'], # no ripole package so far
+ ['cab', \&do_cabextract, 'cabextract'],
+- ['tnef', \&do_tnef_ext, 'tnef'],
++# ['tnef', \&do_tnef_ext, 'tnef'], # use internal do_tnef() instead
+ ['tnef', \&do_tnef],
+ # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead
+ # ['sit', \&do_unstuff, 'unstuff'], # not safe
+@@ -379,16 +379,16 @@ $banned_filename_re = new_RE(
+ # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
+ # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
+
+-# ### http://www.clamav.net/
+-# ['ClamAV-clamd',
+-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
+-# qr/\bOK$/m, qr/\bFOUND$/m,
+-# qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+-# # 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;
+-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+-# # this entry; when running chrooted one may prefer a socket under $MYHOME.
++ ### http://www.clamav.net/
++ ['ClamAV-clamd',
++ \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd.amavisd/clamd.sock"],
++ qr/\bOK$/m, qr/\bFOUND$/m,
++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
++ # 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;
++ # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
++ # this entry; when running chrooted one may prefer a socket under $MYHOME.
+
+ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
+ # # note that Mail::ClamAV requires perl to be build with threading!
diff --git a/amavisd-new.spec b/amavisd-new.spec
index c17f90a..c33bb34 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
Summary: Email filter with virus scanner and spamassassin support
Name: amavisd-new
Version: 2.10.1
-Release: 3%{?prerelease:.%{prerelease}}%{?dist}
+Release: 4%{?prerelease:.%{prerelease}}%{?dist}
# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
License: GPLv2+ and BSD and GFDL
Group: Applications/System
@@ -21,7 +21,7 @@ Source13: amavisd-clean-quarantine.service
Source14: amavisd-clean-quarantine.timer
Source15: amavis-mc.service
Source16: amavisd-snmp-zmq.service
-Patch0: amavisd-new-2.10.0-conf.patch
+Patch0: amavisd-new-2.10.1-conf.patch
Patch1: amavisd-init.patch
Patch2: amavisd-condrestart.patch
# Don't source /etc/sysconfig/network in init script; the network check
@@ -313,6 +313,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 2>&1 || :
%{_sbindir}/amavisd-snmp-subagent-zmq
%changelog
+* Mon Apr 27 2015 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-4
+- Move amavisd socket to /var/run/amavisd
+
* Thu Apr 09 2015 Juan Orti Alcaine <jorti at fedoraproject.org> 2.10.1-3
- Use license macro
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/amavisd-new.git/commit/?h=epel7&id=698f4b5fb334d3e7dc67de218be7498467af75bf
More information about the scm-commits
mailing list