diff options
| author | Remi Collet <remi@remirepo.net> | 2018-12-12 08:03:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-12-12 08:03:24 +0100 |
| commit | b419007a79ef0ae5e27134190614380d27c690ae (patch) | |
| tree | 7eae5b1d3da120f48095d7d83e43db51b1400584 | |
| parent | 507aa10fdd018724ea4855c2dd2c6477416c73e3 (diff) | |
Update to 2.0.5
add patch for PHP 7.0 from https://github.com/laruence/taint/pull/68
| -rw-r--r-- | 68.patch | 21 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-taint.spec | 11 |
4 files changed, 32 insertions, 4 deletions
diff --git a/68.patch b/68.patch new file mode 100644 index 0000000..b7d35f6 --- /dev/null +++ b/68.patch @@ -0,0 +1,21 @@ +From 1130578f37f48cec21b8d3eab7ffac96366662e1 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 12 Dec 2018 07:54:03 +0100 +Subject: [PATCH] fix build with PHP 7.0 + +--- + php_taint.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/php_taint.h b/php_taint.h +index 8b26289..7961e50 100644 +--- a/php_taint.h ++++ b/php_taint.h +@@ -65,6 +65,7 @@ extern zend_module_entry taint_module_entry; + #define TAINT_OP2_TYPE(opline) (opline->op2_type) + + #if PHP_VERSION_ID < 70100 ++#define PHP_7_0 1 + #define TAINT_RET_USED(opline) (!((opline)->result_type & EXT_TYPE_UNUSED)) + #define TAINT_ISERR(var) (var == &EG(error_zval)) + #define TAINT_ERR_ZVAL(var) (var = &EG(error_zval)) @@ -2,7 +2,7 @@ taint taint support => enabled -Version => 2.0.4 +Version => 2.0.5 Directive => Local Value => Master Value taint.enable => Off => Off @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #150 taint version 2.0.4 ] { +Extension [ <persistent> extension #152 taint version 2.0.5 ] { - Dependencies { Dependency [ xdebug (Conflicts) ] diff --git a/php-pecl-taint.spec b/php-pecl-taint.spec index b34afa7..ba162bb 100644 --- a/php-pecl-taint.spec +++ b/php-pecl-taint.spec @@ -15,7 +15,7 @@ %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laruence %global gh_project taint -%global gh_date 20180627 +#global gh_date 20180627 %global pecl_name taint %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini @@ -27,13 +27,14 @@ Version: 2.0.5 Release: 0.3.%{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}/%{gh_project}-%{version}-%{gh_short}.tar.gz %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif License: PHP URL: https://github.com/%{gh_owner}/%{gh_project} Patch0: https://patch-diff.githubusercontent.com/raw/laruence/taint/pull/64.patch +Patch1: https://patch-diff.githubusercontent.com/raw/laruence/taint/pull/68.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 @@ -104,6 +105,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS %patch0 -p1 -b .pr64 +%patch1 -p1 -b .pr68 # When this file will be removed, clean the description. [ -f EXPERIMENTAL ] || exit 1 @@ -242,6 +244,11 @@ fi %changelog +* Wed Dec 12 2018 Remi Collet <remi@remirepo.net> - 2.0.5-1 +- Update to 2.0.5 +- add patch for PHP 7.0 from + https://github.com/laruence/taint/pull/68 + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 2.0.5-0.3.20180627.4b76d9f - rebuild for 7.3.0beta2 new ABI |