diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 56593e6b0b0d..a94c9893de21 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -1,38 +1,36 @@ PORTNAME= libtorrent -DISTVERSION= 0.16.6 -PORTREVISION= 1 +DISTVERSION= 0.16.11 CATEGORIES= net-p2p -MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v0.16.5/ -DISTNAME= ${PORTNAME}-0.16.5 +MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/ MAINTAINER= eduardo@FreeBSD.org COMMENT= BitTorrent Library written in C++ WWW= https://github.com/rakshasa/libtorrent LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl TEST_DEPENDS= cppunit>0:devel/cppunit USES= compiler:c++17-lang cpe libtool localbase:ldflags pathfix \ pkgconfig ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug \ --with-kqueue \ --without-epoll CONFIGURE_ENV= OPENSSL_CFLAGS="-I ${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" # This makes sure that /usr/local/lib appears before /usr/lib when # linking libtorrent to avoid linking with base's libcrypto. MAKE_ARGS= LDFLAGS="${LDFLAGS}" INSTALL_TARGET= install-strip -TEST_TARGET= check -TESTING_UNSAFE= https://github.com/rakshasa/libtorrent/issues/292 +TEST_ARGS= CPPUNIT_LIBS="-L${LOCALBASE}/lib -lcppunit" +TEST_TARGET= check .include diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo index 37bf79d288c7..4109e66fa564 100644 --- a/net-p2p/libtorrent/distinfo +++ b/net-p2p/libtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770149076 -SHA256 (libtorrent-0.16.5.tar.gz) = 9c604b851381bfe68e122995b6a2e7e3f16d2438b715e41d967c5b5e503062a9 -SIZE (libtorrent-0.16.5.tar.gz) = 887247 +TIMESTAMP = 1777633814 +SHA256 (libtorrent-0.16.11.tar.gz) = 620b2892972e8c9d476c995dd52d82cbe86f36733ae3ce5d97e2ca7fc284dea1 +SIZE (libtorrent-0.16.11.tar.gz) = 901667 diff --git a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc b/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc deleted file mode 100644 index b73078bdc1ab..000000000000 --- a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- src/data/memory_chunk.cc.orig 2025-09-05 08:47:37 UTC -+++ src/data/memory_chunk.cc -@@ -49,6 +49,9 @@ MemoryChunk::unmap() { - if (!is_valid()) - throw internal_error("MemoryChunk::unmap() called on an invalid object"); - -+ if (msync(m_ptr, m_end - m_ptr,MS_INVALIDATE) != 0) -+ throw internal_error("MemoryChunk::unmap() - msync() system call failed"); -+ - if (munmap(m_ptr, m_end - m_ptr) != 0) - throw internal_error("MemoryChunk::unmap() system call failed: " + std::string(rak::error_number::current().c_str())); - } diff --git a/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h b/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h deleted file mode 100644 index 9005806055a4..000000000000 --- a/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/torrent/connection_manager.h.orig 2025-06-01 13:09:26 UTC -+++ src/torrent/connection_manager.h -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist index b7afd1e5b6d8..ead99233c3ca 100644 --- a/net-p2p/libtorrent/pkg-plist +++ b/net-p2p/libtorrent/pkg-plist @@ -1,78 +1,80 @@ include/torrent/bitfield.h include/torrent/chunk_manager.h include/torrent/common.h include/torrent/connection_manager.h include/torrent/data/block.h include/torrent/data/block_list.h include/torrent/data/block_transfer.h include/torrent/data/chunk_utils.h include/torrent/data/download_data.h include/torrent/data/file.h include/torrent/data/file_list.h include/torrent/data/file_list_iterator.h include/torrent/data/file_manager.h include/torrent/data/file_utils.h include/torrent/data/piece.h include/torrent/data/transfer_list.h include/torrent/download.h include/torrent/download/choke_group.h include/torrent/download/choke_queue.h include/torrent/download/download_manager.h include/torrent/download/group_entry.h include/torrent/download/resource_manager.h include/torrent/download_info.h include/torrent/error.h include/torrent/event.h include/torrent/exceptions.h include/torrent/hash_string.h include/torrent/net/address_info.h include/torrent/net/connection_state.h include/torrent/net/fd.h include/torrent/net/http_get.h include/torrent/net/http_stack.h include/torrent/net/network_config.h -include/torrent/net/network_manager.h include/torrent/net/poll.h include/torrent/net/resolver.h include/torrent/net/socket_address.h include/torrent/net/socket_address_key.h -include/torrent/net/socket_event.h include/torrent/net/types.h include/torrent/object.h include/torrent/object_raw_bencode.h include/torrent/object_static_map.h include/torrent/object_stream.h include/torrent/path.h include/torrent/peer/choke_status.h include/torrent/peer/client_info.h include/torrent/peer/client_list.h include/torrent/peer/connection_list.h include/torrent/peer/peer.h include/torrent/peer/peer_info.h include/torrent/peer/peer_list.h include/torrent/rate.h +include/torrent/runtime/network_manager.h +include/torrent/runtime/socket_manager.h +include/torrent/system/thread.h include/torrent/throttle.h include/torrent/torrent.h include/torrent/tracker/dht_controller.h include/torrent/tracker/manager.h include/torrent/tracker/tracker.h include/torrent/tracker/tracker_state.h include/torrent/tracker/wrappers.h include/torrent/utils/chrono.h include/torrent/utils/directory_events.h include/torrent/utils/extents.h +include/torrent/utils/file_stat.h include/torrent/utils/log.h include/torrent/utils/log_buffer.h include/torrent/utils/option_strings.h include/torrent/utils/random.h include/torrent/utils/ranges.h include/torrent/utils/resume.h include/torrent/utils/scheduler.h include/torrent/utils/signal_bitfield.h include/torrent/utils/string_manip.h -include/torrent/utils/thread.h +include/torrent/utils/unordered_vector.h include/torrent/utils/uri_parser.h lib/libtorrent.so -lib/libtorrent.so.35 -lib/libtorrent.so.35.0.0 +lib/libtorrent.so.41 +lib/libtorrent.so.41.0.0 libdata/pkgconfig/libtorrent.pc diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 422df359aa99..a2691c202bf3 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -1,45 +1,47 @@ PORTNAME= rtorrent -DISTVERSION= 0.16.6 -PORTREVISION= 1 +DISTVERSION= 0.16.11 CATEGORIES= net-p2p -MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v0.16.5/ -DISTNAME= ${PORTNAME}-0.16.5 +MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/ MAINTAINER= eduardo@FreeBSD.org COMMENT= BitTorrent Client written in C++ WWW= https://github.com/rakshasa/rtorrent LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LIB_DEPENDS= libtorrent.so:net-p2p/libtorrent +TEST_DEPENDS= cppunit>0:devel/cppunit USES= compiler:c++17-lang ncurses pkgconfig USE_RC_SUBR= rtorrent GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug \ --with-xmlrpc-tinyxml2 +TEST_ARGS= CPPUNIT_LIBS="-L${LOCALBASE}/lib -lcppunit" +TEST_TARGET= check + SUB_FILES= pkg-message USERS= rtorrent GROUPS= rtorrent PLIST_FILES= bin/rtorrent \ "@sample ${ETCDIR}/rtorrent.conf.sample" \ ${DATADIR}/lua/rtorrent.lua PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \ ${STAGEDIR}${ETCDIR}/rtorrent.conf.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include diff --git a/net-p2p/rtorrent/distinfo b/net-p2p/rtorrent/distinfo index b0b7d39705ae..c7ef453df068 100644 --- a/net-p2p/rtorrent/distinfo +++ b/net-p2p/rtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770149375 -SHA256 (rtorrent-0.16.5.tar.gz) = 62ebd7662d02bdff005bc29a4b3385238e703bbe2b0c845ea7ae1ffaf9cb66c8 -SIZE (rtorrent-0.16.5.tar.gz) = 851652 +TIMESTAMP = 1777634683 +SHA256 (rtorrent-0.16.11.tar.gz) = bed2fefd69a01dbe95a02b330dd8c257d1aae2b4ee2ba4a9c4859da2fa404f65 +SIZE (rtorrent-0.16.11.tar.gz) = 858663