diff options
| -rw-r--r-- | 0001-constify.patch | 28 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-vld.spec | 25 |
3 files changed, 47 insertions, 8 deletions
diff --git a/0001-constify.patch b/0001-constify.patch new file mode 100644 index 0000000..6bdfe10 --- /dev/null +++ b/0001-constify.patch @@ -0,0 +1,28 @@ +From af212091cd5d4b65d248bace5e2ce2c5827ed2a6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 30 Nov 2021 11:23:03 +0100 +Subject: [PATCH] constify + +--- + vld.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vld.c b/vld.c +index 0c9de4c..aa11d0a 100644 +--- a/vld.c ++++ b/vld.c +@@ -287,9 +287,9 @@ static zend_op_array *vld_compile_file(zend_file_handle *file_handle, int type) + { + zend_op_array *op_array; + #if PHP_VERSION_ID < 80100 +- char *filename = file_handle->filename; ++ const char *filename = file_handle->filename; + #else +- char *filename = ZSTR_VAL(file_handle->filename); ++ const char *filename = ZSTR_VAL(file_handle->filename); + #endif + + if (!VLD_G(execute) && +-- +2.33.1 + @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #119 vld version 0.17.1 ] { +Extension [ <persistent> extension #119 vld version 0.17.2 ] { - INI { Entry [ vld.active <SYSTEM> ] diff --git a/php-pecl-vld.spec b/php-pecl-vld.spec index e39bc20..e3a1cd3 100644 --- a/php-pecl-vld.spec +++ b/php-pecl-vld.spec @@ -26,7 +26,7 @@ Summary: Dump the internal representation of PHP scripts Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 0.17.1 +Version: 0.17.2 %if 0%{?gh_date:1} Release: 0.16.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz @@ -37,6 +37,8 @@ Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP URL: https://pecl.php.net/package/%{pecl_name} +Patch0: 0001-constify.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: make BuildRequires: %{?scl_prefix}php-devel >= 7.0 @@ -57,15 +59,15 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.4" Obsoletes: php74-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} +%endif %endif @@ -96,11 +98,15 @@ mv %{pecl_name}-%{version} NTS : Fix version sed -e 's/"0.16.0"/"%{version}"/' -i NTS/vld.c +pushd NTS +%patch0 -p1 + : Check version -if ! grep -q '"%{version}%{?gh_date:-dev}"' NTS/vld.c; then +if ! grep -q '"%{version}%{?gh_date:-dev}"' vld.c; then : Error: Upstream extension version, expecting %{version}%{?gh_date:-dev}%{?prever:-%{prever}}. exit 1 fi +popd %if %{with_zts} @@ -193,13 +199,13 @@ fi # Minimal load test for NTS extension %{__php} --no-php-ini \ --define extension=NTS/modules/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %if %{with_zts} # Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ --define extension=ZTS/modules/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %endif @@ -218,6 +224,11 @@ fi %changelog +* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 0.17.2-1 +- update to 0.17.2 +- add patch for build warnings from + https://github.com/derickr/vld/pull/72 + * Mon Jan 11 2021 Remi Collet <remi@remirepo.net> - 0.17.1-1 - update to 0.17.1 |