diff --git a/CMakeLists.txt b/CMakeLists.txt index 155ceb28b..b5dca7068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) project(libtorrent DESCRIPTION "Bittorrent library" - VERSION 1.1.10 + VERSION 1.1.11 ) set (SOVERSION "9") diff --git a/ChangeLog b/ChangeLog index 970cdba5d..e903bdcc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.1.11 release + * fix move_storage with save_path with a trailing slash * fix tracker announce issue, advertising port 0 in secondary IPv6 announce * fix missing boost/noncopyable.hpp includes diff --git a/Jamfile b/Jamfile index d8e3dbbad..fb8c6fa0a 100644 --- a/Jamfile +++ b/Jamfile @@ -57,7 +57,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.10 ; +VERSION = 1.1.11 ; rule linking ( properties * ) { diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 1b4ed877d..4fc74071a 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -154,7 +154,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.10', + version = '1.1.11', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/configure.ac b/configure.ac index 5bdf5b9ec..c38bd54d9 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.1.10],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.1.11],[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/building.rst b/docs/building.rst index ed200572c..c07ab2261 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index f0c2a48ca..1d38ebc5b 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index c7d2650eb..3538cffdd 100644 --- a/docs/dht_rss.rst +++ b/docs/dht_rss.rst @@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds ====================================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index 655864c4f..328bf9901 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 61ae47bb0..8ffe82139 100644 --- a/docs/dht_store.rst +++ b/docs/dht_store.rst @@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store ============================================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index 5020d7a66..164873541 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 9bf93bada..54e977af4 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index ee8ea3421..a9db0adb3 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -1050,7 +1050,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 `home`__ diff --git a/docs/hacking.rst b/docs/hacking.rst index 8e1409c29..a5905b894 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index 13bed40ca..231ebfb91 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index d4f2fb411..8503a5312 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index c40798105..ecfdad311 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index 58108f604..df8dc0ac8 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 13849800d..532eb15b9 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index 1901c73f8..718f7faad 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index f174c9e4e..b2554ef6a 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 1 -#define LIBTORRENT_VERSION_TINY 10 +#define LIBTORRENT_VERSION_TINY 11 // 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.1.10.0" -#define LIBTORRENT_REVISION "a499ace80" +#define LIBTORRENT_VERSION "1.1.11.0" +#define LIBTORRENT_REVISION "ed4ca98a1" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index deabbce79..4e1ab9590 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -148,7 +148,7 @@ namespace libtorrent SET_NOPREV(proxy_username, "", &session_impl::update_proxy), SET_NOPREV(proxy_password, "", &session_impl::update_proxy), SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge), - SET_NOPREV(peer_fingerprint, "-LT11A0-", 0), + SET_NOPREV(peer_fingerprint, "-LT11B0-", 0), SET_NOPREV(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) }; diff --git a/tools/set_version.py b/tools/set_version.py index 2038ad7a0..9b585e5cc 100755 --- a/tools/set_version.py +++ b/tools/set_version.py @@ -42,6 +42,8 @@ def substitute_file(name): l = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) elif "version = '" in l and name.endswith('setup.py'): l = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) + elif l.startswith('\tVERSION ') and len(l.split('.')) == 3 and name.endswith('CMakeLists.txt'): + l = "\tVERSION %d.%d.%d\n" % (version[0], version[1], version[2]) elif '"-LT' in l and name.endswith('settings_pack.cpp'): l = re.sub('"-LT[0-9A-Za-z]{4}-"', '"-LT%c%c%c%c-"' % v(version), l)