fix new symbols visibility

author: Remi Collet <remi@remirepo.net> 2017-07-12 12:23:37 +0200
committer: Remi Collet <remi@remirepo.net> 2017-07-12 12:23:37 +0200
commit: d69bb41b47e2e9811d27afa102a36a3c9e2392fe (patch)
tree: 9a02f4671e0a7a0c19b74b54288cffeb96d5a9c3
parent: 39f3cd2efb70cf9fc958cf63e94373206b43a0f6 (diff)
4 files changed, 594 insertions, 17 deletions
diff --git a/compat_reports/2.7.6_to_2.7.6.1/compat_report.html b/compat_reports/2.7.6_to_2.7.6.1/compat_report.html
new file mode 100644
index 0000000..7ece6e3
--- /dev/null
+++ b/compat_reports/2.7.6_to_2.7.6.1/compat_report.html
@@ -0,0 +1,535 @@
+<!-- kind:binary;verdict:compatible;affected:0;added:2;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.1 -->
+<!-- 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:0;tool_version:2.1 -->
+<!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="keywords" content="libcouchbase, compatibility, API, ABI, report" />
+<meta name="description" content="API/ABI compatibility report for the libcouchbase library between 2.7.6 and 2.7.6.1 versions" />
+<title>libcouchbase: 2.7.6 to 2.7.6.1 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:100;
+}
+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:100;
+    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:100;
+}
+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:100;
+}
+span.nowrap {
+    white-space:nowrap;
+}
+span.value {
+    font-weight:bold;
+}
+.passed {
+    background-color:#CCFFCC;
+    font-weight:100;
+}
+.warning {
+    background-color:#F4F4AF;
+    font-weight:100;
+}
+.failed {
+    background-color:#FFCCCC;
+    font-weight:100;
+}
+.new {
+    background-color:#C6DEFF;
+    font-weight:100;
+}
+.compatible {
+    background-color:#CCFFCC;
+    font-weight:100;
+}
+.almost_compatible {
+    background-color:#FFDAA3;
+    font-weight:100;
+}
+.incompatible {
+    background-color:#FFCCCC;
+    font-weight:100;
+}
+.gray {
+    background-color:#DCDCDC;
+    font-weight:100;
+}
+.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.7.6</span> and <span style='color:Red;'>2.7.6.1</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.7.6</td></tr>
+<tr><th>Version #2</th><td>2.7.6.1</td></tr>
+<tr><th>Arch</th><td>x86_64</td></tr>
+<tr><th>GCC Version</th><td>6.3.1</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;'>29</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>217 / 398</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 class='new'><a href='#Binary_Added' style='color:Blue;'>2</a></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='Binary_Added'></a><h2>Added Symbols <span class='new'>&nbsp;2&nbsp;</span></h2><hr/>
+<span class='h_name'>couchbase.h</span>, <span class='lib_name'>libcouchbase.so.2.0.46</span><br/>
+<span class="iname">lcb_resp_get_error_context&#160;<span class='sym_p'><span>(&#160;int <span class='color_p'>cbtype</span></span>, <span>struct lcb_RESPBASE const* <span class='color_p'>rb</span></span>&#160;)</span></span><br/>
+<span class="iname">lcb_resp_get_error_ref&#160;<span class='sym_p'><span>(&#160;int <span class='color_p'>cbtype</span></span>, <span>struct lcb_RESPBASE const* <span class='color_p'>rb</span></span>&#160;)</span></span><br/>
+<br/>
+<a class='top_ref' href='#Top'>to the top</a><br/>
+<a name='Headers'></a><h2>Header Files <span class='gray'>&nbsp;29&nbsp;</span></h2><hr/>
+<div class='h_list'>
+_cxxwrap.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/>
+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/>
+n1ql.h<br/>
+pktfwd.h<br/>
+plugin-internal.h<br/>
+select_io_opts.h<br/>
+subdoc.h<br/>
+sysdefs.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.46<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.7.6</td></tr>
+<tr><th>Version #2</th><td>2.7.6.1</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;'>29</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>275 / 405</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;29&nbsp;</span></h2><hr/>
+<div class='h_list'>
+_cxxwrap.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/>
+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/>
+n1ql.h<br/>
+pktfwd.h<br/>
+plugin-internal.h<br/>
+select_io_opts.h<br/>
+subdoc.h<br/>
+sysdefs.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.46<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.1 &#160;</i>
+</div>
+<br/>
+
+</body></html>
diff --git a/libcouchbase-pr25.patch b/libcouchbase-pr25.patch
deleted file mode 100644
index 68cd2e2..0000000
--- a/libcouchbase-pr25.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/ssl/ssl_common.c b/src/ssl/ssl_common.c
-index 3a5327b..4b18d74 100644
---- a/src/ssl/ssl_common.c
-+++ b/src/ssl/ssl_common.c
-@@ -156,7 +156,9 @@ iotssl_log_errors(lcbio_XSSL *xs)
-         if (ERR_GET_LIB(curerr) == ERR_LIB_SSL) {
-             switch (ERR_GET_REASON(curerr)) {
-             case SSL_R_CERTIFICATE_VERIFY_FAILED:
-+#ifdef SSL_R_MISSING_VERIFY_MESSAGE
-             case SSL_R_MISSING_VERIFY_MESSAGE:
-+#endif
-                 xs->errcode = LCB_SSL_CANTVERIFY;
-                 break;
- 
diff --git a/libcouchbase-pr27.patch b/libcouchbase-pr27.patch
new file mode 100644
index 0000000..1f13164
--- /dev/null
+++ b/libcouchbase-pr27.patch
@@ -0,0 +1,50 @@
+From aa972430720163a8d81babdfae08b5bab5d139c3 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 12 Jul 2017 12:15:36 +0200
+Subject: [PATCH] CCBC-803: make new functions public
+
+---
+ include/libcouchbase/couchbase.h | 2 ++
+ src/handler.cc                   | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/libcouchbase/couchbase.h b/include/libcouchbase/couchbase.h
+index a42f9a04..35f87607 100644
+--- a/include/libcouchbase/couchbase.h
++++ b/include/libcouchbase/couchbase.h
+@@ -3703,6 +3703,7 @@ void lcb_histogram_print(lcb_HISTOGRAM* hg, FILE* stream);
+  *
+  * @return the pointer to string or NULL if context wasn't specified.
+  */
++LIBCOUCHBASE_API
+ const char *
+ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb);
+ 
+@@ -3716,6 +3717,7 @@ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb);
+  *
+  * @return the pointer to string or NULL if ref wasn't specified.
+  */
++LIBCOUCHBASE_API
+ const char *
+ lcb_resp_get_error_ref(int cbtype, const lcb_RESPBASE *rb);
+ 
+diff --git a/src/handler.cc b/src/handler.cc
+index b909dea0..68ee2d16 100644
+--- a/src/handler.cc
++++ b/src/handler.cc
+@@ -1018,6 +1018,7 @@ lcb_resp_get_mutation_token(int cbtype, const lcb_RESPBASE *rb)
+     X(UNLOCK)                                   \
+ 
+ 
++LIBCOUCHBASE_API
+ const char *
+ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb)
+ {
+@@ -1031,6 +1032,7 @@ lcb_resp_get_error_context(int cbtype, const lcb_RESPBASE *rb)
+     return NULL;
+ }
+ 
++LIBCOUCHBASE_API
+ const char *
+ lcb_resp_get_error_ref(int cbtype, const lcb_RESPBASE *rb)
+ {
diff --git a/libcouchbase.spec b/libcouchbase.spec
index fa23abb..cd1a000 100644
--- a/libcouchbase.spec
+++ b/libcouchbase.spec
@@ -14,13 +14,15 @@
 
 Name:          libcouchbase
 Version:       2.7.6
-Release:       1%{?dist}
+Release:       2%{?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:        libcouchbase-pr27.patch
+
 BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRequires: cyrus-sasl-devel
@@ -65,6 +67,7 @@ a Couchbase Server.
 
 %prep
 %setup -q
+%patch0 -p1 -b .pr27
 
 
 %build
@@ -114,10 +117,13 @@ make check
 
 
 %changelog
+* Wed Jul 12 2017 Remi Collet <remi@remirepo.net> - 2.7.6-2
+- fix new symbols visibility, using patch from
+  https://github.com/couchbase/libcouchbase/pull/27
+  for https://issues.couchbase.com/browse/CCBC-803
+
 * Wed Jul 12 2017 Remi Collet <remi@remirepo.net> - 2.7.6-1
 - update to 2.7.6
-- open https://issues.couchbase.com/browse/CCBC-803
-  for non visible symbols (new functions)
 
 * Mon May 22 2017 Remi Collet <remi@remirepo.net> - 2.7.5-1
 - update to 2.7.5
author	Remi Collet <remi@remirepo.net>	2017-07-12 12:23:37 +0200
committer	Remi Collet <remi@remirepo.net>	2017-07-12 12:23:37 +0200
commit	d69bb41b47e2e9811d27afa102a36a3c9e2392fe (patch)
tree	9a02f4671e0a7a0c19b74b54288cffeb96d5a9c3
parent	39f3cd2efb70cf9fc958cf63e94373206b43a0f6 (diff)