From nobody Thu Sep 08 16:22:29 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 4MNktG1H6yz4cQnC; Thu, 8 Sep 2022 16:22:30 +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 4MNktG0tglz3WB5; Thu, 8 Sep 2022 16:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662654150; 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=YrPSa5bCem1dpgmPB8/4Vc4jGh3odqkQYVgn/fRlyBY=; b=a7bNGHsBiJbEyAogdEYFp/4cC6iC1xgPCdXgq40Gw4Winlxw1M6HD+D6SjjyKxGRlXpb0Z ucnZ4OdvrOHXMODaeB2K6Dh9tZL32rg99H665P0V0vhyJCEd1N4Xy8F1CG/RGJ6tuMWmOk RfP1mhZ+B4sToP2phSGDuNPI1ws7pMWNymDL/h22frgFpfxgxMNDLh1WYDA6isIaq9vOb+ O+eYgD3HaaRjKbSm5UHWgCcH0YwHbK1bLLrtp8bSCo4nFV/OfDd08A2AZfGMFxu+a2OUe1 8EwWTmxZFDvRssXwCcLT3e0tUBtLzvby4EWJBe/mjexvAEneTT7VVvDbFqWADw== 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 4MNktF745HzwYj; Thu, 8 Sep 2022 16:22:29 +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 288GMTGR086743; Thu, 8 Sep 2022 16:22:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288GMTwu086742; Thu, 8 Sep 2022 16:22:29 GMT (envelope-from git) Date: Thu, 8 Sep 2022 16:22:29 GMT Message-Id: <202209081622.288GMTwu086742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: e1abc97d9ede - main - devel/arcanist-lib: Fix `arc patch` on PHP 8.1 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: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1abc97d9ede14c8e14b120de52b350acd77f3f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662654150; 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=YrPSa5bCem1dpgmPB8/4Vc4jGh3odqkQYVgn/fRlyBY=; b=PIPXxYFDbm2xg8NcDUllBodNvBdJA477VtEDWeLhse5FH3m9E3p2WT3C4pLlqVpvdmm1ZT M8dBLhVBa3mfj9mjAWL9Yu+YQAiEdeLuPQIFsuKeIvB/h+kbCRJL88YyQry4RFEle26pFF V4SaqsCZlgLTKONjEfPZNBLGlKJdXHb31zaf1PHJEojQGycZrSHx401p5m/tuQQkfGoxfX 7E4Dvz7bk1KLELrUepSdP7rbBpBxfCcMD8s96GVbXNP6fVDYIeic8hDXaFYU5OWdEFtt6T 9YxBTzOdXo8lj2fV07DyxPrC9ahI3hm6QcaAas22EJgrKh1SXKgy4FX6MCx82g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662654150; a=rsa-sha256; cv=none; b=vJlbm5pJ606/wfYtQytVd70mg3tKBWRU2ewlYYaLh4g4mAHog7c+7y71z/lgXokOrMNqiD sTu2jHziefbEqdfpHGXy4aVHBN3UPGnycEcVihDFjdY9z1bXxFS6/EuVlLGJR3pRMiLJOS gt+L+Iurez0w2r8PtbjCjp5hXEIONgq2l50WHHGFUah7yYoMNjp5QzhiOyR3aN+7EtsSxw buzSRtFWmKfKA2nvR7nfz0sWJnF/H8TNi09CVrVHrHOYht3xvohny0pnu87wlwFH6OTlBQ gpn3V7AFJBzRTMXh2Fwqv3RrkLsDY9mxtN77tN4LcUL0zOaMz30WHpbYrqauEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1abc97d9ede14c8e14b120de52b350acd77f3f4 commit e1abc97d9ede14c8e14b120de52b350acd77f3f4 Author: Michael Gmelin AuthorDate: 2022-09-08 16:09:09 +0000 Commit: Michael Gmelin CommitDate: 2022-09-08 16:21:56 +0000 devel/arcanist-lib: Fix `arc patch` on PHP 8.1 --- devel/arcanist-lib/Makefile | 1 + .../files/patch-src_parser_ArcanistBundle.php | 20 ++++++++++++++++++++ ...src_toolset_workflow_ArcanistVersionWorkflow.php} | 0 3 files changed, 21 insertions(+) diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile index 3be58fea6b70..3f2065d8d138 100644 --- a/devel/arcanist-lib/Makefile +++ b/devel/arcanist-lib/Makefile @@ -1,5 +1,6 @@ PORTNAME?= arcanist PORTVERSION?= 20220518 +PORTREVISION?= 1 CATEGORIES?= devel PKGNAMESUFFIX= ${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX} diff --git a/devel/arcanist-lib/files/patch-src_parser_ArcanistBundle.php b/devel/arcanist-lib/files/patch-src_parser_ArcanistBundle.php new file mode 100644 index 000000000000..095e1b24ee81 --- /dev/null +++ b/devel/arcanist-lib/files/patch-src_parser_ArcanistBundle.php @@ -0,0 +1,20 @@ +--- src/parser/ArcanistBundle.php.orig 2022-09-08 16:04:09 UTC ++++ src/parser/ArcanistBundle.php +@@ -762,7 +762,7 @@ final class ArcanistBundle extends Phobject { + $old_data = $this->getBlob($old_phid, $name); + } + +- $old_length = strlen($old_data); ++ $old_length = strlen($old_data ?? ''); + + // Here, and below, the binary will be emitted with base85 encoding. This + // encoding encodes each 4 bytes of input in 5 bytes of output, so we may +@@ -795,7 +795,7 @@ final class ArcanistBundle extends Phobject { + $new_data = $this->getBlob($new_phid, $name); + } + +- $new_length = strlen($new_data); ++ $new_length = strlen($new_data ?? ''); + $this->reserveBytes($new_length * 5 / 4); + + if ($new_data === null) { diff --git a/devel/arcanist-lib/files/patch-src-toolset-workflow-ArcanistVersionWorkflow.php b/devel/arcanist-lib/files/patch-src_toolset_workflow_ArcanistVersionWorkflow.php similarity index 100% rename from devel/arcanist-lib/files/patch-src-toolset-workflow-ArcanistVersionWorkflow.php rename to devel/arcanist-lib/files/patch-src_toolset_workflow_ArcanistVersionWorkflow.php