Create forks of ports net-p2p/libtorrent-rasterbar and net-p2p/py-libtorrent-rasterbar to unbreak net-p2p/deluge-cli

net-p2p/deluge-cli is broken with the latest version of libtorrent-rasterbar.

MFH:		2020Q1

12 files changed, 346 insertions, 2 deletions

diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index a069a4d0161b..0578e7cb69b1 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -45,6 +45,7 @@
     SUBDIR += libswift
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
+    SUBDIR += libtorrent-rasterbar11
     SUBDIR += lidarr
     SUBDIR += linuxdcpp
     SUBDIR += litecoin
@@ -70,6 +71,7 @@
     SUBDIR += parity-ethereum
     SUBDIR += phex
     SUBDIR += py-libtorrent-rasterbar
+    SUBDIR += py-libtorrent-rasterbar11
     SUBDIR += py-py2play
     SUBDIR += py-transmissionrpc
     SUBDIR += py-tremc
diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile
index 088e24b17fcf..199d1ca4c9a1 100644
--- a/net-p2p/deluge-cli/Makefile
+++ b/net-p2p/deluge-cli/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	deluge
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.3.15
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-p2p python
 PKGNAMESUFFIX=	-cli
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	intltool-merge:textproc/intltool
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/py-libtorrent-rasterbar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar11>=0:net-p2p/py-libtorrent-rasterbar11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \
diff --git a/net-p2p/libtorrent-rasterbar11/Makefile b/net-p2p/libtorrent-rasterbar11/Makefile
new file mode 100644
index 000000000000..de183b4bed83
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/Makefile
@@ -0,0 +1,65 @@
+# Created by: Doug Barton <dougb@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	libtorrent-rasterbar
+DISTVERSION=	1.1.14
+CATEGORIES=	net-p2p
+MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
+PKGNAMESUFFIX=	11 # exists to support net-p2p/deluge-cli that is broken with the latest libtorrent-rasterbar
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C++ library implementing a BitTorrent client
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libboost_chrono.so:devel/boost-libs \
+		libboost_random.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs
+
+CONFLICTS_INSTALL=	libtorrent-rasterbar
+
+USES=		cmake compiler:c++14-lang iconv:wchar_t libtool pathfix pkgconfig ssl
+USE_LDCONFIG=	yes
+
+SHLIB_VER=	9
+PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
+
+DOCFILES=	AUTHORS ChangeLog
+PORTDOCS=	${DOCFILES} docs/*
+PORTEXAMPLES=	*.cpp
+
+OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES LOGGING
+OPTIONS_DEFAULT=LOGGING
+OPTIONS_SUB=	yes
+LOGGING_DESC=	Enable disk stat logging and logging to disk
+
+DEBUG_CONFIGURE_ENABLE=		debug
+EXAMPLES_CONFIGURE_ENABLE=	examples
+LOGGING_CONFIGURE_ENABLE=	logging disk-stats
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \
+		${WRKSRC}/Jamfile
+
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/tommath.h.orig ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}
+	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${PORTEXAMPLES} \
+		${STAGEDIR}${EXAMPLESDIR}
+
+do-test: # broken: https://github.com/arvidn/libtorrent/issues/3327
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dbuild_tests=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-rasterbar11/distinfo b/net-p2p/libtorrent-rasterbar11/distinfo
new file mode 100644
index 000000000000..0bedf502c58d
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1580528446
+SHA256 (libtorrent-rasterbar-1.1.14.tar.gz) = 4c1fe55da9361c9d98e725ece7d88f183c09797b2e2667ca4d9386599f8dc36a
+SIZE (libtorrent-rasterbar-1.1.14.tar.gz) = 4040571
diff --git a/net-p2p/libtorrent-rasterbar11/files/patch-bindings_python_compile__flags.in b/net-p2p/libtorrent-rasterbar11/files/patch-bindings_python_compile__flags.in
new file mode 100644
index 000000000000..9d9fb85cc6da
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/files/patch-bindings_python_compile__flags.in
@@ -0,0 +1,5 @@
+--- bindings/python/compile_flags.in.orig	2017-07-02 16:18:10 UTC
++++ bindings/python/compile_flags.in
+@@ -1 +1 @@
+--I@top_srcdir@/include @COMPILETIME_OPTIONS@ @CPPFLAGS@ @BOOST_CPPFLAGS@ @PYTHON_CXXFLAGS@ @OPENSSL_INCLUDES@
++-I@top_srcdir@/include @COMPILETIME_OPTIONS@ @CPPFLAGS@ -std=c++11 @BOOST_CPPFLAGS@ @OPENSSL_INCLUDES@
diff --git a/net-p2p/libtorrent-rasterbar11/files/patch-include_libtorrent_tommath.h b/net-p2p/libtorrent-rasterbar11/files/patch-include_libtorrent_tommath.h
new file mode 100644
index 000000000000..ba5d60d7d970
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/files/patch-include_libtorrent_tommath.h
@@ -0,0 +1,11 @@
+--- include/libtorrent/tommath.h.orig	2016-08-29 10:51:22 UTC
++++ include/libtorrent/tommath.h
+@@ -111,7 +111,7 @@ extern "C" {
+ 
+ /* use arc4random on platforms that support it */
+ #ifdef MP_USE_ALT_RAND
+-    #define MP_GEN_RANDOM()    arc4random()
++    #define MP_GEN_RANDOM()    (int)arc4random()
+ #else
+     #define MP_GEN_RANDOM()    rand()
+ #endif
diff --git a/net-p2p/libtorrent-rasterbar11/pkg-descr b/net-p2p/libtorrent-rasterbar11/pkg-descr
new file mode 100644
index 000000000000..566e60dc0385
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/pkg-descr
@@ -0,0 +1,10 @@
+libtorrent is an open source C++ library implementing the BitTorrent
+protocol, along with most popular extensions, making it suitable for
+real world deployment. It is configurable to be able to fit both
+servers and embedded devices.
+
+The main goals of libtorrent are to be efficient and easy to use.
+
+NB: this is NOT the same library as the net-p2p/libtorrent port!
+
+WWW: https://libtorrent.org/
diff --git a/net-p2p/libtorrent-rasterbar11/pkg-plist b/net-p2p/libtorrent-rasterbar11/pkg-plist
new file mode 100644
index 000000000000..25ee00cc58eb
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar11/pkg-plist
@@ -0,0 +1,205 @@
+include/libtorrent/ConvertUTF.h
+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/alloca.hpp
+include/libtorrent/announce_entry.hpp
+include/libtorrent/assert.hpp
+include/libtorrent/aux_/alert_manager_variadic_emplace.hpp
+include/libtorrent/aux_/allocating_handler.hpp
+include/libtorrent/aux_/byteswap.hpp
+include/libtorrent/aux_/cpuid.hpp
+include/libtorrent/aux_/disable_warnings_pop.hpp
+include/libtorrent/aux_/disable_warnings_push.hpp
+include/libtorrent/aux_/escape_string.hpp
+include/libtorrent/aux_/file_progress.hpp
+include/libtorrent/aux_/merkle.hpp
+include/libtorrent/aux_/openssl.hpp
+include/libtorrent/aux_/proxy_settings.hpp
+include/libtorrent/aux_/route.h
+include/libtorrent/aux_/session_call.hpp
+include/libtorrent/aux_/session_impl.hpp
+include/libtorrent/aux_/session_interface.hpp
+include/libtorrent/aux_/session_settings.hpp
+include/libtorrent/aux_/time.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/build_config.hpp
+include/libtorrent/chained_buffer.hpp
+include/libtorrent/choker.hpp
+include/libtorrent/close_reason.hpp
+include/libtorrent/config.hpp
+include/libtorrent/copy_ptr.hpp
+include/libtorrent/crc32c.hpp
+include/libtorrent/create_torrent.hpp
+include/libtorrent/deadline_timer.hpp
+include/libtorrent/debug.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_job_pool.hpp
+include/libtorrent/disk_observer.hpp
+include/libtorrent/ed25519.hpp
+include/libtorrent/entry.hpp
+include/libtorrent/enum_net.hpp
+include/libtorrent/error.hpp
+include/libtorrent/error_code.hpp
+include/libtorrent/export.hpp
+include/libtorrent/extensions.hpp
+include/libtorrent/extensions/lt_trackers.hpp
+include/libtorrent/extensions/metadata_transfer.hpp
+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/fwd.hpp
+include/libtorrent/gzip.hpp
+include/libtorrent/hasher.hpp
+include/libtorrent/heterogeneous_queue.hpp
+include/libtorrent/hex.hpp
+include/libtorrent/http_connection.hpp
+include/libtorrent/http_parser.hpp
+include/libtorrent/http_seed_connection.hpp
+include/libtorrent/http_stream.hpp
+include/libtorrent/http_tracker_connection.hpp
+include/libtorrent/i2p_stream.hpp
+include/libtorrent/identify_client.hpp
+include/libtorrent/instantiate_connection.hpp
+include/libtorrent/invariant_check.hpp
+include/libtorrent/io.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/dht_observer.hpp
+include/libtorrent/kademlia/dht_storage.hpp
+include/libtorrent/kademlia/dht_tracker.hpp
+include/libtorrent/kademlia/direct_request.hpp
+include/libtorrent/kademlia/dos_blocker.hpp
+include/libtorrent/kademlia/find_data.hpp
+include/libtorrent/kademlia/get_item.hpp
+include/libtorrent/kademlia/get_peers.hpp
+include/libtorrent/kademlia/item.hpp
+include/libtorrent/kademlia/msg.hpp
+include/libtorrent/kademlia/node.hpp
+include/libtorrent/kademlia/node_entry.hpp
+include/libtorrent/kademlia/node_id.hpp
+include/libtorrent/kademlia/observer.hpp
+include/libtorrent/kademlia/put_data.hpp
+include/libtorrent/kademlia/refresh.hpp
+include/libtorrent/kademlia/routing_table.hpp
+include/libtorrent/kademlia/rpc_manager.hpp
+include/libtorrent/kademlia/traversal_algorithm.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/max.hpp
+include/libtorrent/natpmp.hpp
+include/libtorrent/network_thread_pool.hpp
+include/libtorrent/operations.hpp
+include/libtorrent/packet_buffer.hpp
+include/libtorrent/parse_url.hpp
+include/libtorrent/part_file.hpp
+include/libtorrent/pe_crypto.hpp
+include/libtorrent/peer.hpp
+include/libtorrent/peer_class.hpp
+include/libtorrent/peer_class_set.hpp
+include/libtorrent/peer_class_type_filter.hpp
+include/libtorrent/peer_connection.hpp
+include/libtorrent/peer_connection_handle.hpp
+include/libtorrent/peer_connection_interface.hpp
+include/libtorrent/peer_id.hpp
+include/libtorrent/peer_info.hpp
+include/libtorrent/peer_list.hpp
+include/libtorrent/peer_request.hpp
+include/libtorrent/performance_counters.hpp
+include/libtorrent/piece_block_progress.hpp
+include/libtorrent/piece_picker.hpp
+include/libtorrent/platform_util.hpp
+include/libtorrent/proxy_base.hpp
+include/libtorrent/puff.hpp
+include/libtorrent/random.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/rss.hpp
+include/libtorrent/session.hpp
+include/libtorrent/session_handle.hpp
+include/libtorrent/session_settings.hpp
+include/libtorrent/session_stats.hpp
+include/libtorrent/session_status.hpp
+include/libtorrent/settings_pack.hpp
+include/libtorrent/sha1.hpp
+include/libtorrent/sha1_hash.hpp
+include/libtorrent/sliding_average.hpp
+include/libtorrent/socket.hpp
+include/libtorrent/socket_io.hpp
+include/libtorrent/socket_type.hpp
+include/libtorrent/socket_type_fwd.hpp
+include/libtorrent/socks5_stream.hpp
+include/libtorrent/ssl_stream.hpp
+include/libtorrent/stack_allocator.hpp
+include/libtorrent/stat.hpp
+include/libtorrent/stat_cache.hpp
+include/libtorrent/storage.hpp
+include/libtorrent/storage_defs.hpp
+include/libtorrent/string_util.hpp
+include/libtorrent/tailqueue.hpp
+include/libtorrent/thread.hpp
+include/libtorrent/thread_pool.hpp
+include/libtorrent/time.hpp
+include/libtorrent/timestamp_history.hpp
+include/libtorrent/tommath.h
+include/libtorrent/tommath_class.h
+include/libtorrent/tommath_private.h
+include/libtorrent/tommath_superclass.h
+include/libtorrent/torrent.hpp
+include/libtorrent/torrent_handle.hpp
+include/libtorrent/torrent_info.hpp
+include/libtorrent/torrent_peer.hpp
+include/libtorrent/torrent_peer_allocator.hpp
+include/libtorrent/torrent_status.hpp
+include/libtorrent/tracker_manager.hpp
+include/libtorrent/udp_socket.hpp
+include/libtorrent/udp_tracker_connection.hpp
+include/libtorrent/uncork_interface.hpp
+include/libtorrent/union_endpoint.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
+include/libtorrent/web_peer_connection.hpp
+include/libtorrent/xml_parse.hpp
+lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake
+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.1.1.14
+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 0c43e4b11a49..1f0603c653bb 100644
--- a/net-p2p/py-libtorrent-rasterbar/Makefile
+++ b/net-p2p/py-libtorrent-rasterbar/Makefile
@@ -18,6 +18,8 @@ BROKEN=		Doesn't install anything since the last major release: https://github.c
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}-libtorrent-rasterbar11
+
 USES=		compiler:c11 iconv localbase python
 USE_PYTHON=	distutils autoplist
 
diff --git a/net-p2p/py-libtorrent-rasterbar11/Makefile b/net-p2p/py-libtorrent-rasterbar11/Makefile
new file mode 100644
index 000000000000..dedfbc2cc739
--- /dev/null
+++ b/net-p2p/py-libtorrent-rasterbar11/Makefile
@@ -0,0 +1,34 @@
+# Created by: Doug Barton <dougb@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	libtorrent-rasterbar
+DISTVERSION=	1.1.14
+CATEGORIES=	net-p2p python
+MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	11
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Python bindings for libtorrent-rasterbar
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/../../COPYING
+
+LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
+		${PY_BOOST}
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}-libtorrent-rasterbar
+
+USES=		compiler:c11 iconv localbase python
+USE_PYTHON=	distutils autoplist
+
+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
+
+WRKSRC_SUBDIR=	bindings/python
+
+# ensure python paths are correctly identified
+CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
+		PYTHON_VERSION="${PYTHON_VERSION}"
+
+.include <bsd.port.mk>
diff --git a/net-p2p/py-libtorrent-rasterbar11/distinfo b/net-p2p/py-libtorrent-rasterbar11/distinfo
new file mode 100644
index 000000000000..013172ebf5cb
--- /dev/null
+++ b/net-p2p/py-libtorrent-rasterbar11/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1580540445
+SHA256 (libtorrent-rasterbar-1.1.14.tar.gz) = 4c1fe55da9361c9d98e725ece7d88f183c09797b2e2667ca4d9386599f8dc36a
+SIZE (libtorrent-rasterbar-1.1.14.tar.gz) = 4040571
diff --git a/net-p2p/py-libtorrent-rasterbar11/pkg-descr b/net-p2p/py-libtorrent-rasterbar11/pkg-descr
new file mode 100644
index 000000000000..7fb71ee25e70
--- /dev/null
+++ b/net-p2p/py-libtorrent-rasterbar11/pkg-descr
@@ -0,0 +1,4 @@
+The python binding of libtorrent, an open source C++ library implementing the
+BitTorrent protocol.
+
+WWW: http://libtorrent.org/