From nobody Mon May 9 08:18:06 2022 X-Original-To: dev-commits-ports-main@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 F40981AD0760; Mon, 9 May 2022 08:18:06 +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 4KxYvf6Y64z4fh1; Mon, 9 May 2022 08:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652084286; 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=ZjrQW500uVM8MT1JqnQBfTtXMYk1lpfdd3hCXEhWR1A=; b=NUgV3NXk5y/aAB9AwzY2aTPmUvumPt4bMEnsITNaxvAEMGx2phali4FENNidpmxwJYegyK ZKJndciAwquMRxN6+u7NpT50b6KdSQCAKeBABcAJFzMLuJOpjAfhnVcd7bW/vcW3INB60C JNDgnkVVV5B1fASBvoxt8vtcGLEtbWncm5xo5jyryFXKmeBAJdmTo/U81/vABvpIMSNBmQ ytYGyVRj8NnitsnhT6PG0jLyRPnmetySx1jD2MryN4RJvc8Itn0nebbmvUujxV6AdRZrye fQ5a+SJ7Yd9ez4yCPSryNGvc5rKJnK1xcVJrJ4Lan608Qps4ehwMGQQRFCOOPQ== 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 B71985740; Mon, 9 May 2022 08:18:06 +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 2498I6M6081333; Mon, 9 May 2022 08:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2498I6Vv081332; Mon, 9 May 2022 08:18:06 GMT (envelope-from git) Date: Mon, 9 May 2022 08:18:06 GMT Message-Id: <202205090818.2498I6Vv081332@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: f16b3f9ae2ad - main - databases/phppgadmin: fix for PHP8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: f16b3f9ae2ad70954302899106b9d2e14ad874e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652084286; 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=ZjrQW500uVM8MT1JqnQBfTtXMYk1lpfdd3hCXEhWR1A=; b=WUA4PPqvN+O6SqR7NqHizOOEJYbqHnCoaVrJBuE3hGSMD6pVPxjBZEVOjD3prb/KSiqc1S Q9YYXGW2Xb8r/ku2iO81bPWJHh/pPds4/e9M7ZoZEB7bgCOU6BUI3FkDbGS4stMooTf74/ ZxDlvizcgaDgCpFWjsL7Yym/OWTj6bHjZcug4xiUkZgL0OhcVSwpFxHYRhZPk59NByph0K zFsPMX6IUcoKG0GmQ4Ebgf7HZWx/KLn+qbm0MYUH8WVPIEw19PeNYeEW7jfUFRQ6j3svRj zWhotp3ryhdlbaibosEkuPw4ioO1S5QwLS6CG/Yj8vRwUqdwSNDtszcWCx2HzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652084286; a=rsa-sha256; cv=none; b=T2yBTZZkrW4SFarLanx3htaPc550bWnPaefbh5SMCli4dNPWiWvHqW/OUtC4JKdykfV4AM v3NMozkAcZQSPKSNxIL2eA7WS6QXcQJIBH4mmzU5V74jl/3kzQ/R/9QL8UUj5n75NkHWiz gF9VD0k3r/OnYeShGFL8zNbvu4EH6Un1ucKTKiP8EqtLMA8FJ3ur1D2HOdwv9NC7BTTp6v mKW1EOftKgcXJIMAIqr0B14gaW5ptikCIyDuivZD9WP8Ng6kbzanhxQMkoV5Gx1OlYBjbM 3MB3sitedlC7eB0jySyt86qN69R8jy4lfP1zo1XmKWWLsNRIC1DA7SG0ddEKoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=f16b3f9ae2ad70954302899106b9d2e14ad874e5 commit f16b3f9ae2ad70954302899106b9d2e14ad874e5 Author: Dirk Meyer AuthorDate: 2022-05-09 08:17:32 +0000 Commit: Dirk Meyer CommitDate: 2022-05-09 08:17:32 +0000 databases/phppgadmin: fix for PHP8 PR: 263759 --- databases/phppgadmin/Makefile | 2 +- databases/phppgadmin/files/patch-adodb-postgres64.inc.php | 14 ++++++++++++++ databases/phppgadmin/files/patch-all_db.php | 11 +++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index 6a10cf22df20..c44f8140cd94 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -3,7 +3,7 @@ PORTNAME= phppgadmin DISTVERSIONPREFIX= REL_ DISTVERSION= 7-13-0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/databases/phppgadmin/files/patch-adodb-postgres64.inc.php b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php new file mode 100644 index 000000000000..0c62e353ce1a --- /dev/null +++ b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 000000000000..a2f8dbd52592 --- /dev/null +++ b/databases/phppgadmin/files/patch-all_db.php @@ -0,0 +1,11 @@ +--- 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