CVS commit: pkgsrc/net/rtorrent

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  4 09:02:01 UTC 2024

Modified Files:
        pkgsrc/net/rtorrent: Makefile distinfo
        pkgsrc/net/rtorrent/patches: patch-src_utils_directory.h
Added Files:
        pkgsrc/net/rtorrent/patches: patch-src_core_download__store.cc

Log Message:
rtorrent: updated to 0.10.0

RTorrent release version 0.10.0

Thanks to a 3rd party sponsoring development, and recent changes in my personal life, I've started actively developing rtorrent.

Some of the recent PR's merged include:

libtorrent

Significant performance improvements to improve throughput and reduce CPU usage.
A fix for a torrent client crash with the socket address object.
Support for 33 gigabit speed throttles on ruTorrent.

rTorrent

A fix for a torrent client stack overflow crash with the lockfile buffer.
New trackers.delay_scrape command for .rtorrent.rc to avoid crashes with thousands of torrents and allow instant startups.
A fix for compiling the software with LTO (Link Time Optimizations) for additional performance.
A fix for a critical memory leak with RPC commands which may waste an alarming amount of memory.
A fix for critical torrent client breakage if a power outage/failure occurs during a session saving interval.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/rtorrent/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/rtorrent/patches/patch-src_core_download__store.cc
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/rtorrent/patches/patch-src_utils_directory.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/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.94 pkgsrc/net/rtorrent/Makefile:1.95
--- pkgsrc/net/rtorrent/Makefile:1.94   Wed May 29 16:34:03 2024
+++ pkgsrc/net/rtorrent/Makefile        Fri Oct  4 09:02:01 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2024/05/29 16:34:03 adam Exp $
+# $NetBSD: Makefile,v 1.95 2024/10/04 09:02:01 adam Exp $
 
-DISTNAME=      rtorrent-0.9.8
-PKGREVISION=   16
+DISTNAME=      rtorrent-0.10.0
 CATEGORIES=    net
-MASTER_SITES=  https://rtorrent.net/downloads/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rakshasa/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/rakshasa/rtorrent
@@ -23,12 +23,12 @@ LDFLAGS+=   ${PTHREAD_LDFLAGS}
 
 # See http://libtorrent.rakshasa.no/ticket/77
 .include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-4.0.*)
+.if ${CC_VERSION:Mgcc-4.0.*}
 CXXFLAGS+=     -fpermissive -fno-strength-reduce -fno-thread-jumps \
                -fno-inline -fforce-addr
 .endif
 
-.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi?86)
+.if ${CC_VERSION:Mgcc-*} && !empty(MACHINE_ARCH:Mi?86)
 CXXFLAGS+=     -march=i486
 .endif
 

Index: pkgsrc/net/rtorrent/distinfo
diff -u pkgsrc/net/rtorrent/distinfo:1.40 pkgsrc/net/rtorrent/distinfo:1.41
--- pkgsrc/net/rtorrent/distinfo:1.40   Tue Oct 26 11:06:49 2021
+++ pkgsrc/net/rtorrent/distinfo        Fri Oct  4 09:02:01 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.40 2021/10/26 11:06:49 nia Exp $
+$NetBSD: distinfo,v 1.41 2024/10/04 09:02:01 adam Exp $
 
-BLAKE2s (rtorrent-0.9.8.tar.gz) = efb96e697e5f1e6b963698a8eee014c68c6a6679339e5d65eddd0ccdf4bcd389
-SHA512 (rtorrent-0.9.8.tar.gz) = 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
-Size (rtorrent-0.9.8.tar.gz) = 647523 bytes
+BLAKE2s (rtorrent-0.10.0.tar.gz) = f8643ba677c4d461c59bb1471bc5323e238445c1f80eae37bab789627d336891
+SHA512 (rtorrent-0.10.0.tar.gz) = 9c1ca99cd84e5a0984cffd48e37c9f78f66e867cd4df9b1ba0d6060fe447e1c0dd0083328de699fa7011f2b6dd6a22ac569756f24fde074401d8d9a8a11eb636
+Size (rtorrent-0.10.0.tar.gz) = 402931 bytes
+SHA1 (patch-src_core_download__store.cc) = f075273fb4e42fa06e49256d444758dde6b3322d
 SHA1 (patch-src_display_canvas.h) = 6b10c508158d594bcb0633c9e7f3e2885f8456d1
 SHA1 (patch-src_utils_directory.cc) = b3b38e1d9d0887711ac54433e948bfc28112b985
-SHA1 (patch-src_utils_directory.h) = a370881bfdd8534eb25fcbcff8d258b19797941f
+SHA1 (patch-src_utils_directory.h) = 77280b6ab0ba69c77c5bb88eca7beb11954415ad

Index: pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h
diff -u pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h:1.1 pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h:1.2
--- pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h:1.1 Sun Jun 24 16:59:52 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h     Fri Oct  4 09:02:01 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_utils_directory.h,v 1.1 2018/06/24 16:59:52 adam Exp $
+$NetBSD: patch-src_utils_directory.h,v 1.2 2024/10/04 09:02:01 adam Exp $
 
 Fix build under Solaris and DragonFly.
 
---- src/utils/directory.h.orig 2012-03-29 14:06:11.000000000 +0100
-+++ src/utils/directory.h      2012-05-14 23:40:30.000000000 +0100
-@@ -50,7 +50,7 @@
+--- src/utils/directory.h.orig 2024-09-07 06:29:21.000000000 +0000
++++ src/utils/directory.h
+@@ -50,7 +50,7 @@ struct directory_entry {
    // The name and types should match POSIX.
-   uint32_t            d_fileno;
-   uint32_t            d_reclen; //Not used. Messes with Solaris.
--  uint8_t             d_type;
-+  uint32_t             d_type;
+   uint32_t            s_fileno;
+   uint32_t            s_reclen; //Not used. Messes with Solaris.
+-  uint8_t             s_type;
++  uint32_t            s_type;
  
-   std::string         d_name;
+   std::string         s_name;
  };

Added files:

Index: pkgsrc/net/rtorrent/patches/patch-src_core_download__store.cc
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-src_core_download__store.cc:1.1
--- /dev/null   Fri Oct  4 09:02:01 2024
+++ pkgsrc/net/rtorrent/patches/patch-src_core_download__store.cc       Fri Oct  4 09:02:01 2024
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_core_download__store.cc,v 1.1 2024/10/04 09:02:01 adam Exp $
+
+Darwin does not define fdatasync(). Fix copied from Qt.
+https://github.com/rakshasa/rtorrent/issues/1304
+
+--- src/core/download_store.cc.orig    2024-10-03 17:46:35.720389128 +0000
++++ src/core/download_store.cc
+@@ -129,7 +129,11 @@ DownloadStore::write_bencode(const std::
+   if (fd < 0)
+     goto download_store_save_error;
+ 
++#if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO > 0
+   fdatasync(fd);
++#else
++  fsync(fd);
++#endif
+   ::close(fd);
+ 
+   return true;