.gitignore

@@ -1 +1,32 @@
-SOURCES/zip-1.18.2.tgz
+clog
+php-pecl-zip.spec~
+/zip-1.12.1.tgz
+/zip-1.12.2.tgz
+/zip-1.12.3.tgz
+/zip-1.12.4.tgz
+/zip-1.12.5.tgz
+/zip-1.13.0.tgz
+/zip-1.13.1.tgz
+/zip-1.13.2.tgz
+/zip-1.13.3.tgz
+/zip-1.13.4.tgz
+/zip-1.13.5.tgz
+/zip-1.14.0.tgz
+/zip-1.15.0.tgz
+/zip-1.15.1.tgz
+/zip-1.15.2.tgz
+/zip-1.15.3.tgz
+/zip-1.15.4.tgz
+/zip-1.15.5.tgz
+/zip-1.16.0.tgz
+/zip-1.16.1.tgz
+/zip-1.17.0.tgz
+/zip-1.17.1.tgz
+/zip-1.17.2.tgz
+/zip-1.18.0RC6.tgz
+/zip-1.18.0.tgz
+/zip-1.18.1.tgz
+/zip-1.18.2.tgz
+/zip-1.19.0.tgz
+/zip-1.19.1.tgz
+/zip-1.19.2.tgz

.php-pecl-zip.metadata

@@ -1 +0,0 @@
-16e8422eb7b4fa5171a6787c17d3f663abf67311 SOURCES/zip-1.18.2.tgz

SOURCES/zip-tests.patch

@@ -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

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
+

php-pecl-zip.spec

@@ -1,6 +1,6 @@
-# RHEL / Fedora spec file for php-pecl-zip
+# Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -14,22 +14,21 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
-%global upstream_version 1.18.2
+%global upstream_version 1.19.2
 #global upstream_prever  RC6
 
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
 Version:      %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:      1%{?dist}
+Release:      6%{?dist}
 License:      PHP
 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
@@ -169,12 +166,83 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
-* Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-5
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Mon Apr 19 2021 Remi Collet <rcollet@redhat.com> - 1.19.2-4
+- Rebuilt for PHP 8. Related rhbz#1949319
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.19.2-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 1.19.2-1
+- update to 1.19.2
+
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.19.1-1
+- update to 1.19.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun  8 2020 Remi Collet <remi@remirepo.net> - 1.19.0-1
+- update to 1.19.0
+
+* Fri Mar 20 2020 Remi Collet <remi@remirepo.net> - 1.18.2-1
 - update to 1.18.2
 
-* Tue May  7 2019 Remi Collet <remi@remirepo.net> - 1.15.4-1
+* Thu Mar 19 2020 Remi Collet <remi@remirepo.net> - 1.18.1-1
+- update to 1.18.1
+
+* Mon Mar 16 2020 Remi Collet <remi@remirepo.net> - 1.18.0-1
+- update to 1.18.0
+
+* Mon Mar  9 2020 Remi Collet <remi@remirepo.net> - 1.18.0~RC6-1
+- update to 1.18.0RC6
+
+* Fri Feb 28 2020 Remi Collet <remi@remirepo.net> - 1.17.2-1
+- Update to 1.17.2
+
+* Mon Feb  3 2020 Remi Collet <remi@remirepo.net> - 1.17.1-1
+- Update to 1.17.1
+
+* Fri Jan 31 2020 Remi Collet <remi@remirepo.net> - 1.17.0-1
+- Update to 1.17.0
+
+* Wed Jan 29 2020 Remi Collet <remi@remirepo.net> - 1.16.1-1
+- Update to 1.16.1
+
+* Tue Jan 28 2020 Remi Collet <remi@remirepo.net> - 1.16.0-1
+- Update to 1.16.0
+
+* Thu Oct 03 2019 Remi Collet <remi@remirepo.net> - 1.15.5-2
+- rebuild for https://fedoraproject.org/wiki/Changes/php74
+
+* Tue Sep 10 2019 Remi Collet <remi@remirepo.net> - 1.15.5-1
+- Update to 1.15.5
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 1.15.4-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/php73
+
+* Wed Oct  3 2018 Remi Collet <remi@remirepo.net> - 1.15.4-1
 - Update to 1.15.4
 
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Jun 12 2018 Remi Collet <remi@remirepo.net> - 1.15.3-1
 - Update to 1.15.3
 

sources

@@ -0,0 +1 @@
+SHA512 (zip-1.19.2.tgz) = ef0971da57cd1b92a2b458e978d539e82851a65c811c4dd3ead7827db84a3c995d065bb6390ecd617273b92e47236e22c9696a4f98bc263617a2637fa30dd0bd

zip-php8.patch

@@ -0,0 +1,42 @@
+From a6154ce1512755b061848bc1e549118279765dc1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 5 Jun 2020 17:08:21 +0200
+Subject: [PATCH] encode param is optional
+
+---
+ php8/php_zip.stub.php  | 4 ++--
+ php8/php_zip_arginfo.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/php8/php_zip.stub.php b/php8/php_zip.stub.php
+index da8e373..f85464a 100644
+--- a/php8/php_zip.stub.php
++++ b/php8/php_zip.stub.php
+@@ -194,9 +194,9 @@ public function registerCancelCallback(callable $callback) {}
+ 
+ #ifdef HAVE_METHOD_SUPPORTED
+     /** @return bool */
+-    public static function isCompressionMethodSupported(int $method, bool $enc): bool {}
++    public static function isCompressionMethodSupported(int $method, bool $enc = true): bool {}
+ 
+     /** @return bool */
+-    public static function isEncryptionMethodSupported(int $method, bool $enc): bool {}
++    public static function isEncryptionMethodSupported(int $method, bool $enc = true): bool {}
+ #endif
+ }
+diff --git a/php8/php_zip_arginfo.h b/php8/php_zip_arginfo.h
+index c1e8f24..5f150b9 100644
+--- a/php8/php_zip_arginfo.h
++++ b/php8/php_zip_arginfo.h
+@@ -271,9 +271,9 @@ ZEND_END_ARG_INFO()
+ #endif
+ 
+ #if defined(HAVE_METHOD_SUPPORTED)
+-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_isCompressionMethodSupported, 0, 2, _IS_BOOL, 0)
++ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ZipArchive_isCompressionMethodSupported, 0, 1, _IS_BOOL, 0)
+ 	ZEND_ARG_TYPE_INFO(0, method, IS_LONG, 0)
+-	ZEND_ARG_TYPE_INFO(0, enc, _IS_BOOL, 0)
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enc, _IS_BOOL, 0, "true")
+ ZEND_END_ARG_INFO()
+ #endif
+