From nobody Mon Aug 26 00:46:14 2024 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 4WsX6b153Pz5TsQ6; Mon, 26 Aug 2024 00:46:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsX6b0Z1Xz4j84; Mon, 26 Aug 2024 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724633175; 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=CdG5S07EqnVEiUBGJ4wY/dSTQKQM63yGDuBEYw8ig0Y=; b=Q9GxJ1+uy9rllEtvQzztVVcDrArmNoehoaoCHkojoRnk/Iknab7X/tvR813zj2FPjVEMmi BSEWJZI6KFntgNvR40CUkccQxRKZKZofrNYIfqW3clkKdQDoS6aQPEFRXRJPOq6Q6Q6Ice ylY/brI9Ofp7xCAWMy3q0XwOJPOe/VCvuL8mn4VMyZ9YKo9RoR4utnHx8V3jwmrdE1cS7C Rz2fY2nVzZoGgaK/6LW4TMsbNQ2/4oZ6GnoXOAGJ0JUyD3MalH2x1x4wwZrgnc5jq7lVoH a5xc3kWERTNcrj13usy8plCAxQiR3trVN+NzIQr5qkNEHULu+vCgZHBykSSepA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724633175; a=rsa-sha256; cv=none; b=nzk71U7ZqQ4F1JbOMBPMqIwobxxMSxd+jde+CW5/8CZC9v5qCd/2WwTte2ah3XptHAsYsw iNj9WmHwVXu+Dpe1DUB0YpA07cTUWGxavY0iO77dQZ7D0eIyFzyq55IAF8brb83vUxUfYq qYaJT3WYi0geDdFvXRz5dLHlJ6aXhyDhAASv8MPP8z+qfOTPR2YbL+jMarTWVNE6q7EMQm Ult0i+UWk9WcLJvCN2W7wSArIkL2D44YR+nHXLq6UFetCPa1+LoVC3H5bLM/BYsLzKv50l GFklejwSKluE+g3jlzOvVXrdhT1mpMG9rk4O+/+f0LGigtR6peeB4co3g0i/xA== 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=1724633175; 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=CdG5S07EqnVEiUBGJ4wY/dSTQKQM63yGDuBEYw8ig0Y=; b=Rdzw48qLjbFLyyF68tUu7um2Fcu8Vj2a+D/x+kICVKOodIuaZTSDAKPtfdQD45SLKtvWKY +1L4JUm48AWPDDf8UYXOEW3UVsuQlBnChDS4NyTPF4Kdeey8rLpxB3Mt1nMk/HxWgrwFjq U5EsmAB9etXH4GA1EVmNZWkjqcfGXRjSdOah6G2GM2MknSFi2+jTbaDw3QSNE/APprqFZa pfE7WQey+aizXiSFKqJNeDj26OKB2/bgrfUI8OZOhmhWfrO5261KkC/nQ3e0YPTtLRSrsN 0Z4HcL0IS6p+2pNIcoVbv9GY7Tr3pClhL6Sg7EWmRS6BQrsFPdDX+3svRQhw9Q== 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 4WsX6Z67z4zlnw; Mon, 26 Aug 2024 00:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47Q0kEk6073830; Mon, 26 Aug 2024 00:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47Q0kEIX073827; Mon, 26 Aug 2024 00:46:14 GMT (envelope-from git) Date: Mon, 26 Aug 2024 00:46:14 GMT Message-Id: <202408260046.47Q0kEIX073827@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Danilo G. Baio" Subject: git: 3ecf245bfaec - main - net/pecl-oauth2: Fix build with PHP 8.3 and 8.4 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ecf245bfaecdfbc1091402deee1c6d81e5d7618 Auto-Submitted: auto-generated The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ecf245bfaecdfbc1091402deee1c6d81e5d7618 commit 3ecf245bfaecdfbc1091402deee1c6d81e5d7618 Author: Danilo G. Baio AuthorDate: 2024-08-26 00:42:02 +0000 Commit: Danilo G. Baio CommitDate: 2024-08-26 00:44:59 +0000 net/pecl-oauth2: Fix build with PHP 8.3 and 8.4 The previous patch was effective only with PHP 8.4. --- net/pecl-oauth2/Makefile | 4 ++++ net/pecl-oauth2/distinfo | 4 +++- net/pecl-oauth2/files/patch-php__oauth.h | 22 ---------------------- net/pecl-oauth2/files/patch-provider.c | 12 ------------ 4 files changed, 7 insertions(+), 35 deletions(-) diff --git a/net/pecl-oauth2/Makefile b/net/pecl-oauth2/Makefile index 0597bdd795fa..07f8041c808f 100644 --- a/net/pecl-oauth2/Makefile +++ b/net/pecl-oauth2/Makefile @@ -2,6 +2,10 @@ PORTNAME= oauth PORTVERSION= 2.0.7 CATEGORIES= net pear +# https://github.com/php/pecl-web_services-oauth/pull/30 +PATCH_SITES= https://github.com/php/pecl-web_services-oauth/commit/ +PATCHFILES= e7f262becf3feb65c8195fff4591d9dbd8acbace.patch:-p1 + MAINTAINER= dbaio@FreeBSD.org COMMENT= Php interface to the OAuth Protocol WWW= https://pecl.php.net/package/oauth diff --git a/net/pecl-oauth2/distinfo b/net/pecl-oauth2/distinfo index 766a43f5b785..8eb94ec18439 100644 --- a/net/pecl-oauth2/distinfo +++ b/net/pecl-oauth2/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1601204295 +TIMESTAMP = 1724621593 SHA256 (PECL/oauth-2.0.7.tgz) = d46f59072f1ade65cf4c4353b7ecf5546d1c56cad602152cb4ba72abb1aa5eec SIZE (PECL/oauth-2.0.7.tgz) = 78926 +SHA256 (PECL/e7f262becf3feb65c8195fff4591d9dbd8acbace.patch) = 73274160ae8d87f022c70796760e7d4211fb4b3dbb02d9930f2d7727350b4853 +SIZE (PECL/e7f262becf3feb65c8195fff4591d9dbd8acbace.patch) = 2283 diff --git a/net/pecl-oauth2/files/patch-php__oauth.h b/net/pecl-oauth2/files/patch-php__oauth.h deleted file mode 100644 index 8dc2afd70a86..000000000000 --- a/net/pecl-oauth2/files/patch-php__oauth.h +++ /dev/null @@ -1,22 +0,0 @@ ---- php_oauth.h.orig 2024-08-03 14:03:00 UTC -+++ php_oauth.h -@@ -29,7 +29,11 @@ - #include "php_main.h" - #include "php_ini.h" - #include "ext/standard/php_string.h" -+#if PHP_VERSION_ID <= 80300 - #include "ext/standard/php_rand.h" -+#else -+#include "ext/random/php_random.h" -+#endif - #include "ext/standard/php_smart_string.h" - #include "ext/standard/info.h" - #include "ext/standard/php_string.h" -@@ -41,7 +45,6 @@ - #include "php_globals.h" - #include "ext/standard/file.h" - #include "ext/standard/base64.h" --#include "ext/standard/php_lcg.h" - #include "ext/pcre/php_pcre.h" - #include "php_network.h" - diff --git a/net/pecl-oauth2/files/patch-provider.c b/net/pecl-oauth2/files/patch-provider.c deleted file mode 100644 index 3a0c0b10c9d2..000000000000 --- a/net/pecl-oauth2/files/patch-provider.c +++ /dev/null @@ -1,12 +0,0 @@ ---- provider.c.orig 2024-08-03 14:10:13 UTC -+++ provider.c -@@ -236,7 +236,9 @@ static int oauth_provider_parse_auth_header(php_oauth_ - &return_value, - &subpats, - 1, /* global */ -+#if PHP_VERSION_ID <= 80300 - 1, /* use flags */ -+#endif - 2, /* PREG_SET_ORDER */ - 0 - );