diff options
| -rw-r--r-- | 474.patch | 27 | ||||
| -rw-r--r-- | unit-php.spec | 12 |
2 files changed, 6 insertions, 33 deletions
diff --git a/474.patch b/474.patch deleted file mode 100644 index 076dfdc..0000000 --- a/474.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 01ad74d272a2d408b58e16946979ac5d9e127ab5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 2 Sep 2020 11:13:05 +0200 -Subject: [PATCH] fix for PHP 8.0.0beta3 - ---- - src/nxt_php_sapi.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c -index d7e5b476..11e4e702 100644 ---- a/src/nxt_php_sapi.c -+++ b/src/nxt_php_sapi.c -@@ -537,9 +537,13 @@ nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options, int type) - } - - if (nxt_str_eq(&name, "disable_functions", 17)) { -+#ifdef NXT_PHP8 -+ zend_disable_functions((const char *)value.start); -+#else - nxt_php_disable(task, "function", &value, - &PG(disable_functions), - zend_disable_function); -+#endif - continue; - } - diff --git a/unit-php.spec b/unit-php.spec index c0b90a5..ea146d4 100644 --- a/unit-php.spec +++ b/unit-php.spec @@ -9,7 +9,7 @@ %global gh_owner nginx %global project unit -%global gh_commit ba445d31f17194be335fb8bf6295bceac991299d +%global gh_commit 7d77d50568b347ec71a9db1f53b77d1976535294 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %undefine _debugsource_packages @@ -34,16 +34,14 @@ Requires: %{scl_prefix}php-embedded %endif Name: %{?scl_prefix}%{project}-php -Version: 1.19.0 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.20.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for NGINX Unit License: ASL 2.0 URL: https://unit.nginx.org/ Source0: https://github.com/%{gh_owner}/%{project}/archive/%{gh_commit}/%{project}-%{version}-%{gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/nginx/unit/pull/474.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-embedded @@ -62,7 +60,6 @@ and NGINX unit %{version}. %prep %setup -qn %{project}-%{gh_commit} -%patch0 -p1 -b .pr %build @@ -121,6 +118,9 @@ make %{modname}-install DESTDIR=%{buildroot} %changelog +* Fri Oct 9 2020 Remi Collet <remi@remirepo.net> - 1.20.0-1 +- update to 1.20.0 + * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.19.0-3 - rebuild for PHP 8.0.0RC1 |