diff -Naur security/maia.orig/Makefile security/maia/Makefile
--- security/maia.orig/Makefile	2022-03-15 20:13:23.711465000 -0600
+++ security/maia/Makefile	2022-03-16 20:24:01.305790000 -0600
@@ -2,7 +2,7 @@
 
 PORTNAME= maia
 DISTVERSION=	1.0.4
-PORTREVISION= 8
+PORTREVISION= 9
 CATEGORIES= security
 
 MAINTAINER= ek@purplehat.org
@@ -30,7 +30,7 @@
 USE_GITHUB= yes
 GH_ACCOUNT= technion
 GH_PROJECT= maia_mailguard
-GH_TAGNAME= 7f20bd4
+GH_TAGNAME=	48df5fb
 USE_PERL5=	run
 NO_BUILD= yes
 DOCS= LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
@@ -41,23 +41,21 @@
 PEAR_DIR?=	${LOCALBASE}/share/pear
 PLIST_SUB+= USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
-OPTIONS_DEFINE= APACHE LIGHTTPD NGINX WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER \
+OPTIONS_DEFINE= APACHE LIGHTTPD NGINX WEBHOST MYSQL LOCAL PGSQL \
 		DOVECOT2 POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \
 		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \
 		RPM ZOO UNZOO LZOP TNEF DOCS
 
-OPTIONS_DEFAULT=	MYSQL CLAMAV SPAMASSASSIN BDB IPCOUNTRY \
-			DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM \
-			ZOO
+OPTIONS_DEFAULT=	MYSQL CLAMAV DOCS SPAMASSASSIN BDB IPCOUNTRY \
+			DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM ZOO
 
 APACHE_DESC=		Use Apache web server
 LIGHTTPD_DESC=		Use LighTTPD web server
 NGINX_DESC=			Use Nginx web server
 WEBHOST_DESC=		PHP, PEAR, etc... for Maia web interface
-MYSQL_DESC=		Use MySQL datebase
-MYSQLSERVER_DESC= Install MySQL Server
-PGSQL_DESC=		Use PgSQL database
-PGSQLSERVER_DESC= Install PGSQL Server
+MYSQL_DESC=		Use MySQL
+LOCAL_DESC=   All services/databases hosted locally
+PGSQL_DESC=		Use PgSQL
 DOVECOT2_DESC=		Use Dovecot 2.x IMAP/POP3
 POSTFIX_DESC=		Use Postfix MTA
 PFA_DESC=		Use Postfixadmin
@@ -104,7 +102,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MWEBHOST}
-USES+=		php
+USES+=	php
 USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
 		sqlite3 tokenizer xml xmlreader xmlwriter xmlrpc
@@ -134,18 +132,31 @@
 PLIST_SUB+= WEBHOST="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL}
-USES+=		mysql:client
+.if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MLOCAL}
+USES+=		mysql:server,client
 RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
+.if ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MLOCAL}
+USES+=    mysql:client
+RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql
+.endif
+
 .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+= mysqli
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
+.if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MLOCAL}
 USES+=		pgsql
+WANT_PGSQL= server
+RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
+
+.if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MLOCAL}
+USES+=		pgsql
+RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg
+.endif
+
 .if ${PORT_OPTIONS:MPGSQL} && ${PORT_OPTIONS:MWEBHOST}
 USE_PHP+= pgsql
 .endif
@@ -158,19 +169,6 @@
 RUN_DEPENDS+= nginx:www/nginx
 .endif
  
-.if ${PORT_OPTIONS:MMYSQLSERVER}
-USES+=		mysql:server
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg
-.endif
-
-.if ${PORT_OPTIONS:MPGSQLSERVER}
-USES:=		${USES:Npgsql} pgsql
-WANT_PGSQL= server
-.endif
-
 .if ${PORT_OPTIONS:MDOVECOT2}
 RUN_DEPENDS+= dovecot:mail/dovecot
 .endif
@@ -180,7 +178,8 @@
 .endif
 
 .if ${PORT_OPTIONS:MPFA}
-RUN_DEPENDS+= ${LOCALBASE}/www/postfixadmin/config.inc.php:mail/postfixadmin
+USES+= php
+RUN_DEPENDS+= postfixadmin-${PHP_FLAVOR}>=0:mail/postfixadmin
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
@@ -286,8 +285,7 @@
 	scripts/load-sa-rules.pl scripts/maiadbtool.pl \
 	scripts/process-quarantine.pl scripts/resend.pl scripts/send-quarantine-digests.pl \
 	scripts/send-quarantine-reminders.pl scripts/stats-snapshot.pl
-		@${REINPLACE_CMD} -e "s|/etc/maia/maia.conf|${ETCDIR}/maia.conf|" \
-		-e "s|/usr/bin/perl.*|/usr/bin/env perl|" \
+	  @${REINPLACE_CMD} -e "s|/etc/maia/maia.conf|${ETCDIR}/maia.conf|" \
 		${WRKSRC}/${m}
 .endfor
 
@@ -298,22 +296,20 @@
 	@${REINPLACE_CMD} -e "s|daemon_user  = 'maia'|daemon_user  = '${USERS}'|" \
 		-e "s|daemon_group = 'maia'|daemon_group = '${GROUPS}'|" \
 		-e "s|/var/lib/maia|${MAIAHOME}|" \
-		-e "s|'unrar'|'unrar v -c- -p- --'|" \
-		-e "s|DO_SYSLOG = 0|DO_SYSLOG = 1|" ${WRKSRC}/maiad.conf.dist
+    ${WRKSRC}/maiad.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia.conf|${ETCDIR}/maia.conf|" \
 		-e "s|username = 'maia'|username = '${USERS}'|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
 		-e "s|/usr/bin/sa-learn|${PREFIX}/bin/sa-learn|" \
 		-e "s|local_cf_dir = undef|local_cf_dir = '${PREFIX}/etc/mail/spamassassin'|" \
-		-e "s|system_rules_dir = undef|system_rules_dir = '/var/db/spamassassin'|" \
 		-e "s|user_rules_dir = undef|user_rules_dir = '${MAIAHOME}/.spamassassin'|" \
 		-e "s|template_dir = '/etc/maia/templates/'|template_dir = '${ETCDIR}/templates/'|" \
-			${WRKSRC}/maia.conf.dist
+		${WRKSRC}/maia.conf.dist
 
 	@${REINPLACE_CMD} -e "s|/etc/maia/maiad.conf|${ETCDIR}/maiad.conf|" \
 		-e "s|/var/lib/maia|${DATADIR}|" \
-		-e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/maiad
+		${WRKSRC}/maiad
 
 	@${FIND} -E ${WRKSRC} -iregex '.*(bak|~)$$' -delete
 	@${FIND} -E ${WRKSRC} -iregex '.*(gitkeep|~)$$' -delete
diff -Naur security/maia.orig/distinfo security/maia/distinfo
--- security/maia.orig/distinfo	2022-03-15 19:54:33.569034000 -0600
+++ security/maia/distinfo	2022-03-16 20:24:18.224512000 -0600
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615478289
-SHA256 (technion-maia_mailguard-1.0.4-7f20bd4_GH0.tar.gz) = dc54b76ee72b4018768665f504315ccc831d4d64dff24421bfc3775a70548f16
-SIZE (technion-maia_mailguard-1.0.4-7f20bd4_GH0.tar.gz) = 2298104
+TIMESTAMP = 1647483858
+SHA256 (technion-maia_mailguard-1.0.4-48df5fb_GH0.tar.gz) = efe7291e96b38bfac29de9655706e6d58d907290b02172a3c73e7aa3b9aebf71
+SIZE (technion-maia_mailguard-1.0.4-48df5fb_GH0.tar.gz) = 2298060
diff -Naur security/maia.orig/files/patch-maia.conf.dist security/maia/files/patch-maia.conf.dist
--- security/maia.orig/files/patch-maia.conf.dist	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-maia.conf.dist	2022-03-17 18:45:59.018349000 -0600
@@ -0,0 +1,73 @@
+--- maia.conf.dist.orig	2022-03-02 01:05:20 UTC
++++ maia.conf.dist
+@@ -1,7 +1,7 @@
+ ###################################################################
+ #           Maia Mailguard Script Configuration File              #
+ #                                                                 #
+-# This file (/etc/maia.conf) contains configuration information   #
++# This file (/usr/local/etc/maia/maia.conf) contains configuration information   #
+ # used by Maia Mailguard's Perl maintenance scripts.              #
+ ###################################################################
+ 
+@@ -9,16 +9,16 @@
+ $dsn = 'DBI:mysql:maia:localhost:3306';
+ 
+ # Your Maia database user's login name
+-$username = 'maia';
++$username = 'vscan';
+ 
+ # Your Maia database user's password
+ $password = 'password';
+ 
+ # The directory where Maia's Perl scripts can be found.
+-$script_dir = '/var/lib/maia/scripts';
++$script_dir = '/usr/local/share/maia/scripts';
+ 
+ # Location of your sa-learn script
+-$sa_learn = '/usr/bin/sa-learn';
++$sa_learn = '/usr/local/bin/sa-learn';
+ 
+ # Address rewriting type [0..5] (see config.php)
+ $address_rewriting_type = 0;
+@@ -45,19 +45,19 @@ $preserve_case = 0;
+ # The directory where SpamAssassin's local.cf file can be found.
+ #$local_cf_dir = '/etc/mail/spamassassin';
+ #$local_cf_dir = '/etc/spamassassin';
+-$local_cf_dir = undef;  # default: let the script find it
++$local_cf_dir = '/usr/local/etc/mail/spamassassin';  # default: let the script find it
+ 
+ # The directory where SpamAssassin's core rules can be found.
+ # If you wish to specify the directory yourself, you can use the 
+ # %%VERSION%% macro to replace the actual SpamAssassin version number.
+ #$system_rules_dir = '/usr/share/spamassassin';
+ #$system_rules_dir = '/var/lib/spamassassin/%%VERSION%%';  # sa-update
+-$system_rules_dir = undef;  # default: let the script find it
++$system_rules_dir = '/var/db/spamassassin';  # default: let the script find it
+ 
+ # The directory where your amavis user's user_prefs file can be found.
+-#$user_rules_dir = '/var/lib/maia/.spamassassin';
++#$user_rules_dir = '/usr/local/share/maia/.spamassassin';
+ #$user_rules_dur = '~/.spamassassin';
+-$user_rules_dir = undef;  # default: let the script find it
++$user_rules_dir = '/var/maiad/.spamassassin';  # default: let the script find it
+ 
+ 
+ ### process-quarantine.pl
+@@ -96,7 +96,7 @@ $log_dir = '/var/log/maia';
+ $workers = 10;
+ 
+ # Location of your encryption key file, or undef to disable
+-#$key_file = '/var/lib/maia/blowfish.key';
++#$key_file = '/usr/local/share/maia/blowfish.key';
+ $key_file = undef;
+ 
+ # Items larger than this size (in bytes) will not be learned/reported.
+@@ -156,7 +156,7 @@ $mail_types = 1 + 2 + 4 + 8 + 16;
+ $base_url = 'http://example.com/';
+ 
+ # Template directory
+-$template_dir = '/etc/maia/templates/';
++$template_dir = '/usr/local/etc/maia/templates/';
+ 
+ # How you want the digest sorted (choose one per cache type)
+ # (note: non spam/ham caches don't have score to sort by)
diff -Naur security/maia.orig/files/patch-maiad security/maia/files/patch-maiad
--- security/maia.orig/files/patch-maiad	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-maiad	2022-03-17 18:45:59.020048000 -0600
@@ -0,0 +1,11 @@
+--- maiad.orig	2022-03-18 00:44:14 UTC
++++ maiad
+@@ -773,7 +773,7 @@ $map_full_type_to_short_type_re = Amavis::Lookup::RE->
+   [qr/^LHa.*\barchive\b/i             => 'lha'],  # or .lzh
+   [qr/^ARC archive\b/i                => 'arc'],
+   [qr/^ARJ archive\b/i                => 'arj'],
+-  [qr/^Zoo archive\b/i                => 'zoo'],
++  [qr/^Zoo archive\b/i                =>['zoo','unzoo'] ],
+   [qr/^(\S+\s+)?tar archive\b/i       => 'tar'],
+   [qr/^(\S+\s+)?cpio archive\b/i      => 'cpio'],
+   [qr/^Debian binary package\b/i      => 'deb'], # standard Unix archive (ar)
diff -Naur security/maia.orig/files/patch-maiad.conf.dist security/maia/files/patch-maiad.conf.dist
--- security/maia.orig/files/patch-maiad.conf.dist	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-maiad.conf.dist	2022-03-17 18:45:59.022454000 -0600
@@ -0,0 +1,73 @@
+--- maiad.conf.dist.orig	2022-03-02 01:05:20 UTC
++++ maiad.conf.dist
+@@ -21,20 +21,20 @@ $max_servers = 2;
+ # Maiad will run as user ($daemon_user)
+ #   * Typically 'maia'; sometimes 'amavis' or 'vscan'
+ 
+-$daemon_user  = 'maia';
++$daemon_user  = 'vscan';
+ 
+ 
+ # Maiad will run as group ($daemon_group)
+ #   * Typically 'maia'; sometimes 'amavis' or 'vscan'
+ 
+-$daemon_group = 'maia';
++$daemon_group = 'vscan';
+ 
+ 
+ # Maiad's home directory ($MYHOME)
+ #   * Where maiad expects to find supporting files
+ #   * Should be owned by $daemon_user, group $daemon_group
+ 
+-$MYHOME = '/var/lib/maia';
++$MYHOME = '/var/maiad';
+ $TEMPBASE = "$MYHOME/tmp";
+ 
+ ###########################################################################
+@@ -55,8 +55,8 @@ $daemon_chroot_dir = undef;
+ # Path overrides for chrooted environments
+ #   * Uncomment and adjust as necessary if using chroot
+ 
+-# $lock_file = "$daemon_chroot_dir/var/lock/maia/maiad.lock";
+-# $pid_file = "$daemon_chroot_dir/var/run/maia/maiad.pid";
++$lock_file = "/var/run/maia/maiad.lock";
++$pid_file = "var/run/maia/maiad.pid";
+ 
+ 
+ ###########################################################################
+@@ -160,7 +160,7 @@ $log_level = 0;
+ #   * Set to 1 to send logs to syslog, 0 to disable
+ #   * If enabled, configure $SYSLOG_LEVEL as well
+ 
+-$DO_SYSLOG = 0;
++$DO_SYSLOG = 1;
+ 
+ 
+ # Syslog logging facility and level ($SYSLOG_LEVEL)
+@@ -199,7 +199,7 @@ $LOGFILE = "/var/log/maia/maiad.log";
+ #   * If enabled, stores data for optional SNMP agents and nanny utility
+ #   * Required for the optional Message-ID cache feature
+ 
+-$enable_db = 1;
++$enable_db = 0;
+ 
+ 
+ # Message-ID cache ($enable_global_cache)
+@@ -243,7 +243,7 @@ $uncompress  = ['uncompress', 'gzip -d', 'zcat'];
+ $unfreeze    = ['unfreeze', 'freeze -d', 'melt', 'fcat'];
+ $arc         = ['nomarch', 'arc'];
+ $unarj       = ['arj', 'unarj'];
+-#$unrar      = ['rar', 'unrar'];
++$unrar       = ['rar', 'unrar v -c- -p- --'];
+ $zoo         = 'zoo';
+ $lha         = 'lha';
+ $cpio        = ['gcpio','cpio'];
+@@ -390,7 +390,7 @@ $banned_filename_re = new_RE(
+ 
+ # Clam Antivirus Daemon (clamd)
+ ['ClamAV-clamd',
+-   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.ctl"],
++   \&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 maiad, or run it under its own
diff -Naur security/maia.orig/files/patch-scripts_configtest.pl security/maia/files/patch-scripts_configtest.pl
--- security/maia.orig/files/patch-scripts_configtest.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_configtest.pl	2022-03-17 18:45:59.024856000 -0600
@@ -0,0 +1,19 @@
+--- scripts/configtest.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/configtest.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: configtest.pl 1570 2011-07-01 19:09:55Z rjl $
+ 
+@@ -94,8 +94,8 @@
+     # name of this script
+     my $script_name = "configtest";
+ 
+-    # read configuration file (/etc/maia/maia.conf)
+-    my $config_file = "/etc/maia/maia.conf";
++    # read configuration file (/usr/local/etc/maia/maia.conf)
++    my $config_file = "/usr/local/etc/maia/maia.conf";
+     unless (my $rv = do $config_file) {
+         die("Maia: [$script_name] Couldn't parse $config_file: $@\n") if $@;
+         die("Maia: [$script_name] Couldn't open $config_file\n") if (!defined($rv) || !$rv);
diff -Naur security/maia.orig/files/patch-scripts_detectvba.pl security/maia/files/patch-scripts_detectvba.pl
--- security/maia.orig/files/patch-scripts_detectvba.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_detectvba.pl	2022-03-16 18:36:19.734153000 -0600
@@ -0,0 +1,8 @@
+--- scripts/detectvba.pl.orig	2022-03-16 00:45:19 UTC
++++ scripts/detectvba.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #technion@lolware.net
+ #Detects vba macros containing blacklisted strings.
+ #
diff -Naur security/maia.orig/files/patch-scripts_expire-quarantine-cache.pl security/maia/files/patch-scripts_expire-quarantine-cache.pl
--- security/maia.orig/files/patch-scripts_expire-quarantine-cache.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_expire-quarantine-cache.pl	2022-03-17 18:45:59.029632000 -0600
@@ -0,0 +1,28 @@
+--- scripts/expire-quarantine-cache.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/expire-quarantine-cache.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: expire-quarantine-cache.pl 1528 2011-05-31 10:09:15Z rjl $
+ 
+@@ -128,8 +128,8 @@
+     # name of this script
+     my $script_name = "expire-quarantine-cache";
+ 
+-    # read configuration file (/etc/maia/maia.conf)
+-    my $config_file = "/etc/maia/maia.conf";
++    # read configuration file (/usr/local/etc/maia/maia.conf)
++    my $config_file = "/usr/local/etc/maia/maia.conf";
+     unless (my $rv = do $config_file) {
+         fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+         fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
+@@ -168,7 +168,7 @@
+     close(PID_FILE);
+ 
+ 
+-    # defaults (overridden by settings in /etc/maia/maia.conf)
++    # defaults (overridden by settings in /usr/local/etc/maia/maia.conf)
+     $mail_types = (ALL - CONFIRMED_NONSPAM - CONFIRMED_SPAM) 
+         if !defined($mail_types);
+ 
diff -Naur security/maia.orig/files/patch-scripts_load-sa-rules.pl security/maia/files/patch-scripts_load-sa-rules.pl
--- security/maia.orig/files/patch-scripts_load-sa-rules.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_load-sa-rules.pl	2022-03-17 18:45:59.031995000 -0600
@@ -0,0 +1,28 @@
+--- scripts/load-sa-rules.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/load-sa-rules.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: load-sa-rules.pl 1528 2011-05-31 10:09:15Z rjl $
+ 
+@@ -118,8 +118,8 @@
+     # name of this script
+     my $script_name = "load-sa-rules";
+ 
+-    # read configuration file (/etc/maia/maia.conf)
+-    my $config_file = "/etc/maia/maia.conf";
++    # read configuration file (/usr/local/etc/maia/maia.conf)
++    my $config_file = "/usr/local/etc/maia/maia.conf";
+     unless (my $rv = do $config_file) {
+         fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+         fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
+@@ -162,7 +162,7 @@
+     my $sa_version = $sa->VERSION;
+     my $sa_prefix = $sa->{PREFIX};
+ 
+-    # defaults (overridden by values in /etc/maia/maia.conf)
++    # defaults (overridden by values in /usr/local/etc/maia/maia.conf)
+     if (defined($local_cf_dir)) {
+         $local_cf_dir = expand_macros($sa_version, $sa_prefix, $local_cf_dir);
+         fatal(sprintf("Directory %s does not exist!", $local_cf_dir))
diff -Naur security/maia.orig/files/patch-scripts_maiadbtool.pl security/maia/files/patch-scripts_maiadbtool.pl
--- security/maia.orig/files/patch-scripts_maiadbtool.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_maiadbtool.pl	2022-03-17 18:45:59.034397000 -0600
@@ -0,0 +1,26 @@
+--- scripts/maiadbtool.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/maiadbtool.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: $
+ 
+@@ -130,14 +130,14 @@ sub export_wblist_csv($$$$);
+ # name of this script
+ my $script_name = "maiadbtool";
+ 
+-# read configuration file (/etc/maia/maia.conf)
+-my $config_file = "/etc/maia/maia.conf";
++# read configuration file (/usr/local/etc/maia/maia.conf)
++my $config_file = "/usr/local/etc/maia/maia.conf";
+ unless (my $rv = do $config_file) {
+     fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+     fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
+ };
+ 
+-# defaults (overridden by settings in /etc/maia/maia.conf)
++# defaults (overridden by settings in /usr/local/etc/maia/maia.conf)
+ $sa_learn = "sa-learn" if !defined($sa_learn);
+ $address_rewriting_type = 0 if !defined($address_rewriting_type);
+ $routing_domain = "" if !defined($routing_domain);
diff -Naur security/maia.orig/files/patch-scripts_process-quarantine.pl security/maia/files/patch-scripts_process-quarantine.pl
--- security/maia.orig/files/patch-scripts_process-quarantine.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_process-quarantine.pl	2022-03-17 18:45:59.036774000 -0600
@@ -0,0 +1,28 @@
+--- scripts/process-quarantine.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/process-quarantine.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ package Maia::ProcessQuarantine;
+ 
+@@ -51,7 +51,7 @@ Mail::SpamAssassin::Message->import();
+ use Mail::SpamAssassin::PerMsgLearner;
+ use Mail::SpamAssassin::Reporter;
+ 
+-# config file variables from /etc/maia/maia.conf
++# config file variables from /usr/local/etc/maia/maia.conf
+ use vars qw( $key_file $default_max_size $pq_log_level $log_dir
+              $learning_options $report_options $pid_dir
+              $autolearn_ham_threshold $autolearn_spam_threshold
+@@ -150,8 +150,8 @@ if ($0 =~ /^(.*\/)*(.+)\.pl$/i) {
+    $script_name = 'process-quarantine'; # sane default;
+ }
+ 
+-# read configuration file (/etc/maia/maia.conf)
+-load_config_file('/etc/maia/maia.conf');
++# read configuration file (/usr/local/etc/maia/maia.conf)
++load_config_file('/usr/local/etc/maia/maia.conf');
+ 
+ # defaults (overridden by settings in maia.conf)
+ $default_workers = NWORKERS if !defined($default_workers);
diff -Naur security/maia.orig/files/patch-scripts_resend.pl security/maia/files/patch-scripts_resend.pl
--- security/maia.orig/files/patch-scripts_resend.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_resend.pl	2022-03-17 18:45:59.039134000 -0600
@@ -0,0 +1,19 @@
+--- scripts/resend.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/resend.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ # $Id: $
+ 
+@@ -89,8 +89,8 @@ sub resend_mail($$$$$$);
+ # name of this script
+ my $script_name = "resend";
+ 
+-# read configuration file (/etc/maia/maia.conf)
+-my $config_file = "/etc/maia/maia.conf";
++# read configuration file (/usr/local/etc/maia/maia.conf)
++my $config_file = "/usr/local/etc/maia/maia.conf";
+ unless (my $rv = do $config_file) {
+     fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+     fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
diff -Naur security/maia.orig/files/patch-scripts_send-quarantine-digests.pl security/maia/files/patch-scripts_send-quarantine-digests.pl
--- security/maia.orig/files/patch-scripts_send-quarantine-digests.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_send-quarantine-digests.pl	2022-03-17 18:45:59.041528000 -0600
@@ -0,0 +1,28 @@
+--- scripts/send-quarantine-digests.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/send-quarantine-digests.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id$
+ 
+@@ -91,8 +91,8 @@ sub generate_confirm_token($$);
+ # name of this script
+ my $script_name = "send-quarantine-digests";
+ 
+-# read configuration file (/etc/maia/maia.conf)
+-my $config_file = "/etc/maia/maia.conf";
++# read configuration file (/usr/local/etc/maia/maia.conf)
++my $config_file = "/usr/local/etc/maia/maia.conf";
+ unless (my $rv = do $config_file) {
+     fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+     fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
+@@ -131,7 +131,7 @@ print PID_FILE "$$";
+ close(PID_FILE);
+ 
+ 
+-# defaults (overridden by settings in /etc/maia/maia.conf)
++# defaults (overridden by settings in /usr/local/etc/maia/maia.conf)
+ $base_url = "http://example.com/" if !defined($base_url);
+ $template_dir = "/var/lib/maia/templates" if !defined($template_dir);
+ 
diff -Naur security/maia.orig/files/patch-scripts_send-quarantine-reminders.pl security/maia/files/patch-scripts_send-quarantine-reminders.pl
--- security/maia.orig/files/patch-scripts_send-quarantine-reminders.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_send-quarantine-reminders.pl	2022-03-17 18:45:59.043923000 -0600
@@ -0,0 +1,19 @@
+--- scripts/send-quarantine-reminders.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/send-quarantine-reminders.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: send-quarantine-reminders.pl 1528 2011-05-31 10:09:15Z rjl $
+ 
+@@ -89,8 +89,8 @@
+     # name of this script
+     my $script_name = "send-quarantine-reminders";
+ 
+-    # read configuration file (/etc/maia/maia.conf)
+-    my $config_file = "/etc/maia/maia.conf";
++    # read configuration file (/usr/local/etc/maia/maia.conf)
++    my $config_file = "/usr/local/etc/maia/maia.conf";
+     unless (my $rv = do $config_file) {
+         fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+         fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);
diff -Naur security/maia.orig/files/patch-scripts_stats-snapshot.pl security/maia/files/patch-scripts_stats-snapshot.pl
--- security/maia.orig/files/patch-scripts_stats-snapshot.pl	1969-12-31 17:00:00.000000000 -0700
+++ security/maia/files/patch-scripts_stats-snapshot.pl	2022-03-17 18:45:59.046299000 -0600
@@ -0,0 +1,19 @@
+--- scripts/stats-snapshot.pl.orig	2022-03-02 01:05:20 UTC
++++ scripts/stats-snapshot.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # $Id: stats-snapshot.pl 1528 2011-05-31 10:09:15Z rjl $
+ 
+@@ -86,8 +86,8 @@
+     # name of this script
+     my $script_name = "stats-snapshot";
+ 
+-    # read configuration file (/etc/maia/maia.conf)
+-    my $config_file = "/etc/maia/maia.conf";
++    # read configuration file (/usr/local/etc/maia/maia.conf)
++    my $config_file = "/usr/local/etc/maia/maia.conf";
+     unless (my $rv = do $config_file) {
+         fatal(sprintf("Couldn't parse %s: %s", $config_file, $@)) if $@;
+         fatal(sprintf("Couldn't open %s", $config_file)) if (!defined($rv) || !$rv);