From f1adda3da3d808c235b7b6d0451d0af6ad2ac708 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 11 Apr 2024 09:55:32 +0000
Subject: [PATCH] import CS php-pecl-zip-1.22.3-1.module_el8+765+677b369c

---
 .gitignore              |  2 +-
 .php-pecl-zip.metadata  |  2 +-
 SOURCES/zip-tests.patch | 27 ---------------------------
 SPECS/php-pecl-zip.spec | 31 +++++++++++++++----------------
 4 files changed, 17 insertions(+), 45 deletions(-)
 delete mode 100644 SOURCES/zip-tests.patch

diff --git a/.gitignore b/.gitignore
index 28ea08b..d6ab238 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/zip-1.18.2.tgz
+SOURCES/zip-1.22.3.tgz
diff --git a/.php-pecl-zip.metadata b/.php-pecl-zip.metadata
index 38e9de5..91e9ed0 100644
--- a/.php-pecl-zip.metadata
+++ b/.php-pecl-zip.metadata
@@ -1 +1 @@
-16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz
+e60876545544ab04bb1ee013d74066c29cdc156b SOURCES/zip-1.22.3.tgz
diff --git a/SOURCES/zip-tests.patch b/SOURCES/zip-tests.patch
deleted file mode 100644
index 78759ed..0000000
--- a/SOURCES/zip-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 527c199656850e86e8528ddf508c086d1147970b Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 18 May 2020 07:48:59 +0200
-Subject: [PATCH] relax test (TZ issue)
-
----
- tests/bug50678.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/bug50678.phpt b/tests/bug50678.phpt
-index 156318e..a09c54d 100644
---- a/tests/bug50678.phpt
-+++ b/tests/bug50678.phpt
-@@ -18,11 +18,11 @@ $zip->open($filename);
- $zip->extractTo($dirname);
- $zip->close();
- 
--var_dump(date('Ymd', filemtime($dirname . '/entry1.txt')));
-+var_dump(date('Ym', filemtime($dirname . '/entry1.txt')));
- ?>
- Done
- --EXPECT--
--string(8) "20060706"
-+string(6) "200607"
- Done
- --CLEAN--
- <?php
diff --git a/SPECS/php-pecl-zip.spec b/SPECS/php-pecl-zip.spec
index 72dd155..8d2b9fd 100644
--- a/SPECS/php-pecl-zip.spec
+++ b/SPECS/php-pecl-zip.spec
@@ -1,7 +1,7 @@
 # RHEL / Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2020 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -14,7 +14,7 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
-%global upstream_version 1.18.2
+%global upstream_version 1.22.3
 #global upstream_prever  RC6
 
 Summary:      A ZIP archive management extension
@@ -22,14 +22,13 @@ Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
 Version:      %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:      1%{?dist}
-License:      PHP
+License:      PHP-3.01
 URL:          https://pecl.php.net/package/zip
 
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-# Upstream patch for test suite
-Patch0:       %{pecl_name}-tests.patch
-
+BuildRequires: make
+BuildRequires: gcc
 BuildRequires: php-devel
 BuildRequires: pkgconfig(libzip) >= 1.0.0
 BuildRequires: zlib-devel
@@ -61,10 +60,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1
-
 # Sanity check, really often broken
-extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)
+extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php8/php_zip.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
    : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
@@ -133,10 +130,8 @@ cd NTS
 
 : upstream test suite for NTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
-%{_bindir}/php -n run-tests.php --show-diff
+%{_bindir}/php -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -147,10 +142,8 @@ cd ../ZTS
 
 : upstream test suite for ZTS extension
 TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
-%{_bindir}/zts-php -n run-tests.php --show-diff
+%{_bindir}/zts-php -n run-tests.php -q --show-diff
 %endif
 
 
@@ -169,6 +162,12 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
+* Mon Nov 27 2023 Remi Collet <rcollet@redhat.com> - 1.22.3-1
+- update to 1.22.3 for PHP 8.2 RHEL-14705
+
+* Tue Dec 14 2021 Remi Collet <rcollet@redhat.com> - 1.19.2-1
+- update to 1.19.2
+
 * Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1
 - update to 1.18.2