diff --git a/.gitignore b/.gitignore index 62449b6..7b5d5ef 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /amavis-b5619240f3dbbf008549d6688ffd78148c0c6a9d.tar.bz2 /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 daa280f..5124df0 100644 --- a/amavis.spec +++ b/amavis.spec @@ -3,10 +3,10 @@ Summary: Email filter with virus scanner and spamassassin support Name: amavis -Version: 2.13.0 +Version: 2.14.0 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 @@ -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,8 +171,8 @@ install -D -m 644 %{SOURCE8} %{buildroot}%{_tmpfilesdir}/amavisd.conf install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf -%pre -%sysusers_create_compat %{SOURCE11} +install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/amavisd + %preun %systemd_preun amavisd.service @@ -218,6 +219,7 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %{_sysusersdir}/amavis.conf %dir %attr(755,amavis,amavis) %{_rundir}/amavisd %dir %attr(770,amavis,clamupdate) %{_rundir}/clamd.amavisd +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/amavisd %files -n perl-Amavis %license LICENSE @@ -236,6 +238,39 @@ install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/amavis.conf %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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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="" diff --git a/sources b/sources index dfc01a2..570a1a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amavis-v2.13.0.tar.bz2) = b4d623b212bd2bbdcd192cee603941af3854bcd6c09ed1d6194138c0d7e10160ab1fece821bdd134ae86a1f8e5ccd4b3f92643f2f2b4c73c3f0c1e30e4b97441 +SHA512 (amavis-v2.14.0.tar.bz2) = 49303d86947d7ae258c6def8cf9892ff062fd054b4bc6451b1670426a5d767782ed7febd350237d36d4b62db408cbb993b6b4522eb595ead77faafb07012fe58