From 5cb1cb657a5475a6b79546f4615cfdc02258f6e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 11 Oct 2023 14:25:49 +0200
Subject: update to 4.1.6

drop patch merged upstream
---
 PHPINFO                  |  6 +++---
 REFLECTION               | 28 +++++++++++++++++++++-------
 php-pecl-couchbase4.spec | 15 ++++++++-------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 3c1e2bf..6ca88ed 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,9 +2,9 @@
 couchbase
 
 couchbase => enabled
-couchbase_extension_version => 4.1.5
-couchbase_extension_revision => 5b1b578f372738aed683a7286060229da4864106
-couchbase_client_revision => 43cf66a592d1f8112141a73e5a563d7187ee0ee6
+couchbase_extension_version => 4.1.6
+couchbase_extension_revision => dac7e56a90346c16e2d9738bf8e7180ddf165bb9
+couchbase_client_revision => a873bb91aa487fab8acd3b619355b911b1588fc1
 
 Directive => Local Value => Master Value
 couchbase.max_persistent => -1 => -1
diff --git a/REFLECTION b/REFLECTION
index a86539b..e48e143 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #125 couchbase version 4.1.5 ] {
+Extension [ <persistent> extension #126 couchbase version 4.1.6 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -664,20 +664,34 @@ Extension [ <persistent> extension #125 couchbase version 4.1.5 ] {
     }
     Function [ <internal:couchbase> function Couchbase\Extension\collectionCreate ] {
 
-      - Parameters [4] {
+      - Parameters [6] {
         Parameter #0 [ <required> $connection ]
         Parameter #1 [ <required> string $bucketName ]
-        Parameter #2 [ <required> array $collectionSpec ]
-        Parameter #3 [ <optional> ?array $options = <default> ]
+        Parameter #2 [ <required> string $scopeName ]
+        Parameter #3 [ <required> string $collectionName ]
+        Parameter #4 [ <optional> ?array $settings = <default> ]
+        Parameter #5 [ <optional> ?array $options = <default> ]
       }
     }
     Function [ <internal:couchbase> function Couchbase\Extension\collectionDrop ] {
 
-      - Parameters [4] {
+      - Parameters [5] {
         Parameter #0 [ <required> $connection ]
         Parameter #1 [ <required> string $bucketName ]
-        Parameter #2 [ <required> array $collectionSpec ]
-        Parameter #3 [ <optional> ?array $options = <default> ]
+        Parameter #2 [ <required> string $scopeName ]
+        Parameter #3 [ <required> string $collectionName ]
+        Parameter #4 [ <optional> ?array $options = <default> ]
+      }
+    }
+    Function [ <internal:couchbase> function Couchbase\Extension\collectionUpdate ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> $connection ]
+        Parameter #1 [ <required> string $bucketName ]
+        Parameter #2 [ <required> string $scopeName ]
+        Parameter #3 [ <required> string $collectionName ]
+        Parameter #4 [ <required> array $settings ]
+        Parameter #5 [ <optional> ?array $options = <default> ]
       }
     }
     Function [ <internal:couchbase> function Couchbase\Extension\userUpsert ] {
diff --git a/php-pecl-couchbase4.spec b/php-pecl-couchbase4.spec
index 8634d13..bf4f960 100644
--- a/php-pecl-couchbase4.spec
+++ b/php-pecl-couchbase4.spec
@@ -7,7 +7,8 @@
 # Please, preserve the changelog entries
 #
 
-# NOTICE: el-7 is not supported because of OpenSSL 1.0
+# NOTICE: el-7 is not supported (OpenSSL 1.0)
+#         build in 2 QUEUES max (tmpfs size)
 
 # Disable RPATH check
 %global __arch_install_post /bin/true
@@ -26,8 +27,8 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?scl_prefix}php-pecl-couchbase4
-Version:       4.1.5
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       4.1.6
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 # Apache-2.0
 # src
 # third_party/json/LICENSE.ryu
@@ -50,8 +51,6 @@ License:       Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT
 URL:           https://pecl.php.net/package/couchbase
 Source0:       https://pecl.php.net/get/%{sources}.tgz
 
-Patch0:        0001-zend_bool-was-removed-from-8.3.patch
-
 BuildRequires: make
 BuildRequires: cmake >= 3.17
 BuildRequires: %{?dtsprefix}gcc
@@ -117,8 +116,6 @@ sed -e '/LICENSE/s/role="doc"/role="src"/;/COPYING/s/role="doc"/role="src"/' -i
 : Collect license files
 mkdir lic
 cd %{sources}
-%patch -P0 -p1 -b .php83
-
 cp src/deps/couchbase-cxx-client/third_party/hdr_histogram_c/COPYING.txt    ../lic/hdr_histogram_c_COPYING.txt
 cp src/deps/couchbase-cxx-client/third_party/snappy/COPYING                 ../lic/snappy_COPYING
 cp src/deps/couchbase-cxx-client/third_party/fmt/LICENSE.rst                ../lic/fmt_LICENSE.rst
@@ -245,6 +242,10 @@ done
 
 
 %changelog
+* Wed Oct 11 2023 Remi Collet <remi@remirepo.net> - 4.1.6-1
+- update to 4.1.6
+- drop patch merged upstream
+
 * Thu Aug 31 2023 Remi Collet <remi@remirepo.net> - 4.1.5-2
 - add patch for PHP 8.3 from
   https://github.com/couchbase/couchbase-php-client/pull/130
-- 
cgit