From nobody Sat Aug 03 14:14:04 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 4Wbl7K1q03z5SW5J; Sat, 03 Aug 2024 14:14:05 +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 4Wbl7K08NJz4Fyl; Sat, 3 Aug 2024 14:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722694445; 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=iotpsY9AfWT2ArezQvV9LVevsfkqgx4pTB+26lv11/U=; b=CvFSWyGCEUkL5ZhBg1AxWRpu5iZPbj/170GDzdZ6Mfqp/Fcy/jiHBifz9mK+k0nCSg9w3U EjZbDLYCMJpKWxloXkLwS2X3YukbSr6aT6cLj/Bo6Q22mH9RsjhJcBuuGGvXF2Tmew0rQM UUPHnTGxbIM7AynJvGa7q6ArEXPiTKluKXw/2UNj/G9BQsjzHfyvZw6rNlollLKy7+bUDr LZ2e/ZgEYgJIE0YGLGvD/r0MoJi+HnpAsg7LlJfO/Y1HZcdlD/V/eLAYiqzvKzzKusVEK4 8Z53u7gRqiihvnsEjtZGBPfMt3L5foMzjxgWneFeStTTL3DQKho1+W6AsOIS1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722694445; a=rsa-sha256; cv=none; b=FeiceE2OnPPIVHEizO+CDIqcOrItk0q4nf74hdHb6j/vhHtpZaHi6Y1BeboQPB6zqa2zzr n0b55v87SNYl4Pv/vPHPCcBcEFF5/vhyJiRFGl5UmlBX4wMsXJ+rhSaIgh3KXvVTgF5Aum z1MG83YEPiG2sEE1vxW7W8elwDWi4uAJmnH0ZJhECiDSSl78KEPQKD9KAoG/OnB4vHDIcB BHcVKTtKuGn0PDGrp/Gd0ulvuWduG9vKAKPwwN/lpfqN6/uL6nG8aqw/GYj1sSDhk8QWWa gn7Bfl4SrZ6kXq7tA1QU4pCq8DvKXa8hxSdwIJpF5hZ9DoyR1SZ1onynPu7Itg== 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=1722694445; 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=iotpsY9AfWT2ArezQvV9LVevsfkqgx4pTB+26lv11/U=; b=wFz1Y+Uwl5S7LH+dr27Tbbo31SzbX162xrB4lM9Tv4YF4fVWfg9/UoELqVVLhZ7eiwi1Wn dV+K3Rh2raevZjjzX8TdwQDmrjno1wnAjqUAGWNnQWLVw3Mv0gtx4iOgXWsm9trqq5tbVz X8aeY5M6Q5atVhAYwgnx5sl4oxalD/ENiRPqdkzueZ1cYyzV0Qys3MePl9Bv+jEYXRbWgG uZMex3lnNtoa4+7HTKPHJFrtTAm8xi/bVdKR9FP0EmTelpK15LVFp+5g+yznhReYfN+VEL yd2gnomoMfKkxKw2LIJeGDSm/wbSf9ZkTGd8E0cXdKUz8eyCUNAfl1zhK/eYYA== 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 4Wbl7J5ysLzFlG; Sat, 3 Aug 2024 14:14:04 +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 473EE4Rw086058; Sat, 3 Aug 2024 14:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473EE4Zf086055; Sat, 3 Aug 2024 14:14:04 GMT (envelope-from git) Date: Sat, 3 Aug 2024 14:14:04 GMT Message-Id: <202408031414.473EE4Zf086055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 90c701b67966 - main - net/pecl-oauth2: Unbreak for php84 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90c701b679661276028f9fdcdbb36539921e794e Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=90c701b679661276028f9fdcdbb36539921e794e commit 90c701b679661276028f9fdcdbb36539921e794e Author: Muhammad Moinur Rahman AuthorDate: 2024-08-03 14:11:55 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-08-03 14:13:57 +0000 net/pecl-oauth2: Unbreak for php84 Approved by: portmgr (blanket) --- net/pecl-oauth2/Makefile | 1 - net/pecl-oauth2/files/patch-php__oauth.h | 22 ++++++++++++++++++++++ net/pecl-oauth2/files/patch-provider.c | 12 ++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/net/pecl-oauth2/Makefile b/net/pecl-oauth2/Makefile index 156b3076f598..0597bdd795fa 100644 --- a/net/pecl-oauth2/Makefile +++ b/net/pecl-oauth2/Makefile @@ -13,7 +13,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre USES= localbase:ldflags php:pecl -IGNORE_WITH_PHP= 84 CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net/pecl-oauth2/files/patch-php__oauth.h b/net/pecl-oauth2/files/patch-php__oauth.h new file mode 100644 index 000000000000..8dc2afd70a86 --- /dev/null +++ b/net/pecl-oauth2/files/patch-php__oauth.h @@ -0,0 +1,22 @@ +--- 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 new file mode 100644 index 000000000000..3a0c0b10c9d2 --- /dev/null +++ b/net/pecl-oauth2/files/patch-provider.c @@ -0,0 +1,12 @@ +--- 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 + );