Attachment 200643 Details for Bug 234518 – security/maia port patch.

[patch] security/maia port patch.

maia-1.0.4-g20181202.diff (text/plain), 5.46 KB, created by ek on 2018-12-31 05:36:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ek

Created: 2018-12-31 05:36:20 UTC

Size: 5.46 KB

patch

obsolete

>diff -Naur maia.orig/Makefile maia/Makefile
>--- maia.orig/Makefile	2018-08-16 14:29:28.000000000 -0600
>+++ maia/Makefile	2018-12-30 21:49:16.718410000 -0700
>@@ -2,10 +2,14 @@
> # $FreeBSD: head/security/maia/Makefile 477372 2018-08-16 20:29:28Z rene $
> 
> PORTNAME=	maia
>-DISTVERSION=	1.0.4
>-PORTREVISION=	3
>+DISTVERSION=	1.0.4-g20181202
> CATEGORIES=	security
>-MASTER_SITES=	http://www.purplehat.org/downloads/maia/
>+DISTNAME=	maia_mailguard
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	technion
>+GH_PROJECT=	maia_mailguard
>+GH_TAGNAME=	09eb7e5
> 
> MAINTAINER=	ek@purplehat.org
> COMMENT=	Web-based management system based on amavisd-new and SpamAssassin
>@@ -24,7 +28,7 @@
> 		p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \
> 		p5-Net-Server>=0.93:net/p5-Net-Server
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
>+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
> USES=		perl5 shebangfix
> USE_PERL5=	run
> NO_BUILD=	yes
>@@ -40,7 +44,7 @@
> 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 \
>+		POSTFIX PFA CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \
> 		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR ARJ UNARJ LHA ARC NOMARCH CAB \
> 		RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS
> 
>@@ -57,7 +61,6 @@
> 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,8 +127,8 @@
> 		${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=""
> .else
>@@ -136,7 +139,7 @@
> 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 +182,6 @@
> 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,11 +322,12 @@
> 		-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
>+	${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty
> 	${MKDIR} -p ${STAGEDIR}${DATADIR}
> 	@cd ${WRKSRC}/scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripts
> 	${MKDIR} -p ${STAGEDIR}${ETCDIR}/templates
>diff -Naur maia.orig/distinfo maia/distinfo
>--- maia.orig/distinfo	2015-03-29 02:41:53.000000000 -0600
>+++ maia/distinfo	2018-12-29 20:23:40.581086000 -0700
>@@ -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
>diff -Naur maia.orig/pkg-plist maia/pkg-plist
>--- maia.orig/pkg-plist	2016-06-18 09:38:10.000000000 -0600
>+++ maia/pkg-plist	2018-12-30 21:48:53.249442000 -0700
>@@ -358,6 +358,43 @@
> %%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

Flags:

ek: maintainer-approval+

Actions: View | Diff

Attachments on bug 234518: 200643 | 200669