On 2024/05/22 12:43, Stuart Henderson wrote: > I intend to drop php/7.4 and php/8.0 soon (both are out of security > support). The following ports/subpackages are setup to use 7.4 at the > moment, if anyone's interested in them could you take a look at updating > or patching to support 8.1+ please? > ... > www/phppgadmin (pea@, upstream doesn't seem very alive)
This switches to a better maintained fork and works ok with PHP 8.2. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/www/phppgadmin/Makefile,v diff -u -p -r1.37 Makefile --- Makefile 7 Nov 2023 14:19:49 -0000 1.37 +++ Makefile 29 May 2024 11:17:30 -0000 @@ -1,18 +1,17 @@ COMMENT= tool to handle the administration of PostgreSQL over the web -DISTNAME= phpPgAdmin-5.6.0 -MODPHP_VERSION= 7.4 +V= 7.14.7 +GH_ACCOUNT= ReimuHakurei +GH_PROJECT= phpPgAdmin +GH_TAGNAME= v$V-mod +PKGNAME= phpPgAdmin-$V + CATEGORIES= www databases -HOMEPAGE= https://phppgadmin.sourceforge.net/ -REVISION= 2 MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org> # GPLv2+ PERMIT_PACKAGE= Yes -SITES= https://github.com/phppgadmin/phppgadmin/releases/download/REL_5-6-0/ -EXTRACT_SUFX= .tar.bz2 - NO_BUILD= Yes NO_TEST= Yes PKG_ARCH= * @@ -31,6 +30,5 @@ do-install: post-install: @rm -fr ${PREFIX}/phpPgAdmin/tests - @rm ${PREFIX}/phpPgAdmin/conf/{.gitignore,config.inc.php} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/phppgadmin/distinfo,v diff -u -p -r1.13 distinfo --- distinfo 19 Dec 2018 13:26:25 -0000 1.13 +++ distinfo 29 May 2024 11:17:30 -0000 @@ -1,2 +1,2 @@ -SHA256 (phpPgAdmin-5.6.0.tar.bz2) = M+D8e7A4hy0vHdJp93yZJYIgpfT2WfjQ97QpBzeg3TU= -SIZE (phpPgAdmin-5.6.0.tar.bz2) = 880640 +SHA256 (phpPgAdmin-7.14.7-mod.tar.gz) = fA6Jkiq8+I/YGlJZCTDztRIQMtHTcjSlSo9kFRUtwpI= +SIZE (phpPgAdmin-7.14.7-mod.tar.gz) = 1154132 Index: patches/patch-conf_config_inc_php-dist =================================================================== RCS file: /cvs/ports/www/phppgadmin/patches/patch-conf_config_inc_php-dist,v diff -u -p -r1.2 patch-conf_config_inc_php-dist --- patches/patch-conf_config_inc_php-dist 11 Mar 2022 20:10:43 -0000 1.2 +++ patches/patch-conf_config_inc_php-dist 29 May 2024 11:17:30 -0000 @@ -1,6 +1,6 @@ remove paths as they are invalid in the default chroot -Index: conf/config.inc.php +Index: conf/config.inc.php-dist --- conf/config.inc.php-dist.orig +++ conf/config.inc.php-dist @@ -32,8 +32,8 @@ Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/www/phppgadmin/pkg/DESCR,v diff -u -p -r1.1.1.1 DESCR --- pkg/DESCR 10 Nov 2004 07:41:56 -0000 1.1.1.1 +++ pkg/DESCR 29 May 2024 11:17:30 -0000 @@ -3,3 +3,6 @@ as well as a single database. To accompl properly set up PostgreSQL user who can read/write only the desired database. It's up to you to look up the appropriate part in the PostgreSQL manual. + +This package uses a fork of phpPgAdmin; the original version has not +been updated to support recent PostgreSQL or PHP. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/phppgadmin/pkg/PLIST,v diff -u -p -r1.12 PLIST --- pkg/PLIST 11 Mar 2022 20:10:43 -0000 1.12 +++ pkg/PLIST 29 May 2024 11:17:30 -0000 @@ -1,4 +1,5 @@ phpPgAdmin/ +phpPgAdmin/BUGS phpPgAdmin/CREDITS phpPgAdmin/DEVELOPERS phpPgAdmin/FAQ @@ -26,6 +27,8 @@ phpPgAdmin/classes/database/Connection.p phpPgAdmin/classes/database/Postgres.php phpPgAdmin/classes/database/Postgres10.php phpPgAdmin/classes/database/Postgres11.php +phpPgAdmin/classes/database/Postgres12.php +phpPgAdmin/classes/database/Postgres13.php phpPgAdmin/classes/database/Postgres74.php phpPgAdmin/classes/database/Postgres80.php phpPgAdmin/classes/database/Postgres81.php @@ -61,6 +64,8 @@ phpPgAdmin/help.php phpPgAdmin/help/PostgresDoc10.php phpPgAdmin/help/PostgresDoc11.php phpPgAdmin/help/PostgresDoc12.php +phpPgAdmin/help/PostgresDoc13.php +phpPgAdmin/help/PostgresDoc14.php phpPgAdmin/help/PostgresDoc74.php phpPgAdmin/help/PostgresDoc80.php phpPgAdmin/help/PostgresDoc81.php @@ -238,10 +243,8 @@ phpPgAdmin/lang/README phpPgAdmin/lang/afrikaans.php phpPgAdmin/lang/arabic.php phpPgAdmin/lang/catalan.php -phpPgAdmin/lang/chinese-sim.php -phpPgAdmin/lang/chinese-tr.php -phpPgAdmin/lang/chinese-utf8-zh_CN.php -phpPgAdmin/lang/chinese-utf8-zh_TW.php +phpPgAdmin/lang/chinese-zh-CN.php +phpPgAdmin/lang/chinese-zh-TW.php phpPgAdmin/lang/czech.php phpPgAdmin/lang/danish.php phpPgAdmin/lang/dutch.php @@ -273,46 +276,193 @@ phpPgAdmin/lang/ukrainian.php phpPgAdmin/languages.php phpPgAdmin/libraries/ phpPgAdmin/libraries/adodb/ +phpPgAdmin/libraries/adodb/.editorconfig +phpPgAdmin/libraries/adodb/LICENSE.md +phpPgAdmin/libraries/adodb/README.md +phpPgAdmin/libraries/adodb/SECURITY.md +phpPgAdmin/libraries/adodb/adodb-active-record.inc.php +phpPgAdmin/libraries/adodb/adodb-active-recordx.inc.php phpPgAdmin/libraries/adodb/adodb-csvlib.inc.php phpPgAdmin/libraries/adodb/adodb-datadict.inc.php phpPgAdmin/libraries/adodb/adodb-error.inc.php -phpPgAdmin/libraries/adodb/adodb-iterator.inc.php +phpPgAdmin/libraries/adodb/adodb-errorhandler.inc.php +phpPgAdmin/libraries/adodb/adodb-errorpear.inc.php +phpPgAdmin/libraries/adodb/adodb-exceptions.inc.php phpPgAdmin/libraries/adodb/adodb-lib.inc.php +phpPgAdmin/libraries/adodb/adodb-loadbalancer.inc.php +phpPgAdmin/libraries/adodb/adodb-memcache.lib.inc.php +phpPgAdmin/libraries/adodb/adodb-pager.inc.php +phpPgAdmin/libraries/adodb/adodb-pear.inc.php +phpPgAdmin/libraries/adodb/adodb-perf.inc.php phpPgAdmin/libraries/adodb/adodb-time.inc.php +phpPgAdmin/libraries/adodb/adodb-xmlschema.inc.php +phpPgAdmin/libraries/adodb/adodb-xmlschema03.inc.php phpPgAdmin/libraries/adodb/adodb.inc.php +phpPgAdmin/libraries/adodb/composer.json +phpPgAdmin/libraries/adodb/datadict/ +phpPgAdmin/libraries/adodb/datadict/datadict-access.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-db2.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-firebird.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-generic.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-ibase.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-informix.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-mssql.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-mssqlnative.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-mysql.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-oci8.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-postgres.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-sapdb.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-sqlite.inc.php +phpPgAdmin/libraries/adodb/datadict/datadict-sybase.inc.php +phpPgAdmin/libraries/adodb/docs/ +phpPgAdmin/libraries/adodb/docs/README.md +phpPgAdmin/libraries/adodb/docs/adodb.gif +phpPgAdmin/libraries/adodb/docs/adodb2.gif +phpPgAdmin/libraries/adodb/docs/changelog.md +phpPgAdmin/libraries/adodb/docs/changelog_v2.x.md +phpPgAdmin/libraries/adodb/docs/changelog_v3.x.md +phpPgAdmin/libraries/adodb/docs/changelog_v4+5.md +phpPgAdmin/libraries/adodb/docs/changelog_v4.x.md phpPgAdmin/libraries/adodb/drivers/ +phpPgAdmin/libraries/adodb/drivers/adodb-access.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ado.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ado5.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ado_access.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ado_mssql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ads.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-borland_ibase.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-csv.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-db2.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-db2oci.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-db2ora.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-fbsql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-firebird.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ibase.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-informix.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-informix72.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-ldap.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-mssql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-mssql_n.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-mssqlnative.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-mssqlpo.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-mysqli.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-netezza.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-oci8.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-oci805.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-oci8po.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-oci8quercus.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbc.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbc_db2.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbc_mssql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbc_mssql2012.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbc_oracle.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbtp.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-oracle.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_dblib.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_firebird.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_mssql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_mysql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_oci.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_sqlite.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres64.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres7.inc.php phpPgAdmin/libraries/adodb/drivers/adodb-postgres8.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-postgres9.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-proxy.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sapdb.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sqlanywhere.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sqlite.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sqlite3.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sqlitepo.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sybase.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-sybase_ase.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-text.inc.php +phpPgAdmin/libraries/adodb/drivers/adodb-vfp.inc.php phpPgAdmin/libraries/adodb/lang/ phpPgAdmin/libraries/adodb/lang/adodb-ar.inc.php phpPgAdmin/libraries/adodb/lang/adodb-bg.inc.php -phpPgAdmin/libraries/adodb/lang/adodb-bgutf8.inc.php phpPgAdmin/libraries/adodb/lang/adodb-ca.inc.php phpPgAdmin/libraries/adodb/lang/adodb-cn.inc.php phpPgAdmin/libraries/adodb/lang/adodb-cz.inc.php phpPgAdmin/libraries/adodb/lang/adodb-da.inc.php phpPgAdmin/libraries/adodb/lang/adodb-de.inc.php phpPgAdmin/libraries/adodb/lang/adodb-en.inc.php +phpPgAdmin/libraries/adodb/lang/adodb-eo.inc.php phpPgAdmin/libraries/adodb/lang/adodb-es.inc.php -phpPgAdmin/libraries/adodb/lang/adodb-esperanto.inc.php phpPgAdmin/libraries/adodb/lang/adodb-fa.inc.php phpPgAdmin/libraries/adodb/lang/adodb-fr.inc.php phpPgAdmin/libraries/adodb/lang/adodb-hu.inc.php +phpPgAdmin/libraries/adodb/lang/adodb-id.inc.php phpPgAdmin/libraries/adodb/lang/adodb-it.inc.php phpPgAdmin/libraries/adodb/lang/adodb-nl.inc.php +phpPgAdmin/libraries/adodb/lang/adodb-oc.inc.php phpPgAdmin/libraries/adodb/lang/adodb-pl.inc.php phpPgAdmin/libraries/adodb/lang/adodb-pt-br.inc.php phpPgAdmin/libraries/adodb/lang/adodb-ro.inc.php -phpPgAdmin/libraries/adodb/lang/adodb-ru1251.inc.php +phpPgAdmin/libraries/adodb/lang/adodb-ru.inc.php phpPgAdmin/libraries/adodb/lang/adodb-sv.inc.php -phpPgAdmin/libraries/adodb/lang/adodb-uk1251.inc.php -phpPgAdmin/libraries/adodb/lang/adodb_th.inc.php -phpPgAdmin/libraries/adodb/license.txt -phpPgAdmin/libraries/adodb/readme.txt +phpPgAdmin/libraries/adodb/lang/adodb-th.inc.php +phpPgAdmin/libraries/adodb/lang/adodb-uk.inc.php +phpPgAdmin/libraries/adodb/pear/ +phpPgAdmin/libraries/adodb/pear/Auth/ +phpPgAdmin/libraries/adodb/pear/Auth/Container/ +phpPgAdmin/libraries/adodb/pear/Auth/Container/ADOdb.php +phpPgAdmin/libraries/adodb/pear/auth_adodb_example.php +phpPgAdmin/libraries/adodb/pear/readme.Auth.txt +phpPgAdmin/libraries/adodb/perf/ +phpPgAdmin/libraries/adodb/perf/perf-db2.inc.php +phpPgAdmin/libraries/adodb/perf/perf-informix.inc.php +phpPgAdmin/libraries/adodb/perf/perf-mssql.inc.php +phpPgAdmin/libraries/adodb/perf/perf-mssqlnative.inc.php +phpPgAdmin/libraries/adodb/perf/perf-mysql.inc.php +phpPgAdmin/libraries/adodb/perf/perf-oci8.inc.php +phpPgAdmin/libraries/adodb/perf/perf-postgres.inc.php +phpPgAdmin/libraries/adodb/perf/perf-sqlite3.inc.php +phpPgAdmin/libraries/adodb/phpdoc +phpPgAdmin/libraries/adodb/phpdoc.dist.xml +phpPgAdmin/libraries/adodb/pivottable.inc.php +phpPgAdmin/libraries/adodb/rsfilter.inc.php +phpPgAdmin/libraries/adodb/session/ +phpPgAdmin/libraries/adodb/session/adodb-compress-bzip2.php +phpPgAdmin/libraries/adodb/session/adodb-compress-gzip.php +phpPgAdmin/libraries/adodb/session/adodb-cryptsession.php +phpPgAdmin/libraries/adodb/session/adodb-cryptsession2.php +phpPgAdmin/libraries/adodb/session/adodb-encrypt-mcrypt.php +phpPgAdmin/libraries/adodb/session/adodb-encrypt-md5.php +phpPgAdmin/libraries/adodb/session/adodb-encrypt-secret.php +phpPgAdmin/libraries/adodb/session/adodb-encrypt-sha1.php +phpPgAdmin/libraries/adodb/session/adodb-sess.txt +phpPgAdmin/libraries/adodb/session/adodb-session-clob.php +phpPgAdmin/libraries/adodb/session/adodb-session-clob2.php +phpPgAdmin/libraries/adodb/session/adodb-session.php +phpPgAdmin/libraries/adodb/session/adodb-session2.php +phpPgAdmin/libraries/adodb/session/adodb-sessions.mysql.sql +phpPgAdmin/libraries/adodb/session/adodb-sessions.oracle.clob.sql +phpPgAdmin/libraries/adodb/session/adodb-sessions.oracle.sql +phpPgAdmin/libraries/adodb/session/crypt.inc.php +phpPgAdmin/libraries/adodb/session/old/ +phpPgAdmin/libraries/adodb/session/old/adodb-cryptsession.php +phpPgAdmin/libraries/adodb/session/old/adodb-session-clob.php +phpPgAdmin/libraries/adodb/session/old/adodb-session.php +phpPgAdmin/libraries/adodb/session/old/crypt.inc.php +phpPgAdmin/libraries/adodb/session/session_schema.xml +phpPgAdmin/libraries/adodb/session/session_schema2.xml phpPgAdmin/libraries/adodb/toexport.inc.php phpPgAdmin/libraries/adodb/tohtml.inc.php +phpPgAdmin/libraries/adodb/xmlschema.dtd +phpPgAdmin/libraries/adodb/xmlschema03.dtd +phpPgAdmin/libraries/adodb/xsl/ +phpPgAdmin/libraries/adodb/xsl/convert-0.1-0.2.xsl +phpPgAdmin/libraries/adodb/xsl/convert-0.1-0.3.xsl +phpPgAdmin/libraries/adodb/xsl/convert-0.2-0.1.xsl +phpPgAdmin/libraries/adodb/xsl/convert-0.2-0.3.xsl +phpPgAdmin/libraries/adodb/xsl/remove-0.2.xsl +phpPgAdmin/libraries/adodb/xsl/remove-0.3.xsl phpPgAdmin/libraries/decorator.inc.php phpPgAdmin/libraries/errorhandler.inc.php phpPgAdmin/libraries/highlight.php @@ -396,6 +546,8 @@ phpPgAdmin/themes/bootstrap/global.css phpPgAdmin/themes/bootstrap/title.png phpPgAdmin/themes/cappuccino/ phpPgAdmin/themes/cappuccino/global.css +phpPgAdmin/themes/dark/ +phpPgAdmin/themes/dark/global.css phpPgAdmin/themes/default/ phpPgAdmin/themes/default/global.css phpPgAdmin/themes/global.css