From a5d5c6c31590d998fdbe067b23889b2dfd6c17fd Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 17 Nov 2020 11:40:34 +0100 Subject: [PATCH 01/36] Version 2.12.1 --- .gitignore | 1 + amavis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cc3dd1a..5aff4e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /amavis-v2.12.0.tar.bz2 +/amavis-v2.12.1.tar.bz2 diff --git a/amavis.spec b/amavis.spec index a3203b8..e8e1339 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,7 +1,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.12.0 -Release: 9%{?dist} +Version: 2.12.1 +Release: 1%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -226,6 +226,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-1 +- Version 2.12.1 (#1897574 #1851872) + * Tue Aug 18 2020 Juan Orti Alcaine - 2.12.0-9 - Drop unused dependency: perl(Digest::SHA1) - Make optional: perl(Convert::TNEF), perl(Convert::UUlib) diff --git a/sources b/sources index b60fc05..34128c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.12.0.tar.bz2) = f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844 +SHA512 (amavis-v2.12.1.tar.bz2) = 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013 From 72ebe461327994fdfafd88f2645f6e81dfaf3618 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 17 Nov 2020 13:14:48 +0100 Subject: [PATCH 02/36] Disable snmp subpackage in epel8 --- amavis.spec | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index e8e1339..66cc7c0 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,7 +1,13 @@ +%if 0%{?rhel} == 8 +%global with_snmp 0 +%else +%global with_snmp 1 +%endif + Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.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 @@ -105,11 +111,13 @@ Obsoletes: amavisd-new-snmp-zeromq <= 2.11.0-5 Provides: amavisd-new = %{version}-%{release} Obsoletes: amavisd-new < 2.12.0-3 +%if %{?with_snmp} %package snmp Summary: Exports amavis SNMP data Requires: %{name} = %{version}-%{release} Provides: amavisd-new-snmp = %{version}-%{release} Obsoletes: amavisd-new-snmp < 2.12.0-3 +%endif %package doc Summary: Amavis doc files @@ -124,6 +132,7 @@ reliability, portability and maintainability. It talks to MTA via (E)SMTP or LMTP, or by using helper programs. No timing gaps exist in the design which could cause a mail loss. +%if %{?with_snmp} %description snmp This package contains the program amavisd-snmp-subagent, which can be used as a SNMP AgentX, exporting amavisd statistical counters database @@ -135,6 +144,7 @@ amavisd-nanny, but instead of writing results as text to stdout, it 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. +%endif %description doc Documentation files for amavis @@ -152,13 +162,17 @@ sed -e 's,/var/amavis/amavisd.sock\>,%{_rundir}/amavisd/amavisd.sock,' -i amavis rm -rf %{buildroot} install -D -p -m 755 amavisd %{buildroot}%{_sbindir}/amavisd +%if %{?with_snmp} install -D -p -m 755 amavisd-snmp-subagent %{buildroot}%{_sbindir}/amavisd-snmp-subagent +%endif mkdir -p %{buildroot}%{_bindir} install -p -m 755 amavisd-{agent,nanny,release,signer,submit} %{buildroot}%{_bindir}/ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/amavisd.service +%if %{?with_snmp} install -D -p -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/amavisd-snmp.service +%endif mkdir -p -m 0755 %{buildroot}%{_sysconfdir}/clamd.d install -D -p -m 644 amavisd.conf %{buildroot}%{_sysconfdir}/amavisd/amavisd.conf @@ -179,20 +193,26 @@ exit 0 %preun %systemd_preun amavisd.service +%if %{?with_snmp} %preun snmp %systemd_preun amavisd-snmp.service +%endif %post %systemd_post amavisd.service +%if %{?with_snmp} %post snmp %systemd_post amavisd-snmp.service +%endif %postun %systemd_postun_with_restart amavisd.service +%if %{?with_snmp} %postun snmp %systemd_postun_with_restart amavisd-snmp.service +%endif %files %license LICENSE @@ -215,10 +235,12 @@ exit 0 %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd +%if %{?with_snmp} %files snmp %doc AMAVIS-MIB.txt %{_unitdir}/amavisd-snmp.service %{_sbindir}/amavisd-snmp-subagent +%endif %files doc %license LICENSE @@ -226,6 +248,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-2 +- Disable snmp subpackage in epel8 + * Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-1 - Version 2.12.1 (#1897574 #1851872) From e6fd51c86b24e647761c56d042e59260c0e942b4 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 17 Nov 2020 19:50:09 +0100 Subject: [PATCH 03/36] Change ports in configuration file and add a note about SELinux (#1891003) --- ...2.0-conf.patch => amavis-2.12.1-conf.patch | 80 ++++++++++++++----- amavis.spec | 7 +- 2 files changed, 63 insertions(+), 24 deletions(-) rename amavis-2.12.0-conf.patch => amavis-2.12.1-conf.patch (72%) diff --git a/amavis-2.12.0-conf.patch b/amavis-2.12.1-conf.patch similarity index 72% rename from amavis-2.12.0-conf.patch rename to amavis-2.12.1-conf.patch index 3722e8a..0f31e3c 100644 --- a/amavis-2.12.0-conf.patch +++ b/amavis-2.12.1-conf.patch @@ -1,15 +1,15 @@ -From f697a6d1cfe2499751157748a420994635e4ce68 Mon Sep 17 00:00:00 2001 +From f3c1cba05de23ae0509847ee0912e945a9ba08b8 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine -Date: Thu, 1 Aug 2019 12:40:43 +0200 +Date: Tue, 17 Nov 2020 19:43:51 +0100 Subject: [PATCH] Fedora configuration modifications --- - amavis-mc | 6 ++--- + amavis-mc | 6 ++-- amavisd-agent | 2 +- amavisd-nanny | 2 +- - amavisd-signer | 4 ++-- - amavisd.conf | 64 +++++++++++++++++++++++++------------------------- - 5 files changed, 39 insertions(+), 39 deletions(-) + amavisd-signer | 4 +-- + amavisd.conf | 82 +++++++++++++++++++++++++++----------------------- + 5 files changed, 51 insertions(+), 45 deletions(-) diff --git a/amavis-mc b/amavis-mc index 88d9701..f6f8081 100755 @@ -25,7 +25,7 @@ index 88d9701..f6f8081 100755 +$daemon_group = 'amavis'; -$pid_file = '/var/amavis/amavis-mc.pid'; -+$pid_file = '/run/amavisd/amavis-mc.pid'; ++$pid_file = '/var/run/amavisd/amavis-mc.pid'; $log_level = 0; $syslog_ident = 'amavis-mc'; @@ -71,7 +71,7 @@ index f154646..3042b7c 100755 # $daemonize = 1; diff --git a/amavisd.conf b/amavisd.conf -index bb562e6..f2e0e40 100644 +index bb562e6..46df59a 100644 --- a/amavisd.conf +++ b/amavisd.conf @@ -17,25 +17,25 @@ use strict; @@ -102,21 +102,49 @@ index bb562e6..f2e0e40 100644 # $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 = "/run/amavisd/amavisd.lock"; # -L -+$pid_file = "/run/amavisd/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 -@@ -55,7 +55,7 @@ $enable_dkim_signing = 1; # load DKIM signing code, keys defined by dkim_key +@@ -55,11 +55,14 @@ $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 = "/run/amavisd/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 ++# The default receiving port in the Fedora and RHEL SELinux policy is 10024. ++# To allow additional ports you need to label them as 'amavisd_recv_port_t' ++# For example: semanage port -a -t amavisd_recv_port_t -p tcp 10022 $inet_socket_port = 10024; # listen on this local TCP port(s) -@@ -119,11 +119,11 @@ $sa_local_tests_only = 0; # only tests which do not require internet access? +-# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports ++# $inet_socket_port = [10022,10024]; # listen on multiple TCP ports + + $policy_bank{'MYNETS'} = { # mail originating from @mynetworks + originating => 1, # is true in MYNETS by default, but let's make it explicit +@@ -67,8 +70,8 @@ $policy_bank{'MYNETS'} = { # mail originating from @mynetworks + }; + + # it is up to MTA to re-route mail from authenticated roaming users or +-# from internal hosts to a dedicated TCP port (such as 10026) for filtering +-$interface_policy{'10026'} = 'ORIGINATING'; ++# from internal hosts to a dedicated TCP port (such as 10022) for filtering ++$interface_policy{'10022'} = 'ORIGINATING'; + + $policy_bank{'ORIGINATING'} = { # mail supposedly originating from our users + originating => 1, # declare that mail was submitted by our smtp client +@@ -78,7 +81,7 @@ $policy_bank{'ORIGINATING'} = { # mail supposedly originating from our users + spam_admin_maps => ["virusalert\@$mydomain"], + warnbadhsender => 1, + # forward to a smtpd service providing DKIM signing service +- forward_method => 'smtp:[127.0.0.1]:10027', ++ forward_method => 'smtp:[127.0.0.1]:10025', + # force MTA conversion to 7-bit (e.g. before DKIM signing) + smtpd_discard_ehlo_keywords => ['8BITMIME'], + bypass_banned_checks_maps => [1], # allow sending any file names and types +@@ -119,11 +122,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) @@ -132,9 +160,17 @@ index bb562e6..f2e0e40 100644 $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef @addr_extension_virus_maps = ('virus'); -@@ -157,10 +157,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! +@@ -154,13 +157,16 @@ $defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error + + # $myhostname = 'host.example.com'; # must be a fully-qualified domain name! + +-# $notify_method = 'smtp:[127.0.0.1]:10025'; +-# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! ++# The default forwarding port in the Fedora and RHEL SELinux policy is 10025. ++# To allow additional ports you need to label them as 'amavisd_send_port_t'. ++# For example: semanage port -a -t amavisd_send_port_t -p tcp 10023 ++# $notify_method = 'smtp:[127.0.0.1]:10023'; ++# $forward_method = 'smtp:[127.0.0.1]:10023'; # set to undef with milter! -# $final_virus_destiny = D_DISCARD; -# $final_banned_destiny = D_DISCARD; @@ -147,7 +183,7 @@ index bb562e6..f2e0e40 100644 # $bad_header_quarantine_method = undef; # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl -@@ -329,8 +329,8 @@ $banned_filename_re = new_RE( +@@ -329,8 +335,8 @@ $banned_filename_re = new_RE( ['lzma', \&do_uncompress, ['lzmadec', 'xz -dc --format=lzma', 'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ], @@ -158,7 +194,7 @@ index bb562e6..f2e0e40 100644 ['lzo', \&do_uncompress, 'lzop -d'], ['lz4', \&do_uncompress, ['lz4c -d'] ], ['rpm', \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ], -@@ -342,9 +342,9 @@ $banned_filename_re = new_RE( +@@ -342,9 +348,9 @@ $banned_filename_re = new_RE( ['arj', \&do_unarj, ['unarj', 'arj'] ], ['arc', \&do_arc, ['nomarch', 'arc'] ], ['zoo', \&do_zoo, ['zoo', 'unzoo'] ], @@ -170,7 +206,7 @@ index bb562e6..f2e0e40 100644 ['tnef', \&do_tnef], # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead # ['sit', \&do_unstuff, 'unstuff'], # not safe -@@ -382,16 +382,16 @@ $banned_filename_re = new_RE( +@@ -382,16 +388,16 @@ $banned_filename_re = new_RE( # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ], # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1 @@ -186,7 +222,7 @@ index bb562e6..f2e0e40 100644 -# # this entry; when running chrooted one may prefer a socket under $MYHOME. + ### http://www.clamav.net/ + ['ClamAV-clamd', -+ \&ask_daemon, ["CONTSCAN {}\n", "/run/clamd.amavisd/clamd.sock"], ++ \&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 @@ -197,7 +233,7 @@ index bb562e6..f2e0e40 100644 # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) # # note that Mail::ClamAV requires perl to be build with threading! -@@ -701,8 +701,8 @@ $banned_filename_re = new_RE( +@@ -701,8 +707,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 ], @@ -209,5 +245,5 @@ index bb562e6..f2e0e40 100644 ### http://www.ikarus-software.com/ ['Ikarus AntiVirus for Linux', 'ikarus', -- -2.21.0 +2.28.0 diff --git a/amavis.spec b/amavis.spec index 66cc7c0..1ad1ace 100644 --- a/amavis.spec +++ b/amavis.spec @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.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 @@ -18,7 +18,7 @@ Source5: README.quarantine Source8: amavisd-tmpfiles.conf Source9: amavisd.service Source10: amavisd-snmp.service -Patch0: amavis-2.12.0-conf.patch +Patch0: amavis-2.12.1-conf.patch BuildArch: noarch %if 0%{?fedora} BuildRequires: systemd-rpm-macros @@ -248,6 +248,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-3 +- Change ports in configuration file and add a note about SELinux (#1891003) + * Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-2 - Disable snmp subpackage in epel8 From 690bfebd471cbdc96e3b478894d3bcd8b5b6d989 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Fri, 1 Jan 2021 13:34:19 +0100 Subject: [PATCH 04/36] Change /var/run for /run (#1910344) --- amavis-2.12.1-conf.patch | 91 ++++++++++++++++++++++++++++++++++------ amavis.spec | 5 ++- 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/amavis-2.12.1-conf.patch b/amavis-2.12.1-conf.patch index 0f31e3c..25abb83 100644 --- a/amavis-2.12.1-conf.patch +++ b/amavis-2.12.1-conf.patch @@ -1,6 +1,6 @@ -From f3c1cba05de23ae0509847ee0912e945a9ba08b8 Mon Sep 17 00:00:00 2001 +From 46469a787fbc6c588c581d191dc695d6adf33d3f Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine -Date: Tue, 17 Nov 2020 19:43:51 +0100 +Date: Fri, 1 Jan 2021 13:30:16 +0100 Subject: [PATCH] Fedora configuration modifications --- @@ -8,11 +8,11 @@ Subject: [PATCH] Fedora configuration modifications amavisd-agent | 2 +- amavisd-nanny | 2 +- amavisd-signer | 4 +-- - amavisd.conf | 82 +++++++++++++++++++++++++++----------------------- - 5 files changed, 51 insertions(+), 45 deletions(-) + amavisd.conf | 98 ++++++++++++++++++++++++++------------------------ + 5 files changed, 59 insertions(+), 53 deletions(-) diff --git a/amavis-mc b/amavis-mc -index 88d9701..f6f8081 100755 +index 88d9701..5e7e0e7 100755 --- a/amavis-mc +++ b/amavis-mc @@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level @@ -25,7 +25,7 @@ index 88d9701..f6f8081 100755 +$daemon_group = 'amavis'; -$pid_file = '/var/amavis/amavis-mc.pid'; -+$pid_file = '/var/run/amavisd/amavis-mc.pid'; ++$pid_file = '/run/amavisd/amavis-mc.pid'; $log_level = 0; $syslog_ident = 'amavis-mc'; @@ -71,7 +71,7 @@ index f154646..3042b7c 100755 # $daemonize = 1; diff --git a/amavisd.conf b/amavisd.conf -index bb562e6..46df59a 100644 +index bb562e6..615a75a 100644 --- a/amavisd.conf +++ b/amavisd.conf @@ -17,25 +17,25 @@ use strict; @@ -102,8 +102,8 @@ index bb562e6..46df59a 100644 # $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 ++$lock_file = "/run/amavisd/amavisd.lock"; # -L ++$pid_file = "/run/amavisd/amavisd.pid"; # -P #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually $log_level = 0; # verbosity 0..5, -d @@ -112,7 +112,7 @@ index bb562e6..46df59a 100644 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 ++$unix_socketname = "/run/amavisd/amavisd.sock"; # amavisd-release or amavis-milter # option(s) -p overrides $inet_socket_port and $unix_socketname +# The default receiving port in the Fedora and RHEL SELinux policy is 10024. @@ -206,6 +206,22 @@ index bb562e6..46df59a 100644 ['tnef', \&do_tnef], # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead # ['sit', \&do_unstuff, 'unstuff'], # not safe +@@ -363,13 +369,13 @@ $banned_filename_re = new_RE( + + # ### http://www.sophos.com/ + # ['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 ], + + # ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/) + # ['Sophie', +-# \&ask_daemon, ["{}/\n", 'sophie:/var/run/sophie'], ++# \&ask_daemon, ["{}/\n", 'sophie:/run/sophie'], + # qr/(?x)^ 0+ ( : | [\000\r\n]* $)/, qr/(?x)^ 1 ( : | [\000\r\n]* $)/, + # qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], + @@ -382,16 +388,16 @@ $banned_filename_re = new_RE( # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ], # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1 @@ -222,7 +238,7 @@ index bb562e6..46df59a 100644 -# # 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"], ++ \&ask_daemon, ["CONTSCAN {}\n", "/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 @@ -233,6 +249,48 @@ index bb562e6..46df59a 100644 # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) # # note that Mail::ClamAV requires perl to be build with threading! +@@ -405,7 +411,7 @@ $banned_filename_re = new_RE( + + # ### http://www.vanja.com/tools/trophie/ + # ['Trophie', +-# \&ask_daemon, ["{}/\n", 'trophie:/var/run/trophie'], ++# \&ask_daemon, ["{}/\n", 'trophie:/run/trophie'], + # qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m, qr/(?x)^ 1 ( : | [\000\r\n]* $)/m, + # qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], + +@@ -442,7 +448,7 @@ $banned_filename_re = new_RE( + # pack('N',0). # content size + # pack('N',0), + # '/var/drweb/run/drwebd.sock', +-# # '/var/amavis/var/run/drwebd.sock', # suitable for chroot ++# # '/var/amavis/run/drwebd.sock', # suitable for chroot + # # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default + # # '127.0.0.1:3000', # or over an inet socket + # ], +@@ -457,7 +463,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'], +- '-p /var/run/aveserver -s {}/*', ++ '-p /run/aveserver -s {}/*', + [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m, + qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m, + ], +@@ -560,12 +566,12 @@ $banned_filename_re = new_RE( + # ### http://www.avast.com/ + # ['avast! Antivirus daemon', + # \&ask_daemon, # greets with 220, terminate with QUIT +-# ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'], ++# ["SCAN {}\015\012QUIT\015\012", '/run/avast4/mailscanner.sock'], + # qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t[0-9]+\s+([^[ \t\015\012]+)/m ], + + # ### http://www.avast.com/ + # ['avast! Antivirus - Client/Server Version', 'avastlite', +-# '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1], ++# '-a /run/avast4/mailscanner.sock -n {}', [0], [1], + # qr/\t\[L\]\t([^[ \t\015\012]+)/m ], + + ['CAI InoculateIT', 'inocucmd', # retired product @@ -701,8 +707,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 ], @@ -244,6 +302,15 @@ index bb562e6..46df59a 100644 ### http://www.ikarus-software.com/ ['Ikarus AntiVirus for Linux', 'ikarus', +@@ -763,7 +769,7 @@ $banned_filename_re = new_RE( + # [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], + + # ['ClamAV-clamd-stream', +-# \&ask_daemon, ["*", 'clamd:/var/run/clamav/clamd.sock'], ++# \&ask_daemon, ["*", 'clamd:/run/clamav/clamd.sock'], + # qr/\bOK$/m, qr/\bFOUND$/m, + # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], + -- -2.28.0 +2.29.2 diff --git a/amavis.spec b/amavis.spec index 1ad1ace..82e006b 100644 --- a/amavis.spec +++ b/amavis.spec @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.1 -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 @@ -248,6 +248,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Fri Jan 01 2021 Juan Orti Alcaine - 2.12.1-4 +- Change /var/run for /run (#1910344) + * Tue Nov 17 2020 Juan Orti Alcaine - 2.12.1-3 - Change ports in configuration file and add a note about SELinux (#1891003) From 4b6ac850007d77ff9ea324bf39b9bb8ff893d303 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Sat, 9 Jan 2021 16:38:30 +0100 Subject: [PATCH 05/36] Enable snmp subpackage in epel8 as net-snmp-perl is now available --- amavis.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/amavis.spec b/amavis.spec index 82e006b..5df133f 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,13 +1,9 @@ -%if 0%{?rhel} == 8 -%global with_snmp 0 -%else %global with_snmp 1 -%endif Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.1 -Release: 4%{?dist} +Release: 5%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -248,6 +244,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Sat Jan 09 2021 Juan Orti Alcaine - 2.12.1-5 +- Enable snmp subpackage in epel8 as net-snmp-perl is now available + * Fri Jan 01 2021 Juan Orti Alcaine - 2.12.1-4 - Change /var/run for /run (#1910344) From 9c9efa961cfc957c14e0f67008eceea030b179b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:02:24 +0000 Subject: [PATCH 06/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 5df133f..4743872 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.1 -Release: 5%{?dist} +Release: 6%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -244,6 +244,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Jan 09 2021 Juan Orti Alcaine - 2.12.1-5 - Enable snmp subpackage in epel8 as net-snmp-perl is now available From b0999762542a905add2d60dce0612298ef926899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:11 +0100 Subject: [PATCH 07/36] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- amavis.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 4743872..8668b7b 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.1 -Release: 6%{?dist} +Release: 7%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -244,6 +244,10 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.12.1-7 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.12.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From eb08b75900e991144edc80a7af74a7bf94d2d0f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:34:39 +0000 Subject: [PATCH 08/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 18fbe4759f8cea5674d5e6479d58c7be405124d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:30:04 +0000 Subject: [PATCH 09/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 8668b7b..668c206 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.1 -Release: 7%{?dist} +Release: 8%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -244,6 +244,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.12.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.12.1-7 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 00aa31eedee82bda2d246e100571aa31a4fb91fe Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Fri, 22 Oct 2021 17:21:58 +0200 Subject: [PATCH 10/36] Version 2.12.2 (#2013555) --- .gitignore | 1 + amavis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5aff4e9..6a62e0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /amavis-v2.12.0.tar.bz2 /amavis-v2.12.1.tar.bz2 +/amavis-v2.12.2.tar.bz2 diff --git a/amavis.spec b/amavis.spec index 668c206..4019428 100644 --- a/amavis.spec +++ b/amavis.spec @@ -2,8 +2,8 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.12.1 -Release: 8%{?dist} +Version: 2.12.2 +Release: 1%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -244,6 +244,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Fri Oct 22 2021 Juan Orti Alcaine - 2.12.2-1 +- Version 2.12.2 (#2013555) + * Wed Jul 21 2021 Fedora Release Engineering - 2.12.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 34128c7..6f8c4aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.12.1.tar.bz2) = 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013 +SHA512 (amavis-v2.12.2.tar.bz2) = 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff From f5f12fa9c724b5b718a2dae033be4b4be89f63ca Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 26 Oct 2021 14:36:47 +0200 Subject: [PATCH 11/36] Create amavis user with systemd sysusers --- amavis.spec | 15 +++++++++------ amavis.sysusers | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 amavis.sysusers diff --git a/amavis.spec b/amavis.spec index 4019428..1f93128 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: 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 @@ -14,6 +14,7 @@ Source5: README.quarantine Source8: amavisd-tmpfiles.conf Source9: amavisd.service Source10: amavisd-snmp.service +Source11: amavis.sysusers Patch0: amavis-2.12.1-conf.patch BuildArch: noarch %if 0%{?fedora} @@ -179,12 +180,10 @@ mkdir -p %{buildroot}%{_rundir}/{clamd.amavisd,amavisd} install -D -m 644 %{SOURCE8} %{buildroot}%{_tmpfilesdir}/amavisd.conf +install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf + %pre -getent group amavis > /dev/null || %{_sbindir}/groupadd -r amavis -getent passwd amavis > /dev/null || \ - %{_sbindir}/useradd -r -g amavis -d %{_localstatedir}/spool/amavisd -s /sbin/nologin \ - -c "User for amavis" amavis -exit 0 +%sysusers_create_compat %{SOURCE11} %preun %systemd_preun amavisd.service @@ -228,6 +227,7 @@ exit 0 %dir %attr(750,amavis,amavis) %{_localstatedir}/spool/amavisd/db %dir %attr(750,amavis,amavis) %{_localstatedir}/spool/amavisd/quarantine %{_tmpfilesdir}/amavisd.conf +%{_sysusersdir}/amavis.conf %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd @@ -244,6 +244,9 @@ exit 0 %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Tue Oct 26 2021 Juan Orti Alcaine - 2.12.2-2 +- Create amavis user with systemd sysusers + * Fri Oct 22 2021 Juan Orti Alcaine - 2.12.2-1 - Version 2.12.2 (#2013555) diff --git a/amavis.sysusers b/amavis.sysusers new file mode 100644 index 0000000..5fcaaf8 --- /dev/null +++ b/amavis.sysusers @@ -0,0 +1 @@ +u amavis - "Amavis email content filter" /var/spool/amavisd From 749fc626c8fc8a1b5b6ee13bfabed0cca6394348 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Thu, 6 Jan 2022 20:14:08 +0100 Subject: [PATCH 12/36] Remove perl(IO::Stringy) dependency --- amavis.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/amavis.spec b/amavis.spec index 1f93128..c1f63a2 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: 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 @@ -76,7 +76,6 @@ Requires: perl(Digest::SHA) 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) @@ -244,6 +243,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Thu Jan 06 2022 Juan Orti Alcaine - 2.12.2-3 +- Remove perl(IO::Stringy) dependency + * Tue Oct 26 2021 Juan Orti Alcaine - 2.12.2-2 - Create amavis user with systemd sysusers From 26ad9cc3e008d1916d789a2821f36f028f722750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:11:14 +0000 Subject: [PATCH 13/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index c1f63a2..be68630 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 @@ -243,6 +243,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 06 2022 Juan Orti Alcaine - 2.12.2-3 - Remove perl(IO::Stringy) dependency From 8287d1f28fdbe20c416f9326373e3352340034eb Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Tue, 8 Mar 2022 20:59:31 +0100 Subject: [PATCH 14/36] Update to master branch --- .gitignore | 1 + amavis-2.12.1-conf.patch => amavis-conf.patch | 202 ++++++++++-------- amavis.spec | 30 +-- sources | 2 +- 4 files changed, 126 insertions(+), 109 deletions(-) rename amavis-2.12.1-conf.patch => amavis-conf.patch (71%) diff --git a/.gitignore b/.gitignore index 6a62e0f..6163526 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /amavis-v2.12.0.tar.bz2 /amavis-v2.12.1.tar.bz2 /amavis-v2.12.2.tar.bz2 +/amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2 diff --git a/amavis-2.12.1-conf.patch b/amavis-conf.patch similarity index 71% rename from amavis-2.12.1-conf.patch rename to amavis-conf.patch index 25abb83..fab7697 100644 --- a/amavis-2.12.1-conf.patch +++ b/amavis-conf.patch @@ -1,39 +1,41 @@ -From 46469a787fbc6c588c581d191dc695d6adf33d3f Mon Sep 17 00:00:00 2001 +From 76405787e9cbb33dbf6cfe2ec18c539569bcb518 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine -Date: Fri, 1 Jan 2021 13:30:16 +0100 +Date: Tue, 8 Mar 2022 20:49:46 +0100 Subject: [PATCH] Fedora configuration modifications --- - amavis-mc | 6 ++-- - amavisd-agent | 2 +- - amavisd-nanny | 2 +- - amavisd-signer | 4 +-- - amavisd.conf | 98 ++++++++++++++++++++++++++------------------------ - 5 files changed, 59 insertions(+), 53 deletions(-) + bin/amavis-mc | 6 ++-- + bin/amavisd-agent | 2 +- + bin/amavisd-nanny | 2 +- + bin/amavisd-release | 4 +-- + bin/amavisd-signer | 4 +-- + bin/amavisd-submit | 6 ++-- + conf/amavisd.conf | 76 ++++++++++++++++++++++++--------------------- + 7 files changed, 53 insertions(+), 47 deletions(-) -diff --git a/amavis-mc b/amavis-mc -index 88d9701..5e7e0e7 100755 ---- a/amavis-mc -+++ b/amavis-mc -@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group $pid_file $log_level +diff --git a/bin/amavis-mc b/bin/amavis-mc +index 1c913e0..46e2013 100755 +--- a/bin/amavis-mc ++++ b/bin/amavis-mc +@@ -73,10 +73,10 @@ use vars qw(@path @services $daemon_user @daemon_groups $pid_file $log_level ### USER CONFIGURABLE: --$daemon_user = 'vscan'; --$daemon_group = 'vscan'; -+$daemon_user = 'amavis'; -+$daemon_group = 'amavis'; +-$daemon_user = 'vscan'; +-@daemon_groups = 'vscan'; ++$daemon_user = 'amavis'; ++@daemon_groups = 'amavis'; -$pid_file = '/var/amavis/amavis-mc.pid'; +$pid_file = '/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; +diff --git a/bin/amavisd-agent b/bin/amavisd-agent +index bbefbb3..fe44697 100755 +--- a/bin/amavisd-agent ++++ b/bin/amavisd-agent +@@ -54,7 +54,7 @@ use BerkeleyDB; my($dbfile) = 'snmp.db'; my($db_home) = # DB databases directory @@ -42,11 +44,11 @@ index 1ebe2bb..b8271a3 100755 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 +diff --git a/bin/amavisd-nanny b/bin/amavisd-nanny +index f9d7f6d..ffc9d54 100755 +--- a/bin/amavisd-nanny ++++ b/bin/amavisd-nanny +@@ -62,7 +62,7 @@ my($activettl) = 10*60; # stuck active children are sent a SIGTERM my($dbfile) = 'nanny.db'; my($db_home) = # DB databases directory @@ -55,33 +57,80 @@ index 80b84dc..164549f 100755 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 +diff --git a/bin/amavisd-release b/bin/amavisd-release +index 597c663..88ef695 100755 +--- a/bin/amavisd-release ++++ b/bin/amavisd-release +@@ -50,7 +50,7 @@ + # To be placed in amavisd.conf: + # $interface_policy{'SOCK'} = 'AM.PDP'; + # $policy_bank{'AM.PDP'} = { protocol=>'AM.PDP' }; +-# $unix_socketname = '/var/amavis/amavisd.sock'; ++# $unix_socketname = '/run/amavisd/amavisd.sock'; + # or: + # $interface_policy{'9998'} = 'AM.PDP'; + # $policy_bank{'AM.PDP'} = { protocol=>'AM.PDP' }; +@@ -88,7 +88,7 @@ BEGIN { + $log_level = 1; + # $socketname = '127.0.0.1:9998'; + # $socketname = '[::1]:9998'; +- $socketname = '/var/amavis/amavisd.sock'; ++ $socketname = '/run/amavisd/amavisd.sock'; + + ### END OF USER CONFIGURABLE + } +diff --git a/bin/amavisd-signer b/bin/amavisd-signer +index 680513c..6f537f4 100755 +--- a/bin/amavisd-signer ++++ b/bin/amavisd-signer +@@ -88,8 +88,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_user = 'vscan'; +-@daemon_groups = 'vscan'; ++$daemon_user = 'amavis'; ++@daemon_groups = 'amavis'; # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef # $daemonize = 1; -diff --git a/amavisd.conf b/amavisd.conf -index bb562e6..615a75a 100644 ---- a/amavisd.conf -+++ b/amavisd.conf +diff --git a/bin/amavisd-submit b/bin/amavisd-submit +index 7e8cedb..5eefdd7 100755 +--- a/bin/amavisd-submit ++++ b/bin/amavisd-submit +@@ -53,7 +53,7 @@ + # To be placed in amavisd.conf: + # $interface_policy{'SOCK'} = 'AM.PDP'; + # $policy_bank{'AM.PDP'} = { protocol=>'AM.PDP' }; +-# $unix_socketname = '/var/amavis/amavisd.sock'; ++# $unix_socketname = '/run/amavisd/amavisd.sock'; + + use warnings; + use warnings FATAL => 'utf8'; +@@ -73,9 +73,9 @@ BEGIN { + ### USER CONFIGURABLE: + + $log_level = 0; +- $tempbase = '/var/amavis/tmp'; # where to create a temp directory with a msg ++ $tempbase = '/run/amavisd/tmp'; # where to create a temp directory with a msg + +- $socketname = '/var/amavis/amavisd.sock'; ++ $socketname = '/run/amavisd/amavisd.sock'; + # $socketname = '127.0.0.1:9998'; + # $socketname = '[::1]:9998'; + +diff --git a/conf/amavisd.conf b/conf/amavisd.conf +index 71e6f6e..f907710 100644 +--- a/conf/amavisd.conf ++++ b/conf/amavisd.conf @@ -17,25 +17,25 @@ use strict; # truncation in /proc//stat and ps -e output $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 +-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u +-@daemon_groups = 'vscan'; # (leave empty to use $daemon_user's supplementary groups), -g ++$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u ++@daemon_groups = 'amavis'; # (leave empty to use $daemon_user's supplementary groups), -g $mydomain = 'example.com'; # a convenient default for other settings @@ -90,7 +139,7 @@ index bb562e6..615a75a 100644 $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 ++$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' @@ -98,7 +147,7 @@ index bb562e6..615a75a 100644 # $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 ++$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 @@ -206,7 +255,7 @@ index bb562e6..615a75a 100644 ['tnef', \&do_tnef], # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead # ['sit', \&do_unstuff, 'unstuff'], # not safe -@@ -363,13 +369,13 @@ $banned_filename_re = new_RE( +@@ -390,7 +396,7 @@ $banned_filename_re = new_RE( # ### http://www.sophos.com/ # ['Sophos-SSSP', # SAV Dynamic Interface @@ -215,50 +264,7 @@ index bb562e6..615a75a 100644 # # or: ["{}", 'sssp:[127.0.0.1]:4010'], # qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ], - # ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/) - # ['Sophie', --# \&ask_daemon, ["{}/\n", 'sophie:/var/run/sophie'], -+# \&ask_daemon, ["{}/\n", 'sophie:/run/sophie'], - # qr/(?x)^ 0+ ( : | [\000\r\n]* $)/, qr/(?x)^ 1 ( : | [\000\r\n]* $)/, - # qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], - -@@ -382,16 +388,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", "/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! -@@ -405,7 +411,7 @@ $banned_filename_re = new_RE( - - # ### http://www.vanja.com/tools/trophie/ - # ['Trophie', --# \&ask_daemon, ["{}/\n", 'trophie:/var/run/trophie'], -+# \&ask_daemon, ["{}/\n", 'trophie:/run/trophie'], - # qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m, qr/(?x)^ 1 ( : | [\000\r\n]* $)/m, - # qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ], - -@@ -442,7 +448,7 @@ $banned_filename_re = new_RE( +@@ -436,7 +442,7 @@ $banned_filename_re = new_RE( # pack('N',0). # content size # pack('N',0), # '/var/drweb/run/drwebd.sock', @@ -267,7 +273,7 @@ index bb562e6..615a75a 100644 # # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default # # '127.0.0.1:3000', # or over an inet socket # ], -@@ -457,7 +463,7 @@ $banned_filename_re = new_RE( +@@ -451,7 +457,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'], @@ -302,8 +308,14 @@ index bb562e6..615a75a 100644 ### http://www.ikarus-software.com/ ['Ikarus AntiVirus for Linux', 'ikarus', -@@ -763,7 +769,7 @@ $banned_filename_re = new_RE( - # [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], +@@ -800,12 +806,12 @@ $banned_filename_re = new_RE( + # /etc/clamd.conf, or may be controlled by your service manager / init. + # + # ['ClamAV-clamd', +-# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"], ++# \&ask_daemon, ["CONTSCAN {}\n", "/run/clamav/clamd.sock"], + # qr/\bOK$/m, qr/\bFOUND$/m, + # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], # ['ClamAV-clamd-stream', -# \&ask_daemon, ["*", 'clamd:/var/run/clamav/clamd.sock'], @@ -312,5 +324,5 @@ index bb562e6..615a75a 100644 # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], -- -2.29.2 +2.35.1 diff --git a/amavis.spec b/amavis.spec index be68630..4d84694 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,13 +1,15 @@ +%global commit b5619240f3dbbf008549d6688ffd78148c0c6a9d +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global with_snmp 1 Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 4%{?dist} +Release: 5.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis -Source0: https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2 +Source0: https://gitlab.com/amavis/amavis/-/archive/%{commit}/amavis-%{commit}.tar.bz2 Source2: amavis-clamd.conf Source4: README.fedora Source5: README.quarantine @@ -15,7 +17,7 @@ Source8: amavisd-tmpfiles.conf Source9: amavisd.service Source10: amavisd-snmp.service Source11: amavis.sysusers -Patch0: amavis-2.12.1-conf.patch +Patch0: amavis-conf.patch BuildArch: noarch %if 0%{?fedora} BuildRequires: systemd-rpm-macros @@ -92,7 +94,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) @@ -146,24 +148,22 @@ alerting purposes. Documentation files for amavis %prep -%setup -q -n %{name}-v%{version} -%patch0 -p1 +%autosetup -p1 -n %{name}-%{commit} install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/ -sed -e 's,/var/amavis/amavisd.sock\>,%{_rundir}/amavisd/amavisd.sock,' -i amavisd-{release,submit} %build %install rm -rf %{buildroot} -install -D -p -m 755 amavisd %{buildroot}%{_sbindir}/amavisd +install -D -p -m 755 bin/amavisd %{buildroot}%{_sbindir}/amavisd %if %{?with_snmp} -install -D -p -m 755 amavisd-snmp-subagent %{buildroot}%{_sbindir}/amavisd-snmp-subagent +install -D -p -m 755 bin/amavisd-snmp-subagent %{buildroot}%{_sbindir}/amavisd-snmp-subagent %endif mkdir -p %{buildroot}%{_bindir} -install -p -m 755 amavisd-{agent,nanny,release,signer,submit} %{buildroot}%{_bindir}/ +install -p -m 755 bin/amavisd-{agent,nanny,release,signer,submit} %{buildroot}%{_bindir}/ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/amavisd.service %if %{?with_snmp} @@ -171,7 +171,7 @@ install -D -p -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/amavisd-snmp.service %endif mkdir -p -m 0755 %{buildroot}%{_sysconfdir}/clamd.d -install -D -p -m 644 amavisd.conf %{buildroot}%{_sysconfdir}/amavisd/amavisd.conf +install -D -p -m 644 conf/amavisd.conf %{buildroot}%{_sysconfdir}/amavisd/amavisd.conf install -D -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/clamd.d/amavisd.conf mkdir -p %{buildroot}%{_localstatedir}/spool/amavisd/{tmp,db,quarantine} @@ -239,10 +239,14 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %files doc %license LICENSE -%doc AAAREADME.first LDAP.schema LDAP.ldif RELEASE_NOTES TODO -%doc README_FILES test-messages amavisd.conf-* amavisd-custom.conf +%doc AAAREADME.first contrib/LDAP.schema contrib/LDAP.ldif RELEASE_NOTES TODO +%doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Tue Mar 08 2022 Juan Orti Alcaine - 2.12.2-5.gitb561924 +- Update to master branch +- Switch from Net:LibIDN to Net:LibIDN2 + * Wed Jan 19 2022 Fedora Release Engineering - 2.12.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 6f8c4aa..0a9c79d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.12.2.tar.bz2) = 8a6ab4441a9ef2ee757c839f656bc16f00dd9213f6cc0bb976d7f2b76793adf023d33a42099f07b0dae13281171db9ba0405028882a86e2230126e8d6a29a4ff +SHA512 (amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2) = ac973af22192c8fec699935a6cc7edfb8a204151c332a6c233697a6e1a447f1629c3d150839e2e2af99bf7e10ab9d460f5d7006be0dadf87e90038f6a768fff7 From 6270bd50d8905d1aa32f7dd041b1377faa444ede Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Wed, 9 Mar 2022 16:18:27 +0100 Subject: [PATCH 15/36] create perl-Amavis subpackage --- amavis.spec | 59 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/amavis.spec b/amavis.spec index 4d84694..6274db6 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,11 +1,13 @@ %global commit b5619240f3dbbf008549d6688ffd78148c0c6a9d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global with_snmp 1 + +# SNMP enabled by default +%bcond_without snmp Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -25,6 +27,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: systemd %endif BuildRequires: perl-generators +BuildRequires: perl-interpreter %if 0%{?rhel} > 7 || 0%{?fedora} > 24 Suggests: %{name}-doc Recommends: clamav-server-systemd @@ -41,9 +44,6 @@ Recommends: p7zip, p7zip-plugins Recommends: tar Recommends: unzoo Recommends: perl(DBD::SQLite) -Recommends: perl(DBI) -Recommends: perl(Mail::SpamAssassin) -Recommends: perl(Net::LDAP) Recommends: perl(Convert::TNEF) Recommends: perl(Convert::UUlib) %else @@ -60,25 +60,16 @@ Requires: p7zip, p7zip-plugins Requires: tar Requires: unzoo Requires: perl(DBD::SQLite) -Requires: perl(DBI) -Requires: perl(Mail::SpamAssassin) -Requires: perl(Net::LDAP) %endif +Requires: perl-Amavis = %{version}-%{release} Requires: clamav-filesystem Requires: altermime Requires: file Requires: perl(Archive::Tar) -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(Crypt::OpenSSL::RSA) -Requires: perl(Digest::MD5) >= 2.22 -Requires: perl(Digest::SHA) Requires: perl(File::LibMagic) Requires: perl(IO::Socket::IP) -Requires: perl(IO::Socket::SSL) -Requires: perl(MIME::Base64) Requires: perl(MIME::Body) Requires: perl(MIME::Decoder::Base64) Requires: perl(MIME::Decoder::Binary) @@ -87,8 +78,6 @@ Requires: perl(MIME::Decoder::NBit) Requires: perl(MIME::Decoder::QuotedPrint) Requires: perl(MIME::Decoder::UU) Requires: perl(MIME::Head) -Requires: perl(MIME::Parser) -Requires: perl(Mail::DKIM) >= 0.31 Requires: perl(Mail::Field) Requires: perl(Mail::Header) Requires: perl(Mail::Internet) >= 1.58 @@ -96,20 +85,20 @@ Requires: perl(Mail::SPF) Requires: perl(Net::DNS) Requires: perl(Net::LibIDN2) Requires: perl(Net::SSLeay) -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 Obsoletes: amavisd-new-zeromq <= 2.11.0-5 Obsoletes: amavisd-new-snmp-zeromq <= 2.11.0-5 Provides: amavisd-new = %{version}-%{release} Obsoletes: amavisd-new < 2.12.0-3 -%if %{?with_snmp} +%package -n perl-Amavis +Summary: Amavis perl module +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%if %{with snmp} %package snmp Summary: Exports amavis SNMP data Requires: %{name} = %{version}-%{release} @@ -122,6 +111,9 @@ Summary: Amavis doc files Provides: amavisd-new-doc = %{version}-%{release} Obsoletes: amavisd-new-doc < 2.12.0-3 +%description -n perl-Amavis +Amavis perl module used by the amavis mail scanner service. + %description amavis is a high-performance and reliable interface between mailer (MTA) and one or more content checkers: virus scanners, and/or @@ -130,7 +122,7 @@ reliability, portability and maintainability. It talks to MTA via (E)SMTP or LMTP, or by using helper programs. No timing gaps exist in the design which could cause a mail loss. -%if %{?with_snmp} +%if %{with snmp} %description snmp This package contains the program amavisd-snmp-subagent, which can be used as a SNMP AgentX, exporting amavisd statistical counters database @@ -149,13 +141,13 @@ Documentation files for amavis %prep %autosetup -p1 -n %{name}-%{commit} - install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/ %build %install -rm -rf %{buildroot} +mkdir -p -m 0755 %{buildroot}%{perl_vendorlib} +cp -pr lib/* %{buildroot}%{perl_vendorlib}/ install -D -p -m 755 bin/amavisd %{buildroot}%{_sbindir}/amavisd %if %{?with_snmp} @@ -166,7 +158,7 @@ mkdir -p %{buildroot}%{_bindir} install -p -m 755 bin/amavisd-{agent,nanny,release,signer,submit} %{buildroot}%{_bindir}/ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/amavisd.service -%if %{?with_snmp} +%if %{with snmp} install -D -p -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/amavisd-snmp.service %endif @@ -187,7 +179,7 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %preun %systemd_preun amavisd.service -%if %{?with_snmp} +%if %{with snmp} %preun snmp %systemd_preun amavisd-snmp.service %endif @@ -195,7 +187,7 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %post %systemd_post amavisd.service -%if %{?with_snmp} +%if %{with snmp} %post snmp %systemd_post amavisd-snmp.service %endif @@ -203,7 +195,7 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %postun %systemd_postun_with_restart amavisd.service -%if %{?with_snmp} +%if %{with snmp} %postun snmp %systemd_postun_with_restart amavisd-snmp.service %endif @@ -230,7 +222,11 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd -%if %{?with_snmp} +%files -n perl-Amavis +%license LICENSE +%{perl_vendorlib}/* + +%if %{with snmp} %files snmp %doc AMAVIS-MIB.txt %{_unitdir}/amavisd-snmp.service @@ -243,6 +239,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Wed Mar 09 2022 Juan Orti Alcaine - 2.12.2-6.gitb561924 +- create perl-Amavis subpackage + * Tue Mar 08 2022 Juan Orti Alcaine - 2.12.2-5.gitb561924 - Update to master branch - Switch from Net:LibIDN to Net:LibIDN2 From 1ce60a22bfad36cd9a7e7eff19fe0c1519f8a69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Wed, 7 Jul 2021 14:01:55 +0200 Subject: [PATCH 16/36] Remove dependency to Socket6, in Socket is support for IPv6 too --- amavis.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amavis.spec b/amavis.spec index 6274db6..6bc694a 100644 --- a/amavis.spec +++ b/amavis.spec @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 6.git%{shortcommit}%{?dist} +Release: 7.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -87,7 +87,7 @@ Requires: perl(Net::LibIDN2) Requires: perl(Net::SSLeay) Requires: perl(NetAddr::IP) Requires: perl(Razor2::Client::Version) -Requires: perl(Socket6) +Requires: perl(Socket) Requires: perl(URI) Obsoletes: amavisd-new-zeromq <= 2.11.0-5 Obsoletes: amavisd-new-snmp-zeromq <= 2.11.0-5 @@ -239,6 +239,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Tue Apr 04 2022 Michal Josef Špaček - 2.12.2-7.gitb561924 +- Remove dependency to Socket6, in Socket is support for IPv6 too + * Wed Mar 09 2022 Juan Orti Alcaine - 2.12.2-6.gitb561924 - create perl-Amavis subpackage From a14ba398043b765c10edea87f2801f643b9f3550 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Mon, 30 May 2022 09:29:44 +0200 Subject: [PATCH 17/36] Update to latest git snapshot --- .gitignore | 1 + amavis.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6163526..5280dc9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /amavis-v2.12.1.tar.bz2 /amavis-v2.12.2.tar.bz2 /amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2 +/amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2 diff --git a/amavis.spec b/amavis.spec index 6bc694a..652f01f 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,4 +1,4 @@ -%global commit b5619240f3dbbf008549d6688ffd78148c0c6a9d +%global commit 35407e96537e1e42bc01961eb428fa389c24c15f %global shortcommit %(c=%{commit}; echo ${c:0:7}) # SNMP enabled by default @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 7.git%{shortcommit}%{?dist} +Release: 8.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -239,7 +239,10 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog -* Tue Apr 04 2022 Michal Josef Špaček - 2.12.2-7.gitb561924 +* Mon May 30 2022 Juan Orti Alcaine - 2.12.2-8.git35407e9 +- Update to latest git snapshot + +* Mon Apr 04 2022 Michal Josef Špaček - 2.12.2-7.gitb561924 - Remove dependency to Socket6, in Socket is support for IPv6 too * Wed Mar 09 2022 Juan Orti Alcaine - 2.12.2-6.gitb561924 diff --git a/sources b/sources index 0a9c79d..58905ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2) = ac973af22192c8fec699935a6cc7edfb8a204151c332a6c233697a6e1a447f1629c3d150839e2e2af99bf7e10ab9d460f5d7006be0dadf87e90038f6a768fff7 +SHA512 (amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2) = df94be2e8847eca2367639689a0991a1c8a459d35f1a4845e30a3d3f471b9ec31f8cb4b3b6b49085a175f0fb1d261561c3a8cce616858ac1a2c81478d6fceb4e From 68ffba45149664788b31e335b797937a3e10ef66 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:33:37 +0200 Subject: [PATCH 18/36] Perl 5.36 rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 652f01f..75dea96 100644 --- a/amavis.spec +++ b/amavis.spec @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 8.git%{shortcommit}%{?dist} +Release: 9.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -239,6 +239,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Mon May 30 2022 Jitka Plesnikova - 2.12.2-9.git35407e9 +- Perl 5.36 rebuild + * Mon May 30 2022 Juan Orti Alcaine - 2.12.2-8.git35407e9 - Update to latest git snapshot From 0259cdb3819e7d8b19a07773b2fad1a98cb8cc3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:43:04 +0000 Subject: [PATCH 19/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 75dea96..0597960 100644 --- a/amavis.spec +++ b/amavis.spec @@ -7,7 +7,7 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis Version: 2.12.2 -Release: 9.git%{shortcommit}%{?dist} +Release: 10.git%{shortcommit}%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis @@ -239,6 +239,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.12.2-10.git35407e9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 2.12.2-9.git35407e9 - Perl 5.36 rebuild From 0872b39b2e2052c23813aae01c0af8dadaeaf8d8 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Sun, 8 Jan 2023 11:57:10 +0100 Subject: [PATCH 20/36] Version 2.13.0 (RHBZ#2158819) --- .gitignore | 1 + amavis.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5280dc9..62449b6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /amavis-v2.12.2.tar.bz2 /amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2 /amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2 +/amavis-v2.13.0.tar.bz2 diff --git a/amavis.spec b/amavis.spec index 0597960..025b309 100644 --- a/amavis.spec +++ b/amavis.spec @@ -1,17 +1,14 @@ -%global commit 35407e96537e1e42bc01961eb428fa389c24c15f -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - # SNMP enabled by default %bcond_without snmp Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.12.2 -Release: 10.git%{shortcommit}%{?dist} +Version: 2.13.0 +Release: 1%{?dist} # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+ License: GPLv2+ and BSD and GFDL URL: https://gitlab.com/amavis/amavis -Source0: https://gitlab.com/amavis/amavis/-/archive/%{commit}/amavis-%{commit}.tar.bz2 +Source0: https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2 Source2: amavis-clamd.conf Source4: README.fedora Source5: README.quarantine @@ -140,7 +137,7 @@ alerting purposes. Documentation files for amavis %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 -n %{name}-v%{version} install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/ %build @@ -239,6 +236,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Sun Jan 08 2023 Juan Orti Alcaine - 2.13.0-1 +- Version 2.13.0 (RHBZ#2158819) + * Wed Jul 20 2022 Fedora Release Engineering - 2.12.2-10.git35407e9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 58905ed..dfc01a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2) = df94be2e8847eca2367639689a0991a1c8a459d35f1a4845e30a3d3f471b9ec31f8cb4b3b6b49085a175f0fb1d261561c3a8cce616858ac1a2c81478d6fceb4e +SHA512 (amavis-v2.13.0.tar.bz2) = b4d623b212bd2bbdcd192cee603941af3854bcd6c09ed1d6194138c0d7e10160ab1fece821bdd134ae86a1f8e5ccd4b3f92643f2f2b4c73c3f0c1e30e4b97441 From 92738e4edbbe72df9b5a69fe8589f672211bfcd9 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:25:56 +0100 Subject: [PATCH 21/36] Remove perl(MODULE_COMPAT), it will be replaced by generators --- amavis.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 025b309..7ffe1ea 100644 --- a/amavis.spec +++ b/amavis.spec @@ -93,7 +93,6 @@ 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 74434dcaebcda54325ed596c0cf68289b47c93ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:39:50 +0000 Subject: [PATCH 22/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 7ffe1ea..b827223 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: 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 @@ -235,6 +235,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jan 08 2023 Juan Orti Alcaine - 2.13.0-1 - Version 2.13.0 (RHBZ#2158819) From 90d5664891b8ed2c590b9bfc4c6509ff9fbb882b Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Thu, 23 Feb 2023 20:38:18 +0100 Subject: [PATCH 23/36] Update configuration to use clamdscan --- amavis-conf.patch | 44 +++++++++++++++++++++++++++----------------- amavis.spec | 6 +++++- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/amavis-conf.patch b/amavis-conf.patch index fab7697..fee57de 100644 --- a/amavis-conf.patch +++ b/amavis-conf.patch @@ -1,6 +1,6 @@ -From 76405787e9cbb33dbf6cfe2ec18c539569bcb518 Mon Sep 17 00:00:00 2001 +From b23efd704ca7b663276a1d03ae7dcd25b12f5607 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine -Date: Tue, 8 Mar 2022 20:49:46 +0100 +Date: Thu, 23 Feb 2023 20:35:47 +0100 Subject: [PATCH] Fedora configuration modifications --- @@ -10,8 +10,8 @@ Subject: [PATCH] Fedora configuration modifications bin/amavisd-release | 4 +-- bin/amavisd-signer | 4 +-- bin/amavisd-submit | 6 ++-- - conf/amavisd.conf | 76 ++++++++++++++++++++++++--------------------- - 7 files changed, 53 insertions(+), 47 deletions(-) + conf/amavisd.conf | 79 ++++++++++++++++++++++++--------------------- + 7 files changed, 55 insertions(+), 48 deletions(-) diff --git a/bin/amavis-mc b/bin/amavis-mc index 1c913e0..46e2013 100755 @@ -120,7 +120,7 @@ index 7e8cedb..5eefdd7 100755 # $socketname = '[::1]:9998'; diff --git a/conf/amavisd.conf b/conf/amavisd.conf -index 71e6f6e..f907710 100644 +index f9de495..c1058e9 100644 --- a/conf/amavisd.conf +++ b/conf/amavisd.conf @@ -17,25 +17,25 @@ use strict; @@ -209,7 +209,7 @@ index 71e6f6e..f907710 100644 $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef @addr_extension_virus_maps = ('virus'); -@@ -154,13 +157,16 @@ $defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error +@@ -166,13 +169,16 @@ $defang_by_ccat{CC_BADH.",6"} = 1; # header field syntax error # $myhostname = 'host.example.com'; # must be a fully-qualified domain name! @@ -232,7 +232,7 @@ index 71e6f6e..f907710 100644 # $bad_header_quarantine_method = undef; # $os_fingerprint_method = 'p0f:*:2345'; # to query p0f-analyzer.pl -@@ -329,8 +335,8 @@ $banned_filename_re = new_RE( +@@ -341,8 +347,8 @@ $banned_filename_re = new_RE( ['lzma', \&do_uncompress, ['lzmadec', 'xz -dc --format=lzma', 'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ], @@ -243,7 +243,7 @@ index 71e6f6e..f907710 100644 ['lzo', \&do_uncompress, 'lzop -d'], ['lz4', \&do_uncompress, ['lz4c -d'] ], ['rpm', \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ], -@@ -342,9 +348,9 @@ $banned_filename_re = new_RE( +@@ -354,9 +360,9 @@ $banned_filename_re = new_RE( ['arj', \&do_unarj, ['unarj', 'arj'] ], ['arc', \&do_arc, ['nomarch', 'arc'] ], ['zoo', \&do_zoo, ['zoo', 'unzoo'] ], @@ -255,7 +255,17 @@ index 71e6f6e..f907710 100644 ['tnef', \&do_tnef], # ['lha', \&do_lha, 'lha'], # not safe, use 7z instead # ['sit', \&do_unstuff, 'unstuff'], # not safe -@@ -390,7 +396,7 @@ $banned_filename_re = new_RE( +@@ -393,7 +399,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). + # +- ['ClamAV-clamdscan', 'clamdscan', "--fdpass --stdout --no-summary {}", ++ ['ClamAV-clamdscan', 'clamdscan', ++ "--config-file=/etc/clamd.d/amavisd.conf --fdpass --stdout --no-summary {}", + [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( # ### http://www.sophos.com/ # ['Sophos-SSSP', # SAV Dynamic Interface @@ -264,7 +274,7 @@ index 71e6f6e..f907710 100644 # # or: ["{}", 'sssp:[127.0.0.1]:4010'], # qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ], -@@ -436,7 +442,7 @@ $banned_filename_re = new_RE( +@@ -449,7 +456,7 @@ $banned_filename_re = new_RE( # pack('N',0). # content size # pack('N',0), # '/var/drweb/run/drwebd.sock', @@ -273,7 +283,7 @@ index 71e6f6e..f907710 100644 # # '/usr/local/drweb/run/drwebd.sock', # FreeBSD drweb ports default # # '127.0.0.1:3000', # or over an inet socket # ], -@@ -451,7 +457,7 @@ $banned_filename_re = new_RE( +@@ -464,7 +471,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'], @@ -282,7 +292,7 @@ index 71e6f6e..f907710 100644 [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m, qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m, ], -@@ -560,12 +566,12 @@ $banned_filename_re = new_RE( +@@ -573,12 +580,12 @@ $banned_filename_re = new_RE( # ### http://www.avast.com/ # ['avast! Antivirus daemon', # \&ask_daemon, # greets with 220, terminate with QUIT @@ -297,7 +307,7 @@ index 71e6f6e..f907710 100644 # qr/\t\[L\]\t([^[ \t\015\012]+)/m ], ['CAI InoculateIT', 'inocucmd', # retired product -@@ -701,8 +707,8 @@ $banned_filename_re = new_RE( +@@ -714,8 +721,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 ], @@ -308,21 +318,21 @@ index 71e6f6e..f907710 100644 ### http://www.ikarus-software.com/ ['Ikarus AntiVirus for Linux', 'ikarus', -@@ -800,12 +806,12 @@ $banned_filename_re = new_RE( +@@ -813,12 +820,12 @@ $banned_filename_re = new_RE( # /etc/clamd.conf, or may be controlled by your service manager / init. # # ['ClamAV-clamd', -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"], -+# \&ask_daemon, ["CONTSCAN {}\n", "/run/clamav/clamd.sock"], ++# \&ask_daemon, ["CONTSCAN {}\n", "/run/clamd.amavisd/clamd.sock"], # qr/\bOK$/m, qr/\bFOUND$/m, # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], # ['ClamAV-clamd-stream', -# \&ask_daemon, ["*", 'clamd:/var/run/clamav/clamd.sock'], -+# \&ask_daemon, ["*", 'clamd:/run/clamav/clamd.sock'], ++# \&ask_daemon, ["*", 'clamd:/run/clamd.amavisd/clamd.sock'], # qr/\bOK$/m, qr/\bFOUND$/m, # qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ], -- -2.35.1 +2.39.2 diff --git a/amavis.spec b/amavis.spec index b827223..daa280f 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: 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 @@ -28,6 +28,7 @@ BuildRequires: perl-interpreter %if 0%{?rhel} > 7 || 0%{?fedora} > 24 Suggests: %{name}-doc Recommends: clamav-server-systemd +Recommends: clamav Recommends: binutils Recommends: arj Recommends: bzip2 @@ -235,6 +236,9 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %doc README_FILES conf/amavisd.conf-* conf/amavisd-custom.conf %changelog +* Thu Feb 23 2023 Juan Orti Alcaine - 2.13.0-3 +- Update configuration to use clamdscan + * Wed Jan 18 2023 Fedora Release Engineering - 2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From cb1fef656591e7b6c70ffa1a2555850e665fd873 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Sat, 6 May 2023 19:39:43 -0500 Subject: [PATCH 24/36] 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 daa280f..2bded71 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} @@ -170,6 +171,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} @@ -218,6 +221,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/%{name} %files -n perl-Amavis %license LICENSE @@ -236,6 +240,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 2a23b163fd1bdafb9bfe8ad65e5bc39b427bbf26 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Sun, 7 May 2023 10:16:31 +0200 Subject: [PATCH 25/36] Fix sysconfig file name --- amavis.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index 2bded71..be0d7e0 100644 --- a/amavis.spec +++ b/amavis.spec @@ -221,7 +221,7 @@ install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd %{_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/%{name} +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/amavisd %files -n perl-Amavis %license LICENSE From aa159981c1f77f9aed6a37f45491555bc0c5271e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:11:55 +0000 Subject: [PATCH 26/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index be0d7e0..f2e7caa 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: 4%{?dist} +Release: 5%{?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 19 2023 Fedora Release Engineering - 2.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat May 06 2023 Chris Adams - 2.13.0-4 - Add a syconfig file to be able to add arguments From 15a5402dd0ce7ac4a8271f6a3b2eba42ee20c45b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:48:57 +0000 Subject: [PATCH 27/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index f2e7caa..b2c29c4 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: 5%{?dist} +Release: 6%{?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 +* Fri Jan 19 2024 Fedora Release Engineering - 2.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 93c59ee54c68bba20a7e102944aee02325ffd262 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:58:29 +0000 Subject: [PATCH 28/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- amavis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amavis.spec b/amavis.spec index b2c29c4..3a26aa2 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: 6%{?dist} +Release: 7%{?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 +* Mon Jan 22 2024 Fedora Release Engineering - 2.13.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.13.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb17c23e32004ae2f3455c50afb32dca2fa0f648 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: Thu, 14 Mar 2024 13:30:07 +0100 Subject: [PATCH 29/36] Update to version 2.13.1 --- .gitignore | 1 + amavis.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62449b6..9a5de4c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2 /amavis-35407e96537e1e42bc01961eb428fa389c24c15f.tar.bz2 /amavis-v2.13.0.tar.bz2 +/amavis-v2.13.1.tar.bz2 diff --git a/amavis.spec b/amavis.spec index 3a26aa2..f1e4279 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.0 -Release: 7%{?dist} +Version: 2.13.1 +Release: 1%{?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 Mar 14 2024 Juan Orti Alcaine - 2.13.1-1 +- Update to version 2.13.1 + * Mon Jan 22 2024 Fedora Release Engineering - 2.13.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index dfc01a2..5402efe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.13.0.tar.bz2) = b4d623b212bd2bbdcd192cee603941af3854bcd6c09ed1d6194138c0d7e10160ab1fece821bdd134ae86a1f8e5ccd4b3f92643f2f2b4c73c3f0c1e30e4b97441 +SHA512 (amavis-v2.13.1.tar.bz2) = 90a67fa246a2446a4fb3733f10cdb21e25f6f2aea4293a3880606e57cfa1b4c568e1670ec2a43f1d38fdf13d8eab8d22e3e293f86f594968e194dc2c8a5ae992 From 4703551714ac969b6fba17864e839ba440e68458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:55:01 +0000 Subject: [PATCH 30/36] 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 31/36] 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 32/36] 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 33/36] 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 34/36] 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 35/36] 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 36/36] 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