Attachment #200669 for bug #234518

Lines 3-15 Link Here

(-)maia/Makefile (-20 / +22 lines)
3		3
4	PORTNAME= maia	4	PORTNAME= maia
5	DISTVERSION= 1.0.4	5	DISTVERSION= 1.0.4
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://www.purplehat.org/downloads/maia/	8	DISTNAME= maia_mailguard
9		9
10	MAINTAINER= ek@purplehat.org	10	MAINTAINER= ek@purplehat.org
11	COMMENT= Web-based management system based on amavisd-new and SpamAssassin	11	COMMENT= Web-based management system based on amavisd-new and SpamAssassin
12		12
		13	LICENSE=GPLv3
		14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
		15
13	RUN_DEPENDS= p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \	16	RUN_DEPENDS= p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \
14	p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \	17	p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \
15	p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \	18	p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \
Lines 24-52 Link Here
24	p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \	27	p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \
25	p5-Net-Server>=0.93:net/p5-Net-Server	28	p5-Net-Server>=0.93:net/p5-Net-Server
26		29
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
28	USES= perl5 shebangfix	30	USES= perl5 shebangfix
		31
		32	USE_GITHUB= yes
		33	GH_ACCOUNT= technion
		34	GH_PROJECT= maia_mailguard
		35	GH_TAGNAME= 09eb7e5
29	USE_PERL5= run	36	USE_PERL5= run
30	NO_BUILD= yes	37	NO_BUILD= yes
31		38	WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
32	DOCS= LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist	39	DOCS= LICENSE.txt README.md maiad.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
33
34	USERS= vscan	40	USERS= vscan
35	GROUPS= vscan	41	GROUPS= vscan
36	MAIAHOME= /var/maiad	42	MAIAHOME= /var/maiad
37	MAIAQUARANTINE?= /var/maiad/virusmails	43	MAIAQUARANTINE?= /var/maiad/virusmails
38
39	PEAR_DIR?= ${LOCALBASE}/share/pear	44	PEAR_DIR?= ${LOCALBASE}/share/pear
40	PLIST_SUB+= USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"	45	PLIST_SUB+= USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
41		46
42	OPTIONS_DEFINE= APACHE LIGHTTPD WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER DOVECOT2 \	47	OPTIONS_DEFINE= APACHE LIGHTTPD WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER DOVECOT2 \
43	POSTFIX PFA FUZZYOCR CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \	48	POSTFIX PFA CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \
44	IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR ARJ UNARJ LHA ARC NOMARCH CAB \	49	IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \
45	RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS	50	RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS
46		51
47	OPTIONS_DEFAULT= MYSQL CLAMAV SPAMASSASSIN BDB IPCOUNTRY \	52	OPTIONS_DEFAULT= MYSQL CLAMAV SPAMASSASSIN BDB IPCOUNTRY \
48	DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM \	53	DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM \
49	ZOO P7ZIP	54	ZOO P7ZIP
		55
50	APACHE_DESC= Use Apache web server	56	APACHE_DESC= Use Apache web server
51	LIGHTTPD_DESC= Use LighTTPD web server	57	LIGHTTPD_DESC= Use LighTTPD web server
52	WEBHOST_DESC= PHP, PEAR, etc... for Maia web interface	58	WEBHOST_DESC= PHP, PEAR, etc... for Maia web interface
Lines 57-63 Link Here
57	DOVECOT2_DESC= Use Dovecot 2.x IMAP/POP3	63	DOVECOT2_DESC= Use Dovecot 2.x IMAP/POP3
58	POSTFIX_DESC= Use Postfix MTA	64	POSTFIX_DESC= Use Postfix MTA
59	PFA_DESC= Use Postfixadmin	65	PFA_DESC= Use Postfixadmin
60	FUZZYOCR_DESC= Use FuzzyOcr
61	CLAMAV_DESC= Use ClamAV anti-virus	66	CLAMAV_DESC= Use ClamAV anti-virus
62	SPAMASSASSIN_DESC= Use SpamAssassin	67	SPAMASSASSIN_DESC= Use SpamAssassin
63	BDB_DESC= Use BerkeleyDB	68	BDB_DESC= Use BerkeleyDB
Lines 124-131 Link Here
124	${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \	129	${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \
125	${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \	130	${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \
126	${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \	131	${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
127	${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR} \	132	${PEAR_DIR}/MDB2/Driver/mysqli.php:databases/pear-MDB2_Driver_mysqli@${PHP_FLAVOR} \
128	${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \	133	${LOCALBASE}/share/smarty3-${PHP_FLAVOR}/Smarty.class.php:www/smarty3@${PHP_FLAVOR} \
129	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR}	134	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR}
130	PLIST_SUB+= WEBHOST=""	135	PLIST_SUB+= WEBHOST=""
131	.else	136	.else
Lines 136-142 Link Here
136	USE_MYSQL= yes	141	USE_MYSQL= yes
137	.endif	142	.endif
138	.if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST}	143	.if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MWEBHOST}
139	USE_PHP+= mysql mysqli	144	USE_PHP+= mysqli
140	.endif	145	.endif
141		146
142	.if ${PORT_OPTIONS:MPGSQL}	147	.if ${PORT_OPTIONS:MPGSQL}
Lines 179-188 Link Here
179	RUN_DEPENDS+= ${LOCALBASE}/www/postfixadmin/config.inc.php:mail/postfixadmin	184	RUN_DEPENDS+= ${LOCALBASE}/www/postfixadmin/config.inc.php:mail/postfixadmin
180	.endif	185	.endif
181		186
182	.if ${PORT_OPTIONS:MFUZZYOCR}
183	RUN_DEPENDS+= p5-FuzzyOcr-devel>=0:mail/p5-FuzzyOcr-devel
184	.endif
185
186	.if ${PORT_OPTIONS:MCLAMAV}	187	.if ${PORT_OPTIONS:MCLAMAV}
187	RUN_DEPENDS+= clamd:security/clamav	188	RUN_DEPENDS+= clamd:security/clamav
188	.endif	189	.endif
Lines 323-336 Link Here
323	-e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/maiad	324	-e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/maiad
324		325
325	@${FIND} -E ${WRKSRC} -iregex '.*(bak\|~)$$' -delete	326	@${FIND} -E ${WRKSRC} -iregex '.*(bak\|~)$$' -delete
		327	@${FIND} -E ${WRKSRC} -iregex '.*(gitkeep\|~)$$' -delete
326		328
327	do-install:	329	do-install:
328	${MKDIR} ${STAGEDIR}${WWWDIR}	330	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${WWWDIR}/web
329	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}	331	@cd ${WRKSRC}/php && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
330	${LN} -s ${PREFIX}/share/smarty ${STAGEDIR}${WWWDIR}/libs/Smarty	332	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
331	${MKDIR} -p ${STAGEDIR}${DATADIR}	333	${MKDIR} ${STAGEDIR}${DATADIR}
332	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts	334	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
333	${MKDIR} -p ${STAGEDIR}${ETCDIR}/templates	335	${MKDIR} ${STAGEDIR}${ETCDIR}/templates
334	.for i in digest.tpl newuser.tpl reminder.tpl	336	.for i in digest.tpl newuser.tpl reminder.tpl
335	${INSTALL} -m 644 ${WRKSRC}/templates/${i}.dist ${STAGEDIR}${ETCDIR}/templates	337	${INSTALL} -m 644 ${WRKSRC}/templates/${i}.dist ${STAGEDIR}${ETCDIR}/templates
336	.endfor	338	.endfor

Lines 1-2 Link Here

(-)maia/distinfo (-2 / +3 lines)
1	SHA256 (maia-1.0.4.tar.gz) = fdb971d916979172019c5ad5802a45d94980e9a847aede75d6249fac52d78748	1	TIMESTAMP = 1546121679
2	SIZE (maia-1.0.4.tar.gz) = 4514924	2	SHA256 (maia_mailguard_GH0.tar.gz) = 15789ad4b7e00efdfe115bd7688e02d7b456c015ef4d061a2425ff8a1d4b818f
		3	SIZE (maia_mailguard_GH0.tar.gz) = 2298436

Lines 16-18 Link Here

(-)maia/files/pkg-message.in (+5 lines)
16	as maia.conf.dist and maiad.conf.dist.	16	as maia.conf.dist and maiad.conf.dist.
17	*******************************************************************	17	*******************************************************************
18		18
		19	Please note that Maia Mailguard no longer supports "mysql" but has
		20	moved forward to using "mysqli" instead. So, please check your
		21	%%WWWDIR%%/config.php file and make any appropriate changes.
		22	*******************************************************************
		23




%%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

Return to bug 234518

Lines 358-363 Link Here

(-)maia/pkg-plist (+37 lines)
358	%%WWWDIR%%/locale/it/welcome.php	358	%%WWWDIR%%/locale/it/welcome.php
359	%%WWWDIR%%/locale/it/xadminusers.php	359	%%WWWDIR%%/locale/it/xadminusers.php
360	%%WWWDIR%%/locale/it/xlogin.php	360	%%WWWDIR%%/locale/it/xlogin.php
		361	%%WWWDIR%%/locale/ja/admindex.php
		362	%%WWWDIR%%/locale/ja/admindomains.php
		363	%%WWWDIR%%/locale/ja/adminhelp.php
		364	%%WWWDIR%%/locale/ja/adminlanguages.php
		365	%%WWWDIR%%/locale/ja/adminstats.php
		366	%%WWWDIR%%/locale/ja/adminsystem.php
		367	%%WWWDIR%%/locale/ja/adminthemes.php
		368	%%WWWDIR%%/locale/ja/adminusers.php
		369	%%WWWDIR%%/locale/ja/adminviruses.php
		370	%%WWWDIR%%/locale/ja/auth.php
		371	%%WWWDIR%%/locale/ja/confirmspam.php
		372	%%WWWDIR%%/locale/ja/db.php
		373	%%WWWDIR%%/locale/ja/deleteitem.php
		374	%%WWWDIR%%/locale/ja/deliver.php
		375	%%WWWDIR%%/locale/ja/display.php
		376	%%WWWDIR%%/locale/ja/domainsettings.php
		377	%%WWWDIR%%/locale/ja/errors.php
		378	%%WWWDIR%%/locale/ja/falsenegative.php
		379	%%WWWDIR%%/locale/ja/help.php
		380	%%WWWDIR%%/locale/ja/internal-init.php
		381	%%WWWDIR%%/locale/ja/listcache.php
		382	%%WWWDIR%%/locale/ja/login.php
		383	%%WWWDIR%%/locale/ja/logout.php
		384	%%WWWDIR%%/locale/ja/mime.php
		385	%%WWWDIR%%/locale/ja/quarantine.php
		386	%%WWWDIR%%/locale/ja/quickstats.php
		387	%%WWWDIR%%/locale/ja/reportspam.php
		388	%%WWWDIR%%/locale/ja/rulestats.php
		389	%%WWWDIR%%/locale/ja/settings.php
		390	%%WWWDIR%%/locale/ja/smtp.php
		391	%%WWWDIR%%/locale/ja/stats.php
		392	%%WWWDIR%%/locale/ja/viewmail.php
		393	%%WWWDIR%%/locale/ja/virusstats.php
		394	%%WWWDIR%%/locale/ja/wblist.php
		395	%%WWWDIR%%/locale/ja/welcome.php
		396	%%WWWDIR%%/locale/ja/xadminusers.php
		397	%%WWWDIR%%/locale/ja/xlogin.php
361	%%WWWDIR%%/locale/nl/admindex.php	398	%%WWWDIR%%/locale/nl/admindex.php
362	%%WWWDIR%%/locale/nl/admindomains.php	399	%%WWWDIR%%/locale/nl/admindomains.php
363	%%WWWDIR%%/locale/nl/adminhelp.php	400	%%WWWDIR%%/locale/nl/adminhelp.php