bump version to 1.2.16

arvidn · Apr 16, 2022 · 862a889 · 862a889
1 parent 6a7023f
commit 862a889
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+1.2.16 released
+
 	* send User-Agent field in anonymous mode
 	* fix python binding for settings_pack conversion
 	* fix DHT announce timer issue

diff --git a/Jamfile b/Jamfile
@@ -861,7 +861,7 @@ rule generate-pkg-config ( properties * )
 	local libname = [ $(props[2]).name ] ;
 	props = $(props[1]) ;
 
-	local FULL_VERSION = 1.2.15 ;
+	local FULL_VERSION = 1.2.16 ;
 
 	p = [ install-paths $(properties) ] ;
 

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
@@ -452,7 +452,7 @@ def _configure_b2_with_distutils(self, python_binding_dir):
 
 setuptools.setup(
     name="libtorrent",
-    version="1.2.15",
+    version="1.2.16",
     author="Arvid Norberg",
     author_email="arvid@libtorrent.org",
     description="Python bindings for libtorrent-rasterbar",

diff --git a/build_dist.sh b/build_dist.sh
@@ -16,7 +16,7 @@ chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 ./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes
 make dist
 
-VERSION=1.2.15
+VERSION=1.2.16
 
 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz
 cd libtorrent-rasterbar-${VERSION}/test

diff --git a/configure.ac b/configure.ac
@@ -5,7 +5,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libtorrent-rasterbar],[1.2.15],[arvid@libtorrent.org],
+AC_INIT([libtorrent-rasterbar],[1.2.16],[arvid@libtorrent.org],
         [libtorrent-rasterbar],[http://www.libtorrent.org])
 AC_CONFIG_SRCDIR([src/torrent.cpp])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/docs/header.rst b/docs/header.rst
@@ -1,3 +1,3 @@
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.2.15
+:Version: 1.2.16
 
diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic
@@ -545,7 +545,7 @@ cpp
 tos
 BP
 qB
-LT12F0
+LT12G0
 iocontrol
 getname
 getpeername

diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp
@@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define LIBTORRENT_VERSION_MAJOR 1
 #define LIBTORRENT_VERSION_MINOR 2
-#define LIBTORRENT_VERSION_TINY 15
+#define LIBTORRENT_VERSION_TINY 16
 
 // the format of this version is: MMmmtt
 // M = Major version, m = minor version, t = tiny version
 #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
 
-#define LIBTORRENT_VERSION "1.2.15.0"
-#define LIBTORRENT_REVISION "0facda852"
+#define LIBTORRENT_VERSION "1.2.16.0"
+#define LIBTORRENT_REVISION "175c20a89"
 
 namespace libtorrent {
 

diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
@@ -678,9 +678,10 @@ namespace {
 		TORRENT_ASSERT(m_nodes.find(s) != m_nodes.end());
 
 		static_assert(LIBTORRENT_VERSION_MINOR < 16, "version number not supported by DHT");
-		static_assert(LIBTORRENT_VERSION_TINY < 16, "version number not supported by DHT");
+//		static_assert(LIBTORRENT_VERSION_TINY < 16, "version number not supported by DHT");
+		auto const tiny = std::min(15, LIBTORRENT_VERSION_TINY);
 		static char const version_str[] = {'L', 'T'
-			, LIBTORRENT_VERSION_MAJOR, (LIBTORRENT_VERSION_MINOR << 4) | LIBTORRENT_VERSION_TINY};
+			, LIBTORRENT_VERSION_MAJOR, char((LIBTORRENT_VERSION_MINOR << 4) | tiny)};
 		e["v"] = std::string(version_str, version_str + 4);
 
 		m_send_buf.clear();

diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
@@ -124,7 +124,7 @@ constexpr int CLOSE_FILE_INTERVAL = 0;
 		SET(proxy_username, "", &session_impl::update_proxy),
 		SET(proxy_password, "", &session_impl::update_proxy),
 		SET(i2p_hostname, "", &session_impl::update_i2p_bridge),
-		SET(peer_fingerprint, "-LT12F0-", nullptr),
+		SET(peer_fingerprint, "-LT12G0-", nullptr),
 		SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes)
 	}});