From 2c8374974e8bd6125a546c79ff511e2f663dee02 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Tue, 21 Jun 2022 07:48:22 +0000 Subject: [PATCH] 7.4.30 --- .abf.yml | 2 +- add-include.patch | 12 ------------ php7.spec | 9 +++------ 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 add-include.patch diff --git a/.abf.yml b/.abf.yml index f783f01..58d5617 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - php-7.4.26.tar.xz: 7057da60ba8c65e2b0c75129bb9ffff8ddd2f9d0 + php-7.4.30.tar.gz: 7fe1005b3677e2a4d112ecce7e54734fc9d668c9 diff --git a/add-include.patch b/add-include.patch deleted file mode 100644 index 516a35f..0000000 --- a/add-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c -index 53efa865..d6975a44 100644 ---- a/ext/opcache/zend_accelerator_util_funcs.c -+++ b/ext/opcache/zend_accelerator_util_funcs.c -@@ -24,6 +24,7 @@ - #include "zend_accelerator_util_funcs.h" - #include "zend_persist.h" - #include "zend_shared_alloc.h" -+#include - - #if SIZEOF_SIZE_T <= SIZEOF_ZEND_LONG - /* If sizeof(void*) == sizeof(zend_ulong) we can use zend_hash index functions */ diff --git a/php7.spec b/php7.spec index 6835432..4d00db6 100644 --- a/php7.spec +++ b/php7.spec @@ -26,9 +26,9 @@ Summary: The PHP7 scripting language Name: php -Version: 7.4.26 -Release: 4 -Source0: http://ch1.php.net/distributions/php-%{version}.tar.xz +Version: 7.4.30 +Release: 1 +Source0: http://ch1.php.net/distributions/php-%{version}.tar.gz Source1: macros.php Group: Development/PHP License: PHP License @@ -81,8 +81,6 @@ Patch114: php-no_pam_in_c-client.diff # Fix bugs Patch121: php-bug43221.diff Patch122: php-not-use-libgd-const.patch -# fix include -Patch123: add-include.patch BuildRequires: autoconf BuildRequires: automake @@ -1273,7 +1271,6 @@ fi # upstream fixes %patch121 -p0 -b .bug43221.droplet %patch122 -p1 -%patch123 -p1 cp %{SOURCE2} maxlifetime cp %{SOURCE3} php.crond