1
0
Alexei Sorokin 2017-04-23 00:37:51 +00:00 committed by Git OBS Bridge
parent 09e4d38afd
commit 7bcf575cd2
5 changed files with 31 additions and 54 deletions

View File

@ -1,45 +0,0 @@
--- a/bindings/python/src/torrent_handle.cpp
+++ b/bindings/python/src/torrent_handle.cpp
@@ -231,6 +231,21 @@ void add_tracker(torrent_handle& h, dict d)
h.add_tracker(ae);
}
+namespace
+{
+#if defined BOOST_ASIO_HAS_STD_CHRONO
+ using std::chrono::system_clock;
+#else
+ using boost::chrono::system_clock;
+#endif
+
+ time_t to_ptime(time_point tpt)
+ {
+ return system_clock::to_time_t(system_clock::now()
+ + duration_cast<system_clock::duration>(tpt - clock_type::now()));
+ }
+}
+
list trackers(torrent_handle& h)
{
list ret;
@@ -245,8 +260,18 @@ list trackers(torrent_handle& h)
last_error["value"] = i->last_error.value();
last_error["category"] = i->last_error.category().name();
d["last_error"] = last_error;
- d["next_announce"] = i->next_announce;
- d["min_announce"] = i->min_announce;
+ if (i->next_announce > min_time()) {
+ d["next_announce"] = to_ptime(i->next_announce);
+ }
+ else {
+ d["next_announce"] = object();
+ }
+ if (i->min_announce > min_time()) {
+ d["min_announce"] = to_ptime(i->min_announce);
+ }
+ else {
+ d["min_announce"] = object();
+ }
d["scrape_incomplete"] = i->scrape_incomplete;
d["scrape_complete"] = i->scrape_complete;
d["scrape_downloaded"] = i->scrape_downloaded;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45e55f2374507bb67a9b9125f6b8d1c45e6cd33849c62b1d9cb56657354e359a
size 3909420

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44196a89932c26528f5db19289d0f0f4130730a61dccc61c9f1eac9ad3e881d8
size 3912760

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Sat Apr 22 22:36:04 UTC 2017 - sor.alexei@meowr.ru
- Update to version 1.1.3:
* Remove (broken) support for incoming connections over socks5.
* Restore announce_entry's timestamp fields to posix time in
python bindings.
* Deprecate torrent_added_alert (in favour of add_torrent_alert).
* Fix python bindings for parse_magnet_uri.
* Fix a minor robustness issue in DHT bootstrap logic.
* Fix an issue where torrent_status::num_seeds could be negative.
* Document deprecation of dynamic loading/unloading of torrents.
* Include user-agent in tracker announces in anonymous_mode for
private torrents.
* Add support for IPv6 peers from udp trackers.
* Correctly URL encode the IPv6 argument to trackers.
* Fix a bug where settings_pack::file_pool_size setting was not
being honored.
* Add a feature to periodically close files (to make windows
clear disc cache).
* Fix a bug in torrent_handle::file_status.
* Fix an issue with peers not updated on metadata from magnet
links.
- Remove libtorrent-rasterbar-1.1.2-fix-python-timestamp.patch.
-------------------------------------------------------------------
Wed Mar 29 14:36:39 UTC 2017 - sor.alexei@meowr.ru

View File

@ -18,11 +18,11 @@
%define _name libtorrent
%define sover 9
%define _version 1_1_2
%define _version 1_1_3
%bcond_with examples
%bcond_with tests
Name: libtorrent-rasterbar
Version: 1.1.2
Version: 1.1.3
Release: 0
Summary: Libtorrent is a C++ implementation of the BitTorrent protocol
License: BSD-3-Clause
@ -31,8 +31,6 @@ Url: http://libtorrent.org/
Source: https://github.com/arvidn/%{_name}/releases/download/%{_name}-%{_version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM libtorrent-rasterbar-fix-build-boost-1.54.patch sor.alexei@meowr.ru -- Fix building with Boost 1.54.
Patch0: libtorrent-rasterbar-fix-build-boost-1.54.patch
# PATCH-FIX-UPSTREAM libtorrent-rasterbar-1.1.2-fix-python-timestamp.patch -- Restore announce_entry's timestamp fields to POSIX time in Python bindings (commit 852fada).
Patch1: libtorrent-rasterbar-1.1.2-fix-python-timestamp.patch
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: python-devel
@ -81,8 +79,8 @@ The main goals of libtorrent-rasterbar are:
%package -n python2-%{name}
Summary: Python Bindings for libtorrent-rasterbar
Group: Development/Libraries/Python
# python-libtorrent-rasterbar was last used in openSUSE Leap 42.2.
Group: Development/Libraries/Python
Provides: python-%{name} = %{version}
Obsoletes: python-%{name} < %{version}
@ -142,7 +140,6 @@ Documentation for the libtorrent-rasterbar package.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"