commit: 03ae7d71b476090c80862c1401fbcfd3cf9fe74c Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Wed Jan 1 14:04:48 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 03:04:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ae7d71
net-p2p/rtorrent: add 0.15.1 fix SRC_URI as libtorrent/rtorrent are in sync dev-util/cppunit for test only : removed from flags upstream switch to usev as --without-xmlrpc-c is misunderstand by checkconfig add useflag tinyxml2 for namespace-modified-vendor-tinyxml2 (experimental) patch for tests with tinyxml2 Closes: https://bugs.gentoo.org/947327 Bug: https://bugs.gentoo.org/943039 fixed Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/39937 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/rtorrent/Manifest | 1 + .../files/rtorrent-0.15.1-tests-fix-arrays.patch | 144 +++++++++++++++++++++ net-p2p/rtorrent/metadata.xml | 5 + net-p2p/rtorrent/rtorrent-0.15.1.ebuild | 78 +++++++++++ 4 files changed, 228 insertions(+) diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index a7735a86481e..7f5e8e4731b2 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/net-p2p/rtorrent/files/rtorrent-0.15.1-tests-fix-arrays.patch b/net-p2p/rtorrent/files/rtorrent-0.15.1-tests-fix-arrays.patch new file mode 100644 index 000000000000..33162f1168cf --- /dev/null +++ b/net-p2p/rtorrent/files/rtorrent-0.15.1-tests-fix-arrays.patch @@ -0,0 +1,144 @@ +https://github.com/rakshasa/rtorrent/issues/1360 +https://github.com/rakshasa/rtorrent/commit/350d03ca04fedc2153927b7bf26d43030e23d962 +https://github.com/rakshasa/rtorrent/commit/c2c6a4be268aee3f74fe4d0abcf944208b8617ba +--- a/test/rpc/xmlrpc_test.cc ++++ b/test/rpc/xmlrpc_test.cc +@@ -15,6 +15,89 @@ + void initialize_command_dynamic(); + + #if defined(HAVE_XMLRPC_TINYXML2) && !defined(HAVE_XMLRPC_C) ++ ++std::vector<std::tuple<std::string, std::string, std::string>> basic_requests = { ++ std::make_tuple("Basic call", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data/></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Basic call without params", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data/></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("UTF-8 string", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><string>чао</string></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><string>чао</string></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("emoji string", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><string>😊</string></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><string>😊</string></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("base64 data (which gets returned as a string)", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><base64>Zm9vYmFy</base64></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><string>foobar</string></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("i8 ints", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><i8>41</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><i8>41</i8></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("i8 ints", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><i8>2247483647</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><i8>2247483647</i8></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("negative i8 ints", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><i8>-2347483647</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><i8>-2347483647</i8></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Simple array", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><array><data><value><i8>2247483647</i8></value></data></array></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><array><data><value><i8>2247483647</i8></value></data></array></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Empty array", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><array><data></data></array></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><array><data/></array></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Empty struct", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><struct></struct></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><struct/></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Simple struct", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><struct><member><name>lowerBound</name><value><i8>18</i8></value></member><member><name>upperBound</name><value><i8>139</i8></value></member></struct></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><struct><member><name>lowerBound</name><value><i8>18</i8></value></member><member><name>upperBound</name><value><i8>139</i8></value></member></struct></value></data></array></value></param></params></methodResponse>"), ++ ++ std::make_tuple("Invalid - missing method", ++ "<?xml version=\"1.0\"?><methodCall><methodName>no_such_method</methodName><params><param><value><i8>41</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-506</i8></value></member><member><name>faultString</name><value><string>method 'no_such_method' not defined</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - i8 target", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><i8>41</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-500</i8></value></member><member><name>faultString</name><value><string>invalid parameters: target must be a string</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - empty int tag", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><i8/></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>unable to parse empty integer</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - empty int text", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><i8></i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>unable to parse empty integer</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - broken XML", ++ "thodCall><methodName>test_a</methodName><params><param><value><i8>41</i8></value></param></params></method", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-503</i8></value></member><member><name>faultString</name><value><string>Error=XML_ERROR_PARSING_ELEMENT ErrorID=6 (0x6) Line number=1: XMLElement name=method</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - non-integer i8", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><i8>string value</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>unable to parse integer value</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - float i8", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><i8>3.14</i8></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>unable to parse integer value</string></value></member></struct></fault></methodResponse>"), ++ ++ std::make_tuple("Invalid - non-boolean boolean", ++ "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><boolean>string value</boolean></value></param></params></methodCall>", ++ "<?xml version=\"1.0\"?><methodResponse><fault><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>unknown boolean value: string value</string></value></member></struct></fault></methodResponse>") ++}; ++ + void + XmlrpcTest::setUp() { + m_commandItr = m_commands; +@@ -30,36 +113,10 @@ + + void + XmlrpcTest::test_basics() { +- std::ifstream file; file.open("rpc/xmlrpc_test_data.txt"); +- CPPUNIT_ASSERT(file.good()); +- std::vector<std::string> titles; +- std::vector<std::string> inputs; +- std::vector<std::string> outputs; +- std::string line; +- int index = 0; +- // Read file into inputs/outputs +- while (std::getline(file, line)) { +- if (line.size() == 0) { +- continue; +- } +- if (line[0] == '#') { +- titles.push_back(line); +- continue; +- } +- if (index % 2) { +- outputs.push_back(line); +- } else { +- inputs.push_back(line); +- } +- index++; +- } +- +- // Sanity check the above parser +- CPPUNIT_ASSERT_MESSAGE("Could not parse test data", inputs.size() > 0 && inputs.size() == outputs.size() && inputs.size() == titles.size()); +- for (int i = 0; i < inputs.size(); i++) { ++ for (auto& test : basic_requests) { + std::string output; +- m_xmlrpc.process(inputs[i].c_str(), inputs[i].size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;}); +- CPPUNIT_ASSERT_EQUAL_MESSAGE(titles[i], std::string(outputs[i]), output); ++ m_xmlrpc.process(std::get<1>(test).c_str(), std::get<1>(test).size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;}); ++ CPPUNIT_ASSERT_EQUAL_MESSAGE(std::get<0>(test), std::get<2>(test), output); + } + } + +@@ -69,7 +126,7 @@ + // valid UTF-8, but doesn't check strings, and Object strings are + // just a series of bytes so it reflects just fine. + std::string input = "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_reflect</methodName><params><param><value><string></string></value></param><param><value><string>\xc3\x28</string></value></param></params></methodCall>"; +- std::string expected = "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><value><string>\xc3\x28</string></value></array></value></param></params></methodResponse>"; ++ std::string expected = "<?xml version=\"1.0\"?><methodResponse><params><param><value><array><data><value><string>\xc3\x28</string></value></data></array></value></param></params></methodResponse>"; + std::string output; + m_xmlrpc.process(input.c_str(), input.size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;}); + CPPUNIT_ASSERT_EQUAL(expected, output); diff --git a/net-p2p/rtorrent/metadata.xml b/net-p2p/rtorrent/metadata.xml index b72a3c39282e..f5c1fe38c3a2 100644 --- a/net-p2p/rtorrent/metadata.xml +++ b/net-p2p/rtorrent/metadata.xml @@ -5,6 +5,11 @@ <email>[email protected]</email> <name>Jason Zaman</name> </maintainer> + <use> + <flag name="tinyxml2"> + Use vendor tinyxml2 instead of xmlrpc-c. This allows significant reduction in overhead (experimental) + </flag> + </use> <upstream> <remote-id type="github">rakshasa/rtorrent</remote-id> </upstream> diff --git a/net-p2p/rtorrent/rtorrent-0.15.1.ebuild b/net-p2p/rtorrent/rtorrent-0.15.1.ebuild new file mode 100644 index 000000000000..fd8d4dbb77b6 --- /dev/null +++ b/net-p2p/rtorrent/rtorrent-0.15.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2025 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="https://github.com/rakshasa/rtorrent/releases/download/v${PV}/${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 tinyxml2 xmlrpc" +RESTRICT="!test? ( test )" +REQUIRED_USE="tinyxml2? ( !xmlrpc )" + +DEPEND=" + ~net-libs/libtorrent-${PV} + net-misc/curl + sys-libs/ncurses:0= + xmlrpc? ( dev-libs/xmlrpc-c:= ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rtorrent ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-util/cppunit ) +" + +DOCS=( doc/rtorrent.rc ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.15.1-tests-fix-arrays.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) \ + $(usev xmlrpc --with-xmlrpc-c) \ + $(usev tinyxml2 --with-xmlrpc-tinyxml2) +} + +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]" +}
