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 1/4] 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 2/4] 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 3/4] 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 4/4] 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