diff options
| author | Remi Collet <remi@remirepo.net> | 2019-01-21 09:05:30 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-01-21 09:05:30 +0100 |
| commit | 18df250a7b8c862d203f4a154836d11c19016531 (patch) | |
| tree | cca79e87dcdd97b6dc3e384b913846e2a9e2ce53 | |
| parent | 9a3f5d393b40029b494068c5cd49922292560404 (diff) | |
refresh patch (for php < 7.2)
| -rw-r--r-- | 30.patch | 26 | ||||
| -rw-r--r-- | php-pecl-memcache.spec | 7 |
2 files changed, 30 insertions, 3 deletions
@@ -1,7 +1,7 @@ From 82f7fa12daef81f4a9b3c923c848a53dcc1b3b23 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi@remirepo.net> Date: Fri, 22 Jun 2018 13:57:47 +0200 -Subject: [PATCH] fix for PHP 7.3 + fix build warnings +Subject: [PATCH 1/2] fix for PHP 7.3 + fix build warnings --- php7/memcache.c | 14 +++++++++++++- @@ -185,3 +185,27 @@ index dd2434a..98cfde1 100644 mmc_pool_add(pool, mmc, weight); php_url_free(url); } + +From 09e21a63410cbfd8827c7a876d8160a6b80b076c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 22 Jun 2018 15:11:07 +0200 +Subject: [PATCH 2/2] readd this for php < 7.2 + +--- + php7/memcache_pool.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/php7/memcache_pool.c b/php7/memcache_pool.c +index f6e016b..86e8983 100644 +--- a/php7/memcache_pool.c ++++ b/php7/memcache_pool.c +@@ -44,6 +44,9 @@ ZEND_DECLARE_MODULE_GLOBALS(memcache) + MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /* + ensures space for an additional size bytes {{{ */ + { ++#if PHP_VERSION_ID < 70200 ++ register size_t newlen; ++#endif + smart_string_alloc((&(buffer->value)), size, 0); + } + /* }}} */ diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index e62ec3e..21959cc 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -1,6 +1,6 @@ # spec file for php-pecl-memcache # -# Copyright (c) 2007-2018 Remi Collet +# Copyright (c) 2007-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -31,7 +31,7 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcache Version: 3.0.9 %if 0%{?gh_date:1} -Release: 0.12.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.13.%{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 %else Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} @@ -315,6 +315,9 @@ fi %changelog +* Mon Jan 21 2019 Remi Collet <remi@remirepo.net> - 3.0.9-0.13.20170802.e702b5f +- refresh patch (for php < 7.2) + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 3.0.9-0.12.20170802.e702b5f - rebuild for 7.3.0beta2 new ABI |