gentoo auto-resync : 04:03:2023 - 13:38:04

4 files changed, 103 insertions, 0 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index bde0dbc1a04d..71b7b35d54c5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 5cf5cae06f37..97ee053f4555 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,7 +1,9 @@
+AUX rtorrent-0.9.8-bgo891995.patch 1012 BLAKE2B e8988349b9f0f9ed5b3d924e1f0d2f1e00336f59017e1d0a05a45a1bbae9489fbfcad4d6f74b92adff8729a5450b07be0f33174ca807582ac50fe0bf42ce78fa SHA512 2d1a4b63590e57389cfe0498d18a1a381f4cdf47988a440c83488acb2b8a2bc893336048c8cfbc4fbba1c10d60a42862748f10526276c7b1d83ae75320f0f1e2
 AUX rtorrent-r1.init 342 BLAKE2B e51ee479fe4c839ea49f7b1085f33e60f42c64d9cd5915ee59b24ac042a8e86bafac59bc8dd24723b7506dd51b9442bc80163b94f45e4a70184e0571525d05a0 SHA512 f38d095b21a272c0197a8ebd9e4a33d9aa884207844c5303d0f4296fb561894ddf9683571ffd653e818578ef229e80f4a27fdf6d6ff70f53a6dedc45ee267bda
 AUX rtorrent.1 18204 BLAKE2B 4e757f00d9a08978e09593e89b17fb7d7e4afe7f5064ed8bb7d9316f1450471ec42e006478df43eb2a7d4fdcea0445237b0e053f54bd1f4e8ad7db2878b628a1 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe
 AUX rtorrentd.conf 13 BLAKE2B 80db665e7f75c50c02134cced87847926d23ea256868fb6d1213faaa8be1879cbc69e72f006b49b33dc99c0a9dcace2db90c8917ca272554c348bd1e6293514c SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f
 AUX rtorrentd_at-r1.service 479 BLAKE2B 64e4099237eb14e311dc94ef4b1c5fdf6e724a1b3fd49c2ef2c3ebae33c3c0f91c6edc5ee835db5bec2424e92abfcbbc7922aa14c925e60c5e9d973b0105de01 SHA512 28b9aeaa07144413534ffbb3589a2e4e89f688da4c6d53d1e4a87e1c9618dabe1f39d2b42911d10b151963862df5b2a28a71557bfe08011806face28cea82d0b
 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
 EBUILD rtorrent-0.9.8-r1.ebuild 1902 BLAKE2B 03ed31c64a012ceded6e62f5b2f8c35cb972ebba72766a359ff04fbee48c0bfe95b2278cb36504d4e39895e8153718ba1e53adc163d5565660ff75c96e7f6bc1 SHA512 db7708338ddabca61a894c9b920111bbd09e2e887a8155fd26166411bfa81e6756a6ecdcb8baff35e5fc27e4adfebde97c3699a0f5ae890ce10e75c243685d2b
+EBUILD rtorrent-0.9.8-r2.ebuild 1953 BLAKE2B dbcc4ec6332c1fd862e828bb4a3dd96511f568154ba58d3483b97f1f46879619305c0443c28dadb3447ce45445f1de9e5013bb1dacd7ddf19c3c41d92d5b96b5 SHA512 02dde102bdbe2e80ace5e777a3036cc4e958f8dbc4d70e1a6035505c0acf9ed3fbabad4b54a33a85e30775b2837277703f0ca2dab95e8fb369cdbecce43a654c
 MISC metadata.xml 330 BLAKE2B db7e26e16713fbfad69510f84569aa2ccb05c9b1eaa087087fe0d473accf0d644cf0263c7aa2c8a3ab4df9fc92e0fff5b1952bb5ec583d10972b6b07c9290b19 SHA512 72873bcf89cf2fd76621657dd3399231e0e4ce1702ac27304a818a66ee18ee68ea09ce363e784578c261824254ac46d92fc6d8ec2347d8dd6a77f1eb113e0d14
diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.8-bgo891995.patch b/net-p2p/rtorrent/files/rtorrent-0.9.8-bgo891995.patch
new file mode 100644
index 000000000000..943fe64dddc1
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.9.8-bgo891995.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/891995
+https://github.com/rakshasa/rtorrent/issues/1205
+https://github.com/rakshasa/rtorrent/pull/1169
+
+From 812bba81bc049a5f786282b3654cab294b0ef236 Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai <cyphar@cyphar.com>
+Date: Mon, 20 Jun 2022 19:09:57 +1000
+Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer
+
+There appears to have been some change on openSUSE (likely some new
+hardening flags for builds, or some glibc hardening) such that incorrect
+buffer handling results in a segfault even if the buffer is never
+overflowed.
+
+Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
+--- a/src/utils/lockfile.cc
++++ b/src/utils/lockfile.cc
+@@ -98,7 +98,8 @@ Lockfile::try_lock() {
+   int pos = ::gethostname(buf, 255);
+ 
+   if (pos == 0) {
+-    ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());
++    ssize_t len = std::strlen(buf);
++    ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());
+     int __UNUSED result = ::write(fd, buf, std::strlen(buf));
+   }
+ 
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8-r2.ebuild
new file mode 100644
index 000000000000..b3161479593e
--- /dev/null
+++ b/net-p2p/rtorrent/rtorrent-0.9.8-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 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 ~mips ~ppc ~ppc64 ~riscv ~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 )
+
+PATCHES=(
+	"${FILESDIR}/${P}-bgo891995.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() {
+	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"
+}