* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2017-08-19 10:07 Jason Zaman
0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2017-08-19 10:07 UTC (permalink / raw
To: gentoo-commits
commit: cd9ec0ed5640e05a515e3f68cad24e9dad23c3c7
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 06:59:36 2017 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 10:06:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9ec0ed
net-p2p/rtorrent: fix building against cppunit (bug 620908)
Thanks to Nado and Ben Kohler
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/rtorrent-0.9.6-cppunit-pkgconfig.patch | 28 ++++++++++
net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch
new file mode 100644
index 00000000000..753f4cb8a7f
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/620908
+
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2017-08-17 08:52:49.596897308 -0500
++++ b/configure.ac 2017-08-17 08:54:57.171515415 -0500
+@@ -4,7 +4,6 @@
+
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+@@ -43,9 +42,11 @@
+ fi])
+ ])
+
+-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS"
+-LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS"
++PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
++
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
++CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS"
++LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBS"
+
+ PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4,
+ CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
new file mode 100644
index 00000000000..483629ab5db
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils systemd
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="daemon debug ipv6 selinux test xmlrpc"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+ >=dev-libs/libsigc++-2.2.2:2
+ >=net-misc/curl-7.19.1
+ sys-libs/ncurses:0=
+ xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+ daemon? ( app-misc/screen )
+ selinux? ( sec-policy/selinux-rtorrent )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/cppunit
+ virtual/pkgconfig"
+
+DOCS=( doc/rtorrent.rc )
+
+src_prepare() {
+ # bug #358271
+ epatch \
+ "${FILESDIR}"/${PN}-0.9.1-ncurses.patch \
+ "${FILESDIR}"/${PN}-0.9.4-tinfo.patch \
+ "${FILESDIR}"/${PN}-0.9.6-cppunit-pkgconfig.patch
+
+ # https://github.com/rakshasa/rtorrent/issues/332
+ cp "${FILESDIR}"/rtorrent.1 "${S}"/doc/ || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # configure needs bash or script bombs out on some null shift, bug #291229
+ CONFIG_SHELL=${BASH} econf \
+ --disable-dependency-tracking \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+ default
+ doman doc/rtorrent.1
+
+ if use daemon; then
+ newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
+ newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+ systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2018-06-19 5:38 Jason Zaman
0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2018-06-19 5:38 UTC (permalink / raw
To: gentoo-commits
commit: e9423224749658cd38c46397c046ec89afd57d7d
Author: Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
AuthorDate: Mon Jun 18 23:46:37 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 05:37:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9423224
net-p2p/rtorrent: resolve ncurses compile failure
Adds a patch to ensure tinfo is correctly linked.
This only occurs when ncurses is built with the "tinfo" useflag.
Closes: https://bugs.gentoo.org/658390
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-p2p/rtorrent/files/rtorrent-0.9.7-tinfo.patch | 31 +++++++++++++++++++++++
net-p2p/rtorrent/rtorrent-0.9.7.ebuild | 4 +++
2 files changed, 35 insertions(+)
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.7-tinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.9.7-tinfo.patch
new file mode 100644
index 00000000000..8bb009eb676
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.7-tinfo.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac 2018-06-06 23:25:24.000000000 -0500
++++ b/configure.ac 2018-06-18 15:19:52.398995740 -0500
+@@ -32,17 +32,23 @@
+ TORRENT_WITHOUT_STATFS
+
+ AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
+-AX_WITH_CURSES
+-
+-if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+- AC_MSG_ERROR([requires either NcursesW or Ncurses library])
+-fi
++PKG_CHECK_MODULES([CURSES],[ncursesw],[
++ AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
++ ],
++ [PKG_CHECK_MODULES([CURSES],[ncurses],[
++ AC_DEFINE(HAVE_NCURSES_H, 1)
++ ],
++ [AX_WITH_CURSES()
++ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
++ AC_MSG_ERROR([requires either NcursesW or Ncurses library])
++ fi])
++ ])
+
+ PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG])
+ PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
+ PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.7])
+
+-LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
++LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
index f621ce1a181..3b1b5da0040 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
@@ -29,6 +29,10 @@ DEPEND="${COMMON_DEPEND}
DOCS=( doc/rtorrent.rc )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.7-tinfo.patch"
+)
+
pkg_setup() {
if ! linux_config_exists || ! linux_chkconfig_present IPV6; then
ewarn "rtorrent will not start without IPv6 support in your kernel"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2018-07-03 6:04 Jason Zaman
0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2018-07-03 6:04 UTC (permalink / raw
To: gentoo-commits
commit: 02114366f60e28c528b8f94c5a5f27ac25b5d3c9
Author: Stephen Shkardoon <ss23 <AT> ss23 <DOT> geek <DOT> nz>
AuthorDate: Sat Jun 30 04:09:03 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 05:57:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02114366
net-p2p/rtorrent: Patch configure to allow cross compiling
Patch already merged upstream
https://github.com/rakshasa/rtorrent/pull/753
Closes: https://bugs.gentoo.org/show_bug.cgi?id=446186
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/rtorrent-0.9.7-execinfo-configure.patch | 23 +++++++
net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild | 74 ++++++++++++++++++++++
2 files changed, 97 insertions(+)
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.7-execinfo-configure.patch b/net-p2p/rtorrent/files/rtorrent-0.9.7-execinfo-configure.patch
new file mode 100644
index 00000000000..2c7ce5222b8
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.7-execinfo-configure.patch
@@ -0,0 +1,23 @@
+From f84670dd6394729158569a7a5366a00a7d1dccb2 Mon Sep 17 00:00:00 2001
+From: Stephen Shkardoon <ss23@ss23.geek.nz>
+Date: Mon, 25 Jun 2018 20:14:43 +1200
+Subject: [PATCH] Use AC_COMPILE instead of AC_RUN to check for execinfo.h
+
+This way enables cross compiling, since we don't need to run anything during the configure script.
+---
+ scripts/common.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/common.m4 b/scripts/common.m4
+index 9885b037..b1b815b1 100644
+--- a/scripts/common.m4
++++ b/scripts/common.m4
+@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses the stuff defined by the system.
+ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
+ AC_MSG_CHECKING(for execinfo.h)
+
+- AC_RUN_IFELSE([AC_LANG_SOURCE([
++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <execinfo.h>
+ int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
+ ])],
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
new file mode 100644
index 00000000000..74bf66d2a2c
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="daemon debug selinux test xmlrpc"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+ >=dev-libs/libsigc++-2.2.2:2
+ >=net-misc/curl-7.19.1
+ sys-libs/ncurses:0=
+ xmlrpc? ( dev-libs/xmlrpc-c )"
+RDEPEND="${COMMON_DEPEND}
+ daemon? ( app-misc/screen )
+ selinux? ( sec-policy/selinux-rtorrent )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/cppunit
+ virtual/pkgconfig"
+
+DOCS=( doc/rtorrent.rc )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.9.7-tinfo.patch"
+ "${FILESDIR}/${PN}-0.9.7-execinfo-configure.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
+
+ eautoreconf
+}
+
+src_configure() {
+ default
+
+ # configure needs bash or script bombs out on some null shift, bug #291229
+ CONFIG_SHELL=${BASH} econf \
+ --disable-dependency-tracking \
+ $(use_enable debug) \
+ $(use_with xmlrpc xmlrpc-c)
+}
+
+src_install() {
+ default
+ doman doc/rtorrent.1
+
+ if use daemon; then
+ newinitd "${FILESDIR}/rtorrentd.init" rtorrentd
+ newconfd "${FILESDIR}/rtorrentd.conf" rtorrentd
+ systemd_newunit "${FILESDIR}/rtorrentd_at.service" "rtorrentd@.service"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2022-02-26 20:09 Jason Zaman
0 siblings, 0 replies; 6+ messages in thread
From: Jason Zaman @ 2022-02-26 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 17ba1a9e252fd2fc081ba4a0cd1d3c1aae726a5f
Author: Jamie Getty <jamiegetty1 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 4 06:59:50 2022 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 20:01:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ba1a9e
net-p2p/rtorrent: Remove dependency on screen for daemonising.
Also update to EAPI8. econf now automatically passes --with-sysroot=
which sets the macos-only -syslibroot so needs to be --sysroot on linux.
Closes: https://github.com/gentoo/gentoo/pull/23645
Signed-off-by: Jamie Getty <jamiegetty1 <AT> gmail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
net-p2p/rtorrent/files/rtorrent-r1.init | 16 ++++++
net-p2p/rtorrent/files/rtorrentd_at-r1.service | 17 +++++++
net-p2p/rtorrent/rtorrent-0.9.8-r1.ebuild | 70 ++++++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/net-p2p/rtorrent/files/rtorrent-r1.init b/net-p2p/rtorrent/files/rtorrent-r1.init
new file mode 100644
index 000000000000..e16f262bfbe3
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-r1.init
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+description="rTorrent BitTorrent client"
+
+command="/usr/bin/rtorrent"
+command_args="-o system.daemon.set=true"
+command_background=true
+command_user="${USER}"
+pidfile="/run/rtorrent.pid"
+
+depend()
+{
+ use net ypbind nis
+ after slapd mysqld postgresql
+}
diff --git a/net-p2p/rtorrent/files/rtorrentd_at-r1.service b/net-p2p/rtorrent/files/rtorrentd_at-r1.service
new file mode 100644
index 000000000000..bc9220353786
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrentd_at-r1.service
@@ -0,0 +1,17 @@
+# This configuration file is taken from the Arch wiki.
+# https://wiki.archlinux.org/title/RTorrent#Systemd_service_as_a_daemon_for_a_user
+
+[Unit]
+Description=rTorrent for %i
+After=network.target
+
+[Service]
+Type=simple
+User=%i
+Group=%i
+WorkingDirectory=/home/%i
+# Modify the next line to the absolute path for rtorrent.lock, for example
+ExecStartPre=-/bin/rm -f /home/%i/.session/rtorrent.lock
+ExecStart=/usr/bin/rtorrent -o system.daemon.set=true
+Restart=on-failure
+RestartSec=3
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..d0955a6839c0
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.8-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 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/"
+SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="debug selinux test xmlrpc"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
+ >=net-misc/curl-7.19.1
+ 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 )
+
+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() {
+ default
+
+ # 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" "rtorrentd@.service"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2025-03-10 2:54 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-03-10 2:54 UTC (permalink / raw
To: gentoo-commits
commit: f4eeb39010bb26b81112b122be2ee4eeb2afa0ec
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sun Nov 10 07:50:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:49:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4eeb390
net-p2p/rtorrent-0.10.0: fix calls direct ar
Closes: https://bugs.gentoo.org/943039
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/39256
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/rtorrent-0.10.0-fix-calls-ar.patch | 27 ++++++++++++++++++++++
net-p2p/rtorrent/rtorrent-0.10.0.ebuild | 3 +++
2 files changed, 30 insertions(+)
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
new file mode 100644
index 000000000000..21387d989130
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.10.0-fix-calls-ar.patch
@@ -0,0 +1,27 @@
+Merged in upstream :
+https://github.com/rakshasa/rtorrent/commit/73c1233dc09d83e26f9ea41b8e7276daa6926d17
+
+From d0e7f26ff6b5a769d53b613180337056936e22fd Mon Sep 17 00:00:00 2001
+From: PPN-SD nicolas.parlant@parhuet.fr
+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], [sundell.software@gmail.com])
+ 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/rtorrent-0.10.0.ebuild b/net-p2p/rtorrent/rtorrent-0.10.0.ebuild
index c8de47895785..3edd3998e0fe 100644
--- a/net-p2p/rtorrent/rtorrent-0.10.0.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.10.0.ebuild
@@ -33,6 +33,9 @@ DEPEND="${COMMON_DEPEND}
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
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/
@ 2025-06-06 14:09 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-06-06 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 157b4b93bd04f2801a31c94205a5b062c8e41ba8
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jun 5 05:23:48 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 6 14:08:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157b4b93
net-p2p/rtorrent: add 0.15.4
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42454
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/rtorrent/Manifest | 1 +
.../files/rtorrent-0.15.4-fix_waitpid.patch | 63 ++++++++++++
net-p2p/rtorrent/rtorrent-0.15.4.ebuild | 108 +++++++++++++++++++++
3 files changed, 172 insertions(+)
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 102bfa61025f..9434c3d87fab 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -2,3 +2,4 @@ DIST rtorrent-0.10.0.tar.gz 402931 BLAKE2B 3e11dafeb54fd1435176829c1dc45a9d5ad3b
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
diff --git a/net-p2p/rtorrent/files/rtorrent-0.15.4-fix_waitpid.patch b/net-p2p/rtorrent/files/rtorrent-0.15.4-fix_waitpid.patch
new file mode 100644
index 000000000000..cb96ec4f926c
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.15.4-fix_waitpid.patch
@@ -0,0 +1,63 @@
+https://github.com/rakshasa/rtorrent/pull/1507
+From 231606afc16eef08ec1a344a7aaef7504343bb71 Mon Sep 17 00:00:00 2001
+From: rakshasa <sundell.software@gmail.com>
+Date: Sun, 1 Jun 2025 18:21:10 +0200
+Subject: [PATCH] Fix ExecFile waitpid error handling.
+
+---
+ src/rpc/exec_file.cc | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/rpc/exec_file.cc b/src/rpc/exec_file.cc
+index 3be7bfa97..edf36697e 100644
+--- a/src/rpc/exec_file.cc
++++ b/src/rpc/exec_file.cc
+@@ -1,6 +1,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstring>
+ #include <fcntl.h>
+ #include <string>
+ #include <unistd.h>
+@@ -18,7 +19,7 @@ namespace rpc {
+
+ int
+ ExecFile::execute(const char* file, char* const* argv, int flags) {
+- // Write the execued command and its parameters to the log fd.
++ // Write the executed command and its parameters to the log fd.
+ [[maybe_unused]] int result;
+
+ if (m_log_fd != -1) {
+@@ -117,18 +118,23 @@ ExecFile::execute(const char* file, char* const* argv, int flags) {
+ }
+
+ int status;
+- int wpid;
+
+- do {
+- wpid = waitpid(childPid, &status, 0);
+- } while (wpid == -1 && WIFEXITED(status) == 0);
+-
+- if (wpid != childPid)
+- throw torrent::internal_error("ExecFile::execute(...) waitpid failed.");
++ while (waitpid(childPid, &status, 0) == -1) {
++ switch (errno) {
++ case EINTR:
++ continue;
++ case ECHILD:
++ throw torrent::internal_error("ExecFile::execute(...) waitpid failed with ECHILD, child process not found.");
++ case EINVAL:
++ throw torrent::internal_error("ExecFile::execute(...) waitpid failed with EINVAL.");
++ default:
++ throw torrent::internal_error("ExecFile::execute(...) waitpid failed with unexpected error: " + std::string(std::strerror(errno)));
++ }
++ };
+
+ // Check return value?
+ if (m_log_fd != -1) {
+- if (status == 0)
++ if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+ result = write(m_log_fd, "\n--- Success ---\n", sizeof("\n--- Success ---\n"));
+ else
+ result = write(m_log_fd, "\n--- Error ---\n", sizeof("\n--- Error ---\n"));
diff --git a/net-p2p/rtorrent/rtorrent-0.15.4.ebuild b/net-p2p/rtorrent/rtorrent-0.15.4.ebuild
new file mode 100644
index 000000000000..5a2f20511b08
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.15.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# require 64-bit integer
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit autotools linux-info lua-single systemd
+
+DESCRIPTION="BitTorrent Client using libtorrent"
+HOMEPAGE="https://rakshasa.github.io/rtorrent/"
+SRC_URI="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug lua selinux test tinyxml2 xmlrpc"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ lua? ( ${LUA_REQUIRED_USE} )
+ tinyxml2? ( !xmlrpc )
+"
+
+COMMON_DEPEND="
+ ~net-libs/libtorrent-${PV}
+ net-misc/curl
+ sys-libs/ncurses:0=
+ lua? ( ${LUA_DEPS} )
+ xmlrpc? ( dev-libs/xmlrpc-c:=[libxml2] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/nlohmann_json
+"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-rtorrent )
+"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-util/cppunit )
+"
+
+DOCS=( doc/rtorrent.rc )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.15.3-unbundle_json.patch
+ # from upstream. To be removed in next release
+ "${FILESDIR}"/${PN}-0.15.4-fix_waitpid.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
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # use system-json
+ rm -r src/rpc/nlohmann || die
+
+ # 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
+ export CONFIG_SHELL=${BASH}
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_with lua)
+ $(usev xmlrpc --with-xmlrpc-c)
+ $(usev tinyxml2 --with-xmlrpc-tinyxml2)
+ )
+
+ use lua && myeconfargs+=(
+ LUA_INCLUDE="-I$(lua_get_include_dir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ doman doc/rtorrent.1
+
+ if use lua; then
+ insinto $(lua_get_lmod_dir)
+ doins ${PN}.lua
+ fi
+
+ newinitd "${FILESDIR}/rtorrent-r1.init" rtorrent
+ newconfd "${FILESDIR}/rtorrentd.conf" rtorrent
+ systemd_newunit "${FILESDIR}/rtorrentd_at-r1.service" "rtorrentd@.service"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-06-06 14:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-03 6:04 [gentoo-commits] repo/gentoo:master commit in: net-p2p/rtorrent/, net-p2p/rtorrent/files/ Jason Zaman
-- strict thread matches above, loose matches on Subject: below --
2025-06-06 14:09 Sam James
2025-03-10 2:54 Sam James
2022-02-26 20:09 Jason Zaman
2018-06-19 5:38 Jason Zaman
2017-08-19 10:07 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox