diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | gnupg-tests.patch | 49 | ||||
| -rw-r--r-- | no_uid_hint_msg.gpg | bin | 921 -> 0 bytes | |||
| -rw-r--r-- | php-pecl-gnupg.spec | 24 |
5 files changed, 15 insertions, 62 deletions
@@ -3,4 +3,4 @@ gnupg gnupg support => enabled GPGme Version => 1.23.2 -Extension Version => 1.5.2 +Extension Version => 1.5.3 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #82 gnupg version 1.5.2 ] { +Extension [ <persistent> extension #83 gnupg version 1.5.3 ] { - Constants [36] { Constant [ int GNUPG_SIG_MODE_NORMAL ] { 0 } diff --git a/gnupg-tests.patch b/gnupg-tests.patch deleted file mode 100644 index 1bb6e4a..0000000 --- a/gnupg-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2a5bc513c6ae065ef43bda71b321bce1b318f03e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 8 Apr 2025 14:12:09 +0200 -Subject: [PATCH] fix tests with 5.6 - ---- - tests/gnupgt.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc -index 2b8aa08..7b06a0a 100644 ---- a/tests/gnupgt.inc -+++ b/tests/gnupgt.inc -@@ -75,7 +75,7 @@ class gnupgt { - self::reset_key(); - - $gpg = self::create_instance(); -- $gpg->import($privkey ?? $testkey); -+ $gpg->import(is_null($privkey) ? $testkey : $privkey); - } - - /** -From ce9e56099fa619f368676ccaa6b005c8d69f6f12 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 8 Apr 2025 16:59:40 +0200 -Subject: [PATCH] clean hidden files - ---- - tests/gnupgt.inc | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc -index 2b8aa08..7191ec1 100644 ---- a/tests/gnupgt.inc -+++ b/tests/gnupgt.inc -@@ -90,9 +90,10 @@ class gnupgt { - if (!is_dir($homeDir)) { - return; - } -- foreach (glob($homeDir . '/*') as $filename) { -- if (!is_dir($filename)) { -- unlink($filename); -+ $dir = opendir($homeDir); -+ while ($filename = readdir($dir)) { -+ if (!is_dir("$homeDir/$filename")) { -+ unlink("$homeDir/$filename"); - } - } - $privKeyDir = self::get_priv_key_dir($homeDir); diff --git a/no_uid_hint_msg.gpg b/no_uid_hint_msg.gpg Binary files differdeleted file mode 100644 index 67eccf8..0000000 --- a/no_uid_hint_msg.gpg +++ /dev/null diff --git a/php-pecl-gnupg.spec b/php-pecl-gnupg.spec index 9e71a64..40af0a0 100644 --- a/php-pecl-gnupg.spec +++ b/php-pecl-gnupg.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%{?scl:%scl_package php-pecl-gnupg} +%if 0%{?scl:1} +%scl_package php-pecl-gnupg +%else +%global _root_bindir %{_bindir} +%endif %if 0%{?fedora} >= 41 # TODO needs investigation @@ -21,7 +25,7 @@ %global pecl_name gnupg %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini -%global upstream_version 1.5.2 +%global upstream_version 1.5.3 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -34,9 +38,6 @@ Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.". License: BSD-2-Clause URL: https://pecl.php.net/package/gnupg Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz -Source1: https://raw.githubusercontent.com/php-gnupg/php-gnupg/refs/tags/gnupg-%{upstream_version}/tests/no_uid_hint_msg.gpg - -Patch0: %{pecl_name}-tests.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -81,9 +82,6 @@ extension=%{pecl_name}.so EOF cd %{sources} -cp %{SOURCE1} tests/ -%patch -P0 -p1 - # Check extension version extver=$(sed -n '/#define PHP_GNUPG_VERSION/{s/.* "//;s/".*$//;p}' php_gnupg.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -99,9 +97,9 @@ mkdir ZTS %endif %if %{with gpg1} -%{_bindir}/gpg1 --version +%{_root_bindir}/gpg1 --version %else -%{_bindir}/gpg --version +%{_root_bindir}/gpg --version %endif @@ -159,7 +157,7 @@ done cd %{sources} unset GPG_AGENT_INFO %if %{with gpg1} -export GNUPGFILENAME=%{_bindir}/gpg1 +export GNUPGFILENAME=%{_root_bindir}/gpg1 %endif : Check if build NTS extension can be loaded @@ -200,6 +198,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jun 3 2025 Remi Collet <remi@remirepo.net> - 1.5.3-1 +- update to 1.5.3 +- drop patch merged upstream + * Tue Apr 8 2025 Remi Collet <remi@remirepo.net> - 1.5.2-1 - update to 1.5.2 - re-license spec file to CECILL-2.1 |