diff options
| author | Remi Collet <remi@remirepo.net> | 2024-07-31 08:44:44 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-07-31 08:44:44 +0200 |
| commit | 1703d733b837f81edf22897ecde3dfe918c668c5 (patch) | |
| tree | 9744fd3306f2e9cf6303b33f41abac09db56e564 | |
| parent | ad0b20709466ec5fe871e0c204155cf9c57d2d5e (diff) | |
drop patch merged upstream
| -rw-r--r-- | excimer-php84.patch | 57 | ||||
| -rw-r--r-- | php-pecl-excimer.spec | 12 |
2 files changed, 6 insertions, 63 deletions
diff --git a/excimer-php84.patch b/excimer-php84.patch deleted file mode 100644 index abd0c9b..0000000 --- a/excimer-php84.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e8acb2fbd51ac72c848207babd516cd421284461 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 12 Jul 2024 08:56:55 +0200 -Subject: [PATCH 1/2] Fix header path for 8.4 - ---- - excimer.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/excimer.c b/excimer.c -index 8e5df91..46dbdef 100644 ---- a/excimer.c -+++ b/excimer.c -@@ -23,7 +23,11 @@ - #include "zend_exceptions.h" - #include "zend_interfaces.h" - #include "ext/spl/spl_exceptions.h" -+#if PHP_VERSION_ID < 80400 - #include "ext/standard/php_mt_rand.h" -+#else -+#include "ext/random/php_random.h" -+#endif - #include "ext/standard/info.h" - - #if PHP_VERSION_ID < 70200 - -From 8e7113956de192b6107198a118f8024e89234144 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 12 Jul 2024 08:57:21 +0200 -Subject: [PATCH 2/2] simply using php_mt_rand_range - ---- - excimer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/excimer.c b/excimer.c -index 46dbdef..aee441e 100644 ---- a/excimer.c -+++ b/excimer.c -@@ -621,7 +621,7 @@ static zend_object *ExcimerProfiler_new(zend_class_entry *ce) /* {{{ */ - profiler->event_type = EXCIMER_REAL; - - // Stagger start time -- initial = php_mt_rand() * EXCIMER_DEFAULT_PERIOD / UINT32_MAX; -+ initial = php_mt_rand_range(0, EXCIMER_DEFAULT_PERIOD); - excimer_set_timespec(&profiler->initial, initial); - excimer_set_timespec(&profiler->period, EXCIMER_DEFAULT_PERIOD); - log_obj->log.period = EXCIMER_DEFAULT_PERIOD * EXCIMER_BILLION; -@@ -670,7 +670,7 @@ static PHP_METHOD(ExcimerProfiler, setPeriod) - ZEND_PARSE_PARAMETERS_END(); - - // Stagger start time -- initial = php_mt_rand() * period / UINT32_MAX; -+ initial = php_mt_rand_range(0, period); - - excimer_set_timespec(&profiler->period, period); - excimer_set_timespec(&profiler->initial, initial); diff --git a/php-pecl-excimer.spec b/php-pecl-excimer.spec index e7e7570..eaf33df 100644 --- a/php-pecl-excimer.spec +++ b/php-pecl-excimer.spec @@ -20,14 +20,12 @@ Summary: Interrupting timer and low-overhead sampling profiler Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.2.1 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.2.2 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: Apache-2.0 URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: %{pecl_name}-php84.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.1 @@ -59,8 +57,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_EXCIMER_VERSION/{s/.* "//;s/".*$//;p}' php_excimer.h) if test "x${extver}" != "x%{version}"; then @@ -182,6 +178,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \ %changelog +* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 1.2.2-1 +- update to 1.2.2 +- drop patch merged upstream + * Fri Jul 12 2024 Remi Collet <remi@remirepo.net> - 1.2.1-2 - add patch for PHP 8.4 from https://github.com/wikimedia/mediawiki-php-excimer/pull/8 |