Thank you. I suppose this was overdue. I merged it into next. Best, -Michael > On 23 Oct 2020, at 20:26, Peter Müller wrote: > > This package has not been maintained well and is thereof outdated. At > the time of writing, we neither > (a) have a maintainer for this nor > (b) believe it is wise to run a full-featured content scanner on a > firewall for security purposes. (We can make do with Postfix, as it > is known for being a very robust MTA and providess less attack > surface than something actually inspecting transferred messages.) > > Thereof, this patch drops the Amavis add-on. In case it is desired in > future versions of IPFire, it can be easily reverted, restoring the > functionality and behaviour before. > > Signed-off-by: Peter Müller > --- > config/amavisd/amavisd.conf | 438 ------------------------------ > config/rootfiles/packages/amavisd | 7 - > lfs/amavisd | 94 ------- > src/initscripts/packages/amavisd | 45 --- > 4 files changed, 584 deletions(-) > delete mode 100644 config/amavisd/amavisd.conf > delete mode 100644 config/rootfiles/packages/amavisd > delete mode 100644 lfs/amavisd > delete mode 100644 src/initscripts/packages/amavisd > > diff --git a/config/amavisd/amavisd.conf b/config/amavisd/amavisd.conf > deleted file mode 100644 > index 25b4d2682..000000000 > --- a/config/amavisd/amavisd.conf > +++ /dev/null > @@ -1,438 +0,0 @@ > -use strict; > - > -# a minimalistic configuration file for amavisd-new with all necessary settings > -# > -# see amavisd.conf-default for a list of all variables with their defaults; > -# see amavisd.conf-sample for a traditional-style commented file; > -# for more details see documentation in INSTALL, README_FILES/* > -# and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html > - > - > -# COMMONLY ADJUSTED SETTINGS: > - > -# @bypass_virus_checks_maps = (1); # controls running of anti-virus code > -# @bypass_spam_checks_maps = (1); # controls running of anti-spam code > -# $bypass_decode_parts = 1; # controls running of decoders&dearchivers > - > -$max_servers = 2; # num of pre-forked children (2..15 is common), -m > -$daemon_user = 'amavis'; # (no default; customary: vscan or amavis), -u > -$daemon_group = 'amavis'; # (no default; customary: vscan or amavis), -g > - > -$mydomain = 'ipfire.org'; # a convenient default for other settings > - > -# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H > -$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T > -$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. > -$QUARANTINEDIR = '/var/virusmails'; # -Q > -# $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine > - > -# $daemon_chroot_dir = $MYHOME; # chroot directory or undef, -R > - > -# $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 > -#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually > - > -$log_level = 2; # verbosity 0..5, -d > -$log_recip_templ = undef; # disable by-recipient level-0 log entries > -$DO_SYSLOG = 1; # log via syslogd (preferred) > -$syslog_facility = 'mail'; # Syslog facility as a string > - # e.g.: mail, daemon, user, local0, ... local7 > -$syslog_priority = 'debug'; # Syslog base (minimal) priority as a string, > - # choose from: emerg, alert, crit, err, warning, notice, info, debug > - > -$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) > -$enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1 > -$nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed > - > -(a)local_domains_maps = ( [".$mydomain"] ); # list of all local domains > - > -(a)mynetworks = qw( 127.0.0.0/8 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 > - # option(s) -p overrides $inet_socket_port and $unix_socketname > - > -$inet_socket_port = 10024; # listen on this local TCP port(s) > -# $inet_socket_port = [10024,10026]; # 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 > - os_fingerprint_method => undef, # don't query p0f for internal clients > -}; > - > -# 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'; > - > -$policy_bank{'ORIGINATING'} = { # mail supposedly originating from our users > - originating => 1, # declare that mail was submitted by our smtp client > - allow_disclaimers => 1, # enables disclaimer insertion if available > - # notify administrator of locally originating malware > - virus_admin_maps => ["virusalert\@$mydomain"], > - spam_admin_maps => ["spamalert\@$mydomain"], > - warnbadhsender => 1, > - # forward to a smtpd service providing DKIM signing service > - forward_method => 'smtp:[127.0.0.1]:10027', > - # 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 > - terminate_dsn_on_notify_success => 0, # don't remove NOTIFY=SUCCESS option > -}; > - > -$interface_policy{'SOCK'} = 'AM.PDP-SOCK'; # only applies with $unix_socketname > - > -# Use with amavis-release over a socket or with Petr Rehor's amavis-milter.c > -# (with amavis-milter.c from this package or old amavis.c client use 'AM.CL'): > -$policy_bank{'AM.PDP-SOCK'} = { > - protocol => 'AM.PDP', > - auth_required_release => 0, # do not require secret_id for amavisd-release > -}; > - > -$sa_tag_level_deflt = 2.0; # add spam info headers if at, or above that level > -$sa_tag2_level_deflt = 6.2; # add 'spam detected' headers at that level > -$sa_kill_level_deflt = 6.9; # triggers spam evasive actions (e.g. blocks mail) > -$sa_dsn_cutoff_level = 10; # spam level beyond which a DSN is not sent > -# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off > -$penpals_bonus_score = 8; # (no effect without a @storage_sql_dsn database) > -$penpals_threshold_high = $sa_kill_level_deflt; # don't waste time on hi spam > - > -$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger > -$sa_local_tests_only = 0; # only tests which do not require internet access? > - > -$virus_admin = "virusalert\@$mydomain"; # notifications recip. > - > -$mailfrom_notify_admin = "virusalert\@$mydomain"; # notifications sender > -$mailfrom_notify_recip = "virusalert\@$mydomain"; # notifications sender > -$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender > -$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef > - > -(a)addr_extension_virus_maps = ('virus'); > -(a)addr_extension_banned_maps = ('banned'); > -(a)addr_extension_spam_maps = ('spam'); > -(a)addr_extension_bad_header_maps = ('badh'); > -# $recipient_delimiter = '+'; # undef disables address extensions altogether > -# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ > - > -$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; > -# $dspam = 'dspam'; > - > -$MAXLEVELS = 14; > -$MAXFILES = 1500; > -$MIN_EXPANSION_QUOTA = 100*1024; # bytes (default undef, not enforced) > -$MAX_EXPANSION_QUOTA = 300*1024*1024; # bytes (default undef, not enforced) > - > -$sa_spam_subject_tag = '***SPAM*** '; > -$defang_virus = 1; # MIME-wrap passed infected mail > -$defang_banned = 1; # MIME-wrap passed mail containing banned name > -# for defanging bad headers only turn on certain minor contents categories: > -$defang_by_ccat{+CC_BADH.",3"} = 1; # NUL or CR character in header > -$defang_by_ccat{+CC_BADH.",5"} = 1; # header line longer than 998 characters > -$defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error > - > - > -# OTHER MORE COMMON SETTINGS (defaults may suffice): > - > -$myhostname = 'ipfire.localdomain'; # 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! > - > -$final_virus_destiny = D_DISCARD; > -$final_banned_destiny = D_BOUNCE; > -$final_spam_destiny = D_DISCARD; > -$final_bad_header_destiny = D_PASS; > - > - > -# Notify virus sender? Bloß nicht! > -$warnvirussender = 0; > -# Notify spam sender? Bloß nicht! > -$warnspamsender = 0; > -# Notify sender of banned files? Kann man machen. > -$warnbannedsender = 1; > -# Notify sender of syntactically invalid header containing non-ASCII characters? Bloß nicht! > -#$warnbadsender = 0; > -# Notify virus (or banned files) RECIPIENT? Wie man möchte, ich finde es sinnvoll. > -$warnvirusrecip = 1; > -$warnbannedrecip = 1; > -$warnbadhrecip = 1; > - > -# SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all) > - > -# $warnbadhsender, > -# $warnvirusrecip, $warnbannedrecip, $warnbadhrecip, (or @warn*recip_maps) > -# > -# @bypass_virus_checks_maps, @bypass_spam_checks_maps, > -# @bypass_banned_checks_maps, @bypass_header_checks_maps, > -# > -# @virus_lovers_maps, @spam_lovers_maps, > -# @banned_files_lovers_maps, @bad_header_lovers_maps, > -# > -# @blacklist_sender_maps, @score_sender_maps, > -# > -# $clean_quarantine_method, $virus_quarantine_to, $banned_quarantine_to, > -# $bad_header_quarantine_to, $spam_quarantine_to, > -# > -# $defang_bad_header, $defang_undecipherable, $defang_spam > - > - > -# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS > - > -(a)keep_decoded_original_maps = (new_RE( > -# qr'^MAIL$', # retain full original message for virus checking (can be slow) > - qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables > - qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i, > -# qr'^Zip archive data', # don't trust Archive::Zip > -)); > - > - > -# for $banned_namepath_re (a new-style of banned table) see amavisd.conf-sample > - > -$banned_filename_re = new_RE( > - > -### BLOCKED ANYWHERE > -# qr'^UNDECIPHERABLE$', # is or contains any undecipherable components > - qr'^\.(exe-ms|dll)$', # banned file(1) types, rudimentary > -# qr'^\.(exe|lha|tnef|cab|dll)$', # banned file(1) types > - > -### BLOCK THE FOLLOWING, EXCEPT WITHIN UNIX ARCHIVES: > -# [ qr'^\.(gz|bz2)$' => 0 ], # allow any in gzip or bzip2 > - [ qr'^\.(rpm|cpio|tar)$' => 0 ], # allow any in Unix-type archives > - > - qr'.\.(pif|scr)$'i, # banned extensions - rudimentary > -# qr'^\.zip$', # block zip type > - > -### BLOCK THE FOLLOWING, EXCEPT WITHIN ARCHIVES: > -# [ qr'^\.(zip|rar|arc|arj|zoo)$'=> 0 ], # allow any within these archives > - > - qr'^application/x-msdownload$'i, # block these MIME types > - qr'^application/x-msdos-program$'i, > - qr'^application/hta$'i, > - > -# qr'^message/partial$'i, # rfc2046 MIME type > -# qr'^message/external-body$'i, # rfc2046 MIME type > - > -# qr'^(application/x-msmetafile|image/x-wmf)$'i, # Windows Metafile MIME type > -# qr'^\.wmf$', # Windows Metafile file(1) type > - > - # block certain double extensions in filenames > - qr'\.[^./]*[A-Za-z][^./]*\.\s*(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)[.\s]*$'i, > - > -# qr'\{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}\}?'i, # Class ID CLSID, strict > -# qr'\{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}\}?'i, # Class ID extension CLSID, loose > - > - qr'.\.(exe|vbs|pif|scr|cpl)$'i, # banned extension - basic > -# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd > -# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta| > -# inf|ins|isp|js|jse|lnk|mda|mdb|mde|mdw|mdt|mdz|msc|msi|msp|mst| > -# ops|pcd|pif|prg|reg|scr|sct|shb|shs|vb|vbe|vbs| > -# wmf|wsc|wsf|wsh)$'ix, # banned ext - long > -# qr'.\.(ani|cur|ico)$'i, # banned cursors and icons filename > -# qr'^\.ani$', # banned animated cursor file(1) type > - > -# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i, # banned extension - WinZip vulnerab. > -); > -# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631 > -# and http://www.cknow.com/vtutor/vtextensions.htm > - > - > -# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING > - > -(a)score_sender_maps = ({ # a by-recipient hash lookup table, > - # results from all matching recipient tables are summed > - > -# ## per-recipient personal tables (NOTE: positive: black, negative: white) > -# 'user1(a)example.com' => [{'bla-mobile.press(a)example.com' => 10.0}], > -# 'user3(a)example.com' => [{'.ebay.com' => -3.0}], > -# 'user4(a)example.com' => [{'cleargreen(a)cleargreen.com' => -7.0, > -# '.cleargreen.com' => -5.0}], > - > - ## site-wide opinions about senders (the '.' matches any recipient) > - '.' => [ # the _first_ matching sender determines the score boost > - > - new_RE( # regexp-type lookup table, just happens to be all soft-blacklist > - [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i => 5.0], > - [qr'^(greatcasino|investments|lose_weight_today|market\.alert)@'i=> 5.0], > - [qr'^(money2you|MyGreenCard|new\.tld\.registry|opt-out|opt-in)@'i=> 5.0], > - [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i => 5.0], > - [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i => 5.0], > - [qr'^(your_friend|greatoffers)@'i => 5.0], > - [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i => 5.0], > - ), > - > -# read_hash("/var/amavis/sender_scores_sitewide"), > - > - { # a hash-type lookup table (associative array) > - 'nobody(a)cert.org' => -3.0, > - 'cert-advisory(a)us-cert.gov' => -3.0, > - 'owner-alert(a)iss.net' => -3.0, > - 'slashdot(a)slashdot.org' => -3.0, > - 'securityfocus.com' => -3.0, > - 'ntbugtraq(a)listserv.ntbugtraq.com' => -3.0, > - 'security-alerts(a)linuxsecurity.com' => -3.0, > - 'mailman-announce-admin(a)python.org' => -3.0, > - 'amavis-user-admin(a)lists.sourceforge.net'=> -3.0, > - 'amavis-user-bounces(a)lists.sourceforge.net' => -3.0, > - 'spamassassin.apache.org' => -3.0, > - 'notification-return(a)lists.sophos.com' => -3.0, > - 'owner-postfix-users(a)postfix.org' => -3.0, > - 'owner-postfix-announce(a)postfix.org' => -3.0, > - 'owner-sendmail-announce(a)lists.sendmail.org' => -3.0, > - 'sendmail-announce-request(a)lists.sendmail.org' => -3.0, > - 'donotreply(a)sendmail.org' => -3.0, > - 'ca+envelope(a)sendmail.org' => -3.0, > - 'noreply(a)freshmeat.net' => -3.0, > - 'owner-technews(a)postel.acm.org' => -3.0, > - 'ietf-123-owner(a)loki.ietf.org' => -3.0, > - 'cvs-commits-list-admin(a)gnome.org' => -3.0, > - 'rt-users-admin(a)lists.fsck.com' => -3.0, > - 'clp-request(a)comp.nus.edu.sg' => -3.0, > - 'surveys-errors(a)lists.nua.ie' => -3.0, > - 'emailnews(a)genomeweb.com' => -5.0, > - 'yahoo-dev-null(a)yahoo-inc.com' => -3.0, > - 'returns.groups.yahoo.com' => -3.0, > - 'clusternews(a)linuxnetworx.com' => -3.0, > - lc('lvs-users-admin(a)LinuxVirtualServer.org') => -3.0, > - lc('owner-textbreakingnews(a)CNNIMAIL12.CNN.COM') => -5.0, > - > - # soft-blacklisting (positive score) > - 'sender(a)example.net' => 3.0, > - '.example.net' => 1.0, > - > - }, > - ], # end of site-wide tables > -}); > - > - > -(a)decoders = ( > - ['mail', \&do_mime_decode], > - ['asc', \&do_ascii], > - ['uue', \&do_ascii], > - ['hqx', \&do_ascii], > - ['ync', \&do_ascii], > - ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], > - ['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ], > - ['gz', \&do_uncompress, 'gzip -d'], > - ['gz', \&do_gunzip], > - ['bz2', \&do_uncompress, 'bzip2 -d'], > - ['lzo', \&do_uncompress, 'lzop -d'], > - ['rpm', \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ], > - ['cpio', \&do_pax_cpio, ['pax','gcpio','cpio'] ], > - ['tar', \&do_pax_cpio, ['pax','gcpio','cpio'] ], > - ['deb', \&do_ar, 'ar'], > -# ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill > - ['zip', \&do_unzip], > - ['7z', \&do_7zip, ['7zr','7za','7z'] ], > - ['rar', \&do_unrar, ['rar','unrar'] ], > - ['arj', \&do_unarj, ['arj','unarj'] ], > - ['arc', \&do_arc, ['nomarch','arc'] ], > - ['zoo', \&do_zoo, ['zoo','unzoo'] ], > - ['lha', \&do_lha, 'lha'], > -# ['doc', \&do_ole, 'ripole'], > - ['cab', \&do_cabextract, 'cabextract'], > - ['tnef', \&do_tnef_ext, 'tnef'], > - ['tnef', \&do_tnef], > -# ['sit', \&do_unstuff, 'unstuff'], # broken/unsafe decoder > - ['exe', \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ], > -); > - > - > -(a)av_scanners = ( > - > -# ### http://www.clamav.net/ > - ['ClamAV-clamd', > - \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamd"], > - qr/\bOK$/, qr/\bFOUND$/, > - qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], > -# # 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 socket "$MYHOME/clamd". > - > -# ### http://www.f-prot.com/ > -# ['FRISK F-Prot Daemon', > -# \&ask_daemon, > -# ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n", > -# ['127.0.0.1:10200','127.0.0.1:10201','127.0.0.1:10202', > -# '127.0.0.1:10203','127.0.0.1:10204'] ], > -# qr/(?i)]*>clean<\/summary>/, > -# qr/(?i)]*>infected<\/summary>/, > -# qr/(?i)(.+)<\/name>/ ], > - > - ### http://www.kaspersky.com/ (kav4mailservers) > - ['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 {}/*', > - [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/, > - qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/, > - ], > - # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious, > - # currupted or protected archives are to be handled > - > - ### http://www.avira.com/ > - ### Avira AntiVir (formerly H+BEDV) or (old) CentralCommand Vexira Antivirus > - ['Avira AntiVir', ['antivir','vexira'], > - '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/, > - qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) | > - (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/ ], > - # NOTE: if you only have a demo version, remove -z and add 214, as in: > - # '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/, > - > -# ### 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'], > -# qr/\t\[\+\]/, qr/\t\[L\]\t/, qr/\t\[L\]\t([^[ \t\015\012]+)/ ], > - > -# ### http://www.avast.com/ > -# ['avast! Antivirus - Client/Server Version', 'avastlite', > -# '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1], > -# qr/\t\[L\]\t([^[ \t\015\012]+)/ ], > - > - ### http://www.avast.com/ > - ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'], > - '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/ ], > - > - ### http://www.bitdefender.com/ > - ['BitDefender', 'bdc', > - '--arc --mail {}', qr/^Infected files *:0+(?!\d)/, > - qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/, > - qr/(?:suspected|infected): (.*)(?:\033|$)/ ], > - # consider also: --all --nowarn --alev=15 --flev=15. The --all argument may > - # not apply to your version of bdc, check documentation and see 'bdc --help' > - > -); > - > - > -(a)av_scanners_backup = ( > - > - ### http://www.clamav.net/ - backs up clamd or Mail::ClamAV > - ['ClamAV-clamscan', 'clamscan', > - "--stdout --no-summary -r --tempdir=$TEMPBASE {}", > - [0], qr/:.*\sFOUND$/, qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], > - > - ### http://www.f-prot.com/ - backs up F-Prot Daemon > - ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'], > - '-dumb -archive -packed {}', [0,8], [3,6], # or: [0], [3,6,8], > - qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/ ], > - > - ### http://www.kaspersky.com/ > - ['Kaspersky Antivirus v5.5', > - ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner', > - '/opt/kav/5.5/kav4unix/bin/kavscanner', > - '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'], > - '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25], > - qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/ , > -# sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"}, > -# sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"}, > - ], > - > -# always succeeds (uncomment to consider mail clean if all other scanners fail) > -# ['always-clean', sub {0}], > - > -); > - > - > -1; # insure a defined return > diff --git a/config/rootfiles/packages/amavisd b/config/rootfiles/packages/amavisd > deleted file mode 100644 > index f2e1c3f3b..000000000 > --- a/config/rootfiles/packages/amavisd > +++ /dev/null > @@ -1,7 +0,0 @@ > -etc/amavisd.conf > -etc/rc.d/init.d/amavisd > -usr/bin/amavisd > -var/amavis > -var/amavis/db > -var/amavis/tmp > -var/virusmails > diff --git a/lfs/amavisd b/lfs/amavisd > deleted file mode 100644 > index 43d3c6060..000000000 > --- a/lfs/amavisd > +++ /dev/null > @@ -1,94 +0,0 @@ > -############################################################################### > -# # > -# IPFire.org - A linux based firewall # > -# Copyright (C) 2007-2019 IPFire Team # > -# # > -# This program is free software: you can redistribute it and/or modify # > -# it under the terms of the GNU General Public License as published by # > -# the Free Software Foundation, either version 3 of the License, or # > -# (at your option) any later version. # > -# # > -# This program is distributed in the hope that it will be useful, # > -# but WITHOUT ANY WARRANTY; without even the implied warranty of # > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # > -# GNU General Public License for more details. # > -# # > -# You should have received a copy of the GNU General Public License # > -# along with this program. If not, see . # > -# # > -############################################################################### > - > -############################################################################### > -# Definitions > -############################################################################### > - > -include Config > - > -VER = 2.11.1 > - > -THISAPP = amavisd-new-$(VER) > -DL_FILE = $(THISAPP).tar.bz2 > -DL_FROM = $(URL_IPFIRE) > -DIR_APP = $(DIR_SRC)/$(THISAPP) > -TARGET = $(DIR_INFO)/$(THISAPP) > -PROG = amavisd > -PAK_VER = 3 > - > -DEPS = clamav spamassassin perl-Net-LibIDN > - > -############################################################################### > -# Top-level Rules > -############################################################################### > - > -objects = $(DL_FILE) > - > -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > - > -$(DL_FILE)_MD5 = f89fc043c790e35137121e45f2890703 > - > -install : $(TARGET) > - > -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > - > -download :$(patsubst %,$(DIR_DL)/%,$(objects)) > - > -md5 : $(subst %,%_MD5,$(objects)) > - > -dist: > - @$(PAK) > - > -############################################################################### > -# Downloading, checking, md5sum > -############################################################################### > - > -$(patsubst %,$(DIR_CHK)/%,$(objects)) : > - @$(CHECK) > - > -$(patsubst %,$(DIR_DL)/%,$(objects)) : > - @$(LOAD) > - > -$(subst %,%_MD5,$(objects)) : > - @$(MD5) > - > -############################################################################### > -# Installation Details > -############################################################################### > - > -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > - @$(PREBUILD) > - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) && cp -f amavisd /usr/bin > - chown root.root /usr/bin/amavisd > - chmod 755 /usr/bin/amavisd > - > - #install initscripts > - $(call INSTALL_INITSCRIPT,amavisd) > - > - cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc > - chown root.root /etc/amavisd.conf > - chmod 644 /etc/amavisd.conf > - -mkdir -p /var/amavis/{db,tmp} /var/virusmails > - chown amavis.amavis -Rv /var/{amavis,virusmails} > - chmod 750 -Rv /var/{amavis,virusmails} > - @rm -rf $(DIR_APP) > - @$(POSTBUILD) > diff --git a/src/initscripts/packages/amavisd b/src/initscripts/packages/amavisd > deleted file mode 100644 > index 115ffe973..000000000 > --- a/src/initscripts/packages/amavisd > +++ /dev/null > @@ -1,45 +0,0 @@ > -#!/bin/sh > -######################################################################## > -# Begin $rc_base/init.d/amavisd > -# > -# Description : Amavisd Init Script > -# > -# Authors : Michael Tremer (ms(a)ipfire.org) > -# > -# Version : 01.00 > -# > -# Notes : > -# > -######################################################################## > - > -. /etc/sysconfig/rc > -. ${rc_functions} > - > -case "${1}" in > - start) > - boot_mesg "Starting AMaViS Daemon..." > - loadproc /usr/bin/amavisd > - ;; > - > - stop) > - boot_mesg "Stopping AMaViS Daemon..." > - killproc /usr/bin/amavisd > - ;; > - > - restart) > - ${0} stop > - sleep 1 > - ${0} start > - ;; > - > - status) > - statusproc /usr/bin/amavisd > - ;; > - > - *) > - echo "Usage: ${0} {start|stop|restart|status}" > - exit 1 > - ;; > -esac > - > -# End $rc_base/init.d/amavisd > -- > 2.26.2