[Amavisd-new-commits] [pkg-amavisd-new] 12/16: Imported Upstream version 2.10.1
Alexander Wirt
formorer at debian.org
Sun Oct 26 07:38:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository pkg-amavisd-new.
commit 65a63401931d4577181c92d854eeb6076f309d28
Author: Alexander Wirt <formorer at debian.org>
Date: Sun Oct 26 07:57:33 2014 +0100
Imported Upstream version 2.10.1
---
RELEASE_NOTES | 100 +++++++++++++++++++++++++------
amavisd | 147 ++++++++++++++++++++++++----------------------
amavisd-new-courier.patch | 14 ++---
amavisd-new-qmqpqq.patch | 18 +++---
4 files changed, 175 insertions(+), 104 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d2487b9..60dcb81 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,37 @@
---------------------------------------------------------------------------
+ October 25, 2014
+amavisd-new-2.10.1 release notes
+
+Contents:
+ COMPATIBILITY
+ BUG FIXES
+ OTHER
+
+
+COMPATIBILITY
+
+There are no incompatibilities between versions 2.10.0 and 2.10.1.
+
+
+BUG FIXES
+
+- fixed a missing import of mail_addr_idn_to_ascii() and idn_to_utf8()
+ when SQL is in use, resulting in:
+ Undefined subroutine &Amavis::Out::SQL::Log::mail_addr_idn_to_ascii
+ Undefined subroutine &Amavis::Out::SQL::Log::idn_to_utf8
+ reported by Jim Knuth;
+
+
+OTHER
+
+- avoid warnings issued by perl 5.21.5:
+ Negative repeat count does nothing at ./amavisd line 17218
+ Missing argument in sprintf at ./amavisd line 3678
+
+- updated documentation in 2.10.0 release notes (new macros);
+
+
+---------------------------------------------------------------------------
October 22, 2014
amavisd-new-2.10.0 release notes
@@ -6,6 +39,7 @@ Contents:
COMPATIBILITY
BUG FIXES
NEW FEATURES
+ OTHER
COMPATIBILITY
@@ -68,19 +102,23 @@ BUG FIXES
specified 'smtp' as mta-name-type, instead of a 'dns' as prescribed
in RFC 3464;
-- releasing from a quarantine leaves envelope sender address as '<>'
+- releasing from a quarantine left envelope sender address as '<>'
instead of using the address found in a Return-Path header field
of a quarantined message, while also logging a warning:
Quarantine release $QID: missing X-Envelope-From or Return-Path
reported by Pascal Volk;
-- avoid failure of os_fingerprint in certain cases where the
- $os_fingerprint_method uses an asterisk in place of a host IP address
- or port number; the reported error was:
+- avoid failure in os_fingerprint or in smtp forwarding in certain cases
+ where the $os_fingerprint_method or $forward_method or $notify_method
+ uses an asterisk in place of a host IP address or port number.
+ The reported error in os_fingerprint (reported by -ben) was:
os_fingerprint FAILED: Insecure dependency in socket
while running with -T switch
at /usr/lib/perl/5.18/IO/Socket.pm line 80
- reported by -ben;
+ and in SMTP forwarding or notification (reported by Dennis Boone):
+ (!)connect to *:10025 attempt #1:
+ Insecure dependency in socket while running with -T switch
+ at /usr/lib/perl/5.18/IO/Socket.pm line 80.
- files LDAP.ldif and LDAP.schema: added a missing attribute
amavisDisclaimerOptions to objectClass; reported by Quanah Gibson-Mount;
@@ -144,27 +182,55 @@ NEW FEATURES
end up as UTF-8, DNS labels are in ASCII (A-labels); domain names in
calls to dkim_key() may be specified either as UTF-8 or in ASCII (ACE);
-- Received trace information in $log_verbose_templ and in notifications
- now include protocol information (the WITH clause from Received header
- fields);
+- new macro 'mail_addr_decode' takes an e-mail address as a string of
+ octets, where a local part may be encoded as UTF-8, and the domain part
+ may be an international domain name (IDN) consisting either of U-labels
+ or A-labels or NR-LDH labels. Decodes A-labels to U-labels in domain
+ name. Returns a string of logical characters (Unicode), suitable for
+ notification templates. If the mail address is not a valid UTF-8 string,
+ it is interpreted as ISO-8859-1 (Latin-1).
+
+- new macro 'mail_addr_decode_octets' is like 'mail_addr_decode', except
+ that the result is a string of octets, only valid as UTF-8 if the
+ provided address was a valid UTF-8 (garbage-in/garbage-out);
+
+- new macro 'header_field_octets' is like 'header_field', except that
+ a result is a string of octets in UTF-8 encoding, suitable for a log
+ template;
+
+- new macro 'ip_proto_trace_all' expands into a list of information
+ items from a Received header trace; each item consists of a protocol
+ name (the WITH clause) and an IP address, optionally followed by a
+ source port number if known;
+ Example:
+ ESMTP://[2001:db8::143:1]:39141 < ESMTP://2001:db8::25 <
+ esmtps://203.0.113.172 < ESMTPSA://192.168.9.9
+ or:
+ UTF8SMTP://[203.0.113.172]:51208 < UTF8SMTPSA://192.168.9.9
+
+- new macro 'ip_proto_trace_public' is like ip_proto_trace_all, except
+ that entries with non-public IP address are excluded from the list;
+
+ 'Received' trace information in $log_verbose_templ and in notifications
+ now include results from this macro call;
-- added a macro 'protocol' to the default $log_verbose_templ template.
- It evaluates to a protocol name by which a message was received by
- amavisd, according to RFC 3848 ("Transmission Types Registration") and
- "Mail Transmission Types" / "WITH protocol types" IANA registration
+- new macro 'protocol' evaluates to a protocol name by which a message
+ was received by amavisd, according to RFC 3848 ("Transmission Types
+ Registration") and "Mail Transmission Types" / "WITH protocol types"
+ IANA registration
http://www.iana.org/assignments/mail-parameters/mail-parameters.xhtml
e.g.: SMTP, ESMTP, ESMTPA, ESMTPS, ESMTPSA, LMTP, LMTPA, LMTPS, LMTPSA,
UTF8SMTP, UTF8SMTPA, UTF8SMTPS, UTF8SMTPSA,
UTF8LMTP, UTF8LMTPA, UTF8LMTPS, UTF8LMTPSA, ...
-- new macros: mail_addr_decode, mail_addr_decode_octets, mime_decode,
- header_field_octets, ip_trace_all, ip_trace_public, protocol,
- ip_proto_trace_all, ip_proto_trace_public, client_protocol;
- (documented in README_FILES/README.customize);
+- new macro 'client_protocol' expands into a protocol name by which
+ a message was received from a client by MTA; the information is passed
+ from MTA to amavisd through XFORWARD PROTO SMTP protocol extension or
+ through AM.PDP (milter); typical values are 'ESMTP' or 'SMTP';
- use a perl module File::LibMagic when available, instead of spawning
a file(1) utility for classifying contents of mail parts.
- By using a direct interface to libmagic library the startup cost
+ By using a direct interface to a libmagic library the startup cost
of spawning an external process is avoided. Benchmarking shows that
using libmagic is significantly faster especially for checking a small
number of files - takes 4 ms for checking one file with libmagic
diff --git a/amavisd b/amavisd
index 278f0dd..f50a708 100755
--- a/amavisd
+++ b/amavisd
@@ -284,7 +284,7 @@ use constant CC_VIRUS => 9;
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
%EXPORT_TAGS = (
'dynamic_confvars' => # per- policy bank settings
@@ -677,7 +677,7 @@ BEGIN { # init_primary: version, base policy bank
$myprogram_name = $0; # typically 'amavisd'
local $1; $myprogram_name =~ s{([^/]*)\z}{$1}s;
$myproduct_name = 'amavisd-new';
- $myversion_id = '2.10.0'; $myversion_date = '20141022';
+ $myversion_id = '2.10.1'; $myversion_date = '20141025';
$myversion = "$myproduct_name-$myversion_id ($myversion_date)";
$myversion_id_numeric = # x.yyyzzz, allows numerical compare, like Perl $]
@@ -2244,7 +2244,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&init &amavis_log_id &collect_log_stats
&log_to_stderr &log_fd &open_log &close_log &write_log);
@@ -2449,7 +2449,7 @@ use re 'taint';
BEGIN {
use vars qw(@ISA $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
import Amavis::Conf qw(:platform $TEMPBASE);
import Amavis::Log qw(write_log);
}
@@ -2546,7 +2546,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&init §ion_time &report &get_time_so_far
&get_rusage &rusage_report);
@@ -2701,7 +2701,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&untaint &untaint_inplace &min &max &minmax
&unique_list &unique_ref &format_time_interval
@@ -3375,7 +3375,7 @@ sub orcpt_decode($;$) {
# RFC 6533: if an address is labeled with the UTF-8 address type
# but does not conform to utf-8 syntax, then it MUST be copied into
# the message/global-delivery-status field without alteration.
- # --> just leave unchanged
+ # --> just leave $str unchanged as octets
}
# result in $str is presumably an RFC 5322 -encoded addr,
@@ -4411,7 +4411,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&boolean &numeric);
}
@@ -4475,7 +4475,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&exit_status_str &proc_status_ok &kill_proc &cloexec
&run_command &run_command_consumer &run_as_subprocess
@@ -5025,7 +5025,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(
&rfc2822_timestamp &rfc2822_utc_timestamp
@@ -6048,7 +6048,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Util qw(ll do_log fmt_struct);
}
@@ -6167,7 +6167,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION $have_patricia);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&lookup_ip_acl &ip_to_vec &normalize_ip_addr);
import Amavis::Util qw(ll do_log);
@@ -6654,7 +6654,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&lookup &lookup2 &lookup_hash &lookup_acl);
import Amavis::Util qw(ll do_log fmt_struct unique_list
@@ -6959,7 +6959,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&expand &tokenize);
import Amavis::Util qw(ll do_log);
@@ -7261,7 +7261,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Timing qw(section_time);
@@ -7796,7 +7796,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
}
use Errno qw(EIO);
@@ -7932,7 +7932,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform);
import Amavis::Util qw(ll do_log min max minmax idn_to_ascii);
@@ -7993,7 +7993,7 @@ sub new {
};
if ($sock) { # mission accomplished
if (!@failures) {
- do_log(5, "connected to %s successfully%s", $self->{socketname});
+ do_log(5, "connected to %s successfully", $self->{socketname});
} else {
do_log(1, "connected to %s successfully after %d failures on: %s",
$self->{socketname}, scalar(@failures), join(', ', at failures));
@@ -8413,7 +8413,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
}
@@ -8449,7 +8449,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform);
import Amavis::Util qw(setting_by_given_contents_category_all
@@ -8640,7 +8640,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform);
import Amavis::rfc2821_2822_Tools qw(rfc2822_timestamp quote_rfc2821_local
@@ -8963,7 +8963,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&hdr);
import Amavis::Conf qw(:platform c cr ca);
@@ -9296,7 +9296,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(&mail_dispatch);
import Amavis::Conf qw(:platform :confvars c cr ca);
@@ -9450,7 +9450,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&first_received_from &oldest_public_ip_addr_from_received);
import Amavis::Conf qw(:platform c cr ca);
@@ -9502,7 +9502,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&consumed_bytes);
import Amavis::Conf qw(c cr ca
@@ -9591,7 +9591,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Util qw(ll do_log);
}
@@ -9679,7 +9679,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter MIME::Parser::Filer); # subclass of MIME::Parser::Filer
}
# This package will be used by mime_decode().
@@ -9721,7 +9721,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&check_header_validity &check_for_banned_names);
import Amavis::Util qw(ll do_log min max minmax untaint untaint_inplace
@@ -10056,7 +10056,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&mime_decode);
import Amavis::Conf qw(:platform c cr ca $TEMPBASE $MAXFILES);
@@ -10281,7 +10281,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter MIME::Body); # subclass of MIME::Body
import Amavis::Util qw(ll do_log);
}
@@ -10346,7 +10346,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&delivery_status_notification &delivery_short_report
&build_mime_entity &defanged_mime_entity
@@ -11702,7 +11702,7 @@ use re 'taint';
BEGIN {
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
import Amavis::Conf qw(:platform :sa :confvars c cr ca);
import Amavis::Util qw(untaint untaint_inplace
min max minmax unique_list unique_ref
@@ -13210,10 +13210,11 @@ sub process_request {
$sock_addr = normalize_ip_addr($sock_addr);
$peer_addr = normalize_ip_addr($peer_addr);
}
- $conn->socket_port($prop->{sockport});
- $conn->client_port($prop->{peerport});
+ # untaint IP addresses and port numbers, just in case
+ $conn->socket_port(untaint($prop->{sockport}));
+ $conn->client_port(untaint($prop->{peerport}));
$conn->socket_ip(untaint($sock_addr));
- $conn->client_ip(untaint($peer_addr)); # untaint just in case
+ $conn->client_ip(untaint($peer_addr));
}
if ($suggested_protocol eq 'SMTP' || $suggested_protocol eq 'LMTP' ||
($suggested_protocol eq '' && $ns_proto =~ /^(?:TCP|SSLEAY|SSL)\z/)) {
@@ -17215,9 +17216,12 @@ sub prepare_header_edits_for_quarantine($) {
if ($allowed_hdrs && $use_our_hdrs) {
my $spam_level_bar; my $slc = c('sa_spam_level_char');
- $spam_level_bar = $slc x min(64, $whitelisted_any ? 0
- : $blacklisted_any ? 64
- : 0+$max_spam_level) if $slc ne '';
+ if ($slc ne '') {
+ my $bar_len = $whitelisted_any ? 0
+ : $blacklisted_any ? 64
+ : min(64, 0+$max_spam_level);
+ $spam_level_bar = $bar_len <= 0 ? '' : $slc x $bar_len;
+ }
# allow header field wrapping at any comma
my $s = join(",\n ", sort keys %all_spam_tests);
my $sl = 'x';
@@ -19295,7 +19299,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform $myversion $nanny_details_level);
import Amavis::Util qw(ll do_log do_log_safe
@@ -19556,7 +19560,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform $myversion $nanny_details_level);
import Amavis::Util qw(ll do_log do_log_safe
@@ -19813,7 +19817,7 @@ use warnings FATAL => qw(utf8 void);
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw($db_home $daemon_chroot_dir);
import Amavis::Util qw(untaint ll do_log);
@@ -19902,7 +19906,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Util qw(ll do_log);
import Amavis::Conf qw($trim_trailing_space_in_lookup_result_fields);
@@ -20027,7 +20031,7 @@ use warnings FATAL => qw(utf8 void);
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Timing qw(section_time);
@@ -20254,7 +20258,7 @@ BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION
$have_sasl $ldap_sys_default);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
$have_sasl = eval { require Authen::SASL };
import Amavis::Conf qw(:platform :confvars c cr ca);
@@ -20476,7 +20480,7 @@ use re 'taint';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Util qw(ll do_log);
import Amavis::Conf qw($trim_trailing_space_in_lookup_result_fields);
@@ -20601,7 +20605,7 @@ BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION
$ldap_sys_default @ldap_attrs @mv_ldap_attrs);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Timing qw(section_time);
@@ -20821,7 +20825,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Util qw(ll do_log debug_oneshot dump_captured_log
@@ -21500,7 +21504,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Util qw(ll do_log do_log_safe untaint
@@ -22869,7 +22873,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform);
import Amavis::Util qw(ll do_log min max minmax);
@@ -23069,7 +23073,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&rundown_stale_sessions);
import Amavis::Conf qw(:platform c cr ca $smtp_connection_cache_enable);
@@ -23088,7 +23092,7 @@ sub new {
$cache_key = $proto_sockname;
local($1,$2,$3,$4);
if ($proto_sockname =~ # deal with dynamic destinations (wildcards)
- /^([a-z][a-z0-9.+-]*) : (?: \[ ([^\]]*) \] | ([^:]*) ) : ([^:]*)/xs) {
+ /^([a-z][a-z0-9.+-]*) : (?: \[ ([^\]]*) \] | ([^:]*) ) : ([^:]*)/xsi) {
my $peeraddress = defined $2 ? $2 : $3; my $peerport = $4;
$peeraddress = $wildcard_implied_host if $peeraddress eq '*';
$peerport = $wildcard_implied_port if $peerport eq '*';
@@ -23434,7 +23438,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(&mail_via_smtp);
import Amavis::Conf qw(:platform c cr ca $smtp_connection_cache_enable);
@@ -24299,7 +24303,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(&mail_via_pipe);
import Amavis::Conf qw(:platform c cr ca);
@@ -24503,7 +24507,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(&mail_via_bsmtp);
import Amavis::Conf qw(:platform $QUARANTINEDIR c cr ca);
@@ -24703,7 +24707,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&mail_to_local_mailbox);
import Amavis::Conf qw(:platform c cr ca
@@ -25071,7 +25075,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform);
import Amavis::Util qw(ll do_log idn_to_ascii);
@@ -25378,7 +25382,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::rfc2821_2822_Tools;
@@ -26187,7 +26191,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform c cr ca);
import Amavis::Util qw(ll do_log do_log_safe);
@@ -26468,13 +26472,14 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
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);
@@ -26901,7 +26906,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Util qw(ll do_log untaint min max minmax);
}
@@ -27200,7 +27205,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT = qw(&mail_via_sql);
import Amavis::Conf qw(:platform c cr ca $sql_quarantine_chunksize_max);
@@ -27337,7 +27342,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars c cr ca);
import Amavis::Util qw(ll untaint min max minmax unique_list do_log
@@ -28505,7 +28510,7 @@ use IO::File qw(O_RDONLY O_WRONLY O_RDWR O_APPEND O_CREAT O_EXCL);
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform c cr ca);
import Amavis::Util qw(ll do_log min max minmax untaint untaint_inplace
@@ -28907,7 +28912,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars :sa c cr ca);
import Amavis::Util qw(ll do_log sanitize_str min max minmax
@@ -29361,7 +29366,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars :sa c cr ca);
import Amavis::Util qw(ll do_log sanitize_str min max minmax get_deadline);
@@ -29573,7 +29578,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
# let a 'require' understand that this module is already loaded:
$INC{'Mail/SpamAssassin/Logger/Amavislog.pm'} = 'amavisd';
@@ -29610,7 +29615,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
import Amavis::Conf qw(:platform :confvars :sa $daemon_user c cr ca);
import Amavis::Util qw(ll do_log do_log_safe sanitize_str prolong_timer
@@ -30576,7 +30581,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&init &decompose_part &determine_file_types);
import Amavis::Util qw(untaint min max minmax ll do_log snmp_count
@@ -32419,7 +32424,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&dkim_key_postprocess &generate_authentication_results
&dkim_make_signatures &adjust_score_by_signer_reputation
@@ -33588,7 +33593,7 @@ no warnings 'uninitialized';
BEGIN {
require Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- $VERSION = '2.403';
+ $VERSION = '2.404';
@ISA = qw(Exporter);
@EXPORT_OK = qw(&show_or_test_dkim_public_keys &generate_dkim_private_key
&convert_dkim_keys_file);
diff --git a/amavisd-new-courier.patch b/amavisd-new-courier.patch
index 67be687..81823c5 100644
--- a/amavisd-new-courier.patch
+++ b/amavisd-new-courier.patch
@@ -1,5 +1,5 @@
---- amavisd.ori 2014-10-22 19:11:04.558937249 +0200
-+++ amavisd 2014-10-22 19:11:12.611936745 +0200
+--- amavisd.ori 2014-10-26 01:03:34.407616245 +0200
++++ amavisd 2014-10-26 01:03:53.168614917 +0200
@@ -108,5 +108,5 @@
# Amavis::In::AMPDP
# Amavis::In::SMTP
@@ -77,7 +77,7 @@
+ }
my(@modules_extra) = grep(!exists $modules_basic{$_}, keys %INC);
if (@modules_extra) {
-@@ -13229,5 +13263,7 @@
+@@ -13230,5 +13264,7 @@
$ampdp_in_obj->process_policy_request($sock, $conn, \&check_mail, 0);
} elsif ($suggested_protocol eq 'COURIER') {
- die "unavailable support for protocol: $suggested_protocol";
@@ -86,7 +86,7 @@
+ $courier_in_obj->process_courier_request($sock, $conn, \&check_mail);
} elsif ($suggested_protocol eq 'QMQPqq') {
die "unavailable support for protocol: $suggested_protocol";
-@@ -13337,4 +13373,24 @@
+@@ -13338,4 +13374,24 @@
}
+### Net::Server hook
@@ -111,7 +111,7 @@
+
### Child is about to be terminated
### user customizable Net::Server hook
-@@ -18592,4 +18648,9 @@
+@@ -18596,4 +18652,9 @@
undef $Amavis::Conf::log_verbose_templ;
+# courierfilter shutdown needs can_read_hook, added in Net::Server 0.90
@@ -121,14 +121,14 @@
+
if (defined $desired_user && $daemon_user ne '') {
local($1);
-@@ -19246,4 +19307,6 @@
+@@ -19250,4 +19311,6 @@
host => $bind_to[0], # default bind, redundant, merged to @listen_sockets
listen => $listen_queue_size, # undef for a default
+ # need to set multi_port for can_read_hook
+ multi_port => $courierfilter_shutdown ? 1 : undef,
max_servers => $max_servers, # number of pre-forked children
!defined($min_servers) ? ()
-@@ -22854,5 +22917,424 @@
+@@ -22858,5 +22921,424 @@
no warnings 'uninitialized';
-BEGIN { die "Code not available for module Amavis::In::Courier" }
diff --git a/amavisd-new-qmqpqq.patch b/amavisd-new-qmqpqq.patch
index fbb69f6..6d547b9 100644
--- a/amavisd-new-qmqpqq.patch
+++ b/amavisd-new-qmqpqq.patch
@@ -1,5 +1,5 @@
---- amavisd.ori 2014-10-22 19:11:04.558937249 +0200
-+++ amavisd 2014-10-22 19:12:33.480930887 +0200
+--- amavisd.ori 2014-10-26 01:03:34.407616245 +0200
++++ amavisd 2014-10-26 01:04:44.543611588 +0200
@@ -109,4 +109,5 @@
# Amavis::In::SMTP
#( Amavis::In::Courier )
@@ -30,7 +30,7 @@
+ do_log(0,"QMQPqq-in proto code %s loaded", $extra_code_in_qmqpqq ?'':" NOT");
do_log(0,"SMTP-out proto code %s loaded", $extra_code_out_smtp ?'':" NOT");
do_log(0,"Pipe-out proto code %s loaded", $extra_code_out_pipe ?'':" NOT");
-@@ -13231,5 +13236,9 @@
+@@ -13232,5 +13237,9 @@
die "unavailable support for protocol: $suggested_protocol";
} elsif ($suggested_protocol eq 'QMQPqq') {
- die "unavailable support for protocol: $suggested_protocol";
@@ -41,19 +41,19 @@
+ $qmqpqq_in_obj->process_qmqpqq_request($sock,$conn,\&check_mail);
} elsif ($suggested_protocol eq 'TCP-LOOKUP') { #postfix maps, experimental
process_tcp_lookup_request($sock, $conn);
-@@ -13354,4 +13363,5 @@
+@@ -13355,4 +13364,5 @@
do_log_safe(5,"child_finish_hook: invoking DESTROY methods");
undef $smtp_in_obj; undef $ampdp_in_obj; undef $courier_in_obj;
+ undef $qmqpqq_in_obj;
undef $sql_storage; undef $sql_wblist; undef $sql_lookups;
undef $sql_dataset_conn_lookups; undef $sql_dataset_conn_storage;
-@@ -18386,4 +18396,5 @@
+@@ -18390,4 +18400,5 @@
$extra_code_sql_lookup, $extra_code_ldap,
$extra_code_in_ampdp, $extra_code_in_smtp, $extra_code_in_courier,
+ $extra_code_in_qmqpqq,
$extra_code_out_smtp, $extra_code_out_pipe,
$extra_code_out_bsmtp, $extra_code_out_local,
-@@ -18743,5 +18754,11 @@
+@@ -18747,5 +18758,11 @@
undef $extra_code_in_courier;
}
- if ($needed_protocols_in{'QMQPqq'}) { die "In::QMQPqq code not available" }
@@ -66,7 +66,7 @@
+ }
}
-@@ -22860,4 +22877,276 @@
+@@ -22864,4 +22881,276 @@
__DATA__
#
+package Amavis::In::QMQPqq;
@@ -343,8 +343,8 @@
+#
package Amavis::Out::SMTP::Protocol;
use strict;
---- amavisd.conf.ori 2014-10-22 19:10:16.102940379 +0200
-+++ amavisd.conf 2014-10-22 19:12:33.481931103 +0200
+--- amavisd.conf.ori 2014-10-26 01:03:40.235615903 +0200
++++ amavisd.conf 2014-10-26 01:04:44.544610916 +0200
@@ -56,6 +56,6 @@
# option(s) -p overrides $inet_socket_port and $unix_socketname
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git
More information about the Amavisd-new-commits
mailing list