Date: Sun, 20 Mar 2011 16:55:09 GMT From: Lukasz Wasikowski <lukasz@wasikowski.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155727: [maintainer update] Update mail/sgwi to 1.1.2 Message-ID: <201103201655.p2KGt8a9061678@red.freebsd.org> Resent-Message-ID: <201103201700.p2KH06GN075414@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155727 >Category: ports >Synopsis: [maintainer update] Update mail/sgwi to 1.1.2 >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: Sun Mar 20 17:00:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Lukasz Wasikowski >Release: 8.2-RELEASE >Organization: >Environment: FreeBSD bijou.wasikowski.net 8.2-RELEASE FreeBSD 8.2-RELEASE #1: Sun Feb 27 00:42:41 CET 2011 root@bijou.wasikowski.net:/usr/obj/usr/src/sys/bijou i386 >Description: sgwi update to version 1.1.2. >How-To-Repeat: >Fix: Patch attached. Patch attached with submission follows: diff -ruN sgwi.bak/Makefile sgwi/Makefile --- sgwi.bak/Makefile 2010-05-22 06:28:54.000000000 +0200 +++ sgwi/Makefile 2011-03-20 16:41:47.000000000 +0100 @@ -6,7 +6,7 @@ # PORTNAME= sgwi -PORTVERSION= 0.8 +PORTVERSION= 1.1.2 CATEGORIES= mail www MASTER_SITES= http://www.vanheusden.com/sgwi/ DISTNAME= sqlgreywebinterface-${PORTVERSION} @@ -16,7 +16,8 @@ COMMENT= PHP web interface to SQLGrey NO_BUILD= yes -SUB_FILES+= pkg-message +SUB_FILES+= pkg-message pkg-install +SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS= MYSQL "MySQL back-end (use mysql PHP extension)" on OPTIONS+= PGSQL "PostgreSQL back-end (use pgsql PHP extension)" off @@ -33,32 +34,37 @@ IGNORE= needs at least one database back-end .endif +WANT_PHP_WEB= yes + post-patch: ${FIND} ${WRKSRC} -name '*.orig' -delete do-install: - @[ ! -f ${WRKSRC}/.htpasswd ] || ${MV} ${WRKSRC}/.htpasswd ${WRKSRC}/.htpasswd.dist - @[ ! -f ${WRKSRC}/.htaccess ] || ${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist - @[ ! -f ${WRKSRC}/config.inc.php ] || ${MV} ${WRKSRC}/config.inc.php ${WRKSRC}/config.inc.php.dist - @${MKDIR} ${PREFIX}/www/sgwi - @${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/www/sgwi - @${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/sgwi - @${INSTALL_DATA} ${WRKSRC}/*.dist ${PREFIX}/www/sgwi - @${INSTALL_DATA} ${WRKSRC}/.ht* ${PREFIX}/www/sgwi - @[ -f ${PREFIX}/www/sgwi/config.inc.php ] || \ - ${CP} ${PREFIX}/www/sgwi/config.inc.php.dist \ - ${PREFIX}/www/sgwi/config.inc.php - @[ -f ${PREFIX}/www/sgwi/.htpasswd ] || \ - ${CP} ${PREFIX}/www/sgwi/.htpasswd.dist \ - ${PREFIX}/www/sgwi/.htpasswd - @[ -f ${PREFIX}/www/sgwi/.htaccess ] || \ - ${CP} ${PREFIX}/www/sgwi/.htaccess.dist \ - ${PREFIX}/www/sgwi/.htaccess + @[ ! -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} ${PREFIX}/www/sgwi - @${CHOWN} root ${PREFIX}/www/sgwi/.ht* ${PREFIX}/www/sgwi/config.inc.php* - @${CHMOD} 640 ${PREFIX}/www/sgwi/*.php ${PREFIX}/www/sgwi/*.txt ${PREFIX}/www/sgwi/.ht* ${PREFIX}/www/sgwi/*.dist - ${CAT} ${PKGMESSAGE} + @${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} .include <bsd.port.mk> diff -ruN sgwi.bak/distinfo sgwi/distinfo --- sgwi.bak/distinfo 2010-05-22 06:28:54.000000000 +0200 +++ sgwi/distinfo 2011-03-20 17:14:06.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (sqlgreywebinterface-0.8.tgz) = dec77354d94a9b66b3246f0a68285608 -SHA256 (sqlgreywebinterface-0.8.tgz) = 3df6ed0152a9a9f1bac7c22dd12dc3124227596418b4ae3f3a1bceb5e54c9929 -SIZE (sqlgreywebinterface-0.8.tgz) = 5104 +SHA256 (sqlgreywebinterface-1.1.2.tgz) = 60f45f9e1ba2f040e1d403825eadbdd5a5659e4c08915f5d3dacbc99f3971bf0 +SIZE (sqlgreywebinterface-1.1.2.tgz) = 8806 diff -ruN sgwi.bak/files/patch-copyright.php sgwi/files/patch-copyright.php --- sgwi.bak/files/patch-copyright.php 2010-05-22 06:28:54.000000000 +0200 +++ sgwi/files/patch-copyright.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ ---- copyright.inc.php.orig 2008-03-11 22:23:21.000000000 +0100 -+++ copyright.inc.php 2008-03-11 22:23:33.000000000 +0100 -@@ -1,4 +1,4 @@ - <TR HEIGHT=64><TD> - <HR> --<FONT SIZE=-1><A HREF="http://www.vanheusden.com/sgwi/" TARGET="_new">SQLGrey webinterface v0.6</A> by <A HREF="http://www.vanheusden.com/feedbackform.php?subject=SQLGrey%20webinterface" TARGET="_new">folkert@vanheusden.com</A> -+<FONT SIZE=-1><A HREF="http://www.vanheusden.com/sgwi/" TARGET="_new">SQLGrey webinterface v0.8</A> by <A HREF="http://www.vanheusden.com/feedbackform.php?subject=SQLGrey%20webinterface" TARGET="_new">folkert@vanheusden.com</A> - </TD></TR> diff -ruN sgwi.bak/files/pkg-install.in sgwi/files/pkg-install.in --- sgwi.bak/files/pkg-install.in 1970-01-01 01:00:00.000000000 +0100 +++ sgwi/files/pkg-install.in 2011-03-20 16:43:53.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + +WWWDIR=%%WWWDIR%% +WWWOWN=%%WWWOWN%% +WWWGRP=%%WWWGRP%% + +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 +fi diff -ruN sgwi.bak/files/pkg-message.in sgwi/files/pkg-message.in --- sgwi.bak/files/pkg-message.in 2008-03-18 14:13:06.000000000 +0100 +++ sgwi/files/pkg-message.in 2011-03-20 01:11:06.000000000 +0100 @@ -1,14 +1,14 @@ 1. Configure sgwi ----------------- -Edit the %%PREFIX%%/www/sgwi/config.inc.php file to reflect your +Edit the %%WWWDIR%%/includes/config.inc.php file to reflect your setup. The default password for sgwi is admin/admin. It's specified in -the .htpasswd file in %%PREFIX%%/www/sgwi/ directory. Change it +the .htpasswd file in %%WWWDIR%%/ directory. Change it with: -htpasswd %%PREFIX%%/www/sgwi/.htpasswd admin +htpasswd %%WWWDIR%%/.htpasswd admin Also make sure that the location of the .htpasswd file specified in .htaccess file matches your path. @@ -17,7 +17,7 @@ ------------------- Add a line in your httpd.conf to allow the use of .htaccess file. -<Directory "%%PREFIX%%/www/sgwi"> +<Directory "%%WWWDIR%%/"> Options Indexes AllowOverride AuthConfig </Directory> diff -ruN sgwi.bak/pkg-plist sgwi/pkg-plist --- sgwi.bak/pkg-plist 2008-03-18 14:13:05.000000000 +0100 +++ sgwi/pkg-plist 2011-03-20 03:57:15.000000000 +0100 @@ -1,28 +1,23 @@ -@unexec if cmp -s %D/www/sgwi/.htaccess %D/www/sgwi/.htaccess.dist; then rm -f %D/www/sgwi/.htaccess; fi -www/sgwi/.htaccess.dist +@unexec if cmp -s %D/www/sgwi/.htaccess %D/www/sgwi/.htaccess.sample; then rm -f %D/www/sgwi/.htaccess; fi +www/sgwi/.htaccess.sample @exec [ -f %B/.htaccess ] || cp %B/%f %B/.htaccess -@unexec if cmp -s %D/www/sgwi/.htpasswd %D/www/sgwi/.htpasswd.dist; then rm -f %D/www/sgwi/.htpasswd; fi -www/sgwi/.htpasswd.dist +@unexec if cmp -s %D/www/sgwi/.htpasswd %D/www/sgwi/.htpasswd.sample; then rm -f %D/www/sgwi/.htpasswd; fi +www/sgwi/.htpasswd.sample @exec [ -f %B/.htpasswd ] || cp %B/%f %B/.htpasswd www/sgwi/awl.php -www/sgwi/awl_add.php -www/sgwi/awl_delete.php -www/sgwi/awl_delete_undef.php -@unexec if cmp -s %D/www/sgwi/config.inc.php %D/www/sgwi/config.inc.php.dist; then rm -f %D/www/sgwi/config.inc.php; fi -www/sgwi/config.inc.php.dist -@exec [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php www/sgwi/connect.php -www/sgwi/connect_delete.php -www/sgwi/connect_purge.php -www/sgwi/connect_whitelist.php -www/sgwi/copyright.inc.php -www/sgwi/db.inc.php +www/sgwi/includes/awl.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 +www/sgwi/includes/connect.inc.php +www/sgwi/includes/copyright.inc.php +www/sgwi/includes/functions.inc.php +www/sgwi/includes/opt_in_out.inc.php www/sgwi/index.php www/sgwi/license.txt +www/sgwi/main.css www/sgwi/opt_in_out.php -www/sgwi/opt_in_out_add.php -www/sgwi/opt_in_out_delete.php -www/sgwi/opt_in_out_helpers.inc.php www/sgwi/readme.txt -www/sgwi/tools.inc.php +@dirrm www/sgwi/includes @dirrm www/sgwi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103201655.p2KGt8a9061678>