diff options
-rw-r--r-- | PHPINFO | 6 | ||||
-rw-r--r-- | REFLECTION | 2 | ||||
-rw-r--r-- | c88f94839aab4cfe4507588fcd658184bcbce284.patch | 35 | ||||
-rw-r--r-- | php-pecl-couchbase2.spec | 39 |
4 files changed, 20 insertions, 62 deletions
@@ -2,9 +2,9 @@ couchbase couchbase support => enabled -extension version => 2.6.1 -libcouchbase runtime version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98) -libcouchbase headers version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98) +extension version => 2.6.2 +libcouchbase runtime version => 2.10.9 (git: c9159206da3047777b97df7a54e3190fd2bc6cc2) +libcouchbase headers version => 2.10.6 (git: 61e274aae48b6edeecb081afec843dbe31d72790) igbinary transcoder => enabled zlib compressor => enabled @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #108 couchbase version 2.6.1 ] { +Extension [ <persistent> extension #147 couchbase version 2.6.2 ] { - Dependencies { Dependency [ json (Required) ] diff --git a/c88f94839aab4cfe4507588fcd658184bcbce284.patch b/c88f94839aab4cfe4507588fcd658184bcbce284.patch deleted file mode 100644 index b1694b7..0000000 --- a/c88f94839aab4cfe4507588fcd658184bcbce284.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c88f94839aab4cfe4507588fcd658184bcbce284 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 20 Jan 2020 15:04:56 +0100 -Subject: [PATCH] fix possible segfault if htresp is null - -close #23 - -Change-Id: Ia4dea8793a86a4ded07ccecc52e625842c098811 -Reviewed-on: http://review.couchbase.org/121246 -Tested-by: Build Bot <build@couchbase.com> -Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> ---- - src/couchbase/bucket/n1ql.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/couchbase/bucket/n1ql.c b/src/couchbase/bucket/n1ql.c -index 7d60b6b..8d8da13 100644 ---- a/src/couchbase/bucket/n1ql.c -+++ b/src/couchbase/bucket/n1ql.c -@@ -81,8 +81,13 @@ static void n1qlrow_callback(lcb_t instance, int ignoreme, const lcb_RESPN1QL *r - } - } - if (!reported) { -- pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -- (int)resp->nrow, (char *)resp->row); -+ if (resp->htresp) { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -+ (int)resp->nrow, (char *)resp->row); -+ } else { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %.*s", -+ (int)resp->nrow, (char *)resp->row); -+ } - } - } - diff --git a/php-pecl-couchbase2.spec b/php-pecl-couchbase2.spec index d68aebc..dac7785 100644 --- a/php-pecl-couchbase2.spec +++ b/php-pecl-couchbase2.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-couchbase2 # -# Copyright (c) 2013-2020 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -25,21 +25,20 @@ Summary: Couchbase Server PHP extension Name: %{?sub_prefix}php-pecl-couchbase2 -Version: 2.6.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.6.2 +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/couchbase Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: https://github.com/couchbase/php-couchbase/commit/c88f94839aab4cfe4507588fcd658184bcbce284.patch - +BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 5.6 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-pecl-igbinary-devel BuildRequires: %{?scl_prefix}php-json BuildRequires: %{?scl_prefix}php-tokenizer -BuildRequires: pkgconfig(libcouchbase) >= 2.10.5 +BuildRequires: pkgconfig(libcouchbase) < 3 BuildRequires: fastlz-devel BuildRequires: zlib-devel @@ -48,7 +47,6 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-igbinary%{?_isa} Requires: %{?scl_prefix}php-tokenizer%{?_isa} -Requires: libcouchbase%{?_isa} >= %{libbuildver} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} @@ -59,7 +57,7 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release} %endif -%if "%{php_version}" > "7.0" +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || "%{php_version}" > "7.0" Obsoletes: %{?scl_prefix}php-pecl-couchbase < 2 Provides: %{?scl_prefix}php-pecl-couchbase = %{version} Provides: %{?scl_prefix}php-pecl-couchbase%{?_isa} = %{version} @@ -68,26 +66,17 @@ Provides: %{?scl_prefix}php-pecl-couchbase%{?_isa} = %{version} Conflicts: %{?scl_prefix}php-pecl-couchbase < 2 %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php72w-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php73w-pecl-%{pecl_name}2 <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name}2 <= %{version} -Obsoletes: php74w-pecl-%{pecl_name}2 <= %{version} -%endif +Obsoletes: php74-pecl-%{pecl_name} <= %{version} %endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif @@ -108,8 +97,6 @@ mv %{pecl_name}-%{version}%{?prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .up - # Drop bundled library sed -e '/fastlz/d' -i ../package.xml rm -r fastlz @@ -244,6 +231,12 @@ fi %changelog +* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 2.6.2-2 +- rebuild + +* Tue Feb 4 2020 Remi Collet <remi@remirepo.net> - 2.6.2-1 +- update to 2.6.2 + * Tue Jan 28 2020 Remi Collet <remi@remirepo.net> - 2.6.1-4 - add upstream patch to fix segfault in timeout |