diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-03-11 01:49:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-11 01:49:36 +0000 |
commit | cf7807d7aea23a99a144afceaba961cfed652b5f (patch) | |
tree | ffd2c781c27e0b7e72152a685a04938a2b7966f0 /net-p2p | |
parent | 7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 (diff) |
gentoo auto-resync : 11:03:2025 - 01:49:36next
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/Manifest.gz | bin | 6271 -> 6273 bytes | |||
-rw-r--r-- | net-p2p/rtorrent/Manifest | 10 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.10.0-fix-calls-ar.patch | 27 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.15.1-tests-fix-arrays.patch | 144 | ||||
-rw-r--r-- | net-p2p/rtorrent/metadata.xml | 5 | ||||
-rw-r--r-- | net-p2p/rtorrent/rtorrent-0.10.0.ebuild | 3 | ||||
-rw-r--r-- | net-p2p/rtorrent/rtorrent-0.15.1.ebuild | 78 | ||||
-rw-r--r-- | net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild | 4 |
8 files changed, 266 insertions, 5 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz Binary files differindex 9a709a3bd9f7..6ea27b08142c 100644 --- a/net-p2p/Manifest.gz +++ b/net-p2p/Manifest.gz diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index ca22ea0aa871..c6d6e4e1ea80 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,4 +1,6 @@ +AUX rtorrent-0.10.0-fix-calls-ar.patch 721 BLAKE2B e90113ebcfc46789f0cec6e44ee200d66b1ca338b076a1f0e4c87717a245c504dd61d01b9012371e8f097ef84ee41b2b3c6e0aa1ce0bea9cce13cccb87cf830c SHA512 d5eda7a6f9a13a5dc8433772e995256cbde6cbd4a62166c81781b4d623e17c8def0cc812974eceb7b88a44face6abab3b780303618ccd8746daca8a9f44fa690 AUX rtorrent-0.10.0-scgi-software-crash.patch 1274 BLAKE2B 01b0e063f95bdd7778038e7a67f2f16ceb3c65378e810d850694ede842940ba2c68682d06f82a23e8b20fbf2a163a6e1164479d8f69ee6f438d7c9e9546139d0 SHA512 b1dc5db6d2615ff40172835d3c36b644115207c50e115387080023598a452de809601fb2c7d1c30e19d013618a46f5491a4e26dcef854158a0267f90aa959169 +AUX rtorrent-0.15.1-tests-fix-arrays.patch 12506 BLAKE2B 32cbd6e45f459590f51fa7544fc507fdc72731b4026cf4c45529bbbb0a05e10e86fa0af896f0ebb78a47ebceef49913a4659b4788e69f541d6e8e86b42e6bec1 SHA512 7e5e3e50e1f97cbc67ac02a182cf342beeb811017147f7ec60b684a7ca16a76b82fdb4fc36e9fa2b7141f35de7f51ec7299f080b67c8e36eff93b403493654cd AUX rtorrent-0.9.8-bgo891995.patch 1012 BLAKE2B e8988349b9f0f9ed5b3d924e1f0d2f1e00336f59017e1d0a05a45a1bbae9489fbfcad4d6f74b92adff8729a5450b07be0f33174ca807582ac50fe0bf42ce78fa SHA512 2d1a4b63590e57389cfe0498d18a1a381f4cdf47988a440c83488acb2b8a2bc893336048c8cfbc4fbba1c10d60a42862748f10526276c7b1d83ae75320f0f1e2 AUX rtorrent-0.9.8-configure-c99.patch 1958 BLAKE2B 1cbcfc84005bdf44e8939c2c9b72655f1a492b3f6d94e14e76f00453109d275678949be52a29aee72d5125fe33ae96114ce7ce5280b6f7723767683faa50c49f SHA512 375e1e57d12659a34ad799f35c0f0bb5b6bd0edd01f927189b3bef3d3c2d93e72576775bb9c340299f18ee95def5ac3ad149fe5ece4293150b12673e70cfd6f9 AUX rtorrent-r1.init 342 BLAKE2B e51ee479fe4c839ea49f7b1085f33e60f42c64d9cd5915ee59b24ac042a8e86bafac59bc8dd24723b7506dd51b9442bc80163b94f45e4a70184e0571525d05a0 SHA512 f38d095b21a272c0197a8ebd9e4a33d9aa884207844c5303d0f4296fb561894ddf9683571ffd653e818578ef229e80f4a27fdf6d6ff70f53a6dedc45ee267bda @@ -6,9 +8,11 @@ AUX rtorrent.1 18204 BLAKE2B 4e757f00d9a08978e09593e89b17fb7d7e4afe7f5064ed8bb7d AUX rtorrentd.conf 13 BLAKE2B 80db665e7f75c50c02134cced87847926d23ea256868fb6d1213faaa8be1879cbc69e72f006b49b33dc99c0a9dcace2db90c8917ca272554c348bd1e6293514c SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f AUX rtorrentd_at-r1.service 479 BLAKE2B 64e4099237eb14e311dc94ef4b1c5fdf6e724a1b3fd49c2ef2c3ebae33c3c0f91c6edc5ee835db5bec2424e92abfcbbc7922aa14c925e60c5e9d973b0105de01 SHA512 28b9aeaa07144413534ffbb3589a2e4e89f688da4c6d53d1e4a87e1c9618dabe1f39d2b42911d10b151963862df5b2a28a71557bfe08011806face28cea82d0b DIST rtorrent-0.10.0.tar.gz 402931 BLAKE2B 3e11dafeb54fd1435176829c1dc45a9d5ad3bcbfc22a5a3738f3767891adad351d41ae2b40a859ab1bee600250833edd43507558cfdb0fdc51c4381b7336bdb2 SHA512 9c1ca99cd84e5a0984cffd48e37c9f78f66e867cd4df9b1ba0d6060fe447e1c0dd0083328de699fa7011f2b6dd6a22ac569756f24fde074401d8d9a8a11eb636 +DIST rtorrent-0.15.1.tar.gz 688056 BLAKE2B 0fd0b3748e1ec13935fa900434ad5d54c6062ea48c5f8cb320d0a30cb318c09f80347ca665c61a7745770c965eee5e1cfa7e96968a2468ad06711b80be5d6e92 SHA512 e5c713601ecb0c4536b64d98ca53261db35980b04a3f274d12f51467b021d77768e7f6a2004a33a76a99f7d96e0a2c3de4605fd7ee186ba05a7c16aa96b97ea5 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7 -EBUILD rtorrent-0.10.0.ebuild 2225 BLAKE2B fa67629eec352d25a0f27ab6256cfdf25c0f74a03d4e0735e9c80777e6e04205de786fd9806c8305d21c5e24f3baa594d07e4d67bc431c9ed6aa300e0e7adb9d SHA512 fc0fb96eeef97713bdb187cb76dd832304fdbca5b5433294e23e53be011149c5519561054feced830ca4dbe8204e5302291021ee9c82c1baf42a93cc74af4ef6 +EBUILD rtorrent-0.10.0.ebuild 2332 BLAKE2B bd5c4aa13c80530be0e87a36190f810a39b127f091eb66f504c49cf34f9e469a3bd8e292255492ef2acf2f092a52432cdab1b0421a2ff4c0770ca25c78adeb27 SHA512 0f147655c6bcb25a31f6b6070ac272393526a0a75da132e65efe476296a9bfdc6e000a17904c0d2b1a1ac69acde2f507c5de04e3f0df95953568e6b85788a454 +EBUILD rtorrent-0.15.1.ebuild 2031 BLAKE2B ed78fa82db8431b2cfe764d03ad55d441a99776fb17a3289a9c74e55d6c2a2978bc53ff55e0a12511308634657cdb6507f59878600d2421f263be16063bc69b7 SHA512 cf7629219110b74aed814ac321fd68493b8968091cf14ef8efbfc17b3cb8d0e7cf0ad847e1578bfd1d4884fa4049da430fbd64c352de24f48f6a6f8c358e7e9a EBUILD rtorrent-0.9.8-r1.ebuild 1881 BLAKE2B bfac53a2a4ecc4441258d16d97d5830a8f901b9a4fc4f452d97654cfe92e7f1d05e8c19e776d7ccb908e73b38a0281eda27e9632bc1fd0413221e70af9918211 SHA512 837fb9bd4b42cb17769200eb789b503fd3bd330d748180adfea2b6a54c0200ddcb35a5f13492f96962f13dc8afa1945723651ea840be48b6a40141547fe6766d EBUILD rtorrent-0.9.8-r2.ebuild 2055 BLAKE2B 0f0bc11a81811fa0f0fcc343b245204866eca76f9fb1bea87b4af430fd2b9e563b0477150eed9d56c3f6428c0ad04b8b7b0d25ba041e274b39913d6b27c5c2fc SHA512 69950be7a0b54d858959b7f87b113b63661044597b3ae6428d1477c5ffab5b96ae4d3737d5c53f4b2a8b398d3ff154937ceaa7f2bf4c6a1fab587b850f6cf532 -EBUILD rtorrent-0.9.8-r3.ebuild 2096 BLAKE2B 3044c1b5618f7ed1d98aabfe05970337734ff470ae05c7e3fcc1d286ff36b8da1122591d6930493c961236711e06b708a177dfe825c3c4505fde15ddd53e48a5 SHA512 654f32e1876250500d4cab162e5fa9eaafdc2b9154269d1f81e9b9d6b729285b5e88004da99d4b151504b88ddb5d3b41c834d3138b89ca9d73f8338e4ec58cc9 -MISC metadata.xml 330 BLAKE2B db7e26e16713fbfad69510f84569aa2ccb05c9b1eaa087087fe0d473accf0d644cf0263c7aa2c8a3ab4df9fc92e0fff5b1952bb5ec583d10972b6b07c9290b19 SHA512 72873bcf89cf2fd76621657dd3399231e0e4ce1702ac27304a818a66ee18ee68ea09ce363e784578c261824254ac46d92fc6d8ec2347d8dd6a77f1eb113e0d14 +EBUILD rtorrent-0.9.8-r3.ebuild 2092 BLAKE2B f82938eaa9e19ff4ad4402062b555a08178f584bbca35057aac75b9f887c929b64d112caea2a27a18fe97ca1454dac34af916161eed282e64fbaf97d8666fbc6 SHA512 0a70d750de16f83569cb6841412abe809728a2493ab5b5a52ebd9d14d6807a8c2d30404262d468f4132f8151ac20e45c759d449c5e29af03193584063c71e891 +MISC metadata.xml 484 BLAKE2B 5a66a3518e3d87e106398801bda26ed1b44bffa00105e86c42665d5677a6614f46aad0a2952807577baf36aa4cb55987ed440f729b224150f7c699db833d3fd8 SHA512 e02af2ec271b2f80349a8e61510658c573e7b8ac44ef552a4ba4da85b4a0d979446154f49624df467bbe2dc8f9b760bde0e514ba1feca117b24651e7a1f14811 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/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>perfinion@gentoo.org</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.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 ) 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" "rtorrentd@.service" +} diff --git a/net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild index 60567e093ea4..40eb8b3b5005 100644 --- a/net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild +++ b/net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${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" +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 )" |