CVS commit: pkgsrc/net

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Sep  7 07:49:16 UTC 2025

Modified Files:
        pkgsrc/net/libtorrent: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/net/rtorrent: Makefile PLIST distinfo
        pkgsrc/net/rtorrent/patches: patch-src_display_canvas.h
Removed Files:
        pkgsrc/net/libtorrent/patches:
            patch-src_torrent_net_socket__address__key.h

Log Message:
libtorrent rtorrent: updated to 0.16.0

0.16.0

This release moves libcurl dependency to libtorrent and makes http requests in a separate thread. The network.block.* commands now work properly for IPv4/6, although IPv6 support still has some 
issues.

DHT has been fixed and magnet links without any embedded trackers should now work properly.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/libtorrent/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/libtorrent/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/libtorrent/buildlink3.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/net/libtorrent/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h
cvs rdiff -u -r1.109 -r1.110 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/rtorrent/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/rtorrent/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libtorrent/Makefile
diff -u pkgsrc/net/libtorrent/Makefile:1.72 pkgsrc/net/libtorrent/Makefile:1.73
--- pkgsrc/net/libtorrent/Makefile:1.72 Mon Aug 25 09:14:58 2025
+++ pkgsrc/net/libtorrent/Makefile      Sun Sep  7 07:49:15 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2025/08/25 09:14:58 adam Exp $
+# $NetBSD: Makefile,v 1.73 2025/09/07 07:49:15 adam Exp $
 
-DISTNAME=      libtorrent-0.15.6
+DISTNAME=      libtorrent-0.16.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rakshasa/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -55,5 +55,6 @@ pre-configure:
        set -e; cd ${WRKSRC} && autoreconf -fi
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libtorrent/PLIST
diff -u pkgsrc/net/libtorrent/PLIST:1.17 pkgsrc/net/libtorrent/PLIST:1.18
--- pkgsrc/net/libtorrent/PLIST:1.17    Sun Jun  1 17:38:28 2025
+++ pkgsrc/net/libtorrent/PLIST Sun Sep  7 07:49:15 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2025/06/01 17:38:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2025/09/07 07:49:15 adam Exp $
 include/torrent/bitfield.h
 include/torrent/chunk_manager.h
 include/torrent/common.h
@@ -26,9 +26,10 @@ 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/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

Index: pkgsrc/net/libtorrent/buildlink3.mk
diff -u pkgsrc/net/libtorrent/buildlink3.mk:1.27 pkgsrc/net/libtorrent/buildlink3.mk:1.28
--- pkgsrc/net/libtorrent/buildlink3.mk:1.27    Fri Oct  4 09:00:05 2024
+++ pkgsrc/net/libtorrent/buildlink3.mk Sun Sep  7 07:49:15 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2024/10/04 09:00:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2025/09/07 07:49:15 adam Exp $
 
 BUILDLINK_TREE+=       libtorrent
 
@@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.libtorrent+=    libto
 BUILDLINK_PKGSRCDIR.libtorrent?=       ../../net/libtorrent
 
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .endif # LIBTORRENT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libtorrent

Index: pkgsrc/net/libtorrent/distinfo
diff -u pkgsrc/net/libtorrent/distinfo:1.51 pkgsrc/net/libtorrent/distinfo:1.52
--- pkgsrc/net/libtorrent/distinfo:1.51 Mon Aug 25 09:14:58 2025
+++ pkgsrc/net/libtorrent/distinfo      Sun Sep  7 07:49:15 2025
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.51 2025/08/25 09:14:58 adam Exp $
+$NetBSD: distinfo,v 1.52 2025/09/07 07:49:15 adam Exp $
 
-BLAKE2s (libtorrent-0.15.6.tar.gz) = 1000f5a0ed86c71ad79d682538dbd865403dac17631b5135c8b11774a9d60e9b
-SHA512 (libtorrent-0.15.6.tar.gz) = 858f7897a6ef0761d551b0a2837e52e230ea36eeaaea1cf0509abffdc5010e5a9123f00ec3ab8dd1994ed621a2da45bca48e35b7b4d395b07e170cbf0807187a
-Size (libtorrent-0.15.6.tar.gz) = 454932 bytes
+BLAKE2s (libtorrent-0.16.0.tar.gz) = 8a10ed342d0221439d5e4850be3f542a20d32e668e781ac8772fcd785abf6357
+SHA512 (libtorrent-0.16.0.tar.gz) = 64d4f0d583358dabf4b8f71ebb998908fd9b2d19f9c95cfdcf32e41391353cd26dfbcb537f6a3ff025e1c3cba6a0d26373d1c2bd6302996b5939a762db5eaedd
+Size (libtorrent-0.16.0.tar.gz) = 458920 bytes
 SHA1 (patch-src_data_chunk__list.cc) = 581e38ccd2e31b991e1a95dcd4836a7bda11e4e6
 SHA1 (patch-src_data_memory__chunk.cc) = 25c1e529223ab4873f61430e922949eeb29637c4
-SHA1 (patch-src_torrent_net_socket__address__key.h) = a50248e4272f413458236730508d5903fdeba53d

Index: pkgsrc/net/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.109 pkgsrc/net/rtorrent/Makefile:1.110
--- pkgsrc/net/rtorrent/Makefile:1.109  Mon Aug 25 09:14:58 2025
+++ pkgsrc/net/rtorrent/Makefile        Sun Sep  7 07:49:16 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2025/08/25 09:14:58 adam Exp $
+# $NetBSD: Makefile,v 1.110 2025/09/07 07:49:16 adam Exp $
 
-DISTNAME=      rtorrent-0.15.6
+DISTNAME=      rtorrent-0.16.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rakshasa/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -47,6 +47,5 @@ post-install:
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../net/libtorrent/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/rtorrent/PLIST
diff -u pkgsrc/net/rtorrent/PLIST:1.5 pkgsrc/net/rtorrent/PLIST:1.6
--- pkgsrc/net/rtorrent/PLIST:1.5       Wed Mar  7 00:19:08 2012
+++ pkgsrc/net/rtorrent/PLIST   Sun Sep  7 07:49:16 2025
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/07 00:19:08 elric Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/09/07 07:49:16 adam Exp $
 bin/rtorrent
 share/examples/rtorrent/rtorrent.rc
+share/rtorrent/lua/rtorrent.lua

Index: pkgsrc/net/rtorrent/distinfo
diff -u pkgsrc/net/rtorrent/distinfo:1.47 pkgsrc/net/rtorrent/distinfo:1.48
--- pkgsrc/net/rtorrent/distinfo:1.47   Mon Aug 25 09:14:58 2025
+++ pkgsrc/net/rtorrent/distinfo        Sun Sep  7 07:49:16 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2025/08/25 09:14:58 adam Exp $
+$NetBSD: distinfo,v 1.48 2025/09/07 07:49:16 adam Exp $
 
-BLAKE2s (rtorrent-0.15.6.tar.gz) = 64f98b882808cada055b412ec93f3edb0a02d824f6445427753a02f827a6e928
-SHA512 (rtorrent-0.15.6.tar.gz) = ccc6a70695c02fe94af6c0ede240ae26167479c4324b3991c0ed64ae7dc92f99cc5e01c770ebac5f4a7e7de8fe546c37263fdc74462ae181bac7b167b574bcba
-Size (rtorrent-0.15.6.tar.gz) = 866966 bytes
-SHA1 (patch-src_display_canvas.h) = 56fa7905b3e11c6fd277d64b1209e7207e6a4a8e
+BLAKE2s (rtorrent-0.16.0.tar.gz) = 699cbf7b8fc2ecf99842f892f0852ce49820df53cdbff7923b5bb34a75e37e63
+SHA512 (rtorrent-0.16.0.tar.gz) = 98f07d45b423e06f2d21b390bcf4f69f32ee180a6ab41f31665bf2ec1072691a3a1fde42d27b4c5f96dede755d61589b33486a35a7a7c60ca6ada71b16c2b339
+Size (rtorrent-0.16.0.tar.gz) = 854573 bytes
+SHA1 (patch-src_display_canvas.h) = c097e0ac95b2df2c3c54dbf4367f7f9f76adbd10
 SHA1 (patch-src_utils_directory.cc) = b3b38e1d9d0887711ac54433e948bfc28112b985
 SHA1 (patch-src_utils_directory.h) = 77280b6ab0ba69c77c5bb88eca7beb11954415ad

Index: pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h
diff -u pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.2 pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.3
--- pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.2  Tue Apr  1 09:37:54 2025
+++ pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h      Sun Sep  7 07:49:16 2025
@@ -1,18 +1,10 @@
-$NetBSD: patch-src_display_canvas.h,v 1.2 2025/04/01 09:37:54 adam Exp $
+$NetBSD: patch-src_display_canvas.h,v 1.3 2025/09/07 07:49:16 adam Exp $
 
 Make this work with "ncurses" 5.8. Patch taken from:
 http://www.mail-archive.com/arch-general%archlinux.org@localhost/msg18728.html
 
 --- src/display/canvas.h.orig  2025-03-28 18:55:13.000000000 +0000
 +++ src/display/canvas.h
-@@ -1,6 +1,7 @@
- #ifndef RTORRENT_DISPLAY_CANVAS_H
- #define RTORRENT_DISPLAY_CANVAS_H
- 
-+#include <cstdarg>
- #include <string>
- #include <unordered_map>
- #include <vector>
 @@ -15,7 +16,7 @@ public:
    typedef std::vector<Attributes>      attributes_list;
    typedef std::unordered_map<int, int> attributes_map;