From a80fe16a13c73c0640ac762d27bea7ed2a2fc1a7 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 31 May 2022 16:15:45 +0200 Subject: [PATCH 01/10] Patch amavisd to use NET::LibIDN2 (#2059362) --- amavis-2.12.1-libidn2.patch | 102 ++++++++++++++++++++++++++++++++++++ amavis.spec | 9 +++- 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 amavis-2.12.1-libidn2.patch diff --git a/amavis-2.12.1-libidn2.patch b/amavis-2.12.1-libidn2.patch new file mode 100644 index 0000000..8eef12e --- /dev/null +++ b/amavis-2.12.1-libidn2.patch @@ -0,0 +1,102 @@ +Backport of "Switch from Net::LibIDN to Net::LibIDN2" from upstream development at +https://gitlab.com/amavis/amavis/-/commit/b5619240f3dbbf008549d6688ffd78148c0c6a9d +for v2.12.2. + +--- amavis-v2.12.2/amavisd 2021-10-13 10:10:54.000000000 +0200 ++++ amavis-v2.12.2/amavisd.libidn2 2022-05-30 20:02:04.541601324 +0200 +@@ -201,10 +201,20 @@ + # and share already compiled code in memory. Children will still need to 'use' + # modules if they want to inherit from their name space. + # ++sub fetch_modules($$@); # Avoid "called too early to check prototype" warning + sub fetch_modules($$@) { + my($reason, $required, @modules) = @_; + my(@missing); + for my $m (@modules) { ++ if (ref $m eq 'ARRAY') { ++ # interpret as alternatives ++ my $missing = fetch_modules($reason, 0, @$m); ++ if (@$missing == @$m) { ++ local $" = ' | '; ++ push @missing, "(@$missing)"; ++ } ++ next ++ } + local $_ = $m; + $_ .= /^auto::/ ? '.al' : '.pm' if !m{^/} && !m{\.(?:pm|pl|al|ix)\z}; + s{::}{/}g; +@@ -238,8 +248,8 @@ + MIME::Head MIME::Body MIME::Entity MIME::Parser MIME::Decoder + MIME::Decoder::Base64 MIME::Decoder::Binary MIME::Decoder::QuotedPrint + MIME::Decoder::NBit MIME::Decoder::UU MIME::Decoder::Gzip64 +- Net::LibIDN Net::Server Net::Server::PreFork +- )); ++ Net::Server Net::Server::PreFork ++ ), [qw[Net::LibIDN2 Net::LibIDN]]); + # with earlier versions of Perl one may need to add additional modules + # to the list, such as: auto::POSIX::setgid auto::POSIX::setuid ... + fetch_modules('OPTIONAL BASIC MODULES', 0, qw( +@@ -2916,7 +2926,18 @@ + use MIME::Base64; + use Encode (); # Perl 5.8 UTF-8 support + use Scalar::Util qw(tainted); +-use Net::LibIDN (); ++ ++BEGIN { ++ if (eval { require Net::LibIDN2 }) { ++ *libidn_to_ascii = \&Net::LibIDN2::idn2_lookup_u8; ++ *libidn_to_unicode = \&Net::LibIDN2::idn2_to_unicode_88; ++ } elsif (eval { require Net::LibIDN }) { ++ *libidn_to_ascii = sub { Net::LibIDN::idn_to_ascii($_[0], 'UTF-8') }; ++ *libidn_to_unicode = sub { Net::LibIDN::idn_to_unicode($_[0], 'UTF-8') }; ++ } else { ++ die 'Neither Net::LibIDN2 nor Net::LibIDN module found'; ++ } ++} + + use vars qw($enc_ascii $enc_utf8 $enc_latin1 $enc_w1252 $enc_tainted + $enc_taintsafe $enc_is_utf8_buggy); +@@ -3222,13 +3243,14 @@ + if ($s !~ tr/\x00-\x7F//c) { # is all-ASCII (including IP address literal) + $s = lc $s; + } else { +- # Net::LibIDN does not like a leading dot (or '@') in a valid domain name, ++ # Net::LibIDN(2) does not like a leading dot (or '@') in a valid domain name, + # but we need it (e.g. in lookups, meaning subdomains are included), so +- # we have to carry a prefix across the call to Net::LibIDN::idn_to_ascii(). ++ # we have to carry a prefix across the call to Net::LibIDN::idn_to_ascii() or ++ # Net::LibIDN2::idn2_lookup_u8() (wrapped in libidn_to_ascii() here). + my $prefix; local($1); + $prefix = $1 if $s =~ s/^([.\@])//s; # strip a leading dot or '@' + # to ASCII-compatible encoding (ACE) +- my $sa = Net::LibIDN::idn_to_ascii($s, 'UTF-8'); ++ my $sa = libidn_to_ascii($s); + $s = lc $sa if defined $sa; + $s = $prefix.$s if $prefix; + } +@@ -3251,7 +3273,7 @@ + safe_encode_utf8_inplace($s); # to octets (if not already) + if ($s =~ /(?: ^ | \. ) xn-- [\x00-\x2D\x2F-\xFF]{0,58} [\x00-\x2C\x2F-\xFF] + (?: \z | \. )/xsi) { # contains XN-label +- my $su = Net::LibIDN::idn_to_unicode(lc $s, 'UTF-8'); ++ my $su = libidn_to_unicode(lc $s); + return $su if defined $su; + } + $s; +@@ -12970,11 +12992,11 @@ + Authen::SASL Authen::SASL::XS Authen::SASL::Cyrus Authen::SASL::Perl + Encode Scalar::Util Time::HiRes File::Temp Unix::Syslog Unix::Getrusage + Socket Socket6 IO::Socket::INET6 IO::Socket::IP IO::Socket::SSL +- Net::Server NetAddr::IP Net::DNS Net::LibIDN Net::SSLeay Net::Patricia +- Net::LDAP Mail::SpamAssassin Mail::DKIM::Verifier Mail::DKIM::Signer +- Mail::ClamAV Mail::SPF Mail::SPF::Query URI Razor2::Client::Version +- DBI DBD::mysql DBD::Pg DBD::SQLite BerkeleyDB DB_File +- ZMQ ZMQ::LibZMQ2 ZMQ::LibZMQ3 ZeroMQ SAVI Anomy::Sanitizer)); ++ Net::Server NetAddr::IP Net::DNS Net::LibIDN Net::LibIDN2 Net::SSLeay ++ Net::Patricia Net::LDAP Mail::SpamAssassin Mail::DKIM::Verifier ++ Mail::DKIM::Signer Mail::ClamAV Mail::SPF Mail::SPF::Query URI ++ Razor2::Client::Version DBI DBD::mysql DBD::Pg DBD::SQLite BerkeleyDB ++ DB_File ZMQ ZMQ::LibZMQ2 ZMQ::LibZMQ3 ZeroMQ SAVI Anomy::Sanitizer)); + do_log(1, "Module %-19s %s", $m, eval{$m->VERSION} || '?'); + } + do_log(1,"Amavis::ZMQ code %s loaded", $extra_code_zmq ?'':" NOT"); diff --git a/amavis.spec b/amavis.spec index c1f63a2..48090c1 100644 --- a/amavis.spec +++ b/amavis.spec @@ -3,7 +3,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 3%{?dist} +Release: 4%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -16,6 +16,7 @@ Source9: amavisd.service Source10: amavisd-snmp.service Source11: amavis.sysusers Patch0: amavis-2.12.1-conf.patch +Patch1: amavis-2.12.1-libidn2.patch BuildArch: noarch %if 0%{?fedora} BuildRequires: systemd-rpm-macros @@ -92,7 +93,7 @@ Requires: perl(Mail::Header) Requires: perl(Mail::Internet) >= 1.58 Requires: perl(Mail::SPF) Requires: perl(Net::DNS) -Requires: perl(Net::LibIDN) +Requires: perl(Net::LibIDN2) Requires: perl(Net::SSLeay) Requires: perl(Net::Server) >= 2.0 Requires: perl(NetAddr::IP) @@ -148,6 +149,7 @@ Documentation files for amavis %prep %setup -q -n %{name}-v%{version} %patch0 -p1 +%patch1 -p1 install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/ sed -e 's,/var/amavis/amavisd.sock\>,%{_rundir}/amavisd/amavisd.sock,' -i amavisd-{release,submit} @@ -243,6 +245,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue May 31 2022 Juan Orti Alcaine - 2.12.2-4 +- Patch amavisd to use NET::LibIDN2 (#2059362) + * Thu Jan 06 2022 Juan Orti Alcaine - 2.12.2-3 - Remove perl(IO::Stringy) dependency From addfd6eaf46e3eb9cc318438d0eb46d7b37c6068 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Sat, 25 Feb 2023 09:10:29 +0100 Subject: [PATCH 02/10] Add requires for perl MODULE_COMPAT_ --- amavis.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/amavis.spec b/amavis.spec index daa280f..e6234ec 100644 --- a/amavis.spec +++ b/amavis.spec @@ -94,6 +94,7 @@ Obsoletes: amavisd-new < 2.12.0-3 %package -n perl-Amavis Summary: Amavis perl module +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{with snmp} %package snmp From c596590dab7d7dd924699ffcef7b856f4ffda6e4 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Sun, 7 May 2023 11:09:18 +0200 Subject: [PATCH 03/10] Add support for adding arguments with a sysconfig amavisd supports additional command-line arguments, including additional config files with more "-c " arguments, so add a sysconfig file for local additions. --- amavis.spec | 9 ++++++++- amavisd.service | 5 +++-- amavisd.sysconfig | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 amavisd.sysconfig diff --git a/amavis.spec b/amavis.spec index e6234ec..e91aac7 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.13.0 -Release: 3%{?dist} +Release: 4%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -16,6 +16,7 @@ Source8: amavisd-tmpfiles.conf Source9: amavisd.service Source10: amavisd-snmp.service Source11: amavis.sysusers +Source12: amavisd.sysconfig Patch0: amavis-conf.patch BuildArch: noarch %if 0%{?fedora} @@ -171,6 +172,8 @@ install -D -m 644 %{SOURCE8} %{buildroot}%{_tmpfilesdir}/amavisd.conf install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf +install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd + %pre %sysusers_create_compat %{SOURCE11} @@ -219,6 +222,7 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %{_sysusersdir}/amavis.conf %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/amavisd %files -n perl-Amavis %license LICENSE @@ -237,6 +241,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Sat May 06 2023 Chris Adams - 2.13.0-4 +- Add a syconfig file to be able to add arguments + * Thu Feb 23 2023 Juan Orti Alcaine - 2.13.0-3 - Update configuration to use clamdscan diff --git a/amavisd.service b/amavisd.service index 4ebcfed..bcd1ac8 100644 --- a/amavisd.service +++ b/amavisd.service @@ -7,8 +7,9 @@ Wants=clamd@amavisd.service [Service] Type=forking PIDFile=/run/amavisd/amavisd.pid -ExecStart=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf -ExecReload=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf reload +EnvironmentFile=-/etc/sysconfig/amavisd +ExecStart=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf $ARGS +ExecReload=/usr/sbin/amavisd -c /etc/amavisd/amavisd.conf $ARGS reload Restart=on-failure PrivateTmp=true CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_SETGID CAP_SETUID diff --git a/amavisd.sysconfig b/amavisd.sysconfig new file mode 100644 index 0000000..fd8ffed --- /dev/null +++ b/amavisd.sysconfig @@ -0,0 +1,2 @@ +# Add additional arguments to amavisd command-line +#ARGS="" From 4703551714ac969b6fba17864e839ba440e68458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:55:01 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index f1e4279..989a806 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.13.1 -Release: 1%{?dist} +Release: 2%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -240,6 +240,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Mar 14 2024 Juan Orti Alcaine - 2.13.1-1 - Update to version 2.13.1 From 204fc0c8b6976c0ecbc97841504f80e79fd4c3f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:56:55 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 989a806..8d3cfd6 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.13.1 -Release: 2%{?dist} +Release: 3%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -240,6 +240,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 2.13.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e94a5d3c5b3c9bd6fe5f0ca5b7beba1827d9b7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sat, 25 Jan 2025 10:19:26 +0000 Subject: [PATCH 06/10] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- amavis.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amavis.spec b/amavis.spec index 8d3cfd6..796ea5c 100644 --- a/amavis.spec +++ b/amavis.spec @@ -5,8 +5,8 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.13.1 Release: 3%{?dist} -# LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ -License: GPLv2+ and BSD and GFDL +# LDAP schema is GFDL-1.2-or-later, some helpers are BSD-2-Clause, core is GPL-2.0-or-later +License: GPL-2.0-or-later AND BSD-2-Clause AND GFDL-1.2-or-later URL: https://gitlab.com/amavis/amavis Source0: https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2 Source2: amavis-clamd.conf From cc09d915ee330a2e2c8f7c3588b557bc6c8df813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:14 +0100 Subject: [PATCH 07/10] Drop call to %sysusers_create_compat After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers, rpm will handle account creation automatically. --- amavis.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/amavis.spec b/amavis.spec index 796ea5c..040a4a3 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.13.1 -Release: 3%{?dist} +Release: 4%{?dist} # LDAP schema is GFDL-1.2-or-later, some helpers are BSD-2-Clause, core is GPL-2.0-or-later License: GPL-2.0-or-later AND BSD-2-Clause AND GFDL-1.2-or-later URL: https://gitlab.com/amavis/amavis @@ -173,8 +173,6 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd -%pre -%sysusers_create_compat %{SOURCE11} %preun %systemd_preun amavisd.service @@ -240,6 +238,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.13.1-4 +- Drop call to %sysusers_create_compat + * Thu Jan 16 2025 Fedora Release Engineering - 2.13.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e4a4c1baf584305b07339025c5277c9a589223ea Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Thu, 17 Jul 2025 21:05:05 +0200 Subject: [PATCH 08/10] Update to version 2.14.0 (RHBZ#2379545) --- .gitignore | 1 + amavis-conf.patch | 34 +++++++++++++++++----------------- amavis.spec | 7 +++++-- sources | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 9a5de4c..7b5d5ef 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2 /amavis-v2.13.0.tar.bz2 /amavis-v2.13.1.tar.bz2 +/amavis-v2.14.0.tar.bz2 diff --git a/amavis-conf.patch b/amavis-conf.patch index fee57de..66966d4 100644 --- a/amavis-conf.patch +++ b/amavis-conf.patch @@ -1,6 +1,6 @@ -From b23efd704ca7b663276a1d03ae7dcd25b12f5607 Mon Sep 17 00:00:00 2001 -From: Juan Orti Alcaine -Date: Thu, 23 Feb 2023 20:35:47 +0100 +From 760c0848cf0e0c13b33bcd0823ea5a310587d8a1 Mon Sep 17 00:00:00 2001 +From: Juan Orti Alcaine +Date: Thu, 17 Jul 2025 21:02:32 +0200 Subject: [PATCH] Fedora configuration modifications --- @@ -120,7 +120,7 @@ index 7e8cedb..5eefdd7 100755 # $socketname = '[::1]:9998'; diff --git a/conf/amavisd.conf b/conf/amavisd.conf -index f9de495..c1058e9 100644 +index a612b49..d3acb42 100644 --- a/conf/amavisd.conf +++ b/conf/amavisd.conf @@ -17,25 +17,25 @@ use strict; @@ -209,7 +209,7 @@ index f9de495..c1058e9 100644 $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef @addr_extension_virus_maps = ('virus'); -@@ -166,13 +169,16 @@ $defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error +@@ -167,13 +170,16 @@ $defang_by_ccat{CC_UNCHECKED.",3"} = 1; # ambiguous content (e.g. multipart boun # $myhostname = 'host.example.com'; # must be a fully-qualified domain name! @@ -232,7 +232,7 @@ index f9de495..c1058e9 100644 # $bad_header_quarantine_method = undef; # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl -@@ -341,8 +347,8 @@ $banned_filename_re = new_RE( +@@ -342,8 +348,8 @@ $banned_filename_re = new_RE( ['lzma', \&do_uncompress, ['lzmadec', 'xz -dc --format=lzma', 'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ], @@ -241,9 +241,9 @@ index f9de495..c1058e9 100644 +# ['lrz', \&do_uncompress, +# ['lrzip -q -k -d -o -', 'lrzcat -q -k'] ], ['lzo', \&do_uncompress, 'lzop -d'], + ['lzip', \&do_uncompress, ['lzip -d'] ], ['lz4', \&do_uncompress, ['lz4c -d'] ], - ['rpm', \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ], -@@ -354,9 +360,9 @@ $banned_filename_re = new_RE( +@@ -356,9 +362,9 @@ $banned_filename_re = new_RE( ['arj', \&do_unarj, ['unarj', 'arj'] ], ['arc', \&do_arc, ['nomarch', 'arc'] ], ['zoo', \&do_zoo, ['zoo', 'unzoo'] ], @@ -255,7 +255,7 @@ index f9de495..c1058e9 100644 ['tnef', \&do_tnef], # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead # ['sit', \&do_unstuff, 'unstuff'], # not safe -@@ -393,7 +399,8 @@ $banned_filename_re = new_RE( +@@ -396,7 +402,8 @@ $banned_filename_re = new_RE( # * By dropping the --fdpass option, this command is easily adapted for # use with a network socket (clamd running elsewhere). # @@ -265,16 +265,16 @@ index f9de495..c1058e9 100644 [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) -@@ -403,7 +410,7 @@ $banned_filename_re = new_RE( +@@ -406,7 +413,7 @@ $banned_filename_re = new_RE( - # ### http://www.sophos.com/ + # ### http://www.sophos.com/ (EOL 31 March 2022) # ['Sophos-SSSP', # SAV Dynamic Interface -# \&ask_daemon, ["{}", 'sssp:/var/run/savdi/sssp.sock'], +# \&ask_daemon, ["{}", 'sssp:/run/savdi/sssp.sock'], # # or: ["{}", 'sssp:[127.0.0.1]:4010'], # qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ], -@@ -449,7 +456,7 @@ $banned_filename_re = new_RE( +@@ -452,7 +459,7 @@ $banned_filename_re = new_RE( # pack('N',0). # content size # pack('N',0), # '/var/drweb/run/drwebd.sock', @@ -283,7 +283,7 @@ index f9de495..c1058e9 100644 # # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default # # '127.0.0.1:3000', # or over an inet socket # ], -@@ -464,7 +471,7 @@ $banned_filename_re = new_RE( +@@ -467,7 +474,7 @@ $banned_filename_re = new_RE( ['KasperskyLab AVP - aveclient', ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient', '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'], @@ -292,7 +292,7 @@ index f9de495..c1058e9 100644 [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m, qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m, ], -@@ -573,12 +580,12 @@ $banned_filename_re = new_RE( +@@ -576,12 +583,12 @@ $banned_filename_re = new_RE( # ### http://www.avast.com/ # ['avast! Antivirus daemon', # \&ask_daemon, # greets with 220, terminate with QUIT @@ -307,7 +307,7 @@ index f9de495..c1058e9 100644 # qr/\t\[L\]\t([^[ \t\015\012]+)/m ], ['CAI InoculateIT', 'inocucmd', # retired product -@@ -714,8 +721,8 @@ $banned_filename_re = new_RE( +@@ -717,8 +724,8 @@ $banned_filename_re = new_RE( # ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'], # '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ], @@ -318,7 +318,7 @@ index f9de495..c1058e9 100644 ### http://www.ikarus-software.com/ ['Ikarus AntiVirus for Linux', 'ikarus', -@@ -813,12 +820,12 @@ $banned_filename_re = new_RE( +@@ -822,12 +829,12 @@ $banned_filename_re = new_RE( # /etc/clamd.conf, or may be controlled by your service manager / init. # # ['ClamAV-clamd', @@ -334,5 +334,5 @@ index f9de495..c1058e9 100644 # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], -- -2.39.2 +2.50.1 diff --git a/amavis.spec b/amavis.spec index 040a4a3..3eba56f 100644 --- a/amavis.spec +++ b/amavis.spec @@ -3,8 +3,8 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.14.0 +Release: 1%{?dist} # LDAP schema is GFDL-1.2-or-later, some helpers are BSD-2-Clause, core is GPL-2.0-or-later License: GPL-2.0-or-later AND BSD-2-Clause AND GFDL-1.2-or-later URL: https://gitlab.com/amavis/amavis @@ -238,6 +238,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Thu Jul 17 2025 Juan Orti Alcaine - 2.14.0-1 +- Update to version 2.14.0 (RHBZ#2379545) + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.13.1-4 - Drop call to %sysusers_create_compat diff --git a/sources b/sources index 5402efe..570a1a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.13.1.tar.bz2) = 90a67fa246a2446a4fb3733f10cdb21e25f6f2aea4293a3880606e57cfa1b4c568e1670ec2a43f1d38fdf13d8eab8d22e3e293f86f594968e194dc2c8a5ae992 +SHA512 (amavis-v2.14.0.tar.bz2) = 49303d86947d7ae258c6def8cf9892ff062fd054b4bc6451b1670426a5d767782ed7febd350237d36d4b62db408cbb993b6b4522eb595ead77faafb07012fe58 From 24d34a7ce345f76933236523012ba1a118c2bee7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:56:23 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 3eba56f..ce80392 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} # LDAP schema is GFDL-1.2-or-later, some helpers are BSD-2-Clause, core is GPL-2.0-or-later License: GPL-2.0-or-later AND BSD-2-Clause AND GFDL-1.2-or-later URL: https://gitlab.com/amavis/amavis @@ -238,6 +238,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Juan Orti Alcaine - 2.14.0-1 - Update to version 2.14.0 (RHBZ#2379545) From dbc794107d97f15a08f9128b90ceb52adec498fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:37:53 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index ce80392..5124df0 100644 --- a/amavis.spec +++ b/amavis.spec @@ -4,7 +4,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.14.0 -Release: 2%{?dist} +Release: 3%{?dist} # LDAP schema is GFDL-1.2-or-later, some helpers are BSD-2-Clause, core is GPL-2.0-or-later License: GPL-2.0-or-later AND BSD-2-Clause AND GFDL-1.2-or-later URL: https://gitlab.com/amavis/amavis @@ -238,6 +238,9 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild