security/maia: Update to 1.0.4_6

- Code fixes for Perl and PHP 7.4 support
- Removed WDDX dependency
- Added Nginx option
- Replaced hard-coded paths to perl with /usr/bin/env

PR:		254221
Submitted by:	ek@purplehat.org (maintainer)

2 files changed, 18 insertions, 14 deletions

diff --git a/security/maia/Makefile b/security/maia/Makefile
index b11058beaec3..945c4c334987 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	maia
 DISTVERSION=	1.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 
 MAINTAINER=	ek@purplehat.org
@@ -31,7 +31,7 @@ USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
 GH_PROJECT=	maia_mailguard
-GH_TAGNAME=	09eb7e5
+GH_TAGNAME=	7f20bd4
 USE_PERL5=	run
 NO_BUILD=	yes
 DOCS=	LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
@@ -42,8 +42,8 @@ MAIAQUARANTINE?=	/var/maiad/virusmails
 PEAR_DIR?=	${LOCALBASE}/share/pear
 PLIST_SUB+=	USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
-OPTIONS_DEFINE=	APACHE LIGHTTPD WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER DOVECOT2 \
-		POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \
+OPTIONS_DEFINE=	APACHE LIGHTTPD NGINX WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER \
+		DOVECOT2 POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \
 		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \
 		RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS
 
@@ -53,6 +53,7 @@ OPTIONS_DEFAULT=	MYSQL CLAMAV SPAMASSASSIN BDB IPCOUNTRY \
 
 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
@@ -101,14 +102,14 @@ USE_RC_SUBR+=	maiad
 # setting USE_ variables. C'est la vie.
 
 .if ${PORT_OPTIONS:MAPACHE}
-USES+=		apache:run,2.2+
+USES+=		apache:run,2.4+
 .endif
 
 .if ${PORT_OPTIONS:MWEBHOST}
 USES+=		php
 USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
-		sqlite3 tokenizer xml wddx xmlreader xmlwriter xmlrpc
+		sqlite3 tokenizer xml xmlreader xmlwriter xmlrpc
 
 RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
 		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
@@ -136,8 +137,10 @@ PLIST_SUB+=	WEBHOST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USES+=		mysql
+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
@@ -153,10 +156,10 @@ USE_PHP+=	pgsql
 RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+.if ${PORT_OPTIONS:MNGINX}
+RUN_DEPENDS+=	nginx:www/nginx
 .endif
-
+ 
 .if ${PORT_OPTIONS:MMYSQLSERVER}
 USES+=		mysql:server
 .endif
@@ -290,7 +293,8 @@ post-patch:
 	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|" \
-			${WRKSRC}/${m}
+		-e "s|/usr/bin/perl|/usr/bin/env perl|" \
+		${WRKSRC}/${m}
 .endfor
 
 .for i in digest.tpl newuser.tpl reminder.tpl
diff --git a/security/maia/distinfo b/security/maia/distinfo
index b026888e32e5..9d43abbaf4b5 100644
--- a/security/maia/distinfo
+++ b/security/maia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546121679
-SHA256 (technion-maia_mailguard-1.0.4-09eb7e5_GH0.tar.gz) = 15789ad4b7e00efdfe115bd7688e02d7b456c015ef4d061a2425ff8a1d4b818f
-SIZE (technion-maia_mailguard-1.0.4-09eb7e5_GH0.tar.gz) = 2298436
+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