From nobody Mon Sep 04 09:08:49 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 4RfN9G3Y2jz4sR4m; Mon, 4 Sep 2023 09:08:50 +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 4RfN9F3ldYz4RSn; Mon, 4 Sep 2023 09:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818529; 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=HpHR2ecErKY5rhw8LPe7lTGWpfKhl5zGplYZYhKGlhk=; b=STb7D+V7k0A3kKjLVLVcZ2w3LImVhe5BPZO9DZBYRjpocYnBtw2azyupSHLoRx50s4cebQ dUL6UDnTp0JsxJvJUJJpaBi8BNQv5oq3KAvI2f1FZP6Iwlr2z/HGQpykVvwxggpmDQKOjX 8SSVIaJXkHE6IWFJWbgChr7iyMCLqnZ1baYr/nFsgiqRO47saycsbxTRMYUAFxXU+Vf0PF ujWhMky+XpoOVxQ+Kwc4J8Nw7vPmUxouPSH3z8K3/mn0FerojlF30TEixavBxmfcLqaotC P9fADBPHXi76/icb8C+SvXBiygdSwGN47Nj2QGIPus/dMKehrNPS963y1Vlq2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693818529; a=rsa-sha256; cv=none; b=WDsuHqHNdJLvw6NKQtPNy53fvS6Inmxv2KojDRAaFh9RzdDIf2gKrYVJDab04dri7gp7p9 QZzKb+ARWCFd3rVDnn9t7zPZVXr4dB0mCjpklRsPWkN2PWfjk96B4zgr5kU//9QlndL5MD QU84lTXHGOZ7wZnzpkeP1EP9N73DkcANIrxe4QCNsslNqlUfNRYmufGRZt2UrpIXJLQmHB LagN1GNXOe5t5J3FsRpnG5SFa7Q5lreJ/sV+CYv2WWRh/fDpu8NOSQwYG6RFTfJ6UK9Y8t gQQw2rOHThNSwUQDLch1YBnY4YDdojQehWvkPqv8KTws3t8sX7lHfgc8mw1HGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818529; 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=HpHR2ecErKY5rhw8LPe7lTGWpfKhl5zGplYZYhKGlhk=; b=pHm0yGIxUCitFKgrcFhgxM1k8J1Un94Mn9N5lfEbc1iSQJLRDHxCTa9pxLnBIAfi9MrK9P R2Y51KrlnzLg58QdD8EruofVlnfgsrbmrqdMFb7+HxwZWbYePuysJyGNoE8G+7eVrZ/4yv +j1qnUedx/022NvkVq+s/KZ/pgwezsoX2th74nQFDv5N0gxgCeYrnGuTwOgEK+SsR/xxD9 3hvz7MQEYxnls8kqeLnu2Naj0qARoR9Iu/nCP1CKKDUb7YKr9xnPXB26oyZSNXJxKPRuED THhi8jF1coezSCxpKqfpuiLiCJruN/Qm76f7oNfr1dIFbm5SZLC9QiAQHZHreg== 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 4RfN9F2sB9z11HL; Mon, 4 Sep 2023 09:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38498nQr048958; Mon, 4 Sep 2023 09:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38498n5S048955; Mon, 4 Sep 2023 09:08:49 GMT (envelope-from git) Date: Mon, 4 Sep 2023 09:08:49 GMT Message-Id: <202309040908.38498n5S048955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 8b461858eff2 - main - databases/pear-MDB2: Fix PHP error 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b461858eff28db7abaa758fa41847622ee48cd1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b461858eff28db7abaa758fa41847622ee48cd1 commit 8b461858eff28db7abaa758fa41847622ee48cd1 Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 09:04:43 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-04 09:04:43 +0000 databases/pear-MDB2: Fix PHP error - Bump PORTREVISION for package change PR: 272927 Reported by: Joel Rodriguez Obtained from: https://github.com/pear/MDB2/commit/ee0563d1ac6ed2694c48701e24ed7c352edb6639 --- databases/pear-MDB2/Makefile | 1 + databases/pear-MDB2/files/patch-MDB2.php | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile index f9361d812716..9f1bf0c93c28 100644 --- a/databases/pear-MDB2/Makefile +++ b/databases/pear-MDB2/Makefile @@ -1,5 +1,6 @@ PORTNAME= MDB2 DISTVERSION= 2.5.0b5 +PORTREVISION= 1 CATEGORIES= databases www pear MAINTAINER= sunpoet@FreeBSD.org diff --git a/databases/pear-MDB2/files/patch-MDB2.php b/databases/pear-MDB2/files/patch-MDB2.php new file mode 100644 index 000000000000..a6f918aac6dd --- /dev/null +++ b/databases/pear-MDB2/files/patch-MDB2.php @@ -0,0 +1,23 @@ +Obtained from: https://github.com/pear/MDB2/commit/ee0563d1ac6ed2694c48701e24ed7c352edb6639 + +--- MDB2.php.orig 2012-10-29 15:41:51 UTC ++++ MDB2.php +@@ -575,7 +575,7 @@ class MDB2 + $dummy3 = false) + { + $pear = new PEAR; +- $err =& $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true); ++ $err = $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true); + return $err; + } + +@@ -823,7 +823,8 @@ class MDB2 + $parsed['dbsyntax'] = $str; + } + +- if (!count($dsn)) { ++ $dsn = trim($dsn); ++ if (!strlen($dsn)) { + return $parsed; + } +