diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index ea7f8b46a775..d591020bc901 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -1,49 +1,49 @@ PORTNAME= libtorrent -DISTVERSION= 0.15.3 +DISTVERSION= 0.15.4 CATEGORIES= net-p2p 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 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 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 OPTIONS_DEFINE= KQUEUE OPTIONS_DEFAULT= KQUEUE KQUEUE_DESC= Use kqueue(2) support KQUEUE_CONFIGURE_WITH= kqueue .include # Disable instrumentation, which requires 64-bit atomic ops, on i386 when using # gcc to avoid linking errors: # /usr/local/lib/libtorrent.so: undefined reference to `__sync_add_and_fetch_8' # /usr/local/lib/libtorrent.so: undefined reference to `__sync_fetch_and_and_8' .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ARGS+= --disable-instrumentation .endif .include diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo index 965575747ed9..d4847b09e976 100644 --- a/net-p2p/libtorrent/distinfo +++ b/net-p2p/libtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746176226 -SHA256 (libtorrent-0.15.3.tar.gz) = 6a0b01e4c0da817fc06fa0cd0ca539d79a19eaed617e16da9e2d8ba066ea95dd -SIZE (libtorrent-0.15.3.tar.gz) = 872751 +TIMESTAMP = 1748794917 +SHA256 (libtorrent-0.15.4.tar.gz) = 3b4fa871dfb018517b2277156432934d3e9518716954832264d2cd9f2411f365 +SIZE (libtorrent-0.15.4.tar.gz) = 870746 diff --git a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc b/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc index b447785ddd2c..f119df1d6e6e 100644 --- a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc +++ b/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc @@ -1,12 +1,12 @@ ---- src/data/memory_chunk.cc.orig 2010-02-10 09:55:42 UTC +--- src/data/memory_chunk.cc.orig 2025-06-01 13:09:26 UTC +++ src/data/memory_chunk.cc -@@ -86,6 +86,9 @@ +@@ -66,6 +66,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 index 1f7b51e39681..9005806055a4 100644 --- a/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h +++ b/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h @@ -1,10 +1,10 @@ ---- src/torrent/connection_manager.h.orig 2012-04-20 06:42:32 UTC +--- src/torrent/connection_manager.h.orig 2025-06-01 13:09:26 UTC +++ src/torrent/connection_manager.h -@@ -42,6 +42,7 @@ - +@@ -4,6 +4,7 @@ + #include #include #include +#include #include #include #include diff --git a/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h b/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h index cf23b993d598..56e9dbf35b71 100644 --- a/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h +++ b/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h @@ -1,10 +1,10 @@ ---- src/torrent/net/socket_address_key.h.orig 2018-07-03 23:50:04 UTC +--- src/torrent/net/socket_address_key.h.orig 2025-06-01 13:09:26 UTC +++ src/torrent/net/socket_address_key.h @@ -7,6 +7,7 @@ #include - #include + #include #include +#include // Unique key for the socket address, excluding port numbers, etc. diff --git a/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc b/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc deleted file mode 100644 index 213806e717b5..000000000000 --- a/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/torrent/poll_kqueue.cc.orig 2008-12-09 10:47:34 UTC -+++ src/torrent/poll_kqueue.cc -@@ -52,6 +52,8 @@ - #include - #include - #include -+ -+#include - #endif - - namespace torrent { -@@ -113,7 +113,7 @@ - if (fd == -1) - return NULL; - -- return new PollKQueue(fd, 1024, maxOpenSockets); -+ return new PollKQueue(fd, 16384, maxOpenSockets); - } - - PollKQueue::PollKQueue(int fd, int maxEvents, int maxOpenSockets) : diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist index 41397c0111b1..fc8aecae5d69 100644 --- a/net-p2p/libtorrent/pkg-plist +++ b/net-p2p/libtorrent/pkg-plist @@ -1,78 +1,74 @@ 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/http.h include/torrent/net/address_info.h include/torrent/net/fd.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/net/utils.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/poll.h -include/torrent/poll_epoll.h -include/torrent/poll_kqueue.h -include/torrent/poll_select.h include/torrent/rate.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/tracker_controller.h -include/torrent/tracker_list.h include/torrent/utils/chrono.h include/torrent/utils/directory_events.h include/torrent/utils/extents.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/thread.h include/torrent/utils/uri_parser.h lib/libtorrent.so -lib/libtorrent.so.24 -lib/libtorrent.so.24.0.0 +lib/libtorrent.so.25 +lib/libtorrent.so.25.0.0 libdata/pkgconfig/libtorrent.pc diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 2e2f693b9ea6..fe1829c9370e 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -1,47 +1,47 @@ PORTNAME= rtorrent -DISTVERSION= 0.15.3 +DISTVERSION= 0.15.4 CATEGORIES= net-p2p 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= libcurl.so:ftp/curl \ libtorrent.so:net-p2p/libtorrent USES= compiler:c++17-lang ncurses pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug LDFLAGS+= -lexecinfo -pthread SUB_FILES= pkg-message PLIST_FILES= bin/rtorrent PORTDOCS= README PORTEXAMPLES= rtorrent.rc OPTIONS_DEFINE= DOCS EXAMPLES IPV6 OPTIONS_DEFAULT= TINYXML OPTIONS_RADIO= XML OPTIONS_RADIO_XML= TINYXML XMLRPC XMLRPC_DESC= Compile with xmlrpc-c support IPV6_CONFIGURE_ENABLE= ipv6 TINYXML_CONFIGURE_ON= --with-xmlrpc-tinyxml2 XMLRPC_LIB_DEPENDS= libxmlrpc.so:net/xmlrpc-c XMLRPC_CONFIGURE_ON= --with-xmlrpc-c post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR}/ .include diff --git a/net-p2p/rtorrent/distinfo b/net-p2p/rtorrent/distinfo index 3f0058abc275..cf96f2a12744 100644 --- a/net-p2p/rtorrent/distinfo +++ b/net-p2p/rtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746177185 -SHA256 (rtorrent-0.15.3.tar.gz) = 6dfd42c19e6ff2f5ee8b99855314cef4f10bd669663c2670cc85fd6a4e2c4e40 -SIZE (rtorrent-0.15.3.tar.gz) = 858703 +TIMESTAMP = 1748795572 +SHA256 (rtorrent-0.15.4.tar.gz) = 39342070caf7506bce5ffe8527b5693d6cbe4fda851d54d505707c9063919fc4 +SIZE (rtorrent-0.15.4.tar.gz) = 866692