From owner-svn-ports-head@freebsd.org Sat Mar 13 19:37:25 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DBF245A8A43; Sat, 13 Mar 2021 19:37:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DyXyF5rq0z3Hwm; Sat, 13 Mar 2021 19:37:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B779D10530; Sat, 13 Mar 2021 19:37:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12DJbPxM041688; Sat, 13 Mar 2021 19:37:25 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12DJbPok041686; Sat, 13 Mar 2021 19:37:25 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202103131937.12DJbPok041686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sat, 13 Mar 2021 19:37:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568275 - head/security/maia X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/security/maia X-SVN-Commit-Revision: 568275 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Mar 2021 19:37:25 -0000 Author: lwhsu Date: Sat Mar 13 19:37:25 2021 New Revision: 568275 URL: https://svnweb.freebsd.org/changeset/ports/568275 Log: 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) Modified: head/security/maia/Makefile head/security/maia/distinfo Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Sat Mar 13 19:13:47 2021 (r568274) +++ head/security/maia/Makefile Sat Mar 13 19:37:25 2021 (r568275) @@ -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 IPCOUNT 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 Modified: head/security/maia/distinfo ============================================================================== --- head/security/maia/distinfo Sat Mar 13 19:13:47 2021 (r568274) +++ head/security/maia/distinfo Sat Mar 13 19:37:25 2021 (r568275) @@ -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