summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION51
-rw-r--r--php-pecl-yar.spec37
-rw-r--r--yar-php82.patch68
4 files changed, 39 insertions, 119 deletions
diff --git a/PHPINFO b/PHPINFO
index 7419894..27f4ad1 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
yar
yar support => enabled
-Version => 2.3.2
+Version => 2.3.3
Directive => Local Value => Master Value
yar.packager => msgpack => msgpack
diff --git a/REFLECTION b/REFLECTION
index 00bdecd..620f2c3 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #119 yar version 2.3.2 ] {
+Extension [ <persistent> extension #109 yar version 2.3.3 ] {
- Dependencies {
Dependency [ json (Required) ]
@@ -27,7 +27,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
}
- Constants [24] {
- Constant [ string YAR_VERSION ] { 2.3.2 }
+ Constant [ string YAR_VERSION ] { 2.3.3 }
Constant [ int YAR_HAS_MSGPACK ] { 1 }
Constant [ int YAR_OPT_PACKAGER ] { 0 }
Constant [ int YAR_OPT_PERSISTENT ] { 1 }
@@ -207,9 +207,9 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [5] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
- Property [ protected $_type = 'Yar_Exception_S...' ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
+ Property [ protected $_type = 'Yar_Exception_Server' ]
}
- Methods [11] {
@@ -233,6 +233,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -306,8 +307,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -331,6 +332,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -404,8 +406,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -429,6 +431,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -502,8 +505,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -527,6 +530,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -600,8 +604,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -625,6 +629,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -698,8 +703,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -723,6 +728,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -796,8 +802,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -821,6 +827,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -894,8 +901,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -919,6 +926,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -992,8 +1000,8 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [11] {
@@ -1017,6 +1025,7 @@ Extension [ <persistent> extension #119 yar version 2.3.2 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec
index 07a8b8d..9e32e1f 100644
--- a/php-pecl-yar.spec
+++ b/php-pecl-yar.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-yar
#
-# Copyright (c) 2013-2022 Remi Collet
+# Copyright (c) 2013-2024 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -24,19 +24,17 @@
Summary: Light, concurrent RPC framework
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 2.3.2
+Version: 2.3.3
%if 0%{?gh_date:1}
Release: 0.14.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
%else
-Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
%endif
-License: PHP
+License: PHP-3.01
URL: https://pecl.php.net/package/%{pecl_name}
-Patch0: %{pecl_name}-php82.patch
-
BuildRequires: %{?dtsprefix}gcc
BuildRequires: make
BuildRequires: curl-devel
@@ -50,7 +48,6 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: %{?scl_prefix}php-curl%{?_isa}
Requires: %{?scl_prefix}php-json%{?_isa}
Requires: %{?scl_prefix}php-pecl(msgpack)%{?_isa}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
@@ -80,8 +77,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .pr177
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h)
if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then
@@ -162,26 +157,6 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
DEPS="-n"
if [ -f %{php_extdir}/json.so ]; then
@@ -239,6 +214,10 @@ export YAR_API_PORT=$(%{__php} -r 'echo 8960 + PHP_MAJOR_VERSION*100 + PHP_MINOR
%changelog
+* Mon Jul 1 2024 Remi Collet <remi@remirepo.net> - 2.3.3-1
+- update to 2.3.3
+- drop patch merged upstream
+
* Mon Oct 3 2022 Remi Collet <remi@remirepo.net> - 2.3.2-2
- add patch for PHP 8.2 from
https://github.com/laruence/yar/pull/177
diff --git a/yar-php82.patch b/yar-php82.patch
deleted file mode 100644
index 514acff..0000000
--- a/yar-php82.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 15ece2444d614bac545b5d1cd7ea86a2881a9ddd Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 19 Sep 2022 13:12:47 +0200
-Subject: [PATCH 1/2] fix random seed check for PHP 8
-
----
- yar_request.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/yar_request.c b/yar_request.c
-index be6a41b..59f527e 100644
---- a/yar_request.c
-+++ b/yar_request.c
-@@ -34,7 +34,11 @@
- yar_request_t *php_yar_request_instance(zend_string *method, zend_array *parameters, void **options) /* {{{ */ {
- yar_request_t *request = emalloc(sizeof(yar_request_t));
-
-+#if PHP_VERSION_ID < 80200
- if (!BG(mt_rand_is_seeded)) {
-+#else
-+ if (!RANDOM_G(mt19937_seeded)) {
-+#endif
- php_mt_srand(GENERATE_SEED());
- }
-
-
-From 865d2e0615fcfb969db87f254792ec3844600280 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 19 Sep 2022 13:13:01 +0200
-Subject: [PATCH 2/2] fix tests for PHP 8.2
-
----
- tests/yar.inc | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/tests/yar.inc b/tests/yar.inc
-index d5c3693..d096f88 100644
---- a/tests/yar.inc
-+++ b/tests/yar.inc
-@@ -105,17 +105,19 @@ PHP;
-
- function yar_server_cleanup() {
- $dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "htdocs";
-- $dp = opendir($dir);
-- while (($f = readdir($dp))) {
-- if (in_array($f, array('.', '..'))) {
-- continue;
-- }
-- $path = $dir . DIRECTORY_SEPARATOR . $f;
-- if (is_file($path)) {
-- unlink($path);
-+ if (is_dir($dir)) {
-+ $dp = opendir($dir);
-+ while (($f = readdir($dp))) {
-+ if (in_array($f, array('.', '..'))) {
-+ continue;
-+ }
-+ $path = $dir . DIRECTORY_SEPARATOR . $f;
-+ if (is_file($path)) {
-+ unlink($path);
-+ }
- }
-+ rmdir($dir);
- }
-- rmdir($dir);
- }
-
- /* For TCP */