git: e1fc31252d31 - 2025Q2 - net-p2p/{lib,r}torrent: Update to 0.15.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Jun 2025 18:09:38 UTC
The branch 2025Q2 has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e1fc31252d310d821c243bee06f1b11bf1b69a8e
commit e1fc31252d310d821c243bee06f1b11bf1b69a8e
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-06-01 17:51:13 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-06-01 17:57:30 +0000
net-p2p/{lib,r}torrent: Update to 0.15.4
ChangeLog: https://github.com/rakshasa/rtorrent/releases/tag/v0.15.4
MFH: 2025Q2 (bugfix release)
(cherry picked from commit 5bb5070238f9977dee333abcc7ff7ca615b512c5)
---
net-p2p/libtorrent/Makefile | 2 +-
net-p2p/libtorrent/distinfo | 6 +++---
.../libtorrent/files/patch-src_data_memory__chunk.cc | 6 +++---
.../files/patch-src_torrent_connection__manager.h | 6 +++---
.../patch-src_torrent_net_socket__address__key.h | 4 ++--
.../files/patch-src_torrent_poll__kqueue.cc | 20 --------------------
net-p2p/libtorrent/pkg-plist | 10 +++-------
net-p2p/rtorrent/Makefile | 2 +-
net-p2p/rtorrent/distinfo | 6 +++---
9 files changed, 19 insertions(+), 43 deletions(-)
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,5 +1,5 @@
PORTNAME= libtorrent
-DISTVERSION= 0.15.3
+DISTVERSION= 0.15.4
CATEGORIES= net-p2p
MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/
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,6 +1,6 @@
---- 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");
@@ -9,4 +9,4 @@
+
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,7 +1,7 @@
---- 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 <functional>
#include <list>
#include <arpa/inet.h>
+#include <sys/types.h>
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,8 +1,8 @@
---- 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 <cstring>
- #include <inttypes.h>
+ #include <cinttypes>
#include <netinet/in.h>
+#include <sys/socket.h>
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 <sys/event.h>
- #include <sys/select.h>
- #include <sys/time.h>
-+
-+#include <assert.h>
- #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
@@ -47,9 +47,6 @@ 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
@@ -58,14 +55,13 @@ 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
@@ -73,6 +69,6 @@ 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,5 +1,5 @@
PORTNAME= rtorrent
-DISTVERSION= 0.15.3
+DISTVERSION= 0.15.4
CATEGORIES= net-p2p
MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/
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