v1.11.1

(cherry picked from commit 84f30ac956)

.gitignore

@@ -10,7 +10,3 @@ clog
 /php-maxminddb-1.10.1-569bd44.tgz
 /php-maxminddb-1.11.0-f7cc1a1.tgz
 /php-maxminddb-1.11.1-1e66f73.tgz
-/php-maxminddb-1.12.0-5b2d7a7.tgz
-/php-maxminddb-1.12.1-815939e.tgz
-/php-maxminddb-1.13.0-b298986.tgz
-/php-maxminddb-1.13.1-2194f58.tgz

php-maxminddb.spec

@@ -3,20 +3,19 @@
 #
 # remirepo spec file for php-maxminddb
 #
-# SPDX-FileCopyrightText:  Copyright 2018-2025 Remi Collet
+# Copyright (c) 2018-2023 Remi Collet
-# SPDX-License-Identifier: CECILL-2.1
+# License: CC-BY-SA-4.0
-# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit   2194f58d0f024ce923e685cdf92af3daf9951908
+%global gh_commit   1e66f73ffcf25e17c7a910a1317e9720a95497c7
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
 # Extension
-%global pie_vend    maxmind-db
-%global pie_proj    reader-ext
 %global pecl_name   maxminddb
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name    40-%{pecl_name}.ini
 # pure PHP library
 %global pk_vendor    maxmind-db
@@ -31,7 +30,7 @@
 
 Summary:       MaxMind DB Reader extension
 Name:          php-maxminddb
-Version:       1.13.1
+Version:       1.11.1
 Release:       1%{?dist}
 License:       Apache-2.0
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -39,8 +38,6 @@ URL:           https://github.com/%{gh_owner}/%{gh_project}
 Source0:       %{name}-%{version}-%{gh_short}.tgz
 Source1:       makesrc.sh
 
-ExcludeArch:   %{ix86}
-
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: php-devel >= 7.2
@@ -59,9 +56,6 @@ Provides:       php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 Provides:       php-pecl(%{pecl_name})         = %{version}
 Provides:       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
@@ -146,6 +140,11 @@ if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
 fi
 cd ..
 
+mkdir NTS
+%if %{with_zts}
+mkdir ZTS
+%endif
+
 # Drop in the bit of configuration
 cat << 'EOF' | tee %{ini_name}
 ; Enable '%{pecl_name}' extension module
@@ -156,27 +155,38 @@ EOF
 %build
 cd ext
 %{__phpize}
-sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
 
+cd ../NTS
 %configure \
     --with-php-config=%{__phpconfig} \
     --with-libdir=%{_lib} \
     --with-maxminddb
+make %{?_smp_mflags}
 
-%make_build
+%if %{with_zts}
+cd ../ZTS
+%configure \
+    --with-php-config=%{__ztsphpconfig} \
+    --with-libdir=%{_lib} \
+    --with-maxminddb
+make %{?_smp_mflags}
+%endif
 
 
 %install
-: Install the extension
+# Install XML package description
-%make_install -C ext
-
-: Install XML package description
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
-: Install the extension
+# Install the NTS stuff
+make -C NTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
-: Install the library
+%if %{with_zts}
+# Install the ZTS stuff
+make -C ZTS install INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
+%endif
+
 mkdir -p                %{buildroot}%{_datadir}/php/MaxMind
 cp -pr src/MaxMind/Db   %{buildroot}%{_datadir}/php/MaxMind/Db
 
@@ -187,6 +197,12 @@ cp -pr src/MaxMind/Db   %{buildroot}%{_datadir}/php/MaxMind/Db
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
+%if %{with_zts}
+: Minimal load test for ZTS extension
+%{__ztsphp} --no-php-ini \
+    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
+    --modules | grep '^%{pecl_name}$'
+%endif
 ret=0
 
 cd ext
@@ -195,10 +211,17 @@ TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 %{__php} -n run-tests.php -q --show-diff || ret=1
 
+%if %{with_zts}
+: Upstream test suite for ZTS extension
+TEST_PHP_EXECUTABLE=%{__ztsphp} \
+TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
+%{__ztsphp} -n run-tests.php -q --show-diff || ret=1
+%endif
+
 %if %{with tests}
 cd ..
 : Upstream test suite for the library
-for cmd in php80 php81 php82 php83 php84; do
+for cmd in php php80 php81 php82 php83; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit8 \
       --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \
@@ -223,6 +246,11 @@ exit $ret
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
 
+%if %{with_zts}
+%config(noreplace) %{php_ztsinidir}/%{ini_name}
+%{php_ztsextdir}/%{pecl_name}.so
+%endif
+
 
 %files -n php-%{pk_vendor}-%{pk_project}
 %license LICENSE
@@ -233,54 +261,9 @@ exit $ret
 
 
 %changelog
-* Sat Nov 22 2025 Remi Collet <remi@remirepo.net> - 1.13.1-1
-- update to 1.13.1 (no changes)
-- add pie virtual provides
-
-* Fri Nov 21 2025 Remi Collet <remi@remirepo.net> - 1.13.0-1
-- update to 1.13.0
-
-* Wed Sep 17 2025 Remi Collet <remi@remirepo.net> - 1.12.1-3
-- rebuild for https://fedoraproject.org/wiki/Changes/php85
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue May  6 2025 Remi Collet <remi@remirepo.net> - 1.12.1-1
-- update to 1.12.1
-- re-license spec file to CECILL-2.1
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Nov 15 2024 Remi Collet <remi@remirepo.net> - 1.12.0-1
-- update to 1.12.0
-
-* Fri Oct 18 2024 Remi Collet <remi@fedoraproject.org> - 1.11.1-7
-- modernize the spec file
-
-* Mon Oct 14 2024 Remi Collet <remi@fedoraproject.org> - 1.11.1-6
-- rebuild for https://fedoraproject.org/wiki/Changes/php84
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Apr 12 2024 Remi Collet <remi@remirepo.net> - 1.11.1-4
-- drop 32-bit support
-  https://fedoraproject.org/wiki/Changes/php_no_32_bit
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Mon Dec  4 2023 Remi Collet <remi@remirepo.net> - 1.11.1-1
 - update to 1.11.1
 
-* Tue Oct 03 2023 Remi Collet <remi@remirepo.net> - 1.11.0-11
-- rebuild for https://fedoraproject.org/wiki/Changes/php83
-
 * Mon Oct  2 2023 Remi Collet <remi@remirepo.net> - 1.11.0-10
 - add missing dependency on fedora/autoloader
 - build out of sources tree

sources

@@ -1 +1 @@
-SHA512 (php-maxminddb-1.13.1-2194f58.tgz) = 4862dd4afcb899fabd91dfa6a6471aa5bf06f2a4b1c5929d68ad72774c8d83e3ea17f2e2bab557b2d27f7fe2267854c391e19443f52e3667ce04614f3e9cf8d0
+SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106