From a652233142e9bb4efdcce48025d7199c21f7f097 Mon Sep 17 00:00:00 2001 From: arvidn Date: Sat, 18 Apr 2020 17:07:41 +0200 Subject: [PATCH] bump version --- ChangeLog | 2 ++ Jamfile | 2 +- bindings/python/setup.py | 2 +- build_dist.sh | 2 +- configure.ac | 2 +- docs/header.rst | 2 +- docs/hunspell/libtorrent.dic | 2 +- include/libtorrent/version.hpp | 6 +++--- src/settings_pack.cpp | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bd9002f6..be796a1f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.6 released + * fix peer timeout logic * simplify proxy handling. A proxy now overrides listen_interfaces * fix issues when configured to use a non-default choking algorithm diff --git a/Jamfile b/Jamfile index 14e10c527..5ad67906e 100644 --- a/Jamfile +++ b/Jamfile @@ -45,7 +45,7 @@ else : : $(boost-include-path) /usr/local/include ; } -VERSION = 1.2.5 ; +VERSION = 1.2.6 ; rule linking ( properties * ) { diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 411e6ae15..e1240510c 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -182,7 +182,7 @@ else: setup( name='python-libtorrent', - version='1.2.5', + version='1.2.6', author='Arvid Norberg', author_email='arvid@libtorrent.org', description='Python bindings for libtorrent-rasterbar', diff --git a/build_dist.sh b/build_dist.sh index 0372504eb..21cec6c2a 100755 --- 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.5 +VERSION=1.2.6 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz cd libtorrent-rasterbar-${VERSION}/test diff --git a/configure.ac b/configure.ac index dbaefc965..9a75fccd0 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.2.5],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.2.6],[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 index 09ad20452..5c3dd6a88 100644 --- a/docs/header.rst +++ b/docs/header.rst @@ -1,3 +1,3 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.2.5 +:Version: 1.2.6 diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic index f499c5445..a5901248b 100644 --- a/docs/hunspell/libtorrent.dic +++ b/docs/hunspell/libtorrent.dic @@ -546,7 +546,7 @@ cpp tos BP qB -LT1250 +LT1260 iocontrol getname getpeername diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index b391015fc..282e3936f 100644 --- 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 5 +#define LIBTORRENT_VERSION_TINY 6 // 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.5.0" -#define LIBTORRENT_REVISION "9469913cb" +#define LIBTORRENT_VERSION "1.2.6.0" +#define LIBTORRENT_REVISION "ac4dd411c" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index b2dc63d83..751e7c41d 100644 --- 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, "-LT1250-", nullptr), + SET(peer_fingerprint, "-LT1260-", nullptr), SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) }});