From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 20 21:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 7E849958 for ; Thu, 20 Mar 2014 21:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 59DED1BB for ; Thu, 20 Mar 2014 21:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2KL01gc014872 for ; Thu, 20 Mar 2014 21:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2KL01DX014871; Thu, 20 Mar 2014 21:00:01 GMT (envelope-from gnats) Resent-Date: Thu, 20 Mar 2014 21:00:01 GMT Resent-Message-Id: <201403202100.s2KL01DX014871@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lukasz Wasikowski Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 491996E5 for ; Thu, 20 Mar 2014 20:54:10 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34B4616C for ; Thu, 20 Mar 2014 20:54:10 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2KKs9pt070557 for ; Thu, 20 Mar 2014 20:54:09 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2KKs9Cf070556; Thu, 20 Mar 2014 20:54:09 GMT (envelope-from nobody) Message-Id: <201403202054.s2KKs9Cf070556@cgiserv.freebsd.org> Date: Thu, 20 Mar 2014 20:54:09 GMT From: Lukasz Wasikowski To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/187798: [maintainer update] mail/sgwi port cleanup and add staging X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Mar 2014 21:00:01 -0000 >Number: 187798 >Category: ports >Synopsis: [maintainer update] mail/sgwi port cleanup and add staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 20 21:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Lukasz Wasikowski >Release: 9.2-RELEASE-p3 >Organization: >Environment: FreeBSD jinx.wasikowski.net 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #6 r263415: Thu Mar 20 06:06:15 CET 2014 root@jinx.wasikowski.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Port cleanup: - add stage support - add second mirror to MASTER_SITES - rename files/patch-.htaccess to files/patch-.htaccess.sample - rename files/patch-.htpasswd to files/patch-.htpasswd.sample >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN mail/sgwi.orig/Makefile mail/sgwi/Makefile --- mail/sgwi.orig/Makefile 2013-09-20 21:59:12.000000000 +0200 +++ mail/sgwi/Makefile 2014-03-20 21:15:06.770757790 +0100 @@ -4,7 +4,8 @@ PORTNAME= sgwi PORTVERSION= 1.1.6 CATEGORIES= mail www -MASTER_SITES= http://www.vanheusden.com/sgwi/ +MASTER_SITES= http://www.vanheusden.com/sgwi/ \ + http://lukasz.wasikowski.net/files/ DISTNAME= sqlgreywebinterface-${PORTVERSION} EXTRACT_SUFX= .tgz @@ -25,7 +26,6 @@ OPTIONS_DEFAULT=MYSQL -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -42,31 +42,20 @@ ${FIND} ${WRKSRC} -name '*.orig' -delete do-install: - @[ ! -f ${WRKSRC}/.htpasswd ] || ${MV} ${WRKSRC}/.htpasswd ${WRKSRC}/.htpasswd.sample - @[ ! -f ${WRKSRC}/.htaccess ] || ${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.sample - @[ ! -f ${WRKSRC}/includes/config.inc.php ] || ${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample - @${MKDIR} ${WWWDIR} - @${MKDIR} ${WWWDIR}/includes - ${INSTALL_DATA} ${WRKSRC}/*.php ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/*.txt ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/*.css ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/.ht* ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${WWWDIR}/includes/ - ${INSTALL_DATA} ${WRKSRC}/includes/*.php ${WWWDIR}/includes/ - @if [ -f ${WWWDIR}/config.inc.php ]; then \ - ${MV} ${WWWDIR}/config.inc.php ${WWWDIR}/includes/config.inc.php; \ - fi - @[ -f ${WWWDIR}/includes/config.inc.php ] || \ - ${CP} ${WWWDIR}/includes/config.inc.php.sample ${WWWDIR}/includes/config.inc.php - @[ -f ${WWWDIR}/.htpasswd ] || \ - ${CP} ${WWWDIR}/.htpasswd.sample ${WWWDIR}/.htpasswd - @[ -f ${WWWDIR}/.htaccess ] || \ - ${CP} ${WWWDIR}/.htaccess.sample ${WWWDIR}/.htaccess - -post-install: - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/ - @${CHOWN} root ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php* - @${CHMOD} -R 0640 ${WWWDIR}/*.php ${WWWDIR}/*.txt ${WWWDIR}/*.css ${WWWDIR}/.ht* ${WWWDIR}/includes/*.php ${WWWDIR}/includes/*.sample - @${CAT} ${PKGMESSAGE} + @${MV} ${WRKSRC}/includes/config.inc.php ${WRKSRC}/includes/config.inc.php.sample + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR}/includes + ${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/.ht* ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/includes/*.sample ${STAGEDIR}${WWWDIR}/includes/ + ${INSTALL_DATA} ${WRKSRC}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/ + +#post-install: +# @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/ +# @${CHOWN} root ${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/config.inc.php* +# @${CHMOD} -R 0640 ${STAGEDIR}${WWWDIR}/*.php ${STAGEDIR}${WWWDIR}/*.txt ${STAGEDIR}${WWWDIR}/*.css ${STAGEDIR}${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/*.sample +# @${CAT} ${PKGMESSAGE} .include diff -ruN mail/sgwi.orig/files/patch-.htaccess mail/sgwi/files/patch-.htaccess --- mail/sgwi.orig/files/patch-.htaccess 2014-01-22 18:40:44.000000000 +0100 +++ mail/sgwi/files/patch-.htaccess 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- /dev/null 2008-03-11 22:05:01.000000000 +0100 -+++ .htaccess 2008-03-11 22:03:36.000000000 +0100 -@@ -0,0 +1,8 @@ -+AuthUserFile /usr/local/www/sgwi/.htpasswd -+AuthGroupFile /dev/null -+AuthName "sgwi Admin" -+AuthType Basic -+ -+ -+require valid-user -+ diff -ruN mail/sgwi.orig/files/patch-.htaccess.sample mail/sgwi/files/patch-.htaccess.sample --- mail/sgwi.orig/files/patch-.htaccess.sample 1970-01-01 01:00:00.000000000 +0100 +++ mail/sgwi/files/patch-.htaccess.sample 2014-03-20 20:56:04.402753000 +0100 @@ -0,0 +1,11 @@ +--- /dev/null 2008-03-11 22:05:01.000000000 +0100 ++++ .htaccess.sample 2008-03-11 22:03:36.000000000 +0100 +@@ -0,0 +1,8 @@ ++AuthUserFile /usr/local/www/sgwi/.htpasswd ++AuthGroupFile /dev/null ++AuthName "sgwi Admin" ++AuthType Basic ++ ++ ++require valid-user ++ diff -ruN mail/sgwi.orig/files/patch-.htpasswd mail/sgwi/files/patch-.htpasswd --- mail/sgwi.orig/files/patch-.htpasswd 2014-01-22 18:40:44.000000000 +0100 +++ mail/sgwi/files/patch-.htpasswd 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ ---- /dev/null 2008-03-11 22:05:01.000000000 +0100 -+++ .htpasswd 2008-03-11 22:02:21.000000000 +0100 -@@ -0,0 +1 @@ -+admin:1Cm2R1zl5.LII diff -ruN mail/sgwi.orig/files/patch-.htpasswd.sample mail/sgwi/files/patch-.htpasswd.sample --- mail/sgwi.orig/files/patch-.htpasswd.sample 1970-01-01 01:00:00.000000000 +0100 +++ mail/sgwi/files/patch-.htpasswd.sample 2014-03-20 20:56:12.298766000 +0100 @@ -0,0 +1,4 @@ +--- /dev/null 2008-03-11 22:05:01.000000000 +0100 ++++ .htpasswd.sample 2008-03-11 22:02:21.000000000 +0100 +@@ -0,0 +1 @@ ++admin:1Cm2R1zl5.LII diff -ruN mail/sgwi.orig/files/pkg-install.in mail/sgwi/files/pkg-install.in --- mail/sgwi.orig/files/pkg-install.in 2014-01-22 16:52:06.000000000 +0100 +++ mail/sgwi/files/pkg-install.in 2014-03-20 21:07:32.299756000 +0100 @@ -7,6 +7,7 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 else - /usr/sbin/chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/includes/ - /usr/bin/chgrp ${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php + /usr/sbin/chown -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + /usr/sbin/chown root:${WWWGRP} ${WWWDIR}/.ht* ${WWWDIR}/includes/config.inc.php* + /bin/chmod -R 0640 ${STAGEDIR}${WWWDIR}/*.php ${STAGEDIR}${WWWDIR}/*.txt ${STAGEDIR}${WWWDIR}/*.css ${STAGEDIR}${WWWDIR}/.ht* ${STAGEDIR}${WWWDIR}/includes/*.php ${STAGEDIR}${WWWDIR}/includes/*.sample fi diff -ruN mail/sgwi.orig/pkg-plist mail/sgwi/pkg-plist --- mail/sgwi.orig/pkg-plist 2014-01-22 16:16:56.000000000 +0100 +++ mail/sgwi/pkg-plist 2014-03-20 21:24:42.234759693 +0100 @@ -7,6 +7,7 @@ www/sgwi/awl.php www/sgwi/connect.php www/sgwi/includes/awl.inc.php +@exec [ -f %D/www/sgwi/config.inc.php ] && mv -f %D/www/sgwi/config.inc.php %D/www/sgwi/includes/config.inc.php @unexec if cmp -s %D/www/sgwi/includes/config.inc.php %D/www/sgwi/includes/config.inc.php.sample; then rm -f %D/www/sgwi/includes/config.inc.php; fi www/sgwi/includes/config.inc.php.sample @exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php >Release-Note: >Audit-Trail: >Unformatted: