From b4dba48de35aaececae3229fd62718c2e2b5a162 Mon Sep 17 00:00:00 2001
From: Adam Samalik <asamalik@redhat.com>
Date: Tue, 16 May 2023 09:21:59 +0200
Subject: [PATCH] import sources

---
 .gitignore     |  1 +
 sources        |  2 +-
 zip-php8.patch | 42 ------------------------------------------
 3 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 zip-php8.patch

diff --git a/.gitignore b/.gitignore
index 6d1828b..15a8a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/zip-1.15.4.tgz
+/zip-1.15.4.tgz
diff --git a/sources b/sources
index 21e10a5..f7fa181 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA1 (zip-1.15.4.tgz) = 37b9b074d848ed391581fca825d981a634ef8f07
+SHA512 (zip-1.15.4.tgz) = a750e2598d795a00d08a875471dcd68894abf9b775ed959b291ea13422fa773c271a72f90f54f70e51df0848d4e3d99c9f423863d4fc4f0cd85b8d6a739f8c4f
diff --git a/zip-php8.patch b/zip-php8.patch
deleted file mode 100644
index 45e9940..0000000
--- a/zip-php8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
-