From nobody Sun Jan 08 17:49:35 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nql2R3NzHz2qk91; Sun, 8 Jan 2023 17:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nql2R2kZZz4FY8; Sun, 8 Jan 2023 17:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673200175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbH+1n8rNxa0zOvum7W2DbqsGmV3Fe8hA+nA20QbUsA=; b=iaCF0Mg1laAATmDGFOCYsjPADKRh8e2MEmfppIbaVb0MI9HBkaFAjMDZFdt8Pztn/m1XU4 /W16tdEkTMBnRvunXK4iOnprnN2e/7jBiLUJQ5uyUGfcC5ufq/y/ivLQuQn58HAYlvstfq oXS0vdwm6fkJUoXsQN6I8qLDnhOam4yWn/ItygsnLlqEa7e9p1hegbAZAlVidYRtjXq4M7 EwfaP+fQYq8xV7W3p3AtREWDjB559cK2t1sRIesbIKffWIs3F/IdtZLBTwmGLWMp/vNhi+ YlV9ePWinZmy2n59miV8e7znWGZJRJWJoixA6dRKXTeBWTGfPmlCVHtWyX7a6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673200175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbH+1n8rNxa0zOvum7W2DbqsGmV3Fe8hA+nA20QbUsA=; b=AjyQV7/cxS1ZoPqJffpLwx9dNLjPxWmmsEACIrsRkAkLq9wJCWJQuGlJ//divA29ob4gZP TRzs3BAcWMnYEXVIGqmfLatuJNVlRb9LLNJ2wK9zPEv1efUV8Zbp2pBzdqoXy+HmCKAmuL XJdxjknXr7L6q4n8qKrxNy4OsIM//6mDxIZwYBkqF95kif1PATzY23xEkJaK+Ll7wL+uGD YJ+LtUPQ1fhZTVlKgpjtHaudo7qUyXl/TqCaAmbj5yiaqYymM8neZUo1MakMTTAYnoioS6 12wKidlsjUh9E/yu6EV9fBiWwG9fFN8nHK/f9H+MEsszjTqChIJnrZFlsX3vwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673200175; a=rsa-sha256; cv=none; b=mJhT+Uee0KTj9n7oxzqJiY4k+j0fyYskaloiKao4IYR13suld9J8eQLhkNtHLSZF1f7cB7 1tXiG1eMWi52Wle3N8ZmanxndT+cCiAXAnA87hMNttChi7gRgHQBfThG1ZKzxc6HjNP1O2 euX8UwkRl/fkVo/H/Rg4/yyOjyvJ3qBTYNSJtt64ywOgWKpfZQv/gWTCCpWb+8dIlAKgxk oWY6wdJdEyNh4LIKv9pdni10ESEQAnZZnP1enqjpx44R+OtH1whzFgqZ2bqYEPpcxIIxEo RTQ1FObzuxOunnvhIA9+VJGN/CGJZ285R8A5f2z3HZeE8t0fDSDUvASZKuNvMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nql2R1fGBzy9B; Sun, 8 Jan 2023 17:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 308HnZpF004966; Sun, 8 Jan 2023 17:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 308HnZhC004965; Sun, 8 Jan 2023 17:49:35 GMT (envelope-from git) Date: Sun, 8 Jan 2023 17:49:35 GMT Message-Id: <202301081749.308HnZhC004965@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dirk Meyer Subject: git: 838734926dc5 - 2023Q1 - databases/phppgadmin: update to 7.14.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 838734926dc5adfefda2b97d7926cc85dd15d084 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=838734926dc5adfefda2b97d7926cc85dd15d084 commit 838734926dc5adfefda2b97d7926cc85dd15d084 Author: Dirk Meyer AuthorDate: 2023-01-08 17:25:32 +0000 Commit: Dirk Meyer CommitDate: 2023-01-08 17:48:58 +0000 databases/phppgadmin: update to 7.14.3 - add support for postgres15 - fix Authentication Bypass PR: 268785 MFH: 2023Q1 Security: CVE-2021-3850 Security: https://huntr.dev/bounties/bdf5f216-4499-4225-a737-b28bc6f5801c/ (cherry picked from commit 914d197f6fd8a2d4822da8abd63d7fef490c23ea) --- databases/phppgadmin/Makefile | 10 +- databases/phppgadmin/distinfo | 6 +- .../files/patch-adodb-postgres64.inc.php | 14 - databases/phppgadmin/files/patch-all_db.php | 11 - databases/phppgadmin/pkg-plist | 1193 +++++++++++++++++++- 5 files changed, 1194 insertions(+), 40 deletions(-) diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index cc68ec482ea0..ef52fc44d13b 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -1,13 +1,13 @@ PORTNAME= phppgadmin -DISTVERSIONPREFIX= REL_ -DISTVERSION= 7-13-0 -PORTREVISION= 1 +PORTVERSION= 7.14.3 +DISTVERSIONPREFIX= v +DISTVERSIONSUFFIX= -mod CATEGORIES= databases www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= dinoex@FreeBSD.org COMMENT= Web Based Postgres Administration -WWW= http://phppgadmin.sourceforge.net/ +WWW= https://github.com/ReimuHakurei/phpPgAdmin LICENSE= GPLv2 @@ -15,6 +15,8 @@ NO_ARCH= yes NO_BUILD= yes USES= cpe tar:bzip2 php:web,flavors shebangfix USE_GITHUB= yes +GH_ACCOUNT= ReimuHakurei +WRKSRC= ${WRKDIR}/phpPgAdmin-${DISTVERSION}${DISTVERSIONSUFFIX} .if !defined(WITHOUT_PHP_DEPENDS) USE_PHP= pgsql pcre session mbstring diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo index 764d6fc48901..d2dddc67fb96 100644 --- a/databases/phppgadmin/distinfo +++ b/databases/phppgadmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604814761 -SHA256 (phppgadmin-phppgadmin-REL_7-13-0_GH0.tar.gz) = 8694707ebff7bf4357b2920dacf12344e2c6d62c8143dc0f65794f50756c90fd -SIZE (phppgadmin-phppgadmin-REL_7-13-0_GH0.tar.gz) = 804431 +TIMESTAMP = 1673194973 +SHA256 (ReimuHakurei-phppgadmin-v7.14.3-mod_GH0.tar.gz) = 1665aa9530c71b65b3997f451acc293e71992173767d89c4ebaafe40b9290697 +SIZE (ReimuHakurei-phppgadmin-v7.14.3-mod_GH0.tar.gz) = 1811036 diff --git a/databases/phppgadmin/files/patch-adodb-postgres64.inc.php b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php deleted file mode 100644 index 0c62e353ce1a..000000000000 --- a/databases/phppgadmin/files/patch-adodb-postgres64.inc.php +++ /dev/null @@ -1,14 +0,0 @@ ---- libraries/adodb/drivers/adodb-postgres64.inc.php.orig 2020-11-07 06:09:12 UTC -+++ libraries/adodb/drivers/adodb-postgres64.inc.php -@@ -122,6 +122,11 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.re - // changes the metaColumnsSQL, adds columns: attnum[6] - } - -+ function __construct() -+ { -+ // changes the metaColumnsSQL, adds columns: attnum[6] -+ } -+ - function ServerInfo() - { - if (isset($this->version)) return $this->version; diff --git a/databases/phppgadmin/files/patch-all_db.php b/databases/phppgadmin/files/patch-all_db.php deleted file mode 100644 index a2f8dbd52592..000000000000 --- a/databases/phppgadmin/files/patch-all_db.php +++ /dev/null @@ -1,11 +0,0 @@ ---- all_db.php.orig 2020-11-07 06:09:12 UTC -+++ all_db.php -@@ -199,7 +199,7 @@ - echo "\t\t\n"; - echo "\t\t\t