Date: Sat, 3 Aug 2024 14:14:04 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 90c701b67966 - main - net/pecl-oauth2: Unbreak for php84 Message-ID: <202408031414.473EE4Zf086055@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=90c701b679661276028f9fdcdbb36539921e794e commit 90c701b679661276028f9fdcdbb36539921e794e Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-08-03 14:11:55 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 + );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408031414.473EE4Zf086055>