summaryrefslogtreecommitdiffstats
path: root/php-pecl-zip.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-09-18 11:33:44 +0200
committerRemi Collet <remi@php.net>2025-09-18 11:33:44 +0200
commite9331ede82540cecd7d160cb9dfc47e6b4b4912f (patch)
tree2f7ccb2a10be3b5b561bd8dc6aa609b63cf7a5a0 /php-pecl-zip.spec
parenta558f06b96f73eb8e47a822340122376e8bd4947 (diff)
more upstream patches for PHP 8.5
Diffstat (limited to 'php-pecl-zip.spec')
-rw-r--r--php-pecl-zip.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index ba04bbe..b3fed8a 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -43,7 +43,7 @@
Summary: A ZIP archive management extension
Name: %{?scl_prefix}php-pecl-zip
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP-3.01
Group: Development/Languages
URL: https://pecl.php.net/package/zip
@@ -53,6 +53,9 @@ Source0: https://pecl.php.net/get/%{sources}.tgz
Patch0: 0001-8.5-compat.patch
Patch1: 0001-fix-test-for-8.5.0beta2.patch
Patch2: 0001-Fix-leak-when-path-is-too-long-in-ZipArchive-extract.patch
+Patch3: 0001-Fix-memory-leak-in-zip-when-encountering-empty-glob-.patch
+Patch4: 0002-Fix-GH-19688-Remove-pattern-overflow-in-zip-addGlob.patch
+Patch5: 0003-regen-arginfo.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
@@ -121,6 +124,9 @@ cd %{sources}
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
sed -e '/PHP_ZIP_VERSION/s/1.22.dev/%{version}/' -i php74/php_zip.h
# Sanity check, really often broken
@@ -246,6 +252,9 @@ TEST_PHP_EXECUTABLE=%{__ztsphp} \
%changelog
+* Wed Sep 18 2025 Remi Collet <remi@remirepo.net> - 1.22.6-4
+- more upstream patches for PHP 8.5
+
* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 1.22.6-3
- rebuild for 8.5.0alpha3