41 lines
1.9 KiB
Plaintext
41 lines
1.9 KiB
Plaintext
--- amavisd.orig 2025-05-11 13:36:08 UTC
|
|
+++ amavisd
|
|
@@ -1741,13 +1741,13 @@ BEGIN {
|
|
['tnef', \&Amavis::Unpackers::do_tnef],
|
|
# ['lha', \&Amavis::Unpackers::do_lha, \$lha], # not safe, use 7z instead
|
|
# ['sit', \&Amavis::Unpackers::do_unstuff, \$unstuff], # not safe
|
|
- [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ],
|
|
+ [['zip','kmz'], \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ],
|
|
[['zip','kmz'], \&Amavis::Unpackers::do_unzip],
|
|
- ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7z'] ],
|
|
+ ['7z', \&Amavis::Unpackers::do_7zip, ['7zr', '7za', '7zz', '7z'] ],
|
|
[[qw(gz bz2 Z tar)],
|
|
- \&Amavis::Unpackers::do_7zip, ['7za', '7z'] ],
|
|
+ \&Amavis::Unpackers::do_7zip, ['7za', '7zz', '7z'] ],
|
|
[[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
|
|
- \&Amavis::Unpackers::do_7zip, '7z' ],
|
|
+ \&Amavis::Unpackers::do_7zip, ['7zz', '7z'] ],
|
|
['exe', \&Amavis::Unpackers::do_executable, \$unrar, \$lha, \$unarj],
|
|
);
|
|
|
|
@@ -18812,7 +18812,7 @@ sub fetch_modules_extra() {
|
|
auto::Net::SSLeay::dump_peer_certificate));
|
|
}
|
|
push(@modules, qw(Net::DNS::RR::TXT Text::ParseWords
|
|
- auto::Crypt::OpenSSL::RSA::new_public_key)) if $extra_code_dkim;
|
|
+ )) if $extra_code_dkim;
|
|
push(@modules, 'Anomy::Sanitizer') if $enable_anomy_sanitizer;
|
|
Amavis::Boot::fetch_modules('REQUIRED ADDITIONAL MODULES', 1, @modules);
|
|
|
|
@@ -30849,10 +30849,6 @@ sub getSAPlugins {
|
|
$mod_names{'Mail::SpamAssassin::Plugin::DKIM'}) {
|
|
push(@modules, qw(
|
|
Crypt::OpenSSL::RSA
|
|
- auto::Crypt::OpenSSL::RSA::new_public_key
|
|
- auto::Crypt::OpenSSL::RSA::new_key_from_parameters
|
|
- auto::Crypt::OpenSSL::RSA::get_key_parameters
|
|
- auto::Crypt::OpenSSL::RSA::import_random_seed
|
|
Digest::SHA Error));
|
|
}
|
|
# HTML/HeadParser.pm
|