diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | ip2proxy-build.patch | 22 | ||||
| -rw-r--r-- | php-pecl-ip2proxy.spec | 41 |
4 files changed, 26 insertions, 41 deletions
@@ -3,4 +3,4 @@ ip2proxy ip2proxy support => enabled extension version => 3.1.0 -library version => 4.2.0 +library version => 4.2.1 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #85 ip2proxy version 3.1.0 ] { +Extension [ <persistent> extension #92 ip2proxy version 3.1.0 ] { - Constants [4] { Constant [ int IP2PROXY_FILE_IO ] { 0 } diff --git a/ip2proxy-build.patch b/ip2proxy-build.patch deleted file mode 100644 index d38922e..0000000 --- a/ip2proxy-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4b1ed2a22748f4adb7a5e30df9284147601ccd66 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 6 Feb 2025 06:44:46 +0100 -Subject: [PATCH] missing brackets - ---- - ip2proxy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ip2proxy.c b/ip2proxy.c -index 0914c00..622f7ee 100644 ---- a/ip2proxy.c -+++ b/ip2proxy.c -@@ -47,7 +47,7 @@ static zend_function_entry ip2proxy_functions_entry[] = { - PHP_FE(ip2proxy_get_last_seen, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_threat, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_provider, ip2proxy_ip_address) -- PHP_FE(ip2proxy_get_fraud_score, ip2proxy_ip_address -+ PHP_FE(ip2proxy_get_fraud_score, ip2proxy_ip_address) - PHP_FE(ip2proxy_get_all, ip2proxy_ip_address) - PHP_FE(ip2proxy_close, ip2proxy_void) - PHP_FE(ip2proxy_delete_shm, ip2proxy_void) diff --git a/php-pecl-ip2proxy.spec b/php-pecl-ip2proxy.spec index e49e8f3..bd7f60a 100644 --- a/php-pecl-ip2proxy.spec +++ b/php-pecl-ip2proxy.spec @@ -12,6 +12,8 @@ %bcond_without tests %global pecl_name ip2proxy +%global pie_vend ip2location +%global pie_proj ip2proxy-pie %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini %global upstream_version 3.1.0 @@ -22,16 +24,16 @@ # see https://github.com/ip2location/ip2proxy-c/commits/master %global gh_owner ip2location %global gh_project ip2proxy-c -%global gh_commit 75beea905bd25fdba9d8fb965f958ba3c9c552f7 -%global gh_version 4.2.0 +%global gh_commit 79662201167fcbda5532f94ad3e1fefd2b9b073e +%global gh_version 4.2.1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) Summary: Get proxy information of an IP address Name: %{?scl_prefix}php-pecl-%{pecl_name} # library is MIT, extension is PHP -License: MIT and PHP-3.01 +License: MIT AND PHP-3.01 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist} URL: https://pecl.php.net/package/igbinary Source0: https://pecl.php.net/get/%{sources}.tgz @@ -40,9 +42,6 @@ Source1: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{pecl_name}-bundledlib.patch Provides: bundled(%{gh_project}) = %{gh_version} -# Fix build -Patch1: %{pecl_name}-build.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-pear @@ -51,10 +50,15 @@ BuildRequires: %{?scl_prefix}php-devel 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} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# Extension +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -80,7 +84,6 @@ sed -e 's/role="test"/role="src"/' \ cd %{sources} %patch -P0 -p1 -b .rpm -%patch -P1 -p1 -b .pr6 # Check version extver=$(sed -n '/#define PHP_IP2PROXY_VERSION/{s/.* "//;s/".*$//;p}' php_ip2proxy.h) @@ -156,10 +159,6 @@ cd %{sources} --modules | grep %{pecl_name} %if %{with tests} -: Fix test suite -sed -e 's/string(2) "US"/string(1) "-"/;s/string(24) "United States of America"/string(1) "-"/' \ - -i tests/*phpt - : upstream test suite TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ @@ -191,7 +190,15 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Nov 19 2025 Remi Collet <remi@remirepo.net> - 3.1.0-2 +- update bundled libip2proxy to 4.2.1 +- add pie virtual provides + * Thu Feb 6 2025 Remi Collet <remi@remirepo.net> - 3.1.0-1 +- update to 3.1.0 (new sources) +- drop patch merged upstream + +* Thu Feb 6 2025 Remi Collet <remi@remirepo.net> - 3.1.0-0 - update to 3.1.0 - fix build using patch from https://github.com/ip2location/ip2proxy-pecl/pull/6 @@ -199,7 +206,7 @@ REPORT_EXIT_STATUS=1 \ * Tue Feb 4 2025 Remi Collet <remi@remirepo.net> - 3.0.3-5 - re-license spec file to CECILL-2.1 -- update bundled libip2proxy to 4.2.1 +- update bundled libip2proxy to 4.2.0 * Tue Oct 1 2024 Remi Collet <remi@remirepo.net> - 3.0.3-4 - cleanup spec |