From 35c5901a1211c1aecce9fb4515a0aaf18e312f12 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Oct 2023 08:45:13 +0200 Subject: [PATCH 1/5] add missing dependency on fedora/autoloader build out of sources tree (cherry picked from commit 07ae24e5f2b64b71f60ce52442a8997bf812700d) --- php-maxminddb.spec | 58 ++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index d1fa3bb..910e52e 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,12 +3,18 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2018-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +%{!?__phpize: %global __phpize %{_bindir}/phpize} +%{!?__ztsphpize: %global __ztsphpize %{_bindir}/zts-phpize} +%{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} +%{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} + %global gh_commit f7cc1a1472868f25a02636c99d1054232292bc26 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind @@ -20,6 +26,8 @@ # pure PHP library %global pk_vendor maxmind-db %global pk_project reader +%global _configure ../ext/configure + %if 0%{?fedora} %bcond_without tests %else @@ -29,8 +37,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 3%{?dist} -License: ASL 2.0 +Release: 10%{?dist} +License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz @@ -102,6 +110,8 @@ Suggests: geolite2-city # From phpcompatifo report for 1.3.0 Requires: php-filter Requires: php-spl +# Autoloader +Requires: php-composer(fedora/autoloader) Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} @@ -127,10 +137,7 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php --output src/MaxMind/Db/Reader/autoload.php \ src/MaxMind/Db -mv ext NTS - -cd NTS - +cd ext # Sanity check, really often broken extver=$(sed -n '/#define PHP_MAXMINDDB_VERSION/{s/.* "//;s/".*$//;p}' php_maxminddb.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -139,9 +146,9 @@ if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then fi cd .. +mkdir NTS %if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Drop in the bit of configuration @@ -152,19 +159,20 @@ EOF %build -cd NTS -%{_bindir}/phpize +cd ext +%{__phpize} + +cd ../NTS %configure \ - --with-php-config=%{_bindir}/php-config \ + --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ --with-maxminddb make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize %configure \ - --with-php-config=%{_bindir}/zts-php-config \ + --with-php-config=%{__ztsphpconfig} \ --with-libdir=%{_lib} \ --with-maxminddb make %{?_smp_mflags} @@ -193,32 +201,27 @@ cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db : Minimal load test for NTS extension %{__php} --no-php-ini \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --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} + --modules | grep '^%{pecl_name}$' %endif ret=0 -cd NTS +cd ext : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff || ret=1 +%{__php} -n run-tests.php -q --show-diff || ret=1 %if %{with_zts} -cd ../ZTS : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff || ret=1 +%{__ztsphp} -n run-tests.php -q --show-diff || ret=1 %endif %if %{with tests} @@ -264,6 +267,11 @@ exit $ret %changelog +* Mon Oct 2 2023 Remi Collet - 1.11.0-10 +- add missing dependency on fedora/autoloader +- build out of sources tree +- use SPDX license ID + * Fri Dec 10 2021 Remi Collet - 1.11.0-3 - disable library test suite for EL build From 4a5450495cba8229420ebf05533077f9e62de606 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Dec 2023 09:55:38 +0100 Subject: [PATCH 2/5] v1.11.1 (cherry picked from commit 84f30ac9560cba7698fcf4646c38d59533cf855e) (cherry picked from commit 2198caa60d33ceb50a559b9c4befd89d0ab65bec) (cherry picked from commit 9e9cf4bdbfb3640af2c5dfb9054cc658b79349a4) --- .gitignore | 1 + php-maxminddb.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a1e3bb6..9d67ef3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /php-maxminddb-1.10.0-07f84d9.tgz /php-maxminddb-1.10.1-569bd44.tgz /php-maxminddb-1.11.0-f7cc1a1.tgz +/php-maxminddb-1.11.1-1e66f73.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 910e52e..2179b6b 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -15,7 +15,7 @@ %{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} %{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} -%global gh_commit f7cc1a1472868f25a02636c99d1054232292bc26 +%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 @@ -36,8 +36,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.11.0 -Release: 10%{?dist} +Version: 1.11.1 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -102,7 +102,7 @@ Recommends: php-bcmath Recommends: php-gmp Recommends: php-maxminddb # from composer.json "conflict": { -# "ext-maxminddb": "<1.10.0,>=2.0.0" +# "ext-maxminddb": "<1.11.1,>=2.0.0" Conflicts: php-maxminddb < %{version} # Weak dependencies on databases Recommends: geolite2-country @@ -227,7 +227,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %if %{with tests} cd .. : Upstream test suite for the library -for cmd in php php72 php73 php74 php80 php81; 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 \ @@ -267,6 +267,9 @@ exit $ret %changelog +* Mon Dec 4 2023 Remi Collet - 1.11.1-1 +- update to 1.11.1 + * Mon Oct 2 2023 Remi Collet - 1.11.0-10 - add missing dependency on fedora/autoloader - build out of sources tree diff --git a/sources b/sources index 42e5840..b121573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.11.0-f7cc1a1.tgz) = d0d7ce79ed152ba9277997515cade9a8c7a043d1a23a27e6838ad48b3e4f8854327356f3a1d30dff156a203ec65329d3f1d936a26a1e9ee5ae87c4ff400f2997 +SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106 From dd1ba87d209e9eee06d5b7be8d1494e6bc29887b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Nov 2024 08:28:29 +0100 Subject: [PATCH 3/5] v1.12.0 (cherry picked from commit 98b460f37c635ce3516025f85a773ffacfc61e64) --- .gitignore | 1 + php-maxminddb.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9d67ef3..d8a1559 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ 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 diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 2179b6b..4968ffa 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -15,7 +15,7 @@ %{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} %{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} -%global gh_commit 1e66f73ffcf25e17c7a910a1317e9720a95497c7 +%global gh_commit 5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -36,7 +36,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.11.1 +Version: 1.12.0 Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -267,6 +267,9 @@ exit $ret %changelog +* Fri Nov 15 2024 Remi Collet - 1.12.0-1 +- update to 1.12.0 + * Mon Dec 4 2023 Remi Collet - 1.11.1-1 - update to 1.11.1 diff --git a/sources b/sources index b121573..689a09e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106 +SHA512 (php-maxminddb-1.12.0-5b2d7a7.tgz) = 14f178b02055596eeeb1743310cd2479bb7e4f3beb01e7b694ceee8b6f9a315b3949e52d9951d2c33aa7a173b6d14c721f171bfc58292e94ca0c7a81c67a21c6 From 9c25bcfaa3d04d04ea563cbf6b0f7b72d573bebb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 May 2025 08:43:25 +0200 Subject: [PATCH 4/5] update to 1.12.1 re-license spec file to CECILL-2.1 (cherry picked from commit d0009e4dd91ad2f5b509400661d6e92daccb13bf) (cherry picked from commit ba6ad2381dd23632dc7e9d659a5b1cd33e23ea87) --- .gitignore | 1 + php-maxminddb.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d8a1559..67a480f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /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 diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 4968ffa..3681cef 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,9 +3,9 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2018-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -15,7 +15,7 @@ %{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} %{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} -%global gh_commit 5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90 +%global gh_commit 815939e006b7e68062b540ec9e86aaa8be2b6ce4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -36,7 +36,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -267,6 +267,10 @@ exit $ret %changelog +* Tue May 6 2025 Remi Collet - 1.12.1-1 +- update to 1.12.1 +- re-license spec file to CECILL-2.1 + * Fri Nov 15 2024 Remi Collet - 1.12.0-1 - update to 1.12.0 diff --git a/sources b/sources index 689a09e..3bb8362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.12.0-5b2d7a7.tgz) = 14f178b02055596eeeb1743310cd2479bb7e4f3beb01e7b694ceee8b6f9a315b3949e52d9951d2c33aa7a173b6d14c721f171bfc58292e94ca0c7a81c67a21c6 +SHA512 (php-maxminddb-1.12.1-815939e.tgz) = 7202974a44e71908ba257b632272cc875d578bd5639e2183c74c8b673298693acb6520bef0c98e730ee1fc2fe3d4640eb11bd8360d57be4740954b049647af5a From 30e9bcf8b6dc576c8a2025a8a90624c0a5e41498 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Nov 2025 08:41:06 +0100 Subject: [PATCH 5/5] v1.13.0 (cherry picked from commit 391aaa7bf4ec99e24d166d53fa64a8aaf48ffe5d) (cherry picked from commit a5647dece3979cee245e907a62238b171ec127a6) --- .gitignore | 1 + php-maxminddb.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67a480f..89fe537 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /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 diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 3681cef..a72eb54 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -15,7 +15,7 @@ %{!?__phpconfig: %global __phpconfig %{_bindir}/php-config} %{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config} -%global gh_commit 815939e006b7e68062b540ec9e86aaa8be2b6ce4 +%global gh_commit b298986c4f2c75ff080d9f6f4839bec46bda70f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -36,7 +36,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.12.1 +Version: 1.13.0 Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -267,6 +267,9 @@ exit $ret %changelog +* Fri Nov 21 2025 Remi Collet - 1.13.0-1 +- update to 1.13.0 + * Tue May 6 2025 Remi Collet - 1.12.1-1 - update to 1.12.1 - re-license spec file to CECILL-2.1 diff --git a/sources b/sources index 3bb8362..c7ba67a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.12.1-815939e.tgz) = 7202974a44e71908ba257b632272cc875d578bd5639e2183c74c8b673298693acb6520bef0c98e730ee1fc2fe3d4640eb11bd8360d57be4740954b049647af5a +SHA512 (php-maxminddb-1.13.0-b298986.tgz) = c506564948c4a8766cd7b5241af5897c82fc85806eb9d9aa64d6625fc51fefecabd1314396690c806ac2ecd0e489ad54ba27812e04cf04c93b1d1f0d27777ca5