git: 3ecf245bfaec - main - net/pecl-oauth2: Fix build with PHP 8.3 and 8.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Aug 2024 00:46:14 UTC
The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ecf245bfaecdfbc1091402deee1c6d81e5d7618 commit 3ecf245bfaecdfbc1091402deee1c6d81e5d7618 Author: Danilo G. Baio <dbaio@FreeBSD.org> AuthorDate: 2024-08-26 00:42:02 +0000 Commit: Danilo G. Baio <dbaio@FreeBSD.org> 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 - );