git: 76232a78ad06 - main - net-p2p/{,py-}libtorrent-rasterbar: Downgrade 2.0.6-27 -> 1.2.16

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 09 Jun 2022 04:35:18 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76232a78ad06a5467af33ab15de8155d109dc81d

commit 76232a78ad06a5467af33ab15de8155d109dc81d
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-06-08 14:43:42 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-06-09 04:35:15 +0000

    net-p2p/{,py-}libtorrent-rasterbar: Downgrade 2.0.6-27 -> 1.2.16
    
    This reverts commit f8c7a69a6d2cf354ba9f6a3c83982a6641c1b2d6.
---
 net-p2p/libtorrent-rasterbar/Makefile    |  39 ++++++------
 net-p2p/libtorrent-rasterbar/distinfo    |  12 +---
 net-p2p/libtorrent-rasterbar/pkg-plist   | 101 ++++++++++++-------------------
 net-p2p/py-libtorrent-rasterbar/Makefile |  14 ++---
 net-p2p/py-libtorrent-rasterbar/distinfo |  12 +---
 net-p2p/qbittorrent/Makefile             |   1 +
 6 files changed, 68 insertions(+), 111 deletions(-)

diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 3f7a16129c85..6863eb32daed 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -1,12 +1,10 @@
 # Created by: Doug Barton <dougb@FreeBSD.org>
 
 PORTNAME=	libtorrent-rasterbar
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.6-27
-DISTVERSIONSUFFIX=	-g34c75eb5f
-PORTEPOCH=	1
+DISTVERSION=	1.2.16 # 2.x is unusable until memory problems are resolved, see https://github.com/arvidn/libtorrent/issues/6781
+PORTEPOCH=	2
 CATEGORIES=	net-p2p
-#MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/
+MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library implementing a BitTorrent client
@@ -18,29 +16,19 @@ LIB_DEPENDS=	libboost_chrono.so:devel/boost-libs \
 		libboost_random.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs
 
-USES=		cmake:testing compiler:c++11-lib iconv:wchar_t libtool \
-		localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
+USES=		cmake compiler:c++11-lib iconv:wchar_t libtool localbase:ldflags pathfix pkgconfig python:test shebangfix ssl
+SHEBANG_FILES=	test/socks.py test/web_server.py
 USE_LDCONFIG=	yes
 
-SHEBANG_GLOB=	*.py
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	arvidn
-GH_PROJECT=	libtorrent
-GH_TUPLE=	arvidn:try_signal:751a7e5:try_signal/deps/try_signal \
-		arvidn:libsimulator:64fb5b4:libsimulator/simulation/libsimulator \
-		paullouisageneau:boost-asio-gnutls:a57d4d3:asio/deps/asio-gnutls
-
-USE_CXXSTD=	c++17 # prevent boost-related SEGV, see bug#264278
-
 LDFLAGS+=	${ICONV_LIB}
 
+SHLIB_VER=	10
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}" SO_VER="${DISTVERSION}"
+
 DOCFILES=	AUTHORS ChangeLog
 PORTDOCS=	${DOCFILES} docs/*
 PORTEXAMPLES=	*.cpp
 
-CMAKE_TESTING_ON=	build_tests
-
 OPTIONS_DEFINE=		DOCS EXAMPLES LOGGING
 OPTIONS_DEFAULT=	LOGGING
 OPTIONS_SUB=		yes
@@ -49,8 +37,10 @@ LOGGING_DESC=		Enable logging to disk
 EXAMPLES_CMAKE_BOOL=	build_examples
 LOGGING_CMAKE_BOOL=	logging
 
+PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_CMD:T}"|' \
+	@${REINPLACE_CMD} -e 's|return "python3";|return "${PYTHON_CMD}";|' \
 		${WRKSRC}/test/setup_transfer.cpp
 
 post-install:
@@ -61,7 +51,6 @@ post-install:
 	#               https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206169
 	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc
-	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libtorrent-rasterbar.pc.bak
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -74,4 +63,10 @@ post-install-EXAMPLES-on:
 	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
 		${STAGEDIR}${EXAMPLESDIR}
 
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dbuild_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
index 8ce0b98ad4d2..b92e4799dff6 100644
--- a/net-p2p/libtorrent-rasterbar/distinfo
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -1,9 +1,3 @@
-TIMESTAMP = 1653701233
-SHA256 (arvidn-libtorrent-v2.0.6-27-g34c75eb5f_GH0.tar.gz) = e474e81dd41f201872613069be4c357ddffd60da95233d5e026758c14bfd7f23
-SIZE (arvidn-libtorrent-v2.0.6-27-g34c75eb5f_GH0.tar.gz) = 4142182
-SHA256 (arvidn-try_signal-751a7e5_GH0.tar.gz) = dd374f151d2e69ec2f1ebd4ebeb59e4b2233de08934b1c61b676516bec012ecd
-SIZE (arvidn-try_signal-751a7e5_GH0.tar.gz) = 7282
-SHA256 (arvidn-libsimulator-64fb5b4_GH0.tar.gz) = e60e7aaf682395db32c55b006d2a194cd76c6c99f3dd967de890260bdc010b0a
-SIZE (arvidn-libsimulator-64fb5b4_GH0.tar.gz) = 145192
-SHA256 (paullouisageneau-boost-asio-gnutls-a57d4d3_GH0.tar.gz) = f6ceb4638cad0a5dd474ceef62e4bb07aab460af609cc87242292331c6c2616d
-SIZE (paullouisageneau-boost-asio-gnutls-a57d4d3_GH0.tar.gz) = 14644
+TIMESTAMP = 1654705780
+SHA256 (libtorrent-rasterbar-1.2.16.tar.gz) = 5bdc221662541abdc324ded0a74b5cd3f30e6260871080b4a4b3295fb09f02e0
+SIZE (libtorrent-rasterbar-1.2.16.tar.gz) = 4163867
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 5285927ab17d..4f8d8ff4b883 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -1,78 +1,49 @@
 include/libtorrent/add_torrent_params.hpp
 include/libtorrent/address.hpp
 include/libtorrent/alert.hpp
+include/libtorrent/alert_manager.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/announce_entry.hpp
 include/libtorrent/assert.hpp
-include/libtorrent/aux_/alert_manager.hpp
 include/libtorrent/aux_/aligned_storage.hpp
 include/libtorrent/aux_/aligned_union.hpp
 include/libtorrent/aux_/alloca.hpp
 include/libtorrent/aux_/allocating_handler.hpp
-include/libtorrent/aux_/announce_entry.hpp
-include/libtorrent/aux_/apply_pad_files.hpp
 include/libtorrent/aux_/array.hpp
-include/libtorrent/aux_/bandwidth_limit.hpp
-include/libtorrent/aux_/bandwidth_manager.hpp
-include/libtorrent/aux_/bandwidth_queue_entry.hpp
-include/libtorrent/aux_/bandwidth_socket.hpp
 include/libtorrent/aux_/bind_to_device.hpp
-include/libtorrent/aux_/buffer.hpp
+include/libtorrent/aux_/block_cache_reference.hpp
 include/libtorrent/aux_/byteswap.hpp
-include/libtorrent/aux_/chained_buffer.hpp
 include/libtorrent/aux_/container_wrapper.hpp
+include/libtorrent/aux_/cppint_import_export.hpp
 include/libtorrent/aux_/cpuid.hpp
 include/libtorrent/aux_/deferred_handler.hpp
 include/libtorrent/aux_/deprecated.hpp
 include/libtorrent/aux_/deque.hpp
 include/libtorrent/aux_/dev_random.hpp
-include/libtorrent/aux_/directory.hpp
-include/libtorrent/aux_/disable_deprecation_warnings_push.hpp
 include/libtorrent/aux_/disable_warnings_pop.hpp
 include/libtorrent/aux_/disable_warnings_push.hpp
-include/libtorrent/aux_/disk_buffer_pool.hpp
-include/libtorrent/aux_/disk_io_thread_pool.hpp
 include/libtorrent/aux_/disk_job_fence.hpp
-include/libtorrent/aux_/disk_job_pool.hpp
-include/libtorrent/aux_/ed25519.hpp
 include/libtorrent/aux_/escape_string.hpp
 include/libtorrent/aux_/export.hpp
-include/libtorrent/aux_/ffs.hpp
-include/libtorrent/aux_/file_pointer.hpp
 include/libtorrent/aux_/file_progress.hpp
-include/libtorrent/aux_/file_view_pool.hpp
+include/libtorrent/aux_/ffs.hpp
 include/libtorrent/aux_/generate_peer_id.hpp
 include/libtorrent/aux_/has_block.hpp
-include/libtorrent/aux_/hasher512.hpp
-include/libtorrent/aux_/heterogeneous_queue.hpp
 include/libtorrent/aux_/instantiate_connection.hpp
-include/libtorrent/aux_/invariant_check.hpp
 include/libtorrent/aux_/io.hpp
-include/libtorrent/aux_/ip_helpers.hpp
 include/libtorrent/aux_/ip_notifier.hpp
-include/libtorrent/aux_/keepalive.hpp
 include/libtorrent/aux_/listen_socket_handle.hpp
 include/libtorrent/aux_/lsd.hpp
+include/libtorrent/aux_/keepalive.hpp
 include/libtorrent/aux_/merkle.hpp
-include/libtorrent/aux_/merkle_tree.hpp
-include/libtorrent/aux_/mmap.hpp
-include/libtorrent/aux_/mmap_disk_job.hpp
 include/libtorrent/aux_/noexcept_movable.hpp
 include/libtorrent/aux_/numeric_cast.hpp
-include/libtorrent/aux_/open_mode.hpp
-include/libtorrent/aux_/packet_buffer.hpp
-include/libtorrent/aux_/packet_pool.hpp
+include/libtorrent/aux_/openssl.hpp
 include/libtorrent/aux_/path.hpp
-include/libtorrent/aux_/polymorphic_socket.hpp
 include/libtorrent/aux_/pool.hpp
 include/libtorrent/aux_/portmap.hpp
-include/libtorrent/aux_/posix_part_file.hpp
-include/libtorrent/aux_/posix_storage.hpp
 include/libtorrent/aux_/proxy_settings.hpp
 include/libtorrent/aux_/range.hpp
-include/libtorrent/aux_/receive_buffer.hpp
-include/libtorrent/aux_/resolver.hpp
-include/libtorrent/aux_/resolver_interface.hpp
 include/libtorrent/aux_/route.h
 include/libtorrent/aux_/scope_end.hpp
 include/libtorrent/aux_/session_call.hpp
@@ -82,34 +53,33 @@ include/libtorrent/aux_/session_settings.hpp
 include/libtorrent/aux_/session_udp_sockets.hpp
 include/libtorrent/aux_/set_socket_buffer.hpp
 include/libtorrent/aux_/set_traffic_class.hpp
-include/libtorrent/aux_/sha512.hpp
 include/libtorrent/aux_/socket_type.hpp
-include/libtorrent/aux_/storage_free_list.hpp
+include/libtorrent/aux_/storage_piece_set.hpp
 include/libtorrent/aux_/storage_utils.hpp
-include/libtorrent/aux_/store_buffer.hpp
 include/libtorrent/aux_/string_ptr.hpp
-include/libtorrent/aux_/strview_less.hpp
 include/libtorrent/aux_/suggest_piece.hpp
 include/libtorrent/aux_/throw.hpp
 include/libtorrent/aux_/time.hpp
-include/libtorrent/aux_/timestamp_history.hpp
 include/libtorrent/aux_/torrent_impl.hpp
-include/libtorrent/aux_/torrent_list.hpp
 include/libtorrent/aux_/unique_ptr.hpp
-include/libtorrent/aux_/utp_socket_manager.hpp
-include/libtorrent/aux_/utp_stream.hpp
 include/libtorrent/aux_/vector.hpp
-include/libtorrent/aux_/win_cng.hpp
 include/libtorrent/aux_/win_crypto_provider.hpp
 include/libtorrent/aux_/win_util.hpp
 include/libtorrent/aux_/windows.hpp
+include/libtorrent/bandwidth_limit.hpp
+include/libtorrent/bandwidth_manager.hpp
+include/libtorrent/bandwidth_queue_entry.hpp
+include/libtorrent/bandwidth_socket.hpp
 include/libtorrent/bdecode.hpp
 include/libtorrent/bencode.hpp
 include/libtorrent/bitfield.hpp
+include/libtorrent/block_cache.hpp
 include/libtorrent/bloom_filter.hpp
+include/libtorrent/broadcast_socket.hpp
 include/libtorrent/bt_peer_connection.hpp
+include/libtorrent/buffer.hpp
+include/libtorrent/chained_buffer.hpp
 include/libtorrent/choker.hpp
-include/libtorrent/client_data.hpp
 include/libtorrent/close_reason.hpp
 include/libtorrent/config.hpp
 include/libtorrent/copy_ptr.hpp
@@ -117,11 +87,16 @@ include/libtorrent/crc32c.hpp
 include/libtorrent/create_torrent.hpp
 include/libtorrent/deadline_timer.hpp
 include/libtorrent/debug.hpp
-include/libtorrent/disabled_disk_io.hpp
 include/libtorrent/disk_buffer_holder.hpp
+include/libtorrent/disk_buffer_pool.hpp
 include/libtorrent/disk_interface.hpp
+include/libtorrent/disk_io_job.hpp
+include/libtorrent/disk_io_thread.hpp
+include/libtorrent/disk_io_thread_pool.hpp
+include/libtorrent/disk_job_pool.hpp
 include/libtorrent/disk_observer.hpp
 include/libtorrent/download_priority.hpp
+include/libtorrent/ed25519.hpp
 include/libtorrent/entry.hpp
 include/libtorrent/enum_net.hpp
 include/libtorrent/error.hpp
@@ -131,13 +106,15 @@ include/libtorrent/extensions/smart_ban.hpp
 include/libtorrent/extensions/ut_metadata.hpp
 include/libtorrent/extensions/ut_pex.hpp
 include/libtorrent/file.hpp
+include/libtorrent/file_pool.hpp
 include/libtorrent/file_storage.hpp
 include/libtorrent/fingerprint.hpp
 include/libtorrent/flags.hpp
 include/libtorrent/fwd.hpp
 include/libtorrent/gzip.hpp
-include/libtorrent/hash_picker.hpp
 include/libtorrent/hasher.hpp
+include/libtorrent/hasher512.hpp
+include/libtorrent/heterogeneous_queue.hpp
 include/libtorrent/hex.hpp
 include/libtorrent/http_connection.hpp
 include/libtorrent/http_parser.hpp
@@ -147,10 +124,10 @@ include/libtorrent/http_tracker_connection.hpp
 include/libtorrent/i2p_stream.hpp
 include/libtorrent/identify_client.hpp
 include/libtorrent/index_range.hpp
-include/libtorrent/info_hash.hpp
+include/libtorrent/invariant_check.hpp
 include/libtorrent/io.hpp
-include/libtorrent/io_context.hpp
 include/libtorrent/io_service.hpp
+include/libtorrent/io_service_fwd.hpp
 include/libtorrent/ip_filter.hpp
 include/libtorrent/ip_voter.hpp
 include/libtorrent/kademlia/announce_flags.hpp
@@ -179,19 +156,21 @@ include/libtorrent/kademlia/rpc_manager.hpp
 include/libtorrent/kademlia/sample_infohashes.hpp
 include/libtorrent/kademlia/traversal_algorithm.hpp
 include/libtorrent/kademlia/types.hpp
-include/libtorrent/libtorrent.hpp
+include/libtorrent/lazy_entry.hpp
 include/libtorrent/link.hpp
+include/libtorrent/linked_list.hpp
 include/libtorrent/lsd.hpp
 include/libtorrent/magnet_uri.hpp
-include/libtorrent/mmap_disk_io.hpp
-include/libtorrent/mmap_storage.hpp
 include/libtorrent/natpmp.hpp
 include/libtorrent/netlink.hpp
 include/libtorrent/operations.hpp
 include/libtorrent/optional.hpp
+include/libtorrent/packet_buffer.hpp
+include/libtorrent/packet_pool.hpp
 include/libtorrent/parse_url.hpp
 include/libtorrent/part_file.hpp
 include/libtorrent/pe_crypto.hpp
+include/libtorrent/pex_flags.hpp
 include/libtorrent/peer.hpp
 include/libtorrent/peer_class.hpp
 include/libtorrent/peer_class_set.hpp
@@ -204,22 +183,22 @@ include/libtorrent/peer_info.hpp
 include/libtorrent/peer_list.hpp
 include/libtorrent/peer_request.hpp
 include/libtorrent/performance_counters.hpp
-include/libtorrent/pex_flags.hpp
 include/libtorrent/piece_block.hpp
 include/libtorrent/piece_block_progress.hpp
 include/libtorrent/piece_picker.hpp
 include/libtorrent/platform_util.hpp
 include/libtorrent/portmap.hpp
-include/libtorrent/posix_disk_io.hpp
 include/libtorrent/proxy_base.hpp
 include/libtorrent/puff.hpp
 include/libtorrent/random.hpp
 include/libtorrent/read_resume_data.hpp
+include/libtorrent/receive_buffer.hpp
 include/libtorrent/request_blocks.hpp
 include/libtorrent/resolve_links.hpp
+include/libtorrent/resolver.hpp
+include/libtorrent/resolver_interface.hpp
 include/libtorrent/session.hpp
 include/libtorrent/session_handle.hpp
-include/libtorrent/session_params.hpp
 include/libtorrent/session_settings.hpp
 include/libtorrent/session_stats.hpp
 include/libtorrent/session_status.hpp
@@ -227,14 +206,12 @@ include/libtorrent/session_types.hpp
 include/libtorrent/settings_pack.hpp
 include/libtorrent/sha1.hpp
 include/libtorrent/sha1_hash.hpp
-include/libtorrent/sha256.hpp
+include/libtorrent/sha512.hpp
 include/libtorrent/sliding_average.hpp
 include/libtorrent/socket.hpp
 include/libtorrent/socket_io.hpp
-include/libtorrent/socket_type.hpp
 include/libtorrent/socks5_stream.hpp
 include/libtorrent/span.hpp
-include/libtorrent/ssl.hpp
 include/libtorrent/ssl_stream.hpp
 include/libtorrent/stack_allocator.hpp
 include/libtorrent/stat.hpp
@@ -245,6 +222,7 @@ include/libtorrent/string_util.hpp
 include/libtorrent/string_view.hpp
 include/libtorrent/tailqueue.hpp
 include/libtorrent/time.hpp
+include/libtorrent/timestamp_history.hpp
 include/libtorrent/torrent.hpp
 include/libtorrent/torrent_flags.hpp
 include/libtorrent/torrent_handle.hpp
@@ -253,13 +231,14 @@ include/libtorrent/torrent_peer.hpp
 include/libtorrent/torrent_peer_allocator.hpp
 include/libtorrent/torrent_status.hpp
 include/libtorrent/tracker_manager.hpp
-include/libtorrent/truncate.hpp
 include/libtorrent/udp_socket.hpp
 include/libtorrent/udp_tracker_connection.hpp
 include/libtorrent/union_endpoint.hpp
 include/libtorrent/units.hpp
 include/libtorrent/upnp.hpp
 include/libtorrent/utf8.hpp
+include/libtorrent/utp_socket_manager.hpp
+include/libtorrent/utp_stream.hpp
 include/libtorrent/vector_utils.hpp
 include/libtorrent/version.hpp
 include/libtorrent/web_connection_base.hpp
@@ -271,7 +250,7 @@ lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
 lib/libtorrent-rasterbar.so
-lib/libtorrent-rasterbar.so.2.0
-lib/libtorrent-rasterbar.so.2.0.6
+lib/libtorrent-rasterbar.so.%%SO_VER%%
+lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
 libdata/pkgconfig/libtorrent-rasterbar.pc
 share/cmake/Modules/FindLibtorrentRasterbar.cmake
diff --git a/net-p2p/py-libtorrent-rasterbar/Makefile b/net-p2p/py-libtorrent-rasterbar/Makefile
index 3bd39c523ff4..6bc3960af9bb 100644
--- a/net-p2p/py-libtorrent-rasterbar/Makefile
+++ b/net-p2p/py-libtorrent-rasterbar/Makefile
@@ -2,9 +2,8 @@
 
 PORTNAME=	libtorrent-rasterbar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.6-27
-DISTVERSIONSUFFIX=	-g34c75eb5f
-PORTEPOCH=	1
+DISTVERSION=	1.2.16
+PORTEPOCH=	2
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -14,25 +13,20 @@ COMMENT=	Python bindings for libtorrent-rasterbar
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
-BROKEN=		fails to build, see https://github.com/arvidn/libtorrent/issues/6890
+BROKEN=		can't create dynamic relocation R_X86_64_32 against local symbol in readonly segment, see https://github.com/arvidn/libtorrent/issues/6890
 
 BUILD_DEPENDS=	b2:devel/boost_build
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
 
 USES=		compiler:c11 iconv localbase:ldflags python:3.6+
-USE_PYTHON=	distutils autoplist
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	arvidn
 GH_PROJECT=	libtorrent
-GH_TUPLE=	arvidn:try_signal:751a7e5:try_signal/../../deps/try_signal \
-		arvidn:libsimulator:64fb5b4:libsimulator/../../simulation/libsimulator \
-		paullouisageneau:boost-asio-gnutls:a57d4d3:asio/../../deps/asio-gnutls
+USE_PYTHON=	distutils autoplist
 
 BINARY_ALIAS=	b2=${FILESDIR}/b2
 
-USE_CXXSTD=	c++17 # prevent boost-related SEGV, see bug#264278
 CFLAGS+=	-DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331
 LDFLAGS+=	${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330
 
diff --git a/net-p2p/py-libtorrent-rasterbar/distinfo b/net-p2p/py-libtorrent-rasterbar/distinfo
index 3938f9ff9054..8f090fecfde8 100644
--- a/net-p2p/py-libtorrent-rasterbar/distinfo
+++ b/net-p2p/py-libtorrent-rasterbar/distinfo
@@ -1,9 +1,3 @@
-TIMESTAMP = 1653705738
-SHA256 (arvidn-libtorrent-v2.0.6-27-g34c75eb5f_GH0.tar.gz) = e474e81dd41f201872613069be4c357ddffd60da95233d5e026758c14bfd7f23
-SIZE (arvidn-libtorrent-v2.0.6-27-g34c75eb5f_GH0.tar.gz) = 4142182
-SHA256 (arvidn-try_signal-751a7e5_GH0.tar.gz) = dd374f151d2e69ec2f1ebd4ebeb59e4b2233de08934b1c61b676516bec012ecd
-SIZE (arvidn-try_signal-751a7e5_GH0.tar.gz) = 7282
-SHA256 (arvidn-libsimulator-64fb5b4_GH0.tar.gz) = e60e7aaf682395db32c55b006d2a194cd76c6c99f3dd967de890260bdc010b0a
-SIZE (arvidn-libsimulator-64fb5b4_GH0.tar.gz) = 145192
-SHA256 (paullouisageneau-boost-asio-gnutls-a57d4d3_GH0.tar.gz) = f6ceb4638cad0a5dd474ceef62e4bb07aab460af609cc87242292331c6c2616d
-SIZE (paullouisageneau-boost-asio-gnutls-a57d4d3_GH0.tar.gz) = 14644
+TIMESTAMP = 1654714860
+SHA256 (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 2ee435c3e2e6dd8825903230b41fbaf0741b7aed57094f2ca0e6214d89fef9d4
+SIZE (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 3624920
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 2b4876bd3964..91f793932992 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qbittorrent
 DISTVERSION=	4.4.3.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}