CVS commit: pkgsrc/net/transmission

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Feb 20 17:01:51 UTC 2023

Modified Files:
        pkgsrc/net/transmission: Makefile distinfo
Added Files:
        pkgsrc/net/transmission/patches: patch-libtransmission_completion.cc
            patch-libtransmission_completion.h

Log Message:
Ptch to fix "assertion failed leftUntilDone <= sizeWhenDone"

https://github.com/transmission/transmission/pull/4879/commits/57ff8bda34e7d752b76b750b699932500664198d

Bump PKGREVISION

wiz-ack "Definitely"


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/transmission/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/transmission/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/transmission/patches/patch-libtransmission_completion.cc \
    pkgsrc/net/transmission/patches/patch-libtransmission_completion.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/transmission/Makefile
diff -u pkgsrc/net/transmission/Makefile:1.34 pkgsrc/net/transmission/Makefile:1.35
--- pkgsrc/net/transmission/Makefile:1.34       Tue Feb 14 09:45:39 2023
+++ pkgsrc/net/transmission/Makefile    Mon Feb 20 17:01:51 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2023/02/14 09:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2023/02/20 17:01:51 abs Exp $
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 DEPENDS+=      transmission-common>=${VERSION}:../../net/transmission-common
 

Index: pkgsrc/net/transmission/distinfo
diff -u pkgsrc/net/transmission/distinfo:1.22 pkgsrc/net/transmission/distinfo:1.23
--- pkgsrc/net/transmission/distinfo:1.22       Mon Feb 13 13:48:11 2023
+++ pkgsrc/net/transmission/distinfo    Mon Feb 20 17:01:51 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.22 2023/02/13 13:48:11 wiz Exp $
+$NetBSD: distinfo,v 1.23 2023/02/20 17:01:51 abs Exp $
 
 BLAKE2s (transmission-4.0.0.tar.xz) = 4b701562e5b72b5eb60b203c3f682135404feed2083cb04801a42818361eae39
 SHA512 (transmission-4.0.0.tar.xz) = 79945af73fe7226dddadba7cc039516f2f878e05a9cf6c6d799b636b8298e2b2fa25c4426789bd41ef4d2b00d75a3c1c115c1676b4d2a9f09a1526456dceb3f8
 Size (transmission-4.0.0.tar.xz) = 10351556 bytes
 SHA1 (patch-CMakeLists.txt) = 3be8d125e64759e190dd2acae746a9f505b52763
 SHA1 (patch-libtransmission_CMakeLists.txt) = b4f697ecd5dd22fafa38fa72d0bc47b2d940e8dc
+SHA1 (patch-libtransmission_completion.cc) = e774dd8781571728384c59a87c293dcbe05c53cf
+SHA1 (patch-libtransmission_completion.h) = 31171a30d079f313b74f05e7c058a62a6dbc80d0

Added files:

Index: pkgsrc/net/transmission/patches/patch-libtransmission_completion.cc
diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_completion.cc:1.1
--- /dev/null   Mon Feb 20 17:01:52 2023
+++ pkgsrc/net/transmission/patches/patch-libtransmission_completion.cc Mon Feb 20 17:01:51 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-libtransmission_completion.cc,v 1.1 2023/02/20 17:01:51 abs Exp $
+
+patch to fix "assertion failed leftUntilDone <= sizeWhenDone"
+https://github.com/transmission/transmission/pull/4879/commits/57ff8bda34e7d752b76b750b699932500664198d
+
+file 1/2
+
+--- libtransmission/completion.cc.orig 2023-01-30 05:23:05.000000000 +0000
++++ libtransmission/completion.cc
+@@ -156,13 +156,28 @@ void tr_completion::addPiece(tr_piece_in
+     }
+ }
+ 
+-void tr_completion::removePiece(tr_piece_index_t piece)
++void tr_completion::removeBlock(tr_block_index_t block)
+ {
+-    auto const [begin, end] = block_info_->blockSpanForPiece(piece);
+-    size_now_ -= countHasBytesInPiece(piece);
++    if (!hasBlock(block))
++    {
++        return; // already didn't have it
++    }
++
++    blocks_.unset(block);
++    size_now_ -= block_info_->blockSize(block);
++
+     size_when_done_.reset();
+     has_valid_.reset();
+-    blocks_.unsetSpan(begin, end);
++}
++
++void tr_completion::removePiece(tr_piece_index_t piece)
++{
++    auto const [begin, end] = block_info_->blockSpanForPiece(piece);
++
++    for (auto block = begin; block < end; ++block)
++    {
++        removeBlock(block);
++    }
+ }
+ 
+ uint64_t tr_completion::countHasBytesInSpan(tr_byte_span_t span) const
Index: pkgsrc/net/transmission/patches/patch-libtransmission_completion.h
diff -u /dev/null pkgsrc/net/transmission/patches/patch-libtransmission_completion.h:1.1
--- /dev/null   Mon Feb 20 17:01:52 2023
+++ pkgsrc/net/transmission/patches/patch-libtransmission_completion.h  Mon Feb 20 17:01:51 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-libtransmission_completion.h,v 1.1 2023/02/20 17:01:51 abs Exp $
+
+patch to fix "assertion failed leftUntilDone <= sizeWhenDone"
+https://github.com/transmission/transmission/pull/4879/commits/57ff8bda34e7d752b76b750b699932500664198d
+
+file 2/2
+
+--- libtransmission/completion.h.orig  2023-01-30 05:23:05.000000000 +0000
++++ libtransmission/completion.h
+@@ -172,6 +172,8 @@ private:
+         return countHasBytesInSpan(block_info_->byteSpanForPiece(piece));
+     }
+ 
++    void removeBlock(tr_block_index_t block);
++
+     torrent_view const* tor_;
+     tr_block_info const* block_info_;
+