On Wed, Dec 19, 2018 at 11:58:31AM +0100, Solene Rapenne wrote: > Stuart Henderson <s...@spacehopper.org> wrote: > > On 2018/12/18 14:40, Solene Rapenne wrote: > > > Solene Rapenne <sol...@perso.pw> wrote: > > > > Solene Rapenne <sol...@perso.pw> wrote: > > > > > this diff updates phppgadmin to 5.6 version, released a few days ago > > > > > after a > > > > > few years of inactivity. > > > > > > > > > > It happens that the "processes" tab doesn't work on older postgresql > > > > > with this > > > > > version... Don't know if it's a show stopper? > > > > > > > > > > > new diff version, removing the tests from post-install as suggested by > > > sthen@ > > > > Thanks - now that the PLIST diff is actually readable I notice this > > (it's already present in the version in-tree) : > > > > > phpPgAdmin/conf/ > > > +phpPgAdmin/conf/.gitignore > > > phpPgAdmin/conf/config.inc.php > > > phpPgAdmin/conf/config.inc.php-dist > > > > config.inc.php is a user config file and should be handled via the > > @sample mechanism so that updates don't cause conflicts with local changes. > > > > Either this could also be removed in post-install, or commented-out in > > PLIST, and then use an @sample, e.g. > > > > phpPgAdmin/conf/config.inc.php-dist > > @sample phpPgAdmin/conf/config.inc.php > > > > Also in that file we have this .. > > > > // Specify the path to the database dump utilities for this server. > > // You can set these to '' if no dumper is available. > > $conf['servers'][0]['pg_dump_path'] = '/usr/bin/pg_dump'; > > $conf['servers'][0]['pg_dumpall_path'] = '/usr/bin/pg_dumpall'; > > > > - with the default chroot, I think patching to '' probably makes sense. > > new version > > - remove phpPgAdmin/conf/.gitignore in post-install > - use @sample for config.inc.php > - empty the values for pg_dump_path and pg_dumpall_path >
Hi Solene, Thanks for the diff and sorry for the late answer :( Looks good to me. Ok pea@ > Index: Makefile > =================================================================== > RCS file: /data/cvs/ports/www/phppgadmin/Makefile,v > retrieving revision 1.29 > diff -u -p -r1.29 Makefile > --- Makefile 17 Oct 2018 14:15:56 -0000 1.29 > +++ Makefile 19 Dec 2018 09:06:34 -0000 > @@ -2,17 +2,17 @@ > > COMMENT= tool to handle the administration of PostgreSQL over the web > > -DISTNAME= phpPgAdmin-5.1 > +DISTNAME= phpPgAdmin-5.6.0 > CATEGORIES= www databases > HOMEPAGE= http://phppgadmin.sourceforge.net/ > -REVISION= 4 > > MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org> > > # GPLv2+ > PERMIT_PACKAGE_CDROM= Yes > > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phppgadmin/} > +MASTER_SITES= > https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/ > +EXTRACT_SUFX= .tar.bz2 > > NO_BUILD= Yes > NO_TEST= Yes > @@ -29,5 +29,9 @@ RUN_DEPENDS= lang/php/${MODPHP_VERSION}, > do-install: > @cp -Rp ${WRKDIST} ${INSTDIR} > @chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} > + > +post-install: > + @rm -fr ${PREFIX}/phpPgAdmin/tests > + @rm ${PREFIX}/phpPgAdmin/conf/.gitignore > > .include <bsd.port.mk> > Index: distinfo > =================================================================== > RCS file: /data/cvs/ports/www/phppgadmin/distinfo,v > retrieving revision 1.12 > diff -u -p -r1.12 distinfo > --- distinfo 25 Apr 2014 11:00:34 -0000 1.12 > +++ distinfo 5 Dec 2018 13:43:51 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (phpPgAdmin-5.1.tar.gz) = QilOexnTtAA5EuqtmjTfQJbAOAhxrtzhUqoT1JVYeKU= > -SIZE (phpPgAdmin-5.1.tar.gz) = 747520 > +SHA256 (phpPgAdmin-5.6.0.tar.bz2) = > M+D8e7A4hy0vHdJp93yZJYIgpfT2WfjQ97QpBzeg3TU= > +SIZE (phpPgAdmin-5.6.0.tar.bz2) = 880640 > Index: patches/patch-conf_config_inc_php > =================================================================== > RCS file: patches/patch-conf_config_inc_php > diff -N patches/patch-conf_config_inc_php > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-conf_config_inc_php 19 Dec 2018 10:38:15 -0000 > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +remove paths as they are invalid in the default chroot > + > +Index: conf/config.inc.php > +--- conf/config.inc.php.orig > ++++ conf/config.inc.php > +@@ -32,8 +32,8 @@ > + > + // Specify the path to the database dump utilities for this server. > + // You can set these to '' if no dumper is available. > +- $conf['servers'][0]['pg_dump_path'] = '/usr/bin/pg_dump'; > +- $conf['servers'][0]['pg_dumpall_path'] = '/usr/bin/pg_dumpall'; > ++ $conf['servers'][0]['pg_dump_path'] = ''; > ++ $conf['servers'][0]['pg_dumpall_path'] = ''; > + > + // Example for a second server (PostgreSQL for Windows) > + //$conf['servers'][1]['desc'] = 'Test Server'; > Index: pkg/PLIST > =================================================================== > RCS file: /data/cvs/ports/www/phppgadmin/pkg/PLIST,v > retrieving revision 1.10 > diff -u -p -r1.10 PLIST > --- pkg/PLIST 4 Sep 2018 12:46:26 -0000 1.10 > +++ pkg/PLIST 19 Dec 2018 09:03:28 -0000 > @@ -25,6 +25,8 @@ phpPgAdmin/classes/database/ > phpPgAdmin/classes/database/ADODB_base.php > phpPgAdmin/classes/database/Connection.php > phpPgAdmin/classes/database/Postgres.php > +phpPgAdmin/classes/database/Postgres10.php > +phpPgAdmin/classes/database/Postgres11.php > phpPgAdmin/classes/database/Postgres74.php > phpPgAdmin/classes/database/Postgres80.php > phpPgAdmin/classes/database/Postgres81.php > @@ -33,9 +35,16 @@ phpPgAdmin/classes/database/Postgres83.p > phpPgAdmin/classes/database/Postgres84.php > phpPgAdmin/classes/database/Postgres90.php > phpPgAdmin/classes/database/Postgres91.php > +phpPgAdmin/classes/database/Postgres92.php > +phpPgAdmin/classes/database/Postgres93.php > +phpPgAdmin/classes/database/Postgres94.php > +phpPgAdmin/classes/database/Postgres95.php > +phpPgAdmin/classes/database/Postgres96.php > phpPgAdmin/colproperties.php > +phpPgAdmin/composer.json > phpPgAdmin/conf/ > -phpPgAdmin/conf/config.inc.php > +phpPgAdmin/conf/.gitignore > +@sample phpPgAdmin/conf/config.inc.php > phpPgAdmin/conf/config.inc.php-dist > phpPgAdmin/constraints.php > phpPgAdmin/conversions.php > @@ -51,6 +60,9 @@ phpPgAdmin/functions.php > phpPgAdmin/groups.php > phpPgAdmin/help/ > phpPgAdmin/help.php > +phpPgAdmin/help/PostgresDoc10.php > +phpPgAdmin/help/PostgresDoc11.php > +phpPgAdmin/help/PostgresDoc12.php > phpPgAdmin/help/PostgresDoc74.php > phpPgAdmin/help/PostgresDoc80.php > phpPgAdmin/help/PostgresDoc81.php > @@ -60,9 +72,17 @@ phpPgAdmin/help/PostgresDoc84.php > phpPgAdmin/help/PostgresDoc90.php > phpPgAdmin/help/PostgresDoc91.php > phpPgAdmin/help/PostgresDoc92.php > +phpPgAdmin/help/PostgresDoc93.php > +phpPgAdmin/help/PostgresDoc94.php > +phpPgAdmin/help/PostgresDoc95.php > +phpPgAdmin/help/PostgresDoc96.php > phpPgAdmin/history.php > phpPgAdmin/images/ > phpPgAdmin/images/themes/ > +phpPgAdmin/images/themes/bootstrap/ > +phpPgAdmin/images/themes/bootstrap/Favicon.ico > +phpPgAdmin/images/themes/bootstrap/Introduction.png > +phpPgAdmin/images/themes/bootstrap/title.png > phpPgAdmin/images/themes/cappuccino/ > phpPgAdmin/images/themes/cappuccino/Lminus.png > phpPgAdmin/images/themes/cappuccino/Lplus.png > @@ -373,6 +393,9 @@ phpPgAdmin/tables.php > phpPgAdmin/tablespaces.php > phpPgAdmin/tblproperties.php > phpPgAdmin/themes/ > +phpPgAdmin/themes/bootstrap/ > +phpPgAdmin/themes/bootstrap/global.css > +phpPgAdmin/themes/bootstrap/title.png > phpPgAdmin/themes/cappuccino/ > phpPgAdmin/themes/cappuccino/global.css > phpPgAdmin/themes/default/
