commit: 3cb7451b0f687b65e678efb8d530bbf6aed07d73 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Jun 5 07:58:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 6 14:08:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb7451b
net-p2p/rtorrent: drop 0.10.0 Can't be stabilized (see bug below) Keep 0.15.1 for keywords Bug: https://bugs.gentoo.org/946551 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42454 Closes: https://github.com/gentoo/gentoo/pull/42454 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/rtorrent/Manifest | 3 +- .../files/rtorrent-0.10.0-fix-calls-ar.patch | 27 -------- .../rtorrent-0.10.0-scgi-software-crash.patch | 32 --------- net-p2p/rtorrent/rtorrent-0.10.0.ebuild | 79 ---------------------- 4 files changed, 1 insertion(+), 140 deletions(-) diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index 9434c3d87fab..8ffeaee2a7ba 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,5 +1,4 @@ -DIST rtorrent-0.10.0.tar.gz 402931 BLAKE2B 3e11dafeb54fd1435176829c1dc45a9d5ad3bcbfc22a5a3738f3767891adad351d41ae2b40a859ab1bee600250833edd43507558cfdb0fdc51c4381b7336bdb2 SHA512 9c1ca99cd84e5a0984cffd48e37c9f78f66e867cd4df9b1ba0d6060fe447e1c0dd0083328de699fa7011f2b6dd6a22ac569756f24fde074401d8d9a8a11eb636 -DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7 DIST rtorrent-0.15.1.tar.gz 688056 BLAKE2B 0fd0b3748e1ec13935fa900434ad5d54c6062ea48c5f8cb320d0a30cb318c09f80347ca665c61a7745770c965eee5e1cfa7e96968a2468ad06711b80be5d6e92 SHA512 e5c713601ecb0c4536b64d98ca53261db35980b04a3f274d12f51467b021d77768e7f6a2004a33a76a99f7d96e0a2c3de4605fd7ee186ba05a7c16aa96b97ea5 DIST rtorrent-0.15.3.tar.gz 858703 BLAKE2B 9684141b9785a38ba609783aa5d294fb09f777f73beddf7d683531ad79c3fd09ed9b0a6118ef4f87678c5343d660bdd7a5ab18f5ec8e05a2c71a06588576579c SHA512 060319e0e4a5563c29d21b41e369e14e37bf5cc949c60cf482432c4cadda82151e0c5fef8f8082fd765b777b758676907eed070840117cac30565406717cf77c DIST rtorrent-0.15.4.tar.gz 866692 BLAKE2B 941defa4393f29ca562bde6692c201df2e64bc2bf83c9a7aa85f8d19884723868019d54e19cb8f27c303dca094c3c135980ddac278960c657812fb4abd5a66e6 SHA512 9e197a49478e2df8959ce92eb065d4c063bfc096509bc53f13bcc2ebb1b1cc89e7156badb11b7a617d018d4dd77291a0e96762d28bc237deacdb29a36d96af1d +DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7 diff --git a/net-p2p/rtorrent/files/rtorrent-0.10.0-fix-calls-ar.patch b/net-p2p/rtorrent/files/rtorrent-0.10.0-fix-calls-ar.patch deleted file mode 100644 index 21387d989130..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.10.0-fix-calls-ar.patch +++ /dev/null @@ -1,27 +0,0 @@ -Merged in upstream : -https://github.com/rakshasa/rtorrent/commit/73c1233dc09d83e26f9ea41b8e7276daa6926d17 - -From d0e7f26ff6b5a769d53b613180337056936e22fd Mon Sep 17 00:00:00 2001 -From: PPN-SD [email protected] -Date: Sun, 10 Nov 2024 08:31:45 +0100 -Subject: [PATCH] Fix calls ar directly - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index a4dd61d..8d8c463 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -5,6 +5,7 @@ AC_INIT([rtorrent], [0.10.0], [[email protected]]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIRS([scripts]) - AM_INIT_AUTOMAKE([foreign subdir-objects]) -+AM_PROG_AR - - AC_DEFINE([API_VERSION], [10], [api version]) - --- -2.45.2 - diff --git a/net-p2p/rtorrent/files/rtorrent-0.10.0-scgi-software-crash.patch b/net-p2p/rtorrent/files/rtorrent-0.10.0-scgi-software-crash.patch deleted file mode 100644 index 7a329eb38ac9..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.10.0-scgi-software-crash.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b284be6a66b67c625ae255989c3a3d021ebc7c6b Mon Sep 17 00:00:00 2001 -From: stickz <[email protected]> -Date: Fri, 25 Oct 2024 12:35:43 -0400 -Subject: [PATCH] Resolve scgi software crash - -This commit resolves a scgi software crash when the scgi socket is closed before the message can be sent. It instructs `::send()` not to send a SIGPIPE termination signal. Instead the value -1 is returned and handled bellow. The SCgiTask is closed and a new one is sent to complete the task. - -``` -Thread 3 "rtorrent scgi" received signal SIGPIPE, Broken pipe. - [Switching to Thread 0x7fffe635c6c0 (LWP 2443872)] -0x00007ffff7929a84 in send () from /lib/x86_64-linux-gnu/libc.so.6 -``` ---- - src/rpc/scgi_task.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rpc/scgi_task.cc b/src/rpc/scgi_task.cc -index 9f2e329..160ba50 100644 ---- a/src/rpc/scgi_task.cc -+++ b/src/rpc/scgi_task.cc -@@ -200,7 +200,7 @@ SCgiTask::event_read() { - - void - SCgiTask::event_write() { -- int bytes = ::send(m_fileDesc, m_position, m_bufferSize, 0); -+ int bytes = ::send(m_fileDesc, m_position, m_bufferSize, MSG_NOSIGNAL); - - if (bytes == -1) { - if (!rak::error_number::current().is_blocked_momentary()) --- -2.45.2 - diff --git a/net-p2p/rtorrent/rtorrent-0.10.0.ebuild b/net-p2p/rtorrent/rtorrent-0.10.0.ebuild deleted file mode 100644 index 3edd3998e0fe..000000000000 --- a/net-p2p/rtorrent/rtorrent-0.10.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools linux-info systemd - -DESCRIPTION="BitTorrent Client using libtorrent" -HOMEPAGE="https://rakshasa.github.io/rtorrent/" -# rtorrent-archive is an exact match to the tarballs also uploaded to -# https://github.com/rakshasa/rtorrent/releases, but the problem with that more -# common path is the libtorrent/rtorrent versions are not in sync, so updating -# libtorrent wouldnt be more annoying. -SRC_URI="https://github.com/rakshasa/rtorrent-archive/raw/master/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug selinux test xmlrpc" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="~net-libs/libtorrent-0.14.${PV##*.} - net-misc/curl - sys-libs/ncurses:0= - xmlrpc? ( dev-libs/xmlrpc-c:= )" -RDEPEND="${COMMON_DEPEND} - selinux? ( sec-policy/selinux-rtorrent ) -" -DEPEND="${COMMON_DEPEND} - dev-util/cppunit - virtual/pkgconfig" - -DOCS=( doc/rtorrent.rc ) - -PATCHES=( - # Merged in upstream. To be removed for the next release. - "${FILESDIR}"/${PN}-0.10.0-fix-calls-ar.patch - - "${FILESDIR}"/${PN}-0.10.0-scgi-software-crash.patch -) - -pkg_setup() { - if ! linux_config_exists || ! linux_chkconfig_present IPV6; then - ewarn "rtorrent will not start without IPv6 support in your kernel" - ewarn "without further configuration. Please set bind=0.0.0.0 or" - ewarn "similar in your rtorrent.rc" - ewarn "Upstream bug: https://github.com/rakshasa/rtorrent/issues/732" - fi -} - -src_prepare() { - default - - # https://github.com/rakshasa/rtorrent/issues/332 - cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die - - if [[ ${CHOST} != *-darwin* ]]; then - # syslibroot is only for macos, change to sysroot for others - sed -i 's/Wl,-syslibroot,/Wl,--sysroot,/' "${S}/scripts/common.m4" || die - fi - - eautoreconf -} - -src_configure() { - # configure needs bash or script bombs out on some null shift, bug #291229 - CONFIG_SHELL=${BASH} econf \ - $(use_enable debug) \ - $(use_with xmlrpc xmlrpc-c) -} - -src_install() { - default - doman doc/rtorrent.1 - - newinitd "${FILESDIR}/rtorrent-r1.init" rtorrent - newconfd "${FILESDIR}/rtorrentd.conf" rtorrent - systemd_newunit "${FILESDIR}/rtorrentd_at-r1.service" "[email protected]" -}
