From cd118cf4b9d161bb90ad93782ed88b1c55248cb0 Mon Sep 17 00:00:00 2001
From: Aleksei Korotych <aleksei.korotych@avira.com>
Date: Fri, 11 Sep 2020 12:33:24 +0200
Subject: [PATCH 1/2] in case of riak 3.0x server returns 3.0 as version and
 'maj' version detection logic was crashing.

since this piece of code will be used definetely after 2016 lines which
caused chrashed can be safely removed.
---
 riak/tests/test_transports_tcp_transport.py | 14 ++++++++++++++
 riak/transports/tcp/transport.py            | 11 +----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 riak/tests/test_transports_tcp_transport.py

diff --git a/riak/tests/test_transports_tcp_transport.py b/riak/tests/test_transports_tcp_transport.py
new file mode 100644
index 00000000..88621be5
--- /dev/null
+++ b/riak/tests/test_transports_tcp_transport.py
@@ -0,0 +1,14 @@
+import unittest
+
+from riak.transports.tcp import TcpTransport
+from riak.node import RiakNode
+
+
+class TransportsTCPTransportTests(unittest.TestCase):
+    def test__server_version(self):
+        node = RiakNode()
+        transport = TcpTransport(node=node)
+        transport.get_server_info = lambda: {'server_version': '2.1.2'}
+        self.assertEqual('2.1.2', transport._server_version())
+        transport.get_server_info = lambda: {'server_version': '3.0'}
+        self.assertEqual('3.0', transport._server_version())
diff --git a/riak/transports/tcp/transport.py b/riak/transports/tcp/transport.py
index 5d3a1599..07adde27 100644
--- a/riak/transports/tcp/transport.py
+++ b/riak/transports/tcp/transport.py
@@ -93,16 +93,7 @@ def _get_codec(self, msg_code):
     # FeatureDetection API
     def _server_version(self):
         server_info = self.get_server_info()
-        ver = server_info['server_version']
-        (maj, min, patch) = [int(v) for v in ver.split('.')]
-        if maj == 0:
-            import datetime
-            now = datetime.datetime.now()
-            if now.year == 2016:
-                # GH-471 As of 20160509 Riak TS OSS 1.3.0 returns '0.8.0' as
-                # the version string.
-                return '2.1.1'
-        return ver
+        return server_info['server_version']
 
     def ping(self):
         """

From cbd86e8951c714724e9d0df44dab010a3d74c35d Mon Sep 17 00:00:00 2001
From: Aleksei Korotych <aleksei.korotych@avira.com>
Date: Tue, 11 Jan 2022 08:20:37 +0100
Subject: [PATCH 2/2] improving git protocol security on github

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 510fba6e..7c6e1c90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "riak_pb"]
 	path = riak_pb
-	url = git://github.com/basho/riak_pb.git
+	url = https://github.com/basho/riak_pb.git
 [submodule "tools"]
 	path = tools
-	url = git://github.com/basho/riak-client-tools.git
+	url = https://github.com/basho/riak-client-tools.git
 [submodule "docs"]
 	path = docs
 	url = https://github.com/basho/riak-python-client.git