From owner-svn-ports-all@FreeBSD.ORG Sun Jul 13 18:13:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18587920; Sun, 13 Jul 2014 18:13:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EEA952CC4; Sun, 13 Jul 2014 18:13:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DIDvHl013268; Sun, 13 Jul 2014 18:13:57 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DIDvj4013264; Sun, 13 Jul 2014 18:13:57 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407131813.s6DIDvj4013264@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 13 Jul 2014 18:13:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361702 - in branches/2014Q3/mail/postfixadmin: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 18:13:58 -0000 Author: rakuco Date: Sun Jul 13 18:13:56 2014 New Revision: 361702 URL: http://svnweb.freebsd.org/changeset/ports/361702 QAT: https://qat.redports.org/buildarchive/r361702/ Log: MFH: r361679 - Update to 2.3.7, which contains a security fix. - Support staging. PR: 189248 Submitted by: Lukasz Wasikowski Approved by: maintainer timeout (72 days) Security: ff98087f-0a8f-11e4-b00b-5453ed2e2b49 Approved by: portmgr (miwi) Modified: branches/2014Q3/mail/postfixadmin/Makefile branches/2014Q3/mail/postfixadmin/distinfo branches/2014Q3/mail/postfixadmin/files/pkg-message.in branches/2014Q3/mail/postfixadmin/pkg-descr Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/postfixadmin/Makefile ============================================================================== --- branches/2014Q3/mail/postfixadmin/Makefile Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/Makefile Sun Jul 13 18:13:56 2014 (r361702) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfixadmin -PORTVERSION= 2.3.6 +PORTVERSION= 2.3.7 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -17,6 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERS NO_BUILD= yes SUB_FILES+= pkg-message +SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL MYSQLI PGSQL @@ -24,8 +25,6 @@ MYSQLI_DESC= MySQL 4.1+ back-end (use my OPTIONS_DEFAULT= MYSQL -NO_STAGE= yes - OPTIONS_DEFINE= DOCS .include @@ -44,6 +43,8 @@ USE_PHP+= mysqli USE_PHP+= pgsql .endif +WANT_PHP_WEB= yes + post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @@ -51,46 +52,35 @@ pre-install: @${RM} -rf ${WRKSRC}/ADDITIONS/squirrelmail-plugin do-install: - @${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION - @${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS - @${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS/cyrus - @${MKDIR} ${PREFIX}/www/postfixadmin/css - @${MKDIR} ${PREFIX}/www/postfixadmin/admin - @${MKDIR} ${PREFIX}/www/postfixadmin/images - @${MKDIR} ${PREFIX}/www/postfixadmin/languages - @${MKDIR} ${PREFIX}/www/postfixadmin/model - @${MKDIR} ${PREFIX}/www/postfixadmin/templates - @${MKDIR} ${PREFIX}/www/postfixadmin/users + @${MKDIR} ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION + @${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS + @${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS/cyrus + @${MKDIR} ${STAGEDIR}${WWWDIR}/css + @${MKDIR} ${STAGEDIR}${WWWDIR}/admin + @${MKDIR} ${STAGEDIR}${WWWDIR}/images + @${MKDIR} ${STAGEDIR}${WWWDIR}/languages + @${MKDIR} ${STAGEDIR}${WWWDIR}/model + @${MKDIR} ${STAGEDIR}${WWWDIR}/templates + @${MKDIR} ${STAGEDIR}${WWWDIR}/users (cd ${WRKSRC}/ && \ - ${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php") - @${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample - @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE} - @${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin - @${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin - @${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css - @${INSTALL_DATA} ${WRKSRC}/admin/* ${PREFIX}/www/postfixadmin/admin - @${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/postfixadmin/images - @${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/www/postfixadmin/languages - @${INSTALL_DATA} ${WRKSRC}/model/* ${PREFIX}/www/postfixadmin/model - @${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/www/postfixadmin/templates - @${INSTALL_DATA} ${WRKSRC}/users/* ${PREFIX}/www/postfixadmin/users - @${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION + ${COPYTREE_SHARE} \*.php ${STAGEDIR}${WWWDIR} "! -name config.inc.php") + @${CP} ${WRKSRC}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample + @${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/*.TXT ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/css/* ${STAGEDIR}${WWWDIR}/css + @${INSTALL_DATA} ${WRKSRC}/admin/* ${STAGEDIR}${WWWDIR}/admin + @${INSTALL_DATA} ${WRKSRC}/images/* ${STAGEDIR}${WWWDIR}/images + @${INSTALL_DATA} ${WRKSRC}/languages/* ${STAGEDIR}${WWWDIR}/languages + @${INSTALL_DATA} ${WRKSRC}/model/* ${STAGEDIR}${WWWDIR}/model + @${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${WWWDIR}/templates + @${INSTALL_DATA} ${WRKSRC}/users/* ${STAGEDIR}${WWWDIR}/users + @${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION (cd ${WRKSRC}/ADDITIONS/ && \ - ${COPYTREE_SHARE} \* ${PREFIX}/www/postfixadmin/ADDITIONS/ "! -name squirrelmail-plugin") + ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/ADDITIONS/ "! -name squirrelmail-plugin") .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .endif -post-install: - @if [ ! -f ${PREFIX}/www/postfixadmin/config.inc.php ]; then \ - ${CP} -p ${PREFIX}/www/postfixadmin/config.inc.php.sample ${PREFIX}/www/postfixadmin/config.inc.php ; \ - fi - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/postfixadmin - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/*.php ${PREFIX}/www/postfixadmin/css/*.css - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/admin/*.php - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php - @${CAT} ${PKGMESSAGE} - .include Modified: branches/2014Q3/mail/postfixadmin/distinfo ============================================================================== --- branches/2014Q3/mail/postfixadmin/distinfo Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/distinfo Sun Jul 13 18:13:56 2014 (r361702) @@ -1,2 +1,2 @@ -SHA256 (postfixadmin-2.3.6.tar.gz) = ea505281b6c04bda887eb4e6aa6c023b354c4ef4864aa60dcb1425942bf2af63 -SIZE (postfixadmin-2.3.6.tar.gz) = 1597001 +SHA256 (postfixadmin-2.3.7.tar.gz) = 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e +SIZE (postfixadmin-2.3.7.tar.gz) = 1600662 Modified: branches/2014Q3/mail/postfixadmin/files/pkg-message.in ============================================================================== --- branches/2014Q3/mail/postfixadmin/files/pkg-message.in Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/files/pkg-message.in Sun Jul 13 18:13:56 2014 (r361702) @@ -9,7 +9,7 @@ REQUIRED!! ---------- - You are using Postfix 2.0 or higher. - You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher. -- You are using PHP 4.1 or higher (5.X recommended) +- You are using PHP 5.1.2 or higher. - You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher) INSTALL / UPGRADE Modified: branches/2014Q3/mail/postfixadmin/pkg-descr ============================================================================== --- branches/2014Q3/mail/postfixadmin/pkg-descr Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/pkg-descr Sun Jul 13 18:13:56 2014 (r361702) @@ -2,7 +2,7 @@ Postfix Admin is a web-based management Postfix with Postfix-style Virtual Domains using MySQL or PostgreSQL lookups. Postfix Admin is known to work on Apache and Lighttpd, but is designed to work on any web server with -PHP 4.1+ support. +PHP 5.1.2+ support. Postfix Admin features: @@ -13,4 +13,4 @@ Postfix Admin features: - Backup MX; - Packaged with over 25 languages. -WWW: http://www.postfixadmin.org +WWW: http://www.postfixadmin.org