v2.10.4 from Fedora

author: Remi Collet <remi@remirepo.net> 2019-06-20 10:20:59 +0200
committer: Remi Collet <remi@remirepo.net> 2019-06-20 10:20:59 +0200
commit: 16796cfc8223ccfca9c3c65c3c75621e497b9945 (patch)
tree: 162aaca903e32fe956a3c3267eee1ae79c58cf4e
parent: 36224c3807b032d77173df9d34930d97158ecf0b (diff)
8 files changed, 680 insertions, 7 deletions
diff --git a/compat_reports/2.10.3_to_2.10.4/compat_report.html b/compat_reports/2.10.3_to_2.10.4/compat_report.html
new file mode 100644
index 0000000..4e229af
--- /dev/null
+++ b/compat_reports/2.10.3_to_2.10.4/compat_report.html
@@ -0,0 +1,600 @@
+<!-- kind:binary;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 -->
+<!-- kind:source;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:3;tool_version:2.3 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width,initial-scale=1" />
+<meta name="keywords" content="libcouchbase, compatibility, API, ABI, report" />
+<meta name="description" content="API/ABI compatibility report for the libcouchbase library between 2.10.3 and 2.10.4 versions" />
+<title>libcouchbase: 2.10.3 to 2.10.4 compatibility report</title>
+<style type="text/css">
+body {
+    font-family:Arial, sans-serif;
+    background-color:White;
+    color:Black;
+}
+hr {
+    color:Black;
+    background-color:Black;
+    height:1px;
+    border:0;
+}
+h1 {
+    margin-bottom:0px;
+    padding-bottom:0px;
+    font-size:1.625em;
+}
+h2 {
+    margin-bottom:0px;
+    padding-bottom:0px;
+    font-size:1.25em;
+    white-space:nowrap;
+}
+span.section {
+    font-weight:bold;
+    cursor:pointer;
+    color:#003E69;
+    white-space:nowrap;
+    margin-left:0.3125em;
+}
+span.new_sign {
+    font-weight:bold;
+    margin-left:1.65em;
+    color:#003E69;
+}
+span.new_sign_lbl {
+    margin-left:3em;
+    font-size:1em;
+    color:Black;
+}
+span:hover.section {
+    color:#336699;
+}
+span.sect_aff {
+    cursor:pointer;
+    padding-left:1.55em;
+    font-size:0.875em;
+    color:#cc3300;
+}
+span.sect_info {
+    cursor:pointer;
+    padding-left:1.55em;
+    font-size:0.875em;
+    color:Black;
+}
+span.ext {
+    font-weight:normal;
+}
+span.h_name {
+    color:#cc3300;
+    font-size:0.875em;
+    font-weight:bold;
+}
+div.h_list, div.lib_list {
+    font-size:0.94em;
+    padding-left:0.4em;
+}
+span.ns {
+    color:#408080;
+    font-size:0.94em;
+}
+span.lib_name {
+    color:Green;
+    font-size:0.875em;
+    font-weight:bold;
+}
+span.iname {
+    font-weight:bold;
+    color:#003E69;
+    margin-left:0.3125em;
+}
+span.iname_b {
+    font-weight:bold;
+}
+span.iname_a {
+    color:#333333;
+    font-weight:bold;
+    font-size:0.94em;
+}
+span.sym_p {
+    font-weight:normal;
+    white-space:normal;
+}
+span.sym_pd {
+    white-space:normal;
+}
+span.sym_p span, span.sym_pd span {
+    white-space:nowrap;
+}
+div.affect {
+    padding-left:1em;
+    padding-bottom:10px;
+    font-size:0.87em;
+    font-style:italic;
+    line-height:0.9em;
+}
+div.affected {
+    padding-left:1.9em;
+    padding-top:10px;
+}
+table.ptable {
+    border-collapse:collapse;
+    border:1px outset black;
+    margin-left:0.95em;
+    margin-top:3px;
+    margin-bottom:3px;
+    width:56.25em;
+}
+table.ptable td {
+    border:1px solid gray;
+    padding:3px;
+    font-size:0.875em;
+    text-align:left;
+    vertical-align:top;
+    max-width:28em;
+    word-wrap:break-word;
+}
+table.ptable th.pn {
+    width:2%;
+}
+table.ptable th.chg {
+    width:47%;
+}
+table.vtable {
+    border-collapse:collapse;
+    border:1px outset black;
+    margin-left:1.9em;
+    margin-top:0.7em;
+}
+table.vtable td {
+    border:1px solid gray;
+    padding:3px;
+    font-size:0.875em;
+    vertical-align:top;
+    max-width:450px;
+    word-wrap:break-word;
+}
+table.ptable th, table.vtable th {
+    background-color:#eeeeee;
+    font-weight:bold;
+    color:#333333;
+    font-family:Verdana, Arial;
+    font-size:0.875em;
+    border:1px solid gray;
+    text-align:center;
+    vertical-align:top;
+    white-space:nowrap;
+    padding:3px;
+}
+table.summary {
+    border-collapse:collapse;
+    border:1px outset black;
+}
+table.summary th {
+    background-color:#eeeeee;
+    font-weight:normal;
+    text-align:left;
+    font-size:0.94em;
+    white-space:nowrap;
+    border:1px inset gray;
+    padding:3px;
+}
+table.summary td {
+    text-align:right;
+    white-space:nowrap;
+    border:1px inset gray;
+    padding:3px 5px 3px 10px;
+}
+span.mngl {
+    padding-left:1em;
+    font-size:0.875em;
+    cursor:text;
+    color:#444444;
+    font-weight:bold;
+}
+span.pleft {
+    padding-left:2.5em;
+}
+span.sym_ver {
+    color:#333333;
+    white-space:nowrap;
+    font-family:"DejaVu Sans Mono", Monospace;
+}
+span.attr {
+    color:#333333;
+    font-weight:normal;
+}
+span.color_p {
+    font-style:italic;
+    color:Brown;
+}
+span.p {
+    font-style:italic;
+}
+span.fp {
+    font-style:italic;
+    background-color:#DCDCDC;
+}
+span.ttype {
+    font-weight:normal;
+}
+span.nowrap {
+    white-space:nowrap;
+}
+span.value {
+    font-weight:bold;
+}
+.passed {
+    background-color:#CCFFCC;
+    font-weight:normal;
+}
+.warning {
+    background-color:#F4F4AF;
+    font-weight:normal;
+}
+.failed {
+    background-color:#FFCCCC;
+    font-weight:normal;
+}
+.new {
+    background-color:#C6DEFF;
+    font-weight:normal;
+}
+.compatible {
+    background-color:#CCFFCC;
+    font-weight:normal;
+}
+.almost_compatible {
+    background-color:#FFDAA3;
+    font-weight:normal;
+}
+.incompatible {
+    background-color:#FFCCCC;
+    font-weight:normal;
+}
+.gray {
+    background-color:#DCDCDC;
+    font-weight:normal;
+}
+.top_ref {
+    font-size:0.69em;
+}
+.footer {
+    font-size:0.75em;
+}
+
+.tabset {
+    float:left;
+}
+a.tab {
+    border:1px solid Black;
+    float:left;
+    margin:0px 5px -1px 0px;
+    padding:3px 5px 3px 5px;
+    position:relative;
+    font-size:0.875em;
+    background-color:#DDD;
+    text-decoration:none;
+    color:Black;
+}
+a.disabled:hover
+{
+    color:Black;
+    background:#EEE;
+}
+a.active:hover
+{
+    color:Black;
+    background:White;
+}
+a.active {
+    border-bottom-color:White;
+    background-color:White;
+}
+div.tab {
+    border-top:1px solid Black;
+    padding:0px;
+    width:100%;
+    clear:both;
+}
+</style>
+<script type="text/javascript" language="JavaScript">
+<!--
+function showContent(header, id)
+{
+    e = document.getElementById(id);
+    if(e.style.display == 'none')
+    {
+        e.style.display = 'block';
+        e.style.visibility = 'visible';
+        header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[&minus;]");
+    }
+    else
+    {
+        e.style.display = 'none';
+        e.style.visibility = 'hidden';
+        header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]");
+    }
+}
+function initTabs()
+{
+    var url = window.location.href;
+    if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1)
+    {
+        var tab1 = document.getElementById('BinaryID');
+        var tab2 = document.getElementById('SourceID');
+        tab1.className='tab disabled';
+        tab2.className='tab active';
+    }
+    var sets = document.getElementsByTagName('div');
+    for (var i = 0; i < sets.length; i++)
+    {
+        if (sets[i].className.indexOf('tabset') != -1)
+        {
+            var tabs = [];
+            var links = sets[i].getElementsByTagName('a');
+            for (var j = 0; j < links.length; j++)
+            {
+                if (links[j].className.indexOf('tab') != -1)
+                {
+                    tabs.push(links[j]);
+                    links[j].tabs = tabs;
+                    var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1));
+                    //reset all tabs on start
+                    if (tab)
+                    {
+                        if (links[j].className.indexOf('active')!=-1) {
+                            tab.style.display = 'block';
+                        }
+                        else {
+                            tab.style.display = 'none';
+                        }
+                    }
+                    links[j].onclick = function()
+                    {
+                        var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1));
+                        if (tab)
+                        {
+                            //reset all tabs before change
+                            for (var k = 0; k < this.tabs.length; k++)
+                            {
+                                document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none';
+                                this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled');
+                            }
+                            this.className = 'tab active';
+                            tab.style.display = 'block';
+                            // window.location.hash = this.id.replace('ID', '');
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    if(url.indexOf('#')!=-1) {
+        location.href=location.href;
+    }
+}
+if (window.addEventListener) window.addEventListener('load', initTabs, false);
+else if (window.attachEvent) window.attachEvent('onload', initTabs);
+-->
+</script>
+</head>
+<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libcouchbase</span> library between <span style='color:Red;'>2.10.3</span> and <span style='color:Red;'>2.10.4</span> versions on <span style='color:Blue;'>x86_64</span></h1>
+
+            <br/>
+            <div class='tabset'>
+            <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a>
+            <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a>
+            </div><div id='BinaryTab' class='tab'>
+<h2>Test Info</h2><hr/>
+<table class='summary'>
+<tr><th>Library Name</th><td>libcouchbase</td></tr>
+<tr><th>Version #1</th><td>2.10.3</td></tr>
+<tr><th>Version #2</th><td>2.10.4</td></tr>
+<tr><th>Arch</th><td>x86_64</td></tr>
+<tr><th>GCC Version</th><td>8</td></tr>
+<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr>
+</table>
+<h2>Test Results</h2><hr/>
+<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>33</a></td></tr>
+<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr>
+<tr><th>Total Symbols / Types</th><td>286 / 465</td></tr>
+<tr><th>Compatibility</th>
+<td class='compatible'>100%</td>
+</tr>
+</table>
+<h2>Problem Summary</h2><hr/>
+<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr>
+<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr>
+<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr>
+<tr><td>Medium</td><td>0</td></tr>
+<tr><td>Low</td><td>0</td></tr>
+<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr>
+<tr><td>Medium</td><td>0</td></tr>
+<tr><td>Low</td><td>0</td></tr>
+<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr>
+</table>
+
+<a name='Headers'></a><h2>Header Files <span class='gray'>&nbsp;33&nbsp;</span></h2><hr/>
+<div class='h_list'>
+_cxxwrap.h<br/>
+analytics.h<br/>
+api-legacy.h<br/>
+api3.h<br/>
+assert.h<br/>
+auth.h<br/>
+cbft.h<br/>
+cntl-private.h<br/>
+cntl.h<br/>
+configuration.h<br/>
+couchbase.h<br/>
+crypto.h<br/>
+deprecated.h<br/>
+http.h<br/>
+iops.h<br/>
+ixmgmt.h<br/>
+kvbuf.h<br/>
+libev_io_opts.h<br/>
+libevent_io_opts.h<br/>
+libuv_compat.h<br/>
+libuv_io_opts.h<br/>
+metrics.h<br/>
+n1ql.h<br/>
+pktfwd.h<br/>
+plugin-internal.h<br/>
+select_io_opts.h<br/>
+subdoc.h<br/>
+sysdefs.h<br/>
+tracing.h<br/>
+vbucket.h<br/>
+views.h<br/>
+visibility.h<br/>
+wsaerr.h<br/>
+</div>
+<br/><a class='top_ref' href='#Top'>to the top</a><br/>
+<a name='Libs'></a><h2>Libraries <span class='gray'>&nbsp;1&nbsp;</span></h2><hr/>
+<div class='lib_list'>
+libcouchbase.so.2.0.65<br/>
+</div>
+<br/><a class='top_ref' href='#Top'>to the top</a><br/>
+<br/><br/><br/></div><div id='SourceTab' class='tab'>
+<h2>Test Info</h2><hr/>
+<table class='summary'>
+<tr><th>Library Name</th><td>libcouchbase</td></tr>
+<tr><th>Version #1</th><td>2.10.3</td></tr>
+<tr><th>Version #2</th><td>2.10.4</td></tr>
+<tr><th>Arch</th><td>x86_64</td></tr>
+<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr>
+</table>
+<h2>Test Results</h2><hr/>
+<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>33</a></td></tr>
+<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr>
+<tr><th>Total Symbols / Types</th><td>554 / 472</td></tr>
+<tr><th>Compatibility</th>
+<td class='compatible'>100%</td>
+</tr>
+</table>
+<h2>Problem Summary</h2><hr/>
+<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr>
+<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr>
+<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr>
+<tr><td>Medium</td><td>0</td></tr>
+<tr><td>Low</td><td>0</td></tr>
+<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr>
+<tr><td>Medium</td><td>0</td></tr>
+<tr><td>Low</td><td>0</td></tr>
+<tr><th>Problems with<br/>Constants</th><td>Low</td><td class='warning'><a href='#Constant_Source_Problems_Low' style='color:Blue;'>3</a></td></tr>
+</table>
+
+<a name='Low_Risk_Source_Problems'></a><a name='Constant_Source_Problems_Low'></a>
+<h2>Problems with Constants, Low Severity <span class='warning'>&nbsp;3&nbsp;</span></h2><hr/>
+<span class='h_name'>configuration.h</span><br/>
+<span class="section" onclick="javascript:showContent(this, 'c_1')">
+<span class='ext'>[+]</span> LCB_VERSION</span>
+<br/>
+<div id="c_1" style="display:none;">
+<table class='ptable'>
+<tr>
+<th class='pn'></th>
+<th class='chg'>Change</th>
+<th>Effect</th>
+</tr>
+<tr>
+<th>1</th>
+<td>The value of constant <b>LCB_VERSION</b> has been changed from <b>0x021003</b> to <b>0x021004</b>.</td>
+<td>Recompilation of a client program may be broken.</td>
+</tr>
+</table>
+<br/>
+</div>
+
+<span class="section" onclick="javascript:showContent(this, 'c_2')">
+<span class='ext'>[+]</span> LCB_VERSION_CHANGESET</span>
+<br/>
+<div id="c_2" style="display:none;">
+<table class='ptable'>
+<tr>
+<th class='pn'></th>
+<th class='chg'>Change</th>
+<th>Effect</th>
+</tr>
+<tr>
+<th>1</th>
+<td>The value of constant <b>LCB_VERSION_CHANGESET</b> has been changed from <b>&quot;b387722192f0bc49b0a846859610493e2f8129cd&quot;</b> to <b>&quot;246092988b2568658916b8b0fcffcbf290f66fed&quot;</b>.</td>
+<td>Recompilation of a client program may be broken.</td>
+</tr>
+</table>
+<br/>
+</div>
+
+<span class="section" onclick="javascript:showContent(this, 'c_3')">
+<span class='ext'>[+]</span> LCB_VERSION_STRING</span>
+<br/>
+<div id="c_3" style="display:none;">
+<table class='ptable'>
+<tr>
+<th class='pn'></th>
+<th class='chg'>Change</th>
+<th>Effect</th>
+</tr>
+<tr>
+<th>1</th>
+<td>The value of constant <b>LCB_VERSION_STRING</b> has been changed from <b>&quot;2.10.3&quot;</b> to <b>&quot;2.10.4&quot;</b>.</td>
+<td>Recompilation of a client program may be broken.</td>
+</tr>
+</table>
+<br/>
+</div>
+
+<br/>
+<a class='top_ref' href='#Top'>to the top</a><br/>
+<a name='Headers'></a><h2>Header Files <span class='gray'>&nbsp;33&nbsp;</span></h2><hr/>
+<div class='h_list'>
+_cxxwrap.h<br/>
+analytics.h<br/>
+api-legacy.h<br/>
+api3.h<br/>
+assert.h<br/>
+auth.h<br/>
+cbft.h<br/>
+cntl-private.h<br/>
+cntl.h<br/>
+configuration.h<br/>
+couchbase.h<br/>
+crypto.h<br/>
+deprecated.h<br/>
+http.h<br/>
+iops.h<br/>
+ixmgmt.h<br/>
+kvbuf.h<br/>
+libev_io_opts.h<br/>
+libevent_io_opts.h<br/>
+libuv_compat.h<br/>
+libuv_io_opts.h<br/>
+metrics.h<br/>
+n1ql.h<br/>
+pktfwd.h<br/>
+plugin-internal.h<br/>
+select_io_opts.h<br/>
+subdoc.h<br/>
+sysdefs.h<br/>
+tracing.h<br/>
+vbucket.h<br/>
+views.h<br/>
+visibility.h<br/>
+wsaerr.h<br/>
+</div>
+<br/><a class='top_ref' href='#Top'>to the top</a><br/>
+<a name='Libs'></a><h2>Libraries <span class='gray'>&nbsp;1&nbsp;</span></h2><hr/>
+<div class='lib_list'>
+libcouchbase.so.2.0.65<br/>
+</div>
+<br/><a class='top_ref' href='#Top'>to the top</a><br/>
+<br/><br/><br/></div><hr/>
+<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.3 &#160;</i>
+</div>
+<br/>
+
+</body></html>
diff --git a/0001-enforce-system-crypto-policies.patch b/libcouchbase-0001-enforce-system-crypto-policies.patch
index 4c42bc1..4c42bc1 100644
--- a/0001-enforce-system-crypto-policies.patch
+++ b/libcouchbase-0001-enforce-system-crypto-policies.patch
diff --git a/0002-do-not-install-plugins-into-libdir.patch b/libcouchbase-0002-do-not-install-plugins-into-libdir.patch
index 74a0528..74a0528 100644
--- a/0002-do-not-install-plugins-into-libdir.patch
+++ b/libcouchbase-0002-do-not-install-plugins-into-libdir.patch
diff --git a/0003-fix-pkgconfig-paths.patch b/libcouchbase-0003-fix-pkgconfig-paths.patch
index 29e3985..29e3985 100644
--- a/0003-fix-pkgconfig-paths.patch
+++ b/libcouchbase-0003-fix-pkgconfig-paths.patch
diff --git a/libcouchbase-0004-fix-test-so-resolution.patch b/libcouchbase-0004-fix-test-so-resolution.patch
new file mode 100644
index 0000000..9984dd9
--- /dev/null
+++ b/libcouchbase-0004-fix-test-so-resolution.patch
@@ -0,0 +1,26 @@
+From 0c00d0a84762b0e5f5fe4b53d5b8fa6e839334de Mon Sep 17 00:00:00 2001
+From: Sergey Avseyev <sergey.avseyev@gmail.com>
+Date: Thu, 20 Jun 2019 10:22:03 +0300
+Subject: [PATCH 2/2] Fix test SO resolution
+
+Change-Id: I00d817381061a4ec06fcc86925eec2d1daf8c7d8
+---
+ cmake/Modules/GenerateConfigDotH.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/GenerateConfigDotH.cmake b/cmake/Modules/GenerateConfigDotH.cmake
+index a919be33..aee77cb1 100644
+--- a/cmake/Modules/GenerateConfigDotH.cmake
++++ b/cmake/Modules/GenerateConfigDotH.cmake
+@@ -38,7 +38,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     OUTPUT_VARIABLE LIBM_SO_TRACE
+     ERROR_QUIET
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]* LIBM_SO_PATH ${LIBM_SO_TRACE})
++  STRING(REGEX MATCH [-_a-z0-9/]+libm.so[.0-9]+ LIBM_SO_PATH ${LIBM_SO_TRACE})
+   IF (EXISTS "${LIBM_SO_PATH}")
+     GET_FILENAME_COMPONENT(CMAKE_TEST_SHARED_OBJECT ${LIBM_SO_PATH} NAME)
+   ENDIF()
+-- 
+2.22.0
+
diff --git a/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch b/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch
new file mode 100644
index 0000000..a5f2970
--- /dev/null
+++ b/libcouchbase-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch
@@ -0,0 +1,37 @@
+From 21267293d5b2c445beab4c792a94eb39434db592 Mon Sep 17 00:00:00 2001
+From: Sergey Avseyev <sergey.avseyev@gmail.com>
+Date: Tue, 30 Apr 2019 16:36:19 +0300
+Subject: [PATCH 1/2] Fixes SSL sockets with openssl 1.1.1c+
+
+BIO_get_mem_ptr does not give direct access to internal buffer, so we
+have to invalidate our copy before using buffer values.
+
+Change-Id: I0dba625dd0be702ec7eea640047facf3caf79fef
+---
+ src/ssl/ssl_e.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c
+index f4506cf6..734a3e64 100644
+--- a/src/ssl/ssl_e.c
++++ b/src/ssl/ssl_e.c
+@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es)
+      * calls. While we could have done this inline with the send() call this
+      * would make future optimization more difficult. */
+     GT_WRITE_DONE:
++#if !LCB_CAN_OPTIMIZE_SSL_BIO
++    BIO_get_mem_ptr(es->wbio, &wmb);
++#endif
+     while (wmb->length > (size_t)tmp_len) {
+         char dummy[4096];
+         unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy);
+         BIO_read(es->wbio, dummy, to_read);
++#if !LCB_CAN_OPTIMIZE_SSL_BIO
++        BIO_get_mem_ptr(es->wbio, &wmb);
++#endif
+     }
+     BIO_clear_retry_flags(es->wbio);
+     return 0;
+-- 
+2.22.0
+
diff --git a/libcouchbase.spec b/libcouchbase.spec
index 3250198..e89dde3 100644
--- a/libcouchbase.spec
+++ b/libcouchbase.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for libcouchbase
 #
-# Copyright (c) 2013-2018 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -23,17 +23,22 @@
 %endif
 
 Name:          libcouchbase
-Version:       2.10.3
-Release:       2%{?dist}
+Version:       2.10.4
+Release:       1%{?dist}
 Summary:       Couchbase client library
 Group:         System Environment/Libraries
 License:       ASL 2.0
 URL:           http://www.couchbase.com/communities/c/getting-started
 Source0:       http://packages.couchbase.com/clients/c/%{name}-%{version}.tar.gz
 
-Patch0:        0001-enforce-system-crypto-policies.patch
-Patch1:        0002-do-not-install-plugins-into-libdir.patch
-Patch2:        0003-fix-pkgconfig-paths.patch
+Patch0:        %{name}-0001-enforce-system-crypto-policies.patch
+Patch1:        %{name}-0002-do-not-install-plugins-into-libdir.patch
+Patch2:        %{name}-0003-fix-pkgconfig-paths.patch
+# http://review.couchbase.org/110930
+Patch3: %{name}-0004-fix-test-so-resolution.patch
+# http://review.couchbase.org/110929
+Patch4: %{name}-0005-fixes-ssl-sockets-with-openssl-1.1.1c.patch
+
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -129,6 +134,8 @@ a Couchbase Server.
 %patch0 -p1 -b .crypto
 %patch1 -p1 -b .plug
 %patch2 -p1 -b .pkgc
+%patch3 -p1 -b .testso
+%patch4 -p1 -b .openssl
 
 
 %build
@@ -203,6 +210,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags}
 
 
 %changelog
+* Thu Jun 20 2019 Sergey Avseyev <sergey.avseyev@gmail.com> - 2.10.4-1
+- Update to 2.10.4
+
 * Mon Jan 21 2019 Sergey Avseyev <sergey.avseyev@gmail.com> - 2.10.3-2
 - Add explicit curdir on CMake invocation
 
diff --git a/libcouchbase.xml b/libcouchbase.xml
index 1679efa..035f5a3 100644
--- a/libcouchbase.xml
+++ b/libcouchbase.xml
@@ -9,7 +9,7 @@
 
 <version>
     <!-- Version of the library -->
-2.10.3
+2.10.4
 </version>
 
 <headers>
author	Remi Collet <remi@remirepo.net>	2019-06-20 10:20:59 +0200
committer	Remi Collet <remi@remirepo.net>	2019-06-20 10:20:59 +0200
commit	16796cfc8223ccfca9c3c65c3c75621e497b9945 (patch)
tree	162aaca903e32fe956a3c3267eee1ae79c58cf4e
parent	36224c3807b032d77173df9d34930d97158ecf0b (diff)