From 5a48c63aedd146ff0767a9b224cb71c498eea827 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Oct 28 2019 09:19:55 +0000 Subject: Upgrade to 1.2.2 --- diff --git a/.gitignore b/.gitignore index a2e9b48..c738af8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libtorrent-rasterbar-1.1.13.tar.gz +/libtorrent-rasterbar-1.2.2.tar.gz diff --git a/disable_failed_test.patch b/disable_failed_test.patch deleted file mode 100644 index 816258d..0000000 --- a/disable_failed_test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -4,7 +4,6 @@ - bdecode_benchmark - - test_programs = \ -- test_primitives \ - test_recheck \ - test_stat_cache \ - test_file \ - diff --git a/rb_libtorrent-1.0.1-boost_noncopyable.patch b/rb_libtorrent-1.0.1-boost_noncopyable.patch deleted file mode 100644 index 519d4f4..0000000 --- a/rb_libtorrent-1.0.1-boost_noncopyable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libtorrent-rasterbar-1.0.1/include/libtorrent/disk_buffer_pool.hpp 2014-07-03 05:53:49.000000000 +0100 -+++ libtorrent-rasterbar-1.0.1/include/libtorrent/disk_buffer_pool.hpp 2014-08-18 17:43:37.380809092 +0100 -@@ -40,6 +40,8 @@ POSSIBILITY OF SUCH DAMAGE. - #include "libtorrent/session_settings.hpp" - #include "libtorrent/allocator.hpp" - -+#include -+ - #ifndef TORRENT_DISABLE_POOL_ALLOCATOR - #include - #endif diff --git a/rb_libtorrent-1.1.9-system-tommath.patch b/rb_libtorrent-1.1.9-system-tommath.patch deleted file mode 100644 index 05f466b..0000000 --- a/rb_libtorrent-1.1.9-system-tommath.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -uNrp libtorrent-rasterbar-1.1.9.old/include/libtorrent/Makefile.am libtorrent-rasterbar-1.1.9/include/libtorrent/Makefile.am ---- libtorrent-rasterbar-1.1.9.old/include/libtorrent/Makefile.am 2018-07-29 20:56:49.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/include/libtorrent/Makefile.am 2018-08-09 13:44:38.622783008 +0100 -@@ -154,11 +154,6 @@ nobase_include_HEADERS = \ - web_peer_connection.hpp \ - xml_parse.hpp \ - \ -- tommath.h \ -- tommath_class.h \ -- tommath_superclass.h \ -- tommath_private.h \ -- \ - aux_/alert_manager_variadic_emplace.hpp \ - aux_/allocating_handler.hpp \ - aux_/cpuid.hpp \ -diff -uNrp libtorrent-rasterbar-1.1.9.old/include/libtorrent/Makefile.in libtorrent-rasterbar-1.1.9/include/libtorrent/Makefile.in ---- libtorrent-rasterbar-1.1.9.old/include/libtorrent/Makefile.in 2018-07-30 07:59:59.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/include/libtorrent/Makefile.in 2018-08-09 13:44:57.328613695 +0100 -@@ -496,11 +496,6 @@ nobase_include_HEADERS = \ - web_peer_connection.hpp \ - xml_parse.hpp \ - \ -- tommath.h \ -- tommath_class.h \ -- tommath_superclass.h \ -- tommath_private.h \ -- \ - aux_/alert_manager_variadic_emplace.hpp \ - aux_/allocating_handler.hpp \ - aux_/cpuid.hpp \ -diff -uNrp libtorrent-rasterbar-1.1.9.old/src/Makefile.am libtorrent-rasterbar-1.1.9/src/Makefile.am ---- libtorrent-rasterbar-1.1.9.old/src/Makefile.am 2018-07-29 20:56:49.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/src/Makefile.am 2018-08-09 13:46:45.625633479 +0100 -@@ -92,7 +92,6 @@ libtorrent_rasterbar_la_SOURCES = \ - magnet_uri.cpp \ - merkle.cpp \ - metadata_transfer.cpp \ -- mpi.cpp \ - natpmp.cpp \ - parse_url.cpp \ - part_file.cpp \ -@@ -158,7 +157,7 @@ libtorrent_rasterbar_la_SOURCES = \ - $(BUILTIN_CRYPTO_SOURCES) - - libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO) --libtorrent_rasterbar_la_LIBADD = @BOOST_SYSTEM_LIB@ @OPENSSL_LIBS@ -+libtorrent_rasterbar_la_LIBADD = @BOOST_SYSTEM_LIB@ @OPENSSL_LIBS@ -ltommath - - AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY -I$(top_srcdir)/include -I$(top_srcdir)/ed25519/src @DEBUGFLAGS@ @OPENSSL_INCLUDES@ - AM_CFLAGS = -I$(top_srcdir)/ed25519/src -std=c99 -diff -uNrp libtorrent-rasterbar-1.1.9.old/src/Makefile.in libtorrent-rasterbar-1.1.9/src/Makefile.in ---- libtorrent-rasterbar-1.1.9.old/src/Makefile.in 2018-07-30 07:59:59.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/src/Makefile.in 2018-08-09 13:49:15.214279513 +0100 -@@ -156,7 +156,7 @@ am__libtorrent_rasterbar_la_SOURCES_DIST - http_tracker_connection.cpp i2p_stream.cpp identify_client.cpp \ - instantiate_connection.cpp ip_filter.cpp ip_voter.cpp \ - lazy_bdecode.cpp lsd.cpp lt_trackers.cpp magnet_uri.cpp \ -- merkle.cpp metadata_transfer.cpp mpi.cpp natpmp.cpp \ -+ merkle.cpp metadata_transfer.cpp natpmp.cpp \ - parse_url.cpp part_file.cpp pe_crypto.cpp \ - performance_counters.cpp peer_connection.cpp \ - peer_connection_handle.cpp peer_class.cpp peer_class_set.cpp \ -@@ -223,7 +223,7 @@ am_libtorrent_rasterbar_la_OBJECTS = web - http_tracker_connection.lo i2p_stream.lo identify_client.lo \ - instantiate_connection.lo ip_filter.lo ip_voter.lo \ - lazy_bdecode.lo lsd.lo lt_trackers.lo magnet_uri.lo merkle.lo \ -- metadata_transfer.lo mpi.lo natpmp.lo parse_url.lo \ -+ metadata_transfer.lo natpmp.lo parse_url.lo \ - part_file.lo pe_crypto.lo performance_counters.lo \ - peer_connection.lo peer_connection_handle.lo peer_class.lo \ - peer_class_set.lo piece_picker.lo platform_util.lo \ -@@ -564,7 +564,6 @@ libtorrent_rasterbar_la_SOURCES = \ - magnet_uri.cpp \ - merkle.cpp \ - metadata_transfer.cpp \ -- mpi.cpp \ - natpmp.cpp \ - parse_url.cpp \ - part_file.cpp \ -@@ -630,7 +629,7 @@ libtorrent_rasterbar_la_SOURCES = \ - $(BUILTIN_CRYPTO_SOURCES) - - libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO) --libtorrent_rasterbar_la_LIBADD = @BOOST_SYSTEM_LIB@ @OPENSSL_LIBS@ -+libtorrent_rasterbar_la_LIBADD = @BOOST_SYSTEM_LIB@ @OPENSSL_LIBS@ -ltommath - AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY -I$(top_srcdir)/include -I$(top_srcdir)/ed25519/src @DEBUGFLAGS@ @OPENSSL_INCLUDES@ - AM_CFLAGS = -I$(top_srcdir)/ed25519/src -std=c99 - AM_LDFLAGS = @OPENSSL_LDFLAGS@ -@@ -844,7 +843,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/magnet_uri.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/merkle.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_transfer.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/natpmp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet_buffer.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_url.Plo@am__quote@ -diff -uNrp libtorrent-rasterbar-1.1.9.old/src/pe_crypto.cpp libtorrent-rasterbar-1.1.9/src/pe_crypto.cpp ---- libtorrent-rasterbar-1.1.9.old/src/pe_crypto.cpp 2018-07-29 20:56:52.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/src/pe_crypto.cpp 2018-08-09 13:50:14.584742131 +0100 -@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include - - extern "C" { --#include "libtorrent/tommath.h" -+#include - } - - #include "libtorrent/aux_/disable_warnings_pop.hpp" -diff -uNrp libtorrent-rasterbar-1.1.9.old/test/test_pe_crypto.cpp libtorrent-rasterbar-1.1.9/test/test_pe_crypto.cpp ---- libtorrent-rasterbar-1.1.9.old/test/test_pe_crypto.cpp 2018-07-29 20:56:49.000000000 +0100 -+++ libtorrent-rasterbar-1.1.9/test/test_pe_crypto.cpp 2018-08-09 13:50:52.289401344 +0100 -@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include "test.hpp" - - extern "C" { --#include "libtorrent/tommath.h" -+#include - } - - #if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS) diff --git a/rb_libtorrent-boost169.patch b/rb_libtorrent-boost169.patch deleted file mode 100644 index fd25360..0000000 --- a/rb_libtorrent-boost169.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libtorrent-rasterbar-1.1.13/include/libtorrent/config.hpp.orig 2019-04-27 10:25:22.000000000 -0500 -+++ libtorrent-rasterbar-1.1.13/include/libtorrent/config.hpp 2019-05-03 08:56:01.793014380 -0500 -@@ -50,6 +50,7 @@ - #include - #include - #include -+#include - #include // for snprintf - #include // for IOV_MAX - diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec index 1d803ad..b901d9e 100644 --- a/rb_libtorrent.spec +++ b/rb_libtorrent.spec @@ -15,19 +15,16 @@ Name: rb_libtorrent -Version: 1.1.13 -Release: 5%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative License: BSD URL: https://www.libtorrent.org -Source0: https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_13/libtorrent-rasterbar-%{version}.tar.gz +Source0: https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_2_2/libtorrent-rasterbar-%{version}.tar.gz Source1: %{name}-README-renames.Fedora Source2: %{name}-COPYING.Boost Source3: %{name}-COPYING.zlib -Patch0: %{name}-1.1.9-system-tommath.patch -Patch1: disable_failed_test.patch -Patch2: %{name}-boost169.patch %if 0%{?rhel} # aarch64 is broken and I have zero interest in fixing it @@ -38,14 +35,12 @@ BuildRequires: asio-devel BuildRequires: automake BuildRequires: boost-devel BuildRequires: gcc-c++ -BuildRequires: libtommath-devel BuildRequires: pkgconfig(zlib) %if 0%{?fedora} < 31 || 0%{?rhel} BuildRequires: pkgconfig(python2) %endif BuildRequires: libtool BuildRequires: util-linux -BuildRequires: chrpath %description %{name} is a C++ library that aims to be a good alternative to all @@ -125,10 +120,6 @@ Python applications. %prep %setup -q -n "libtorrent-rasterbar-%{version}" -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -rm include/libtorrent/tommath* src/mpi.cpp sed -i -e 's|include/libtorrent/version.hpp|../include/libtorrent/version.hpp|' configure configure.ac autoreconf -fiv @@ -233,16 +224,7 @@ pushd build %{make_install} ## Do the renaming due to the somewhat limited %%_bindir namespace. rename client torrent_client %{buildroot}%{_bindir}/* -## Fix rpath -chrpath -d %{buildroot}%{_bindir}/bt_get -chrpath -d %{buildroot}%{_bindir}/bt_get2 -chrpath -d %{buildroot}%{_bindir}/connection_tester -chrpath -d %{buildroot}%{_bindir}/dump_torrent -chrpath -d %{buildroot}%{_bindir}/make_torrent -chrpath -d %{buildroot}%{_bindir}/simple_torrent_client -chrpath -d %{buildroot}%{_bindir}/stats_counters -chrpath -d %{buildroot}%{_bindir}/torrent_client_test -chrpath -d %{buildroot}%{_bindir}/upnp_test + %if 0%{?fedora} < 31 || 0%{?rhel} ## Install the python 2 binding module. pushd bindings/python @@ -269,7 +251,7 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %{!?_licensedir:%global license %doc} %doc AUTHORS ChangeLog %license COPYING -%{_libdir}/libtorrent-rasterbar.so.9* +%{_libdir}/libtorrent-rasterbar.so.10* %files devel %doc docs/ @@ -284,6 +266,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %{_bindir}/*torrent* %{_bindir}/bt_ge* %{_bindir}/connection_tester +%{_bindir}/custom_storage +%{_bindir}/dht_put +%{_bindir}/session_log_alerts %{_bindir}/stats_counters %{_bindir}/upnp_test @@ -304,6 +289,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %endif # with python3 %changelog +* Sun Oct 27 2019 Leigh Scott - 1.2.2-1 +- Upgrade to 1.2.2 + * Mon Aug 19 2019 Miro Hrončok - 1.1.13-5 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 7c0eea4..11ff245 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtorrent-rasterbar-1.1.13.tar.gz) = 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160 +SHA512 (libtorrent-rasterbar-1.2.2.tar.gz) = 8ef867d253fe187336ec5919683526997298319b755bcd72eeca2c56c81462d2aed912d2eadcd560d2a8729b36798718f9a1668a83927211f49667af9bdf0a06