summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--9.patch22
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-raphf.spec36
4 files changed, 23 insertions, 39 deletions
diff --git a/9.patch b/9.patch
deleted file mode 100644
index 762cfc9..0000000
--- a/9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d48a944c053084382b2b0a914cb1058cda89d99c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 21 Sep 2020 15:48:01 +0200
-Subject: [PATCH] fix format, used is unsigned long
-
----
- src/php_raphf_api.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/php_raphf_api.c b/src/php_raphf_api.c
-index 004fd66..d71ce36 100644
---- a/src/php_raphf_api.c
-+++ b/src/php_raphf_api.c
-@@ -624,7 +624,7 @@ static int php_persistent_handle_apply_info_ex(zval *p, int argc,
- zend_hash_key *super_key = va_arg(argv, zend_hash_key *);
- char used[21], free[21];
-
-- slprintf(used, sizeof(used), "%u", list->used);
-+ slprintf(used, sizeof(used), "%lu", list->used);
- slprintf(free, sizeof(free), "%d", zend_hash_num_elements(&list->free));
-
- php_info_print_table_row(4, super_key->key->val, key->key->val, used, free);
diff --git a/PHPINFO b/PHPINFO
index 3b8c982..b885f5d 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
raphf
Resource and persistent handle factory support => enabled
-Extension version => 2.0.1
+Extension version => 2.0.2
Persistent handles in this process
Provider => Ident => Used => Free
diff --git a/REFLECTION b/REFLECTION
index c37bec4..b95cd31 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #95 raphf version 2.0.1 ] {
+Extension [ <persistent> extension #105 raphf version 2.0.2 ] {
- INI {
Entry [ raphf.persistent_handle.limit <SYSTEM> ]
diff --git a/php-pecl-raphf.spec b/php-pecl-raphf.spec
index c5d607e..e516aef 100644
--- a/php-pecl-raphf.spec
+++ b/php-pecl-raphf.spec
@@ -3,9 +3,9 @@
#
# Fedora spec file for php-pecl-raphf
#
-# Copyright (c) 2013-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -18,6 +18,8 @@
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name raphf
+%global pie_vend m6w6
+%global pie_proj ext-raphf
#global prever RC1
%global ini_name 40-%{pecl_name}.ini
%global sources %{pecl_name}-%{version}
@@ -25,14 +27,12 @@
Summary: Resource and persistent handles factory
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 2.0.1
-Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 2.0.2
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
License: BSD-2-Clause
URL: https://pecl.php.net/package/%{pecl_name}
-Patch0: https://patch-diff.githubusercontent.com/raw/m6w6/ext-raphf/pull/9.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -44,12 +44,15 @@ BuildRequires: %{?scl_prefix}php-pecl-http >= 2.0.0
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# PECL/PIE
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%description
@@ -76,8 +79,6 @@ These are the files needed to compile programs using %{name}.
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
cd %{sources}
-%patch -P0 -p1 -b .pr9
-
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_RAPHF_VERSION/{s/.* "//;s/".*$//;p}' php_raphf.h)
if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then
@@ -212,6 +213,11 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Fri Aug 29 2025 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- update to 2.0.2
+- re-license spec file to CECILL-2.1
+- add pie virtualprovides (m6w6/ext-raphf)
+
* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 2.0.1-9
- rebuild for 8.5.0alpha3