diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 8fa9721d5772..d4574fa941ad 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -1,36 +1,36 @@ PORTNAME= libtorrent -DISTVERSION= 0.16.15 +DISTVERSION= 0.16.17 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 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_ARGS= CPPUNIT_LIBS="-L${LOCALBASE}/lib -lcppunit" TEST_TARGET= check .include diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo index af09fd5f29ec..84080e767163 100644 --- a/net-p2p/libtorrent/distinfo +++ b/net-p2p/libtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1782153833 -SHA256 (libtorrent-0.16.15.tar.gz) = bbb09fb80f50fede504799885d1df054c9edf7e7820f9d5a9c72674dcf60c9cf -SIZE (libtorrent-0.16.15.tar.gz) = 911534 +TIMESTAMP = 1783343262 +SHA256 (libtorrent-0.16.17.tar.gz) = 9efd7f3176a03f7935b5616ff57695524e99a3184e43ec01110d13d960d2abf6 +SIZE (libtorrent-0.16.17.tar.gz) = 917140 diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist index 151242a9c439..5755f5a8f615 100644 --- a/net-p2p/libtorrent/pkg-plist +++ b/net-p2p/libtorrent/pkg-plist @@ -1,82 +1,83 @@ include/torrent/bitfield.h include/torrent/chunk_manager.h include/torrent/common.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/types.h include/torrent/download_info.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/resolver.h include/torrent/net/socket_address.h include/torrent/net/socket_address_key.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_config.h include/torrent/runtime/network_manager.h +include/torrent/runtime/proxy_manager.h include/torrent/runtime/runtime.h include/torrent/runtime/socket_manager.h include/torrent/system/callbacks.h include/torrent/system/poll.h include/torrent/system/system.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/types/string_utf8.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/string_manip.h include/torrent/utils/unordered_vector.h include/torrent/utils/uri_parser.h lib/libtorrent.so -lib/libtorrent.so.45 -lib/libtorrent.so.45.0.0 +lib/libtorrent.so.47 +lib/libtorrent.so.47.0.0 libdata/pkgconfig/libtorrent.pc diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 0ae8dcc549c6..ccd3fb17f69e 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -1,47 +1,49 @@ PORTNAME= rtorrent -DISTVERSION= 0.16.15 +DISTVERSION= 0.16.17 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 +BROKEN_i386= error: static assertion failed; see also: https://github.com/rakshasa/rtorrent/issues/1859 + 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 9f0dc301c5c1..c21d7b018ac3 100644 --- a/net-p2p/rtorrent/distinfo +++ b/net-p2p/rtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1782155904 -SHA256 (rtorrent-0.16.15.tar.gz) = 202b56b75916cae86b4db4208cc42279f12d07a06e2ffba8ac8361bcb6dac18d -SIZE (rtorrent-0.16.15.tar.gz) = 868541 +TIMESTAMP = 1783343880 +SHA256 (rtorrent-0.16.17.tar.gz) = 115cdb6bf70f5c0f43687ca57c974bc45a7ff970562a56b51b971b9bf51ef0a1 +SIZE (rtorrent-0.16.17.tar.gz) = 868244 diff --git a/net-p2p/rtorrent/files/patch-Fix-i386 b/net-p2p/rtorrent/files/patch-Fix-i386 deleted file mode 100644 index de47190588b4..000000000000 --- a/net-p2p/rtorrent/files/patch-Fix-i386 +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/rakshasa/rtorrent/issues/1859 - ---- src/rpc/command.h.orig 2026-06-30 20:49:08 UTC -+++ src/rpc/command.h -@@ -169,8 +169,10 @@ class command_base { (public) - template - void set_function(T s, [[maybe_unused]] int value = command_base_is_valid::value) { - static_assert(sizeof(T) <= sizeof(t_pod), "t_pod storage overflow"); -- static_assert(alignof(std::max_align_t) % alignof(T) == 0, "t_pod alignment insufficient for type"); -- static_assert(alignof(std::max_align_t) >= alignof(T), "t_pod structural capacity mismatch"); -+ #if !defined(__i386__) -+ static_assert(alignof(std::max_align_t) % alignof(T) == 0, "t_pod alignment insufficient for type"); -+ static_assert(alignof(std::max_align_t) >= alignof(T), "t_pod structural capacity mismatch"); -+ #endif - - if (m_dest_helper) - m_dest_helper(t_pod);