.gitignore

@@ -1,3 +1 @@
-/zip-1.15.2.tgz
-/zip-1.15.3.tgz
-/zip-1.15.4.tgz
+SOURCES/zip-1.18.2.tgz

.php-pecl-zip.metadata

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

SOURCES/zip-tests.patch

@@ -0,0 +1,27 @@
+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

SPECS/php-pecl-zip.spec

@@ -1,6 +1,6 @@
-# Fedora spec file for php-pecl-zip
+# RHEL / Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -14,15 +14,21 @@
 %global with_zts  0%{?__ztsphp:1}
 %global ini_name  40-%{pecl_name}.ini
 
+%global upstream_version 1.18.2
+#global upstream_prever  RC6
+
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.15.4
+Version:      %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:      1%{?dist}
 License:      PHP
-URL:          http://pecl.php.net/package/zip
+URL:          https://pecl.php.net/package/zip
 
-Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
+
+# Upstream patch for test suite
+Patch0:       %{pecl_name}-tests.patch
 
 BuildRequires: php-devel
 BuildRequires: pkgconfig(libzip) >= 1.0.0
@@ -47,17 +53,20 @@ Zip est une extension pour créer et lire les archives au format ZIP.
 
 %prep 
 %setup -c -q
+mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
-cd %{pecl_name}-%{version}
+cd NTS
+%patch0 -p1
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)
-if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
 
@@ -70,12 +79,12 @@ EOF
 
 %if %{with_zts}
 : Duplicate sources tree for ZTS build
-cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
+cp -pr NTS ZTS
 %endif
 
 
 %build
-cd %{pecl_name}-%{version}
+cd NTS
 %{_bindir}/phpize
 %configure \
   --with-libzip \
@@ -85,7 +94,7 @@ cd %{pecl_name}-%{version}
 make %{?_smp_mflags}
 
 %if %{with_zts}
-cd ../%{pecl_name}-zts
+cd ../ZTS
 %{_bindir}/zts-phpize
 %configure \
   --with-libzip \
@@ -97,26 +106,26 @@ make %{?_smp_mflags}
 
 
 %install
-make -C %{pecl_name}-%{version} install INSTALL_ROOT=%{buildroot}
+make -C NTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
 # Install XML package description
 install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
-make -C %{pecl_name}-zts install INSTALL_ROOT=%{buildroot}
+make -C ZTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
-cd %{pecl_name}-%{version}
+cd NTS
 for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 
 
 %check
-cd %{pecl_name}-%{version}
+cd NTS
 : minimal load test of NTS extension
 %{_bindir}/php --no-php-ini \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
@@ -127,10 +136,10 @@ 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
+%{_bindir}/php -n run-tests.php --show-diff
 
 %if %{with_zts}
-cd ../%{pecl_name}-zts
+cd ../ZTS
 : minimal load test of ZTS extension
 %{_bindir}/zts-php --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
@@ -141,12 +150,12 @@ 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
+%{_bindir}/zts-php -n run-tests.php --show-diff
 %endif
 
 
 %files
-%license %{pecl_name}-%{version}/LICENSE
+%license NTS/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -160,6 +169,9 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
+* Thu May 14 2020 Remi Collet <rcollet@redhat.com> - 1.18.2-1
+- update to 1.18.2
+
 * Tue May  7 2019 Remi Collet <remi@remirepo.net> - 1.15.4-1
 - Update to 1.15.4
 

sources

@@ -1 +0,0 @@
-SHA512 (zip-1.15.4.tgz) = a750e2598d795a00d08a875471dcd68894abf9b775ed959b291ea13422fa773c271a72f90f54f70e51df0848d4e3d99c9f423863d4fc4f0cd85b8d6a739f8c4f