From 260a13ba446746e6e724503385ed06e1f4fe2da0 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine <[email protected]> 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 <[email protected]> +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 <[email protected]> -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 <[email protected]> 2.10.0-0.1.rc2 +- Update to 2.10.0-rc2 + * Wed Aug 20 2014 Juan Orti Alcaine <[email protected]> 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 http://pkgs.fedoraproject.org/cgit/amavisd-new.git/commit/?h=epel7&id=260a13ba446746e6e724503385ed06e1f4fe2da0 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/perl-devel
