From 834d34eee897a08c2d640d70ea9e8517c835c496 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Dec 2023 08:26:12 +0100 Subject: refresh patches (avoid offset) --- php-8.0.10-phar-sha.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'php-8.0.10-phar-sha.patch') diff --git a/php-8.0.10-phar-sha.patch b/php-8.0.10-phar-sha.patch index 7d6fa2c..9a6cea2 100644 --- a/php-8.0.10-phar-sha.patch +++ b/php-8.0.10-phar-sha.patch @@ -203,7 +203,7 @@ index 77f21cef9da53..bc08e4edde05d 100644 efree(savebuf); efree(sig); php_stream_close(fp); -@@ -3162,7 +3164,9 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv +@@ -3171,7 +3173,9 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv php_stream_write(newfile, digest, digest_len); efree(digest); @@ -284,7 +284,7 @@ index 9c1e5f2fa1eef..c05970e657f18 100644 } #endif } -@@ -3028,6 +3032,8 @@ PHP_METHOD(Phar, setSignatureAlgorithm) +@@ -3029,6 +3033,8 @@ PHP_METHOD(Phar, setSignatureAlgorithm) case PHAR_SIG_MD5: case PHAR_SIG_SHA1: case PHAR_SIG_OPENSSL: @@ -293,7 +293,7 @@ index 9c1e5f2fa1eef..c05970e657f18 100644 if (phar_obj->archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->archive))) { zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname); RETURN_THROWS(); -@@ -3066,19 +3072,25 @@ PHP_METHOD(Phar, getSignature) +@@ -3067,19 +3073,25 @@ PHP_METHOD(Phar, getSignature) add_assoc_stringl(return_value, "hash", phar_obj->archive->signature, phar_obj->archive->sig_len); switch(phar_obj->archive->sig_flags) { case PHAR_SIG_MD5: @@ -324,7 +324,7 @@ index 9c1e5f2fa1eef..c05970e657f18 100644 break; default: unknown = strpprintf(0, "Unknown (%u)", phar_obj->archive->sig_flags); -@@ -5103,6 +5115,8 @@ void phar_object_init(void) /* {{{ */ +@@ -5104,6 +5116,8 @@ void phar_object_init(void) /* {{{ */ REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "PHPS", PHAR_MIME_PHPS) REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "MD5", PHAR_SIG_MD5) REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL", PHAR_SIG_OPENSSL) -- cgit