diff options
| -rw-r--r-- | 35.patch | 25 | ||||
| -rw-r--r-- | php-pecl-oauth.spec | 14 |
2 files changed, 37 insertions, 2 deletions
diff --git a/35.patch b/35.patch new file mode 100644 index 0000000..4751c02 --- /dev/null +++ b/35.patch @@ -0,0 +1,25 @@ +From 633d0a55cd23d17c6a2e964d7671348b682af761 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 4 Jul 2025 14:45:20 +0200 +Subject: [PATCH] arg_separators.input is an zend_string in 8.5 + +--- + oauth.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/oauth.c b/oauth.c +index 1493eb7..a7fd6cc 100644 +--- a/oauth.c ++++ b/oauth.c +@@ -60,7 +60,11 @@ static int oauth_parse_str(char *params, zval *dest_array) /* {{{ */ + } + + res = params; ++#if PHP_VERSION_ID < 80500 + separator = (char *) estrdup(PG(arg_separator).input); ++#else ++ separator = (char *) estrdup(ZSTR_VAL(PG(arg_separator).input)); ++#endif + var = php_strtok_r(res, separator, &strtok_buf); + while (var) { + val = strchr(var, '='); diff --git a/php-pecl-oauth.spec b/php-pecl-oauth.spec index c21426c..17fea30 100644 --- a/php-pecl-oauth.spec +++ b/php-pecl-oauth.spec @@ -21,19 +21,20 @@ Name: %{?scl_prefix}php-pecl-oauth Version: 2.0.9 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP OAuth consumer extension License: BSD-3-Clause URL: https://pecl.php.net/package/oauth Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: 35.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc # see https://github.com/php/pecl-web_services-oauth/pull/31 BuildRequires: %{?scl_prefix}php-devel >= 7.1 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-posix -BuildRequires: pcre-devel BuildRequires: libcurl-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -64,6 +65,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p1 -b .pr35 + #sed -e '/PHP_OAUTH_VERSION/s/2.0.3-dev/2.0.3/' -i php_oauth.h # Sanity check, really often broken extver=$(sed -n '/#define PHP_OAUTH_VERSION/{s/.* //;s/".*$//;p}' php_oauth.h) @@ -166,6 +169,13 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Jul 4 2025 Remi Collet <remi@remirepo.net> - 2.0.9-3 +- add patch for PHP 8.5 from + https://github.com/php/pecl-web_services-oauth/pull/35 + +* Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 2.0.9-2 +- drop unneeded BR on pcre-devel + * Tue Oct 8 2024 Remi Collet <remi@remirepo.net> - 2.0.9-1 - update to 2.0.9 - drop patches merged upstream |