Date: Tue, 1 Jan 2019 22:24:36 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489054 - in head/security/maia: . files Message-ID: <201901012224.x01MOaOd019624@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Jan 1 22:24:35 2019 New Revision: 489054 URL: https://svnweb.freebsd.org/changeset/ports/489054 Log: security/maia: Update to 1.0.4_4 Port now fetches from GitHub. While here, pet portlint. PR: 234518 Submitted by: Janky Jay <ek@purplehat.org> (maintainer) Modified: head/security/maia/Makefile (contents, props changed) head/security/maia/distinfo (contents, props changed) head/security/maia/files/pkg-message.in (contents, props changed) head/security/maia/pkg-plist (contents, props changed) Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Tue Jan 1 22:17:04 2019 (r489053) +++ head/security/maia/Makefile Tue Jan 1 22:24:35 2019 (r489054) @@ -3,13 +3,16 @@ PORTNAME= maia DISTVERSION= 1.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security -MASTER_SITES= http://www.purplehat.org/downloads/maia/ +DISTNAME= maia_mailguard MAINTAINER= ek@purplehat.org COMMENT= Web-based management system based on amavisd-new and SpamAssassin +LICENSE=GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + RUN_DEPENDS= p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \ p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \ p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \ @@ -24,29 +27,32 @@ RUN_DEPENDS= p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Sys p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \ p5-Net-Server>=0.93:net/p5-Net-Server -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USES= perl5 shebangfix + +USE_GITHUB= yes +GH_ACCOUNT= technion +GH_PROJECT= maia_mailguard +GH_TAGNAME= 09eb7e5 USE_PERL5= run NO_BUILD= yes - +WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME} DOCS= LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist - USERS= vscan GROUPS= vscan MAIAHOME= /var/maiad 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 FUZZYOCR CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \ - IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR ARJ UNARJ LHA ARC NOMARCH CAB \ + POSTFIX PFA CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \ + IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \ RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS OPTIONS_DEFAULT= MYSQL CLAMAV SPAMASSASSIN BDB IPCOUNTRY \ DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM \ ZOO P7ZIP + APACHE_DESC= Use Apache web server LIGHTTPD_DESC= Use LighTTPD web server WEBHOST_DESC= PHP, PEAR, etc... for Maia web interface @@ -57,7 +63,6 @@ PGSQLSERVER_DESC= Install PGSQL Server DOVECOT2_DESC= Use Dovecot 2.x IMAP/POP3 POSTFIX_DESC= Use Postfix MTA PFA_DESC= Use Postfixadmin -FUZZYOCR_DESC= Use FuzzyOcr CLAMAV_DESC= Use ClamAV anti-virus SPAMASSASSIN_DESC= Use SpamAssassin BDB_DESC= Use BerkeleyDB @@ -124,19 +129,19 @@ RUN_DEPENDS+= ${PEAR_DIR}/Mail/mime.php:mail/pear-Mail ${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \ ${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \ ${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ - ${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR} \ - ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \ + ${PEAR_DIR}/MDB2/Driver/mysqli.php:databases/pear-MDB2_Driver_mysqli@${PHP_FLAVOR} \ + ${LOCALBASE}/share/smarty3-${PHP_FLAVOR}/Smarty.class.php:www/smarty3@${PHP_FLAVOR} \ ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR} -PLIST_SUB+= WEBHOST="" +PLIST_SUB+= WEBHOST="" .else -PLIST_SUB+= WEBHOST="@comment " +PLIST_SUB+= WEBHOST="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes .endif .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST} -USE_PHP+= mysql mysqli +USE_PHP+= mysqli .endif .if ${PORT_OPTIONS:MPGSQL} @@ -179,10 +184,6 @@ RUN_DEPENDS+= postfix:mail/postfix RUN_DEPENDS+= ${LOCALBASE}/www/postfixadmin/config.inc.php:mail/postfixadmin .endif -.if ${PORT_OPTIONS:MFUZZYOCR} -RUN_DEPENDS+= p5-FuzzyOcr-devel>=0:mail/p5-FuzzyOcr-devel -.endif - .if ${PORT_OPTIONS:MCLAMAV} RUN_DEPENDS+= clamd:security/clamav .endif @@ -323,14 +324,15 @@ post-patch: -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/maiad @${FIND} -E ${WRKSRC} -iregex '.*(bak|~)$$' -delete + @${FIND} -E ${WRKSRC} -iregex '.*(gitkeep|~)$$' -delete do-install: - ${MKDIR} ${STAGEDIR}${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web @cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - ${LN} -s ${PREFIX}/share/smarty ${STAGEDIR}${WWWDIR}/libs/Smarty - ${MKDIR} -p ${STAGEDIR}${DATADIR} + ${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty + ${MKDIR} ${STAGEDIR}${DATADIR} @cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts - ${MKDIR} -p ${STAGEDIR}${ETCDIR}/templates + ${MKDIR} ${STAGEDIR}${ETCDIR}/templates .for i in digest.tpl newuser.tpl reminder.tpl ${INSTALL} -m 644 ${WRKSRC}/templates/${i}.dist ${STAGEDIR}${ETCDIR}/templates .endfor Modified: head/security/maia/distinfo ============================================================================== --- head/security/maia/distinfo Tue Jan 1 22:17:04 2019 (r489053) +++ head/security/maia/distinfo Tue Jan 1 22:24:35 2019 (r489054) @@ -1,2 +1,3 @@ -SHA256 (maia-1.0.4.tar.gz) = fdb971d916979172019c5ad5802a45d94980e9a847aede75d6249fac52d78748 -SIZE (maia-1.0.4.tar.gz) = 4514924 +TIMESTAMP = 1546121679 +SHA256 (maia_mailguard_GH0.tar.gz) = 15789ad4b7e00efdfe115bd7688e02d7b456c015ef4d061a2425ff8a1d4b818f +SIZE (maia_mailguard_GH0.tar.gz) = 2298436 Modified: head/security/maia/files/pkg-message.in ============================================================================== --- head/security/maia/files/pkg-message.in Tue Jan 1 22:17:04 2019 (r489053) +++ head/security/maia/files/pkg-message.in Tue Jan 1 22:24:35 2019 (r489054) @@ -16,3 +16,8 @@ as maia.conf.dist and maiad.conf.dist. ******************************************************************* + Please note that Maia Mailguard no longer supports "mysql" but has + moved forward to using "mysqli" instead. So, please check your + %%WWWDIR%%/config.php file and make any appropriate changes. +******************************************************************* + Modified: head/security/maia/pkg-plist ============================================================================== --- head/security/maia/pkg-plist Tue Jan 1 22:17:04 2019 (r489053) +++ head/security/maia/pkg-plist Tue Jan 1 22:24:35 2019 (r489054) @@ -358,6 +358,43 @@ sbin/maiad %%WWWDIR%%/locale/it/welcome.php %%WWWDIR%%/locale/it/xadminusers.php %%WWWDIR%%/locale/it/xlogin.php +%%WWWDIR%%/locale/ja/admindex.php +%%WWWDIR%%/locale/ja/admindomains.php +%%WWWDIR%%/locale/ja/adminhelp.php +%%WWWDIR%%/locale/ja/adminlanguages.php +%%WWWDIR%%/locale/ja/adminstats.php +%%WWWDIR%%/locale/ja/adminsystem.php +%%WWWDIR%%/locale/ja/adminthemes.php +%%WWWDIR%%/locale/ja/adminusers.php +%%WWWDIR%%/locale/ja/adminviruses.php +%%WWWDIR%%/locale/ja/auth.php +%%WWWDIR%%/locale/ja/confirmspam.php +%%WWWDIR%%/locale/ja/db.php +%%WWWDIR%%/locale/ja/deleteitem.php +%%WWWDIR%%/locale/ja/deliver.php +%%WWWDIR%%/locale/ja/display.php +%%WWWDIR%%/locale/ja/domainsettings.php +%%WWWDIR%%/locale/ja/errors.php +%%WWWDIR%%/locale/ja/falsenegative.php +%%WWWDIR%%/locale/ja/help.php +%%WWWDIR%%/locale/ja/internal-init.php +%%WWWDIR%%/locale/ja/listcache.php +%%WWWDIR%%/locale/ja/login.php +%%WWWDIR%%/locale/ja/logout.php +%%WWWDIR%%/locale/ja/mime.php +%%WWWDIR%%/locale/ja/quarantine.php +%%WWWDIR%%/locale/ja/quickstats.php +%%WWWDIR%%/locale/ja/reportspam.php +%%WWWDIR%%/locale/ja/rulestats.php +%%WWWDIR%%/locale/ja/settings.php +%%WWWDIR%%/locale/ja/smtp.php +%%WWWDIR%%/locale/ja/stats.php +%%WWWDIR%%/locale/ja/viewmail.php +%%WWWDIR%%/locale/ja/virusstats.php +%%WWWDIR%%/locale/ja/wblist.php +%%WWWDIR%%/locale/ja/welcome.php +%%WWWDIR%%/locale/ja/xadminusers.php +%%WWWDIR%%/locale/ja/xlogin.php %%WWWDIR%%/locale/nl/admindex.php %%WWWDIR%%/locale/nl/admindomains.php %%WWWDIR%%/locale/nl/adminhelp.php
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901012224.x01MOaOd019624>