diff options
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/Manifest.gz | bin | 6769 -> 6768 bytes | |||
| -rw-r--r-- | net-p2p/amule/Manifest | 3 | ||||
| -rw-r--r-- | net-p2p/amule/amule-2.3.3-r4.ebuild | 3 | ||||
| -rw-r--r-- | net-p2p/amule/files/amule-2.3.3-boost-1.87.patch | 146 |
4 files changed, 150 insertions, 2 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz Binary files differindex db33b9b75dc2..23aa9603f4ce 100644 --- a/net-p2p/Manifest.gz +++ b/net-p2p/Manifest.gz diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 3ea94879abc7..90248613fb7c 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,6 +1,7 @@ AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65 AUX amule-2.3.3-autoconf-2.70.patch 956 BLAKE2B 2e7bde0e6be3e392555e4a5420ae3736762939150ce1aee39c052a56fbaa2c4192aa43f34b73f9810ad6e3b9a5e06311d374ca1d26ed289f91eaf2acb77f616a SHA512 36918f134eaaae17463ceac3d06e6fdf48d3913212564792067c15c946dd7536bf67772d777734d80f1f833b378e0c212932d5bd564f201aeb9545070d890b78 AUX amule-2.3.3-backport-pr368.patch 1696 BLAKE2B 9d52b6192f4a4cbb7d73be34c23fe59db51f321c3f07412801721d47d9ecb12e0098b7b211766934a5545ed01b330974e56188773e5c844d1bd01fedd1edd454 SHA512 b4cd302c1003720aa4bcd4c1a17233b0303d2d614e359ba7f3da685f520817d58f5056f11437a87e85aaefa74f053d769aacfabdc96621a76bb648d456dfcb17 +AUX amule-2.3.3-boost-1.87.patch 5564 BLAKE2B 15956ddbd7f26a847f1e3afe31ab20e281562913cde68e0cb10c46b2e0959f435c225ed780a5240e247d1ed80fb21defe02a06a71e765fe014cac4d35df4fe89 SHA512 8c4cf8ff7ff192bd72616bcabe9bda8dbae91884e61bf028ffb839f462b695fc69d9b4471cc8436d0ac3edd5f75dbdd0941cd99a061e2374018e6daa928e0510 AUX amule-2.3.3-fix-exception.patch 259 BLAKE2B 9a9ebb025ac3f553432215bc0f2c34bd1b6eeaaf9b436bd19870ba4412326dd37ce372bd5a3866e6cd65f0e98e8aea09025dd751d6b6849c37dd527b1af56da0 SHA512 5c8580f0d294a828b2ce42c59bd3079d9bf9735a88337d2cb3aa2b014c6bb8cecee891e35431b9e22a6ae8ca91f816de89a532fe6c10eae2ecbed33212e4604d AUX amule-2.3.3-use-xdg-open-as-preview-default.patch 754 BLAKE2B 5dfa4ef482dd42768140fffbc5d9f13f4bf9a017fdb819f2e749d2a68f6a2bee5e6a1af381f579b8b6564f2e87861640dfb0be4a501e26a517894cea4a7e96a4 SHA512 8e04d0a43ca739956c2e77afa4356256553ef5299822d0761b3ffbf966e4d1251c4822dba756484ab08dd3b97ed9a8f0e69112230f7b229d27e063478f9793bf AUX amule-2.3.3-wx3.2.patch 17509 BLAKE2B b14471083d825beb68b65938308c5df265a831ea48a37abd8d2b92e38232c52aa4cc875f703531d388f091e7af0f1d634e4e5394b5f1522297ace0274ec65f93 SHA512 bde8a0db21c5650172084dfbfea155b88c6b44766034cc83738bfe77cd343b389296cbc0069c09066fbbba1df7951bb8763f1b2dd0c63375a1b67f615093902b @@ -10,6 +11,6 @@ AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d854870 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0 DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e EBUILD amule-2.3.3-r3.ebuild 3424 BLAKE2B 045bb453a8be13a8ca6717cf9b5c509b10bf18d3eb0f168ce8f8ca38261827e31a23c37a3332bab5a4f71a5cf6ff32f6e02e0c5916b6bee915d954f5834baf51 SHA512 27d9c697edc564893b17d093edb59cc6d03b1c4f69b57c3e957c043bfb9f6b9d48ebc0cb98d0687cb73652934048a369ed90844ac9a399b3ec5c9297c87d47da -EBUILD amule-2.3.3-r4.ebuild 3477 BLAKE2B 7925e0626838c9a46185fcb20229571e448c8641100746757fa9026702a87fb8fd8df24474f679f8fb965e0188317c015779c6fda7158bd14f604d6248fd5637 SHA512 00a673912d46d21cbd634ea8223c60b12c151760069b169a9c23e5d606c80efcae48b5a00f9ae79a21207000127563a25de39e623af625f4476a4f9a86ca43f0 +EBUILD amule-2.3.3-r4.ebuild 3514 BLAKE2B ad8be9b7b5ee90704abb6be30c16979514fd0c0196597d4e2cd78a18f2b64b0bd585831af677510120c88f09aecdc53f16f26bb0c9f5d345628ad456d8a5548b SHA512 6e4b88f2280b3b7a78bc19ed0a0086fabfd4930623e4f47826f14e5b9110dd1c2f992b506eeffa9fc699f98b1261eac10c4ffa3f89f67d15d03d16f15c0e62eb EBUILD amule-9999.ebuild 3398 BLAKE2B 191e23736095c59571739d3a260879e2617104cc45be2325359fea81dd178e905919c0040fb52b3ac15e2b9a85432c8addc74373562c4db84e20996432520610 SHA512 43eb0b99137fd9ead75e12c194278fb6764aee27d0d9ccfae9b7657236dea521890d09742cfe90a4e000530932e458de960401acd48a99b3bcc820767729d39c MISC metadata.xml 717 BLAKE2B 104a91afec9919613f9897f655886e7d51f3c2f69af4efe47aab38b1c31982f6f97f8fb117ceffe2b53c5ba3bdc6fcef332dc4bf4cd956430187dcc374b3f473 SHA512 37b08e9a0376417b2e8c2372d5a59564ae23b522e36b97c163cb0d5c5113298eeac11b181f129854b983276ec8b8958b3df9599296152fecc5504d34c9554515 diff --git a/net-p2p/amule/amule-2.3.3-r4.ebuild b/net-p2p/amule/amule-2.3.3-r4.ebuild index 40687025dc71..cadfc1d4efb0 100644 --- a/net-p2p/amule/amule-2.3.3-r4.ebuild +++ b/net-p2p/amule/amule-2.3.3-r4.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 @@ -56,6 +56,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.3-backport-pr368.patch" "${FILESDIR}/${PN}-2.3.3-wx3.2.patch" "${FILESDIR}/${PN}-2.3.3-use-xdg-open-as-preview-default.patch" + "${FILESDIR}/${P}-boost-1.87.patch" ) src_prepare() { diff --git a/net-p2p/amule/files/amule-2.3.3-boost-1.87.patch b/net-p2p/amule/files/amule-2.3.3-boost-1.87.patch new file mode 100644 index 000000000000..10256c6238eb --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.3-boost-1.87.patch @@ -0,0 +1,146 @@ +From 212b1891da96750ca602df05b575b4d679ca6f1e Mon Sep 17 00:00:00 2001 +From: Luigi 'Comio' Mantellini <luigi.mantellini@gmail.com> +Date: Mon, 16 Dec 2024 07:53:11 +0100 +Subject: [PATCH] Fix build with Boost 1.87 that removes deprecated asio + methods + +--- + src/LibSocketAsio.cpp | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/src/LibSocketAsio.cpp b/src/LibSocketAsio.cpp +index 5f8b02652..8e15c8635 100644 +--- a/src/LibSocketAsio.cpp ++++ b/src/LibSocketAsio.cpp +@@ -70,7 +70,7 @@ + + using namespace boost::asio; + using namespace boost::system; // for error_code +-static io_service s_io_service; ++static io_context s_io_service; + + // Number of threads in the Asio thread pool + const int CAsioService::m_numberOfThreads = 4; +@@ -265,7 +265,7 @@ public: + AddDebugLogLineF(logAsio, CFormat(wxT("Write %d %s")) % nbytes % m_IP); + m_sendBuffer = new char[nbytes]; + memcpy(m_sendBuffer, buf, nbytes); +- m_strand.dispatch(boost::bind(& CAsioSocketImpl::DispatchWrite, this, nbytes)); ++ dispatch(m_strand, boost::bind(& CAsioSocketImpl::DispatchWrite, this, nbytes)); + m_ErrorCode = 0; + return nbytes; + } +@@ -279,7 +279,7 @@ public: + if (m_sync || s_io_service.stopped()) { + DispatchClose(); + } else { +- m_strand.dispatch(boost::bind(& CAsioSocketImpl::DispatchClose, this)); ++ dispatch(m_strand, boost::bind(& CAsioSocketImpl::DispatchClose, this)); + } + } + } +@@ -538,7 +538,7 @@ private: + { + m_readPending = true; + m_readBufferContent = 0; +- m_strand.dispatch(boost::bind(& CAsioSocketImpl::DispatchBackgroundRead, this)); ++ dispatch(m_strand, boost::bind(& CAsioSocketImpl::DispatchBackgroundRead, this)); + } + + void PostReadEvent(int DEBUG_ONLY(from) ) +@@ -618,7 +618,7 @@ private: + uint32 m_readBufferContent; + bool m_eventPending; + char * m_sendBuffer; +- io_service::strand m_strand; // handle synchronisation in io_service thread pool ++ io_context::strand m_strand; // handle synchronisation in io_service thread pool + deadline_timer m_timer; + bool m_connected; + bool m_closed; +@@ -875,7 +875,7 @@ private: + } + // We were not successful. Try again. + // Post the request to the event queue to make sure it doesn't get called immediately. +- m_strand.post(boost::bind(& CAsioSocketServerImpl::StartAccept, this)); ++ post(m_strand, boost::bind(& CAsioSocketServerImpl::StartAccept, this)); + } + + // The wrapper object +@@ -886,7 +886,7 @@ private: + CScopedPtr<CAsioSocketImpl> m_currentSocket; + // Is there a socket available? + bool m_socketAvailable; +- io_service::strand m_strand; // handle synchronisation in io_service thread pool ++ io_context::strand m_strand; // handle synchronisation in io_service thread pool + }; + + +@@ -1021,7 +1021,7 @@ public: + // Collect data, make a copy of the buffer's content + CUDPData * recdata = new CUDPData(buf, nBytes, addr); + AddDebugLogLineF(logAsio, CFormat(wxT("UDP SendTo %d to %s")) % nBytes % addr.IPAddress()); +- m_strand.dispatch(boost::bind(& CAsioUDPSocketImpl::DispatchSendTo, this, recdata)); ++ dispatch(m_strand, boost::bind(& CAsioUDPSocketImpl::DispatchSendTo, this, recdata)); + return nBytes; + } + +@@ -1035,7 +1035,7 @@ public: + if (s_io_service.stopped()) { + DispatchClose(); + } else { +- m_strand.dispatch(boost::bind(& CAsioUDPSocketImpl::DispatchClose, this)); ++ dispatch(m_strand, boost::bind(& CAsioUDPSocketImpl::DispatchClose, this)); + } + } + +@@ -1162,7 +1162,7 @@ private: + ip::udp::socket * m_socket; + CMuleUDPSocket * m_muleSocket; + bool m_OK; +- io_service::strand m_strand; // handle synchronisation in io_service thread pool ++ io_context::strand m_strand; // handle synchronisation in io_service thread pool + deadline_timer m_timer; + amuleIPV4Address m_address; + +@@ -1254,7 +1254,7 @@ public: + void * Entry() + { + AddLogLineNS(CFormat(_("Asio thread %d started")) % m_threadNumber); +- io_service::work worker(s_io_service); // keep io_service running ++ auto worker = make_work_guard(s_io_service); // keep io_service running + s_io_service.run(); + AddDebugLogLineN(logAsio, CFormat(wxT("Asio thread %d stopped")) % m_threadNumber); + +@@ -1342,7 +1342,7 @@ bool amuleIPV4Address::Hostname(const wxString& name) + // This is usually just an IP. + std::string sname(unicode2char(name)); + error_code ec; +- ip::address_v4 adr = ip::address_v4::from_string(sname, ec); ++ ip::address_v4 adr = ip::make_address_v4(sname, ec); + if (!ec) { + m_endpoint->address(adr); + return true; +@@ -1353,17 +1353,16 @@ bool amuleIPV4Address::Hostname(const wxString& name) + error_code ec2; + ip::tcp::resolver res(s_io_service); + // We only want to get IPV4 addresses. +- ip::tcp::resolver::query query(ip::tcp::v4(), sname, ""); +- ip::tcp::resolver::iterator endpoint_iterator = res.resolve(query, ec2); ++ ip::tcp::resolver::results_type endpoint_iterator = res.resolve(sname, "", ec2); + if (ec2) { + AddDebugLogLineN(logAsio, CFormat(wxT("Hostname(\"%s\") resolve failed: %s")) % name % ec2.message()); + return false; + } +- if (endpoint_iterator == ip::tcp::resolver::iterator()) { ++ if (endpoint_iterator == ip::tcp::resolver::results_type()) { + AddDebugLogLineN(logAsio, CFormat(wxT("Hostname(\"%s\") resolve failed: no address found")) % name); + return false; + } +- m_endpoint->address(endpoint_iterator->endpoint().address()); ++ m_endpoint->address(endpoint_iterator.begin()->endpoint().address()); + AddDebugLogLineN(logAsio, CFormat(wxT("Hostname(\"%s\") resolved to %s")) % name % IPAddress()); + return true; + } +-- +2.45.2 + |