diff options
Diffstat (limited to 'net-p2p')
27 files changed, 709 insertions, 697 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz Binary files differindex fd6155683388..7f656f1a1a2a 100644 --- a/net-p2p/Manifest.gz +++ b/net-p2p/Manifest.gz diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest index 10b82d8f32e9..f3091791ad8a 100644 --- a/net-p2p/airdcpp-webclient/Manifest +++ b/net-p2p/airdcpp-webclient/Manifest @@ -4,4 +4,4 @@ DIST airdcpp-webclient-2.2.1.tar.gz 845507 BLAKE2B 5d97fe5d25957d870cc5480153acb DIST airdcpp-webclient-2.3.0.tar.gz 880508 BLAKE2B 426c0582ffad734cae2f66826aa04b2db791a110abc79629f4e3b71a69db354b56d213feae6d807f3b7a3f2906aac00fc50c49eaf3dc7d8e09783f59c99ef4e5 SHA512 b1f47c8f500aa684a8cabcff916b6a1e41230d949a35d57c80f13734f6f88f8c3a31d99f64cc1f6e316d26710da894670f130baf78fec5ecf3a70a70f0d7417a EBUILD airdcpp-webclient-2.2.1.ebuild 1431 BLAKE2B 5a4ec19c01fd32862d96a415cfabd10576b4ae435a33d8788ba2a8ec1dc02e0e30f517a76c36d2392840ae239d7aa3ff9571b7625208c13e2d81c5741469284f SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902 EBUILD airdcpp-webclient-2.3.0.ebuild 1440 BLAKE2B 1a2486c19ac9b0814b03811232d648553febaf1277f3b8d88dccf57f3af6078f34b5ed73f6ab14a9b32f822fdbb8ae9a583a8a09ebafbb9271b6641d5929e348 SHA512 1726caffeea7019c6b3ae244c29d787749871c309bafb83974d947c960f7137c51923ad9ef0feed8124055e326291bc2c00aeec938f7e3a6702e7a824475e8c2 -MISC metadata.xml 928 BLAKE2B e00d0b7df5302e9129c18fa7250dc30fe34e339cd99e41751d64546d41b0ed328e442825f372acec7207e97f67655c3c05ce99cfda096a7895097210b2d57b1f SHA512 ceccd70826faff18052a1cfe3cdcef1a253ed1227565fa94e865fba8c0a5b8a03535844a3b78d98f6bc26e8a9f29202f0bf1e19fa833d4356ace1e6b26e3936e +MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268 diff --git a/net-p2p/airdcpp-webclient/metadata.xml b/net-p2p/airdcpp-webclient/metadata.xml index ca7220f262bf..3926c87bf039 100644 --- a/net-p2p/airdcpp-webclient/metadata.xml +++ b/net-p2p/airdcpp-webclient/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sautier.louis@gmail.com</email> + <email>sbraz@gentoo.org</email> <name>Louis Sautier</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">airdcpp-web/airdcpp-webclient</remote-id> <bugs-to>https://github.com/airdcpp-web/airdcpp-webclient/issues</bugs-to> diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 712d48557b32..38ea670f9f64 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,8 +1,14 @@ AUX amule-2.2.6-fallocate.diff 687 BLAKE2B c7c7df787b417e58db50c59192eb455c495ecd38f9fd5f547ff3db6cfa642eba323f4ade99c66fe981777479a728afb9e12e1ae494853af8bbb4634448820dcd SHA512 406eb05eecfa7d027f7eaeefa2ead92078d5f7ed0e72f3ce47ac4f1f23b2852577f429f999a009198515e35efacfa6e54283494bb3eaf6332ee6bed9963c65ba +AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26 +AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65 +AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c +AUX amule-2.3.2-fix-crash-closing-last-search-tab-2.patch 5073 BLAKE2B a90260842bbadae7ea2f068a2c4fb94d3024e61ff0eecf340257fbbdb7657a7946aed36b8bdfe3f5a5c06852be55d144909f74cdb01761fb0e167c67ea4c0fc6 SHA512 8227cbb72af28a076e03dec466fb53660985de33fd84ef8856b6d098035015bc4e9c4d5a3da5a320053525d0356f3a73f2fe0b9f1c1eb7991b29bc4e1e93751f +AUX amule-2.3.2-fix-crash-shared-dir-utf8.patch 2204 BLAKE2B 3266ef16038176af0e3cef9e8a16517a34f78723e725c453e557f88fac3b8b233edb34aa10b3295563a769df3fc9a1c0ef88cf2eaf5b43a5bd2d60f4b4a09757 SHA512 f0ae3e7e8ee4105c4999d248f58ad946db7c163f6f2fa1ee54f97509d82cf43cbadffcd537d728f2dc547cbe83deaa8737e794d42a773707b2fe85d6a671b4e1 AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6 AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016 EBUILD amule-2.3.2-r1.ebuild 2264 BLAKE2B ffa5219b33d63414838be657972556be4122717478698053454e3a7da290a5f174e6730e52b3ff05305b7010821a0588ca2ab092d28c9e0daae19e83d0f6043a SHA512 defd04e15bc4d77fe48a78999dac8410228199029011bba8ecf295388354029bf43a1f17741696c65b36acc90dea0e4b5c47ebbcbab5111d4eb95a84949179fc -MISC metadata.xml 443 BLAKE2B fe1d99ffaa324176572c2598aa153515cff324e69df364d4e7b2cc71af7c82b8573718ac2f3a4b2ae462f2aa844e7ecff97df91715ba76ebd15f001342c61057 SHA512 61b72c6f3bf1aaf4d09045f2ff0d1eb053cc55fe4126da2aa25d45ba7ee7c3db604df823cbf02db2a758e1ee108c4516f0223b4c3dfe88a67d75ae7a2bb44d38 +EBUILD amule-2.3.2-r2.ebuild 2347 BLAKE2B 1686989f65579b96657919d7be1fe5899069c8591397dcb4f88a641fb00f3b480cb57fb1726cd645db891a38ad45606183b0075af3483d7e2f9e352182ebe2a4 SHA512 7b1a024b022b6c83bc51fe73694435dd92a254845548e466dc550a7c12ea5dd77955a389c2bab3e315a0dca5b95342df51e1eb102cf7bda0d024cac15c794efa +MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild new file mode 100644 index 000000000000..b91ba903777e --- /dev/null +++ b/net-p2p/amule/amule-2.3.2-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0" + +inherit wxwidgets user + +MY_P="${PN/m/M}-${PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="daemon debug geoip nls remote stats upnp +X" + +COMMON_DEPEND=" + dev-libs/boost:= + dev-libs/crypto++:= + sys-libs/binutils-libs:0= + sys-libs/zlib + x11-libs/wxGTK:${WX_GTK_VER}[X?] + stats? ( media-libs/gd:=[jpeg,png] ) + geoip? ( dev-libs/geoip ) + upnp? ( net-libs/libupnp:* ) + remote? ( media-libs/libpng:0= ) + !net-p2p/imule" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch" + "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch" + "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch" + "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch" + "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch" +) + +pkg_setup() { + if use stats && ! use X; then + einfo "Note: You would need both the X and stats USE flags" + einfo "to compile aMule Statistics GUI." + einfo "I will now compile console versions only." + fi + + setup-wxwidgets +} + +pkg_preinst() { + if use daemon || use remote; then + enewgroup p2p + enewuser p2p -1 -1 /home/p2p p2p + fi +} + +src_configure() { + local myconf + + if use X; then + use stats && myconf="${myconf} + --enable-wxcas + --enable-alc" + use remote && myconf="${myconf} + --enable-amule-gui" + else + myconf=" + --disable-monolithic + --disable-amule-gui + --disable-wxcas + --disable-alc" + fi + + econf \ + --with-denoise-level=0 \ + --with-wx-config="${WX_CONFIG}" \ + --enable-amulecmd \ + --with-boost \ + $(use_enable debug) \ + $(use_enable daemon amule-daemon) \ + $(use_enable geoip) \ + $(use_enable nls) \ + $(use_enable remote webserver) \ + $(use_enable stats cas) \ + $(use_enable stats alcc) \ + $(use_enable upnp) \ + ${myconf} +} + +src_install() { + default + + if use daemon; then + newconfd "${FILESDIR}"/amuled.confd amuled + newinitd "${FILESDIR}"/amuled.initd amuled + fi + if use remote; then + newconfd "${FILESDIR}"/amuleweb.confd amuleweb + newinitd "${FILESDIR}"/amuleweb.initd amuleweb + fi +} diff --git a/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch new file mode 100644 index 000000000000..d23534475603 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch @@ -0,0 +1,25 @@ +From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001 +From: Tommy Jerry Mairo <tommy.mairo@gmail.com> +Date: Wed, 21 Mar 2018 19:56:28 +0100 +Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0 + +--- + src/ClientCreditsList.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp +index 3bea9fe2d..69e881fd8 100644 +--- a/src/ClientCreditsList.cpp ++++ b/src/ClientCreditsList.cpp +@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting() + // calculate and store public key + CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey)); + CryptoPP::ArraySink asink(m_abyMyPublicKey, 80); +- pubkey.DEREncode(asink); ++ pubkey.GetMaterial().Save(asink); + m_nMyPublicKeyLen = asink.TotalPutLength(); + asink.MessageEnd(); + } catch (const CryptoPP::Exception& e) { +-- +2.16.4 + diff --git a/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch new file mode 100644 index 000000000000..74a0203a993e --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch @@ -0,0 +1,12 @@ +Disable NewVersionCheck by default +--- a/src/Preferences.cpp ++++ b/src/Preferences.cpp +@@ -1210,7 +1210,7 @@ void CPreferences::BuildItemList( const + /** + * Version check + **/ +- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true ))); ++ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false ))); + + /** + * Obfuscation diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch new file mode 100644 index 000000000000..c480165eb983 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch @@ -0,0 +1,97 @@ +From 0f0c5c220228aea81142c7c00f73414cdb1b507a Mon Sep 17 00:00:00 2001 +From: gaffa <gaffa@confuseacat.dk> +Date: Wed, 12 Oct 2016 19:36:21 +0200 +Subject: [PATCH] A workaround for inconsistent behaviour in wxWidgets, where + the button release signal is falling through. Instead of calling DeletePage + directly an event is added to delete the page after the button release event + has been processed by all handlers. + +--- + src/MuleNotebook.cpp | 17 ++++++++++++++++- + src/MuleNotebook.h | 13 +++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/src/MuleNotebook.cpp b/src/MuleNotebook.cpp +index ff3ba294e..4ab23ce18 100644 +--- a/src/MuleNotebook.cpp ++++ b/src/MuleNotebook.cpp +@@ -32,6 +32,7 @@ + + DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED) ++DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE) + + BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook) + EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton) +@@ -44,6 +45,7 @@ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook) + EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease) + EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease) + EVT_MOTION(CMuleNotebook::OnMouseMotion) ++ EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage) + END_EVENT_TABLE() + + CMuleNotebook::CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) +@@ -60,6 +62,12 @@ CMuleNotebook::~CMuleNotebook() + DeleteAllPages(); + } + ++void CMuleNotebook::OnDeletePage(wxBookCtrlEvent& evt) ++{ ++ int page = evt.GetSelection(); ++ DeletePage(page); ++} ++ + + bool CMuleNotebook::DeletePage(int nPage) + { +@@ -216,7 +224,14 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) + if ((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp()) || + ((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp()))) { + // User did click on a 'x' or middle click on the label +- DeletePage(tab); ++ ++ /* WORKAROUND: Instead of calling DeletePage, we need to wait for the ++ * mouse release signal to reach Gtk. Inconsistent with normal wxEvent ++ * behaviour the button release handler in wxWidgets don't evaluate ++ * the result of the signal handling. */ ++ wxNotebookEvent evt( wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, GetId(), tab ); ++ evt.SetEventObject(this); ++ AddPendingEvent( evt ); + } else { + // Is not a 'x'. Send this event up. + event.Skip(); +diff --git a/src/MuleNotebook.h b/src/MuleNotebook.h +index dda097d07..ab2809d88 100644 +--- a/src/MuleNotebook.h ++++ b/src/MuleNotebook.h +@@ -31,7 +31,16 @@ + + DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, -1) + DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, -1) ++DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1) + ++#define EVT_MULENOTEBOOK_DELETE_PAGE(id, fn) \ ++ DECLARE_EVENT_TABLE_ENTRY( \ ++ wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, \ ++ id, \ ++ -1, \ ++ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ ++ NULL \ ++ ), + #define EVT_MULENOTEBOOK_PAGE_CLOSING(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, \ +@@ -107,6 +116,10 @@ public: + */ + void SetPopupHandler( wxWindow* widget ); + ++private: ++ // Internal handler. Workaround for wxWidgets Tab-Crash bug. ++ void OnDeletePage(wxBookCtrlEvent& evt); ++ + protected: + /** + * Event handler for left or middle mouse button release (for closing pages) +-- +2.16.4 + diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch new file mode 100644 index 000000000000..e47970beb0c8 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch @@ -0,0 +1,159 @@ +From 4c94c2d9f3be8b9068966f15aebc29b8c9b706ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?D=C3=A9vai=20Tam=C3=A1s?= <gonosztopi@amule.org> +Date: Mon, 17 Oct 2016 22:14:26 +0200 +Subject: [PATCH] Apply the workaround only if needed + +This way it'll be easy for us to remove the workaround once wxWidgets fixes +the bug. +--- + docs/Changelog | 4 ++++ + src/MuleNotebook.cpp | 19 ++++++++++++++----- + src/MuleNotebook.h | 8 ++++++++ + 3 files changed, 26 insertions(+), 5 deletions(-) + +diff --git a/docs/Changelog b/docs/Changelog +index 7dbff70b2..e9176dd51 100644 +--- a/docs/Changelog ++++ b/docs/Changelog +@@ -2,6 +2,10 @@ Version 2.4.0 - The river knows. + ---------- + 201?-??-?? + ++ gaffatape: ++ * Workaround for bug in wxWidgets causing aMule to crash on ++ closing the last search tab ++ + GonoszTopi: + * Fix restoring toolbar orientation on 'Cancel' + +diff --git a/src/MuleNotebook.cpp b/src/MuleNotebook.cpp +index 4ab23ce18..5d3ad0453 100644 +--- a/src/MuleNotebook.cpp ++++ b/src/MuleNotebook.cpp +@@ -32,7 +32,10 @@ + + DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED) ++ ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE) ++#endif + + BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook) + EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton) +@@ -45,9 +48,12 @@ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook) + EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease) + EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease) + EVT_MOTION(CMuleNotebook::OnMouseMotion) ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage) ++#endif + END_EVENT_TABLE() + ++ + CMuleNotebook::CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) + : wxNotebook(parent, id, pos, size, style, name) + { +@@ -62,11 +68,14 @@ CMuleNotebook::~CMuleNotebook() + DeleteAllPages(); + } + ++ ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + void CMuleNotebook::OnDeletePage(wxBookCtrlEvent& evt) + { + int page = evt.GetSelection(); + DeletePage(page); + } ++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND + + + bool CMuleNotebook::DeletePage(int nPage) +@@ -208,7 +217,6 @@ void CMuleNotebook::OnPopupCloseOthers(wxCommandEvent& WXUNUSED(evt)) + + void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) + { +- + if (GetImageList() == NULL) { + // This Mulenotebook has no images on tabs, so nothing to do. + event.Skip(); +@@ -224,7 +232,7 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) + if ((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp()) || + ((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp()))) { + // User did click on a 'x' or middle click on the label +- ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + /* WORKAROUND: Instead of calling DeletePage, we need to wait for the + * mouse release signal to reach Gtk. Inconsistent with normal wxEvent + * behaviour the button release handler in wxWidgets don't evaluate +@@ -232,16 +240,18 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event) + wxNotebookEvent evt( wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, GetId(), tab ); + evt.SetEventObject(this); + AddPendingEvent( evt ); ++#else ++ DeletePage(tab); ++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND + } else { + // Is not a 'x'. Send this event up. + event.Skip(); + } +- + } + ++ + void CMuleNotebook::OnMouseMotion(wxMouseEvent &event) + { +- + if (GetImageList() == NULL) { + // This Mulenotebook has no images on tabs, so nothing to do. + event.Skip(); +@@ -263,7 +273,6 @@ void CMuleNotebook::OnMouseMotion(wxMouseEvent &event) + // Is not a 'x'. Send this event up. + event.Skip(); + } +- + } + + // File_checked_for_headers +diff --git a/src/MuleNotebook.h b/src/MuleNotebook.h +index ab2809d88..14f61ee68 100644 +--- a/src/MuleNotebook.h ++++ b/src/MuleNotebook.h +@@ -28,9 +28,13 @@ + + #include <wx/notebook.h> + ++#define MULE_NEEDS_DELETEPAGE_WORKAROUND wxCHECK_VERSION(3,0,2) ++ + + DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, -1) + DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, -1) ++ ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1) + + #define EVT_MULENOTEBOOK_DELETE_PAGE(id, fn) \ +@@ -41,6 +45,8 @@ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1) + (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ + NULL \ + ), ++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND ++ + #define EVT_MULENOTEBOOK_PAGE_CLOSING(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, \ +@@ -116,9 +122,11 @@ public: + */ + void SetPopupHandler( wxWindow* widget ); + ++#if MULE_NEEDS_DELETEPAGE_WORKAROUND + private: + // Internal handler. Workaround for wxWidgets Tab-Crash bug. + void OnDeletePage(wxBookCtrlEvent& evt); ++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND + + protected: + /** +-- +2.16.4 + diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch new file mode 100644 index 000000000000..aa92ff6c81ee --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch @@ -0,0 +1,78 @@ +From 17816ed02f59bab9c27310e7f24c73266b0a3003 Mon Sep 17 00:00:00 2001 +From: persmule <persmule@gmail.com> +Date: Wed, 5 Oct 2016 13:47:46 +0800 +Subject: [PATCH] Add a routine to set file name conversion for amuled which + based on wxAppConsole + +--- + src/amule.h | 7 +++++++ + src/amuled.cpp | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 42 insertions(+) + +diff --git a/src/amule.h b/src/amule.h +index f25702f60..240c02dd9 100644 +--- a/src/amule.h ++++ b/src/amule.h +@@ -553,6 +553,13 @@ private: + int OnExit(); + + virtual int InitGui(bool geometry_enable, wxString &geometry_string); ++ // The GTK wxApps sets its file name conversion properly ++ // in wxApp::Initialize(), while wxAppConsole::Initialize() ++ // does not, leaving wxConvFile being set to wxConvLibc. File ++ // name conversion should be set otherwise amuled will abort to ++ // handle non-ASCII file names which monolithic amule can handle. ++ // This function are overrided to perform this. ++ virtual bool Initialize(int& argc_, wxChar **argv_); + + #ifdef AMULED_APPTRAITS + struct sigaction m_oldSignalChildAction; +diff --git a/src/amuled.cpp b/src/amuled.cpp +index 486da5973..86e1ff8b8 100644 +--- a/src/amuled.cpp ++++ b/src/amuled.cpp +@@ -704,6 +704,41 @@ int CamuleDaemonApp::InitGui(bool ,wxString &) + return 0; + } + ++bool CamuleDaemonApp::Initialize(int& argc_, wxChar **argv_) ++{ ++ if ( !wxAppConsole::Initialize(argc_, argv_) ) { ++ return false; ++ } ++ ++#ifdef __UNIX__ ++ wxString encName; ++#if wxUSE_INTL ++ // if a non default locale is set, ++ // assume that the user wants his ++ // filenames in this locale too ++ encName = wxLocale::GetSystemEncodingName().Upper(); ++ ++ // But don't consider ASCII in this case. ++ if ( !encName.empty() ) { ++ if ( encName == wxT("US-ASCII") ) { ++ // This means US-ASCII when returned ++ // from GetEncodingFromName(). ++ encName.clear(); ++ } ++ } ++#endif // wxUSE_INTL ++ ++ // in this case, UTF-8 is used by default. ++ if ( encName.empty() ) { ++ encName = wxT("UTF-8"); ++ } ++ ++ static wxConvBrokenFileNames fileconv(encName); ++ wxConvFileName = &fileconv; ++#endif // __UNIX__ ++ ++ return true; ++} + + int CamuleDaemonApp::OnExit() + { +-- +2.16.4 + diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml index 2a3a65502073..836b2cdc312b 100644 --- a/net-p2p/amule/metadata.xml +++ b/net-p2p/amule/metadata.xml @@ -1,13 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="daemon">Enable amule daemon</flag> - <flag name="remote">Enable remote controlling of the client</flag> - <flag name="stats">Enable statistic reporting</flag> - </use> - <upstream> - <remote-id type="sourceforge">amule</remote-id> - </upstream> + <maintainer type="person"> + <email>alexander@tsoy.me</email> + <name>Alexander Tsoy</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">amule-project/amule</remote-id> + </upstream> + <use> + <flag name="daemon">Enable amule daemon</flag> + <flag name="remote">Enable remote controlling of the client</flag> + <flag name="stats">Enable statistic reporting</flag> + </use> </pkgmetadata> diff --git a/net-p2p/litecoind/Manifest b/net-p2p/litecoind/Manifest index f8ab9571a20e..d479efff2a75 100644 --- a/net-p2p/litecoind/Manifest +++ b/net-p2p/litecoind/Manifest @@ -8,5 +8,5 @@ AUX litecoind-0.10.2.2-memenv_h.patch 506 BLAKE2B 70f9911bd90fcba5c4f41aaabfd8a2 AUX litecoind-0.10.4.0-gcc6.patch 2789 BLAKE2B 3c943438cad1b029a4764b76b901e1959edb14599b09aced7897d632defc5005d70d7de3f49e9ea56fe87243b071e2257f6b6984bd748be7697b607044ee47ae SHA512 7c5a14c50076438d04fd7ce3b24d0c17ae23d67c043ffb381e893f2ec6c4903842638347be12ca090bef2e3fb07721bccae77c61c34018ba406e9ceba4cd0cc0 AUX litecoind.logrotate 113 BLAKE2B 01ca87d1a52061ff95baba8f5c570747b962c7836e5fbe3bed62292afc8b1ddcd7eb550441a3966e84290e2ee2c37acd73ed58b753434723292a28ec17883f22 SHA512 eaa9f462be8dc755b675e4d5cb3ad271e3b1053edfa06df7862fa887160c849c768d2a268a7c8b52d1cfc834c186780b71435ee65475ea6c6692c18bded48dec DIST litecoin-0.10.4.0.tar.gz 4730189 BLAKE2B 3b3e4db10ca7ebb048853a424438d888a239cc736b1b2aa29dd0b6571daec5a64f95aee98a82991cd3e69b26965151f298655ca09745f103ebde1d15216ae2f8 SHA512 ae17e754d188efb1b51a376a52fe03e43b58c5059673b7dd4ecbf4f48574290b84011525fef2e10893f53e4da3d6ad9b5577001bb40aef7080d4c2479f4714a9 -EBUILD litecoind-0.10.4.0.ebuild 2543 BLAKE2B f06c6987f1f4ca0b7a884159dbf718192e5799e80ca6c6002c9945263f341a52fe95ac408523eae2fea58a64d5b458e8505b0a3fad33a27873a062715584b56c SHA512 f75bab399458e0771b6bb08c37c7c749eab7df51ab63f1e92693e0b3c6315b173e449f553df5f97ab263a6ded263107cb809748e81f8624864f8892e373b0ab7 +EBUILD litecoind-0.10.4.0.ebuild 2545 BLAKE2B de5f8387008dcf738f90ecc89959a56fa86b6863d0a29b21c72370ae4c7c77ddded95693d17b75039a68a1e2e9fbc5b63ecc2900a5d7fa032d10e66f0d60f99f SHA512 876ce9ca91bb3626a24af550bf43bd301680603c18c206bd6360902a316388453d3241fc15c6af04420a112fa556fd7744126174033cc1860b6cb206e0677cfd MISC metadata.xml 396 BLAKE2B d75a242beda5f641ab3e995c20517fc18334d39df0fdb44107e1c54adcd87911d8baf360ae05bdf66ba9d5e690d296760ba3d1599e8bd8cf5fbb1ed653601c29 SHA512 b7bed8abba67ee6344e39e4a41991a0b1c036a51cf1ca338a8851507e8e7bcb9e3081445eaa7fb09b2b1ef352d02dbff5339faebc0becce9273bd743344d47a6 diff --git a/net-p2p/litecoind/litecoind-0.10.4.0.ebuild b/net-p2p/litecoind/litecoind-0.10.4.0.ebuild index 32c939ec998e..343fe5987cf1 100644 --- a/net-p2p/litecoind/litecoind-0.10.4.0.ebuild +++ b/net-p2p/litecoind/litecoind-0.10.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,7 +26,7 @@ RDEPEND=" logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] - >=dev-libs/leveldb-1.18-r1 + >=dev-libs/leveldb-1.18-r1:= " DEPEND="${RDEPEND} >=app-shells/bash-4.1 diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index 612b9f3cc4a7..011b77fc3d55 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,11 +1,14 @@ AUX rtorrent-0.9.1-ncurses.patch 416 BLAKE2B 7e94844be4d5c2e50f8d0b88d6c2861d129b8b0627b56a78cbc4d2b47fb028aaea73ce9233118587139a0dad4cd24ba4c001679b168f7ec8150f5e0ec2450310 SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 AUX rtorrent-0.9.4-tinfo.patch 1137 BLAKE2B 3b48a7755e858f1d6d22d0051c824b8fdf9ed24e1e390996a5dbb28d0d75733a9d9cabe86d5b75b5cea75e52251b3770295219bc4e1d49a15ab906672809a3dd SHA512 5f571daa1bdaa8823bbbf52c66df3ff88be487e3fdaa8ea4f45c26b13336995a4a81a712766a8181bc85746e458652bb11c4dcc28d76da3137025e52e614c179 AUX rtorrent-0.9.6-cppunit-pkgconfig.patch 857 BLAKE2B 89a3d1e869e6d97a3ce511e5ed8f8eec025ad5de77fc17252a3c66cb8c232bfde919f8a0535728e19d43a1575b38323b382150e2e3c54cba8481243c84fff2b7 SHA512 94cf317ef2ec8dae361fa82df156bee153f58c927bdc4f203c5318ba839f8a7024021a4d2e90771b067f313c8ff524659b41aaa386b1a2341561f196c97fc03f +AUX rtorrent-0.9.7-tinfo.patch 1457 BLAKE2B abbca9424939f02f341cfb4f15c10d4e17624add223e6c2365b795555ee7e70f6abc3e6dfe8455bef493df7c549df3117cbd9f19095a9219b106da8191d5c951 SHA512 7f4a9262dfd4a89329cf90818d49c76c0310318bb6bf61055336235a319b5717a6b6d25903c93cf4160b718f17d78cf9192138b72d8ddd1f46494c001bf30979 AUX rtorrent.1 18204 BLAKE2B 4e757f00d9a08978e09593e89b17fb7d7e4afe7f5064ed8bb7d9316f1450471ec42e006478df43eb2a7d4fdcea0445237b0e053f54bd1f4e8ad7db2878b628a1 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe AUX rtorrentd.conf 13 BLAKE2B 80db665e7f75c50c02134cced87847926d23ea256868fb6d1213faaa8be1879cbc69e72f006b49b33dc99c0a9dcace2db90c8917ca272554c348bd1e6293514c SHA512 f241452b812a1837660f9ad52881feacc02825e82ea7ac19acc662b4219dd58997ea908275b8c9ee78ed791babf79c1a91069dc6d5b5fb3c461e3026cdeab73f AUX rtorrentd.init 871 BLAKE2B 3f83e6bb52044e293127aaf7ae505c1dc6422698360537edb5c898e512e52fc42efff34f000937f00f16839c5b02beb64540af42ae6b1849a81424bfbf392656 SHA512 f71d55ed18ef9d32c56be5508c91cafb0f10609cf5402e7ff1b63a7166b9b52a58aa6c580a7709e4449a279caba6adcf4f2fc76a6768a82f12993a3df92124aa AUX rtorrentd_at.service 308 BLAKE2B 2aac1f49a25d35136db25a13c08d1847d21701272d56a6ca06eee6a8426719c340a041568cc1d575fae341a49fa1f53a132ba11ff73180b1bee246197d8119c2 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615 DIST rtorrent-0.9.6.tar.gz 610845 BLAKE2B 4a4faccffe79e7d877e3be9a9b16edcea87f1969ee2689f7789ebd738a19a5a41f5eae3b33c5b874b5c31ad8e872baa88374fae2047dbc76d4f1c0bc6d7ecbd4 SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75 +DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00 EBUILD rtorrent-0.9.6-r1.ebuild 1661 BLAKE2B 3b051276ea6b869219bc999793189f9ae49586d5e30e59d5cda59bf0c4d02b5af22cb1d35dd135a18e7930f7118f416ef07ca54a33bd2867def21857975b6b34 SHA512 7d2821df7ae04bda406f0afe964bf1edb858d407181e157c476a278a0a1daccfa77acaa1126e9a36bff4f6033b4289a239c91e9517260b611b93f3940c187272 EBUILD rtorrent-0.9.6.ebuild 1607 BLAKE2B 7bba30c404e10bb4e723ebffe0f1cbf0da15750259cf2e5a3061e0768ea6cae78d4be6b51be8ec1266e2df1bfb2081d6d5bff8318c33b00e51e01487f9cf62f3 SHA512 8fe7ab26bd876073b09ae926e979a32d926374a411a70753b7133731f5a381ec2577df095689fa9fc7d759792e62dae7734324e24446b3c01f4f97322f17f04b +EBUILD rtorrent-0.9.7.ebuild 1885 BLAKE2B 53df5b61398a823e1ec9495ea351ce4636e5c314a105240e774fe80cdd4ea0b05727b8a5aaf609d8460beb80766fb7c7b373400f7cf1932489b75dcfc6f9bbec SHA512 4a6a21e792f0fdf3d6a0b1e66778e78a04ef80485e4a5905cbda8e4a8e4af0da14f6514b14a47c74b6ae7934a8949e022f82e189e28d61c822fa40006fcd3ace MISC metadata.xml 676 BLAKE2B ec4ff11bbb2ba69ce911f527e77d14f2891307bf9f321a7da4eda884dd0bb93961275592617e19070f958b9ac91372133130f33770f527623076f5b5338e0969 SHA512 f2e5e3a709b1be52e3947529e4aa4bc9d279820333287d562c0254b761962ebb19ad9a47c8c9f181eb103ae1580ebd4d68b8ce1684598cde0aad0faa126dbbd6 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 000000000000..8bb009eb676d --- /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 new file mode 100644 index 000000000000..3b1b5da00401 --- /dev/null +++ b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild @@ -0,0 +1,73 @@ +# 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" +) + +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 +} diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest index 733b2bf02bf9..c8a1d91e3b94 100644 --- a/net-p2p/torrentinfo/Manifest +++ b/net-p2p/torrentinfo/Manifest @@ -2,4 +2,4 @@ AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683 DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2 EBUILD torrentinfo-1.8.6-r1.ebuild 651 BLAKE2B 53b29a9a128ae0d86dfa8ba002e5ba2d595173638d2838391a52b5e23c33401c9edcc8bf6f2b7b7353cafdc715e517e13573ea6d168ffe3f8e1de74b8c494697 SHA512 5193fa2291a2fda3a509fa9ec74a83b1a6d8e0a40493fd876f3c71c2279101d00e05f333281e451044ad4ef5cd85deb29332bdf7eef98cd8ce5f7db739f0e797 EBUILD torrentinfo-1.8.6.ebuild 588 BLAKE2B ccc8ac40b0c7b05b49411024c4d4ccf97216ae5a63fab0c48c5b81031a4f75496eb61f3b3190da9b2c62d0a5de47fa91a7c59d3d54e5202575d8b1286e13a056 SHA512 d548e58d23b1db0621ee3bd48b2b56ac14a99bdf9c658cb203a9cd9d9962f9d168f94f99bf1bae911a513c195e4cce76c2da6096a1e0175c762055c2f68a2067 -MISC metadata.xml 638 BLAKE2B 84a6091308a250a879450ca5d9ee4d17defb189968961da6ef7063d4aa4abaf59a1120d1cbc1b8eec4d7fc36f0834bb7c594ad81cd7d62bc4bcd0daa06270b61 SHA512 117d1130ffe71504745527604412fbef33d597a921a28f4c354120448454c8e339396f5083d9f756c94a6cec897c2fe8135a2a8211a7ff9c9dc1c4ba8225668b +MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5 diff --git a/net-p2p/torrentinfo/metadata.xml b/net-p2p/torrentinfo/metadata.xml index 2054982a1b7c..80c3d150237e 100644 --- a/net-p2p/torrentinfo/metadata.xml +++ b/net-p2p/torrentinfo/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sautier.louis@gmail.com</email> + <email>sbraz@gentoo.org</email> <name>Louis Sautier</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <maintainer> <email>fuuzetsu@fuuzetsu.co.uk</email> diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest index 6920b97dea21..79066eb1f922 100644 --- a/net-p2p/transmission/Manifest +++ b/net-p2p/transmission/Manifest @@ -1,15 +1,10 @@ AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb -AUX transmission-2.92-handshake.patch 1257 BLAKE2B dbbf66458702c1aafcedbc296b12c6aa77973463f83db3aa6e2b8c388fd60e2e33f487021fe3c53c18415f6d8e098eb949cfba963f1b07b15d35140cf8d29a7e SHA512 d4272018ffc7ea9607dae475275d694e678119160225f00135ced711771ddf79af7271c42399bccf701d67ac07052a47f33439ba32bb74838786d3e915c364f6 -AUX transmission-2.92-pr468.patch 11213 BLAKE2B 87aaeefa0bbace9522c18374e5aeb159dc6d40c61c5d7d6cae0eada3c46c66dc29db37493523c12ce443da8470384be39ad64f0763b2d649b5d60c1b6a896482 SHA512 aa0c7e09d302da4811b1bd4c80c61e97c5592e91561872d733cf9de6d386cf039c29a6c57843bc804bca2b5a1a6ef640dacb496bf590e70591aef8c2ef11d9f2 AUX transmission-2.93-libressl.patch 353 BLAKE2B 62d7875b9cb96bba9d03da8a109545c755831dbdeb374081b719128746b5a1c2cb1a55e05b0e82ad615bc5a2d9e6e385ac6aab4370e98ebd582b31b24ecb43b0 SHA512 72489bc86a61d8c612b5d3b1b55897090c87423dd50b354b14cb8ee9f9fbdd5e2be75d3d6840369947c99d4231e5f23986040837bee5f45a2756631e4301bd2f AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946 -DIST transmission-2.92.tar.xz 3378116 BLAKE2B 8929a2eab8a1617db44ca8a081fd7de786daef92e891ac86d4690451c0f4fa0d4e1ea03692c59babea6e9aee5dcfef57bd81e5c72a0bb4fe9efbd436ff006104 SHA512 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11 DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7 -EBUILD transmission-2.92-r2.ebuild 4347 BLAKE2B ccdce02673646bcc583f0fbd173c10cb2445669e04dd48ac2012298e1d7f663e78fe50ed6e300194e29a08dba3fbea3dc8c1028722f6a9e6a894dd85a696cac8 SHA512 1dc44445ec7bda9aff29c70a0a368cfca377795e14d887e66c9c552f0629142398f13b49c8b1da8b46fa8f5d15f7a9c7c7430e772dfc135e45619c69e35bf332 -EBUILD transmission-2.92-r3.ebuild 4409 BLAKE2B d6a4fa648bffd2a900aa5cf6dd962188aab4e9fe25d83ccce8f24b19389d3e2b5c9c1a552e37304b564be3d1ed69e657048afe850f4a592c73676b270c7fa911 SHA512 5fb59bff0ada74dc9ee9d12e81ebafba842ce2c56d7259640ca78f5b55983792b8763dc1076732f2c539703778e70f918a40055940c9445c3d65721c11dd6bb6 EBUILD transmission-2.93.ebuild 4375 BLAKE2B dd60b643985afdb20cb782f229011535b1c6dd98554e1b28b32dc805ca6b4ffd25485d10ca3dcd0eaa7b0a498d40edbd5c5533965def675e3c7b93193a38acb6 SHA512 5afb734ad2ee190605e6d7204b59afd556cbfd50e3a8c5308d916f2d40fbaf81301c53f5e664ffc0db7bf701d37bb6e01d9b73027de527f1fe036b0638926e91 EBUILD transmission-2.94.ebuild 4331 BLAKE2B 5017f6413789c8c9a42c845cff467424a4a5424b492cc10126b18519d4814d75e7497f251b78b64b08f67d1691be2e3b95411a0cb60f81eb7246173687e78971 SHA512 aba78a0d158f9b864fcd6bf7f11386d2ee9009f9a2c556e4071b9c19d13a1a72e56a38303bd8e02a54ba39a73b4c763114581e17378cffdde898c604fa090ea8 EBUILD transmission-9999.ebuild 3726 BLAKE2B ed8e5e8ddc738eddfbcd5d562f31f8ff62a7833fcbfac05ef8a9b0c157ec579eb8ad8ec471527371221f14dd00094ec4f5f429a831154a5d2cbc80425c4f2a64 SHA512 af09f34bd910244bea541f350fc8df64229cf1df57332a80d6b109190630b37ccebf835a85aff6f3803d12c00d25dee24ecee93bedd02d6f9a54a118c0fea4cf diff --git a/net-p2p/transmission/files/transmission-2.92-handshake.patch b/net-p2p/transmission/files/transmission-2.92-handshake.patch deleted file mode 100644 index a30cd583fae0..000000000000 --- a/net-p2p/transmission/files/transmission-2.92-handshake.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 4c00df9463ea4fd70b73c620e439f5c3ee5efa60 -Author: Mike Gelfand <mikedld@mikedld.com> -Date: Sun Sep 18 13:58:15 2016 +0300 - - Abort handshake if establishing DH shared secret fails - - Fixes #27 - -diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c -index c728696..e7ff131 100644 ---- a/libtransmission/handshake.c -+++ b/libtransmission/handshake.c -@@ -425,7 +425,8 @@ readYb (tr_handshake * handshake, struct evbuffer * inbuf) - - /* compute the secret */ - evbuffer_remove (inbuf, yb, KEY_LEN); -- tr_cryptoComputeSecret (handshake->crypto, yb); -+ if (!tr_cryptoComputeSecret (handshake->crypto, yb)) -+ return tr_handshakeDone (handshake, false); - - /* now send these: HASH ('req1', S), HASH ('req2', SKEY) xor HASH ('req3', S), - * ENCRYPT (VC, crypto_provide, len (PadC), PadC, len (IA)), ENCRYPT (IA) */ -@@ -741,7 +742,9 @@ readYa (tr_handshake * handshake, - - /* read the incoming peer's public key */ - evbuffer_remove (inbuf, ya, KEY_LEN); -- tr_cryptoComputeSecret (handshake->crypto, ya); -+ if (!tr_cryptoComputeSecret (handshake->crypto, ya)) -+ return tr_handshakeDone (handshake, false); -+ - computeRequestHash (handshake, "req1", handshake->myReq1); - - /* send our public key to the peer */ diff --git a/net-p2p/transmission/files/transmission-2.92-pr468.patch b/net-p2p/transmission/files/transmission-2.92-pr468.patch deleted file mode 100644 index a3a0cf160823..000000000000 --- a/net-p2p/transmission/files/transmission-2.92-pr468.patch +++ /dev/null @@ -1,302 +0,0 @@ -Fix a weakness that allows remote code execution via the Transmission -RPC server using DNS rebinding: - -https://bugs.chromium.org/p/project-zero/issues/detail?id=1447 - -Patch adapted from Tavis Ormandy's patch on the Transmission master -branch to the Transmission 2.92 release by Leo Famulari -<leo@famulari.name>: - -https://github.com/transmission/transmission/pull/468/commits - -From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001 -From: Tavis Ormandy <taviso@google.com> -Date: Thu, 11 Jan 2018 10:00:41 -0800 -Subject: [PATCH] mitigate dns rebinding attacks against daemon - ---- - libtransmission/quark.c | 2 + - libtransmission/quark.h | 2 + - libtransmission/rpc-server.c | 116 +++++++++++++++++++++++++++++++++++++---- - libtransmission/rpc-server.h | 4 ++ - libtransmission/session.c | 2 + - libtransmission/transmission.h | 1 + - libtransmission/web.c | 3 ++ - 7 files changed, 121 insertions(+), 9 deletions(-) - -diff --git a/libtransmission/quark.c b/libtransmission/quark.c -index 30cc2bca4..b4fd7aabd 100644 ---- a/libtransmission/quark.c -+++ b/libtransmission/quark.c -@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] = - { "rpc-authentication-required", 27 }, - { "rpc-bind-address", 16 }, - { "rpc-enabled", 11 }, -+ { "rpc-host-whitelist", 18 }, -+ { "rpc-host-whitelist-enabled", 26 }, - { "rpc-password", 12 }, - { "rpc-port", 8 }, - { "rpc-url", 7 }, -diff --git a/libtransmission/quark.h b/libtransmission/quark.h -index 7f5212733..17464be8f 100644 ---- a/libtransmission/quark.h -+++ b/libtransmission/quark.h -@@ -291,6 +291,8 @@ enum - TR_KEY_rpc_authentication_required, - TR_KEY_rpc_bind_address, - TR_KEY_rpc_enabled, -+ TR_KEY_rpc_host_whitelist, -+ TR_KEY_rpc_host_whitelist_enabled, - TR_KEY_rpc_password, - TR_KEY_rpc_port, - TR_KEY_rpc_url, -diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c -index a3485f3fa..292cd5fce 100644 ---- a/libtransmission/rpc-server.c -+++ b/libtransmission/rpc-server.c -@@ -52,6 +52,7 @@ struct tr_rpc_server - bool isEnabled; - bool isPasswordEnabled; - bool isWhitelistEnabled; -+ bool isHostWhitelistEnabled; - tr_port port; - char * url; - struct in_addr bindAddress; -@@ -63,6 +64,7 @@ struct tr_rpc_server - char * password; - char * whitelistStr; - tr_list * whitelist; -+ tr_list * hostWhitelist; - - char * sessionId; - time_t sessionIdExpiresAt; -@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address) - return false; - } - -+static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req) -+{ -+ /* If password auth is enabled, any hostname is permitted. */ -+ if (server->isPasswordEnabled) -+ { -+ return true; -+ } -+ -+ char const* const host = evhttp_find_header(req->input_headers, "Host"); -+ -+ // If whitelist is disabled, no restrictions. -+ if (!server->isHostWhitelistEnabled) -+ return true; -+ -+ /* No host header, invalid request. */ -+ if (host == NULL) -+ { -+ return false; -+ } -+ -+ /* Host header might include the port. */ -+ char* const hostname = tr_strndup(host, strcspn(host, ":")); -+ -+ /* localhost or ipaddress is always acceptable. */ -+ if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname)) -+ { -+ tr_free(hostname); -+ return true; -+ } -+ -+ /* Otherwise, hostname must be whitelisted. */ -+ for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) { -+ if (tr_wildmat(hostname, l->data)) -+ { -+ tr_free(hostname); -+ return true; -+ } -+ } -+ -+ tr_free(hostname); -+ return false; -+} -+ - static bool - test_session_id (struct tr_rpc_server * server, struct evhttp_request * req) - { -@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg) - handle_upload (req, server); - } - #ifdef REQUIRE_SESSION_ID -+ else if (!isHostnameAllowed(server, req)) -+ { -+ char* tmp = tr_strdup_printf( -+ "<p>Transmission received your request, but the hostname was unrecognized.</p>" -+ "<p>To fix this, choose one of the following options:" -+ "<ul>" -+ "<li>Enable password authentication, then any hostname is allowed.</li>" -+ "<li>Add the hostname you want to use to the whitelist in settings.</li>" -+ "</ul></p>" -+ "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>" -+ "<p>This requirement has been added to help prevent " -+ "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> " -+ "attacks.</p>"); -+ send_simple_response(req, 421, tmp); -+ tr_free(tmp); -+ } -+ - else if (!test_session_id (server, req)) - { - const char * sessionId = get_current_session_id (server); -@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg) - "<li> When you get this 409 error message, resend your request with the updated header" - "</ol></p>" - "<p>This requirement has been added to help prevent " -- "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> " -+ "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> " - "attacks.</p>" - "<p><code>%s: %s</code></p>", - TR_RPC_SESSION_ID_HEADER, sessionId); -@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server) - return server->url ? server->url : ""; - } - --void --tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) -+static void -+tr_rpcSetList (char const* whitelistStr, tr_list** list) - { - void * tmp; - const char * walk; - -- /* keep the string */ -- tmp = server->whitelistStr; -- server->whitelistStr = tr_strdup (whitelistStr); -- tr_free (tmp); -- - /* clear out the old whitelist entries */ -- while ((tmp = tr_list_pop_front (&server->whitelist))) -+ while ((tmp = tr_list_pop_front (list)) != NULL) - tr_free (tmp); - - /* build the new whitelist entries */ -@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) - const char * delimiters = " ,;"; - const size_t len = strcspn (walk, delimiters); - char * token = tr_strndup (walk, len); -- tr_list_append (&server->whitelist, token); -+ tr_list_append (list, token); - if (strcspn (token, "+-") < len) - tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'! Are you using an old ACL by mistake?)", token); - else -@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr) - } - } - -+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr) -+{ -+ tr_rpcSetList(whitelistStr, &server->hostWhitelist); -+} -+ -+void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr) -+{ -+ /* keep the string */ -+ char* const tmp = server->whitelistStr; -+ server->whitelistStr = tr_strdup(whitelistStr); -+ tr_free(tmp); -+ -+ tr_rpcSetList(whitelistStr, &server->whitelist); -+} -+ - const char* - tr_rpcGetWhitelist (const tr_rpc_server * server) - { -@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server) - return server->isWhitelistEnabled; - } - -+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled) -+{ -+ server->isHostWhitelistEnabled = isEnabled; -+} -+ - /**** - ***** PASSWORD - ****/ -@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session * session, tr_variant * settings) - else - tr_rpcSetWhitelistEnabled (s, boolVal); - -+ key = TR_KEY_rpc_host_whitelist_enabled; -+ -+ if (!tr_variantDictFindBool(settings, key, &boolVal)) -+ { -+ missing_settings_key(key); -+ } -+ else -+ { -+ tr_rpcSetHostWhitelistEnabled(s, boolVal); -+ } -+ -+ key = TR_KEY_rpc_host_whitelist; -+ -+ if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL) -+ { -+ missing_settings_key(key); -+ } -+ else -+ { -+ tr_rpcSetHostWhitelist(s, str); -+ } -+ - key = TR_KEY_rpc_authentication_required; - if (!tr_variantDictFindBool (settings, key, &boolVal)) - missing_settings_key (key); -diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h -index e0302c5ea..8c9e6b24e 100644 ---- a/libtransmission/rpc-server.h -+++ b/libtransmission/rpc-server.h -@@ -49,6 +49,10 @@ void tr_rpcSetWhitelist (tr_rpc_server * server, - - const char* tr_rpcGetWhitelist (const tr_rpc_server * server); - -+void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled); -+ -+void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist); -+ - void tr_rpcSetPassword (tr_rpc_server * server, - const char * password); - -diff --git a/libtransmission/session.c b/libtransmission/session.c -index 844cadba8..58b717913 100644 ---- a/libtransmission/session.c -+++ b/libtransmission/session.c -@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d) - tr_variantDictAddStr (d, TR_KEY_rpc_username, ""); - tr_variantDictAddStr (d, TR_KEY_rpc_whitelist, TR_DEFAULT_RPC_WHITELIST); - tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled, true); -+ tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST); -+ tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true); - tr_variantDictAddInt (d, TR_KEY_rpc_port, atoi (TR_DEFAULT_RPC_PORT_STR)); - tr_variantDictAddStr (d, TR_KEY_rpc_url, TR_DEFAULT_RPC_URL_STR); - tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled, true); -diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h -index 4f76adfd6..e213a8f4e 100644 ---- a/libtransmission/transmission.h -+++ b/libtransmission/transmission.h -@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void); - #define TR_DEFAULT_BIND_ADDRESS_IPV4 "0.0.0.0" - #define TR_DEFAULT_BIND_ADDRESS_IPV6 "::" - #define TR_DEFAULT_RPC_WHITELIST "127.0.0.1" -+#define TR_DEFAULT_RPC_HOST_WHITELIST "" - #define TR_DEFAULT_RPC_PORT_STR "9091" - #define TR_DEFAULT_RPC_URL_STR "/transmission/" - #define TR_DEFAULT_PEER_PORT_STR "51413" -diff --git a/libtransmission/web.c b/libtransmission/web.c -index ee495e9fc..c7f062730 100644 ---- a/libtransmission/web.c -+++ b/libtransmission/web.c -@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code) - case 415: return "Unsupported Media Type"; - case 416: return "Requested Range Not Satisfiable"; - case 417: return "Expectation Failed"; -+ case 421: return "Misdirected Request"; - case 500: return "Internal Server Error"; - case 501: return "Not Implemented"; - case 502: return "Bad Gateway"; diff --git a/net-p2p/transmission/transmission-2.92-r2.ebuild b/net-p2p/transmission/transmission-2.92-r2.ebuild deleted file mode 100644 index ba43a7787f0c..000000000000 --- a/net-p2p/transmission/transmission-2.92-r2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools fdo-mime flag-o-matic gnome2-utils qmake-utils systemd user - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz" - -# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest -# transmission in licenses/ is for mentioning OpenSSL linking exception -# MIT is in several libtransmission/ headers -LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" -SLOT=0 -IUSE="ayatana gtk libressl lightweight systemd qt5 xfs" -KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux" - -RDEPEND=">=dev-libs/libevent-2.0.10:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libnatpmp - >=net-libs/miniupnpc-1.7:= - >=net-misc/curl-7.16.3[ssl] - sys-libs/zlib:= - gtk? ( - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.4:3 - ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) - systemd? ( >=sys-apps/systemd-209:= )" -DEPEND="${RDEPEND} - >=dev-libs/glib-2.32 - dev-util/intltool - sys-devel/gettext - virtual/os-headers - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) - xfs? ( sys-fs/xfsprogs )" - -REQUIRED_USE="ayatana? ( gtk )" - -DOCS=( AUTHORS NEWS qt/README.txt ) - -PATCHES=( - "${FILESDIR}"/libsystemd.patch - "${FILESDIR}/${P}-handshake.patch" -) - -src_prepare() { - sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die - - # Trick to avoid automagic dependency - if ! use ayatana ; then - sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die - fi - - # http://trac.transmissionbt.com/ticket/4324 - sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die - - # Prevent m4_copy error when running aclocal - # m4_copy: won't overwrite defined macro: glib_DEFUN - rm m4/glib-gettext.m4 || die - - default - eautoreconf -} - -src_configure() { - export ac_cv_header_xfs_xfs_h=$(usex xfs) - - # https://bugs.gentoo.org/577528 - append-lfs-flags - - econf \ - --enable-external-natpmp \ - $(use_enable lightweight) \ - $(use_with systemd systemd-daemon) \ - $(use_with gtk) - - if use qt5; then - pushd qt >/dev/null || die - eqmake5 qtr.pro - popd >/dev/null || die - fi -} - -src_compile() { - emake - - if use qt5; then - emake -C qt - $(qt5_get_bindir)/lrelease qt/translations/*.ts || die - fi -} - -src_install() { - default - - rm "${ED%/}"/usr/share/transmission/web/LICENSE || die - - newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon - newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon - systemd_dounit daemon/transmission-daemon.service - systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf - - if use qt5; then - pushd qt >/dev/null || die - emake INSTALL_ROOT="${ED%/}"/usr install - - domenu transmission-qt.desktop - - local res - for res in 16 22 24 32 48 64 72 96 128 192 256; do - doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png - done - doicon -s scalable icons/hicolor/scalable/transmission-qt.svg - - insinto /usr/share/qt5/translations - doins translations/*.qm - popd >/dev/null || die - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - enewgroup transmission - enewuser transmission -1 -1 /var/lib/transmission transmission - - if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then - mkdir -p "${EROOT%/}"/var/lib/transmission || die - chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die - fi - - elog "If you use transmission-daemon, please, set 'rpc-username' and" - elog "'rpc-password' (in plain text, transmission-daemon will hash it on" - elog "start) in settings.json file located at /var/lib/transmission/config or" - elog "any other appropriate config directory." - elog - elog "Since µTP is enabled by default, transmission needs large kernel buffers for" - elog "the UDP socket. You can append following lines into /etc/sysctl.conf:" - elog " net.core.rmem_max = 4194304" - elog " net.core.wmem_max = 1048576" - elog "and run sysctl -p" -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/transmission/transmission-2.92-r3.ebuild b/net-p2p/transmission/transmission-2.92-r3.ebuild deleted file mode 100644 index 839052138da0..000000000000 --- a/net-p2p/transmission/transmission-2.92-r3.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools fdo-mime flag-o-matic gnome2-utils qmake-utils systemd user - -DESCRIPTION="A Fast, Easy and Free BitTorrent client" -HOMEPAGE="http://www.transmissionbt.com/" -SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz" - -# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest -# transmission in licenses/ is for mentioning OpenSSL linking exception -# MIT is in several libtransmission/ headers -LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" -SLOT=0 -IUSE="ayatana gtk libressl lightweight systemd qt5 xfs" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" - -RDEPEND=">=dev-libs/libevent-2.0.10:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libnatpmp - >=net-libs/miniupnpc-1.7:= - >=net-misc/curl-7.16.3[ssl] - sys-libs/zlib:= - gtk? ( - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.4:3 - ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) - systemd? ( >=sys-apps/systemd-209:= )" -DEPEND="${RDEPEND} - >=dev-libs/glib-2.32 - dev-util/intltool - sys-devel/gettext - virtual/os-headers - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) - xfs? ( sys-fs/xfsprogs )" - -REQUIRED_USE="ayatana? ( gtk )" - -DOCS=( AUTHORS NEWS qt/README.txt ) - -PATCHES=( - "${FILESDIR}"/libsystemd.patch - "${FILESDIR}"/transmission-2.92-handshake.patch - "${FILESDIR}"/transmission-2.92-pr468.patch -) - -src_prepare() { - sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die - - # Trick to avoid automagic dependency - if ! use ayatana ; then - sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die - fi - - # http://trac.transmissionbt.com/ticket/4324 - sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die - - # Prevent m4_copy error when running aclocal - # m4_copy: won't overwrite defined macro: glib_DEFUN - rm m4/glib-gettext.m4 || die - - default - eautoreconf -} - -src_configure() { - export ac_cv_header_xfs_xfs_h=$(usex xfs) - - # https://bugs.gentoo.org/577528 - append-lfs-flags - - econf \ - --enable-external-natpmp \ - $(use_enable lightweight) \ - $(use_with systemd systemd-daemon) \ - $(use_with gtk) - - if use qt5; then - pushd qt >/dev/null || die - eqmake5 qtr.pro - popd >/dev/null || die - fi -} - -src_compile() { - emake - - if use qt5; then - emake -C qt - $(qt5_get_bindir)/lrelease qt/translations/*.ts || die - fi -} - -src_install() { - default - - rm "${ED%/}"/usr/share/transmission/web/LICENSE || die - - newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon - newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon - systemd_dounit daemon/transmission-daemon.service - systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf - - if use qt5; then - pushd qt >/dev/null || die - emake INSTALL_ROOT="${ED%/}"/usr install - - domenu transmission-qt.desktop - - local res - for res in 16 22 24 32 48 64 72 96 128 192 256; do - doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png - done - doicon -s scalable icons/hicolor/scalable/transmission-qt.svg - - insinto /usr/share/qt5/translations - doins translations/*.qm - popd >/dev/null || die - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - enewgroup transmission - enewuser transmission -1 -1 /var/lib/transmission transmission - - if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then - mkdir -p "${EROOT%/}"/var/lib/transmission || die - chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die - fi - - elog "If you use transmission-daemon, please, set 'rpc-username' and" - elog "'rpc-password' (in plain text, transmission-daemon will hash it on" - elog "start) in settings.json file located at /var/lib/transmission/config or" - elog "any other appropriate config directory." - elog - elog "Since µTP is enabled by default, transmission needs large kernel buffers for" - elog "the UDP socket. You can append following lines into /etc/sysctl.conf:" - elog " net.core.rmem_max = 4194304" - elog " net.core.wmem_max = 1048576" - elog "and run sysctl -p" -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest index 8649865f4134..63c7e7ff3629 100644 --- a/net-p2p/xmr-stak/Manifest +++ b/net-p2p/xmr-stak/Manifest @@ -1,9 +1,11 @@ +AUX xmr-stak 909 BLAKE2B 36ee36054b285af242065ebfdeb9d05dbcb28314e9e5ab9bebe247860847b7b85fb5b26bdffba871558d69b7df65345cec7ca9c52ff1c749de4d26145c023783 SHA512 fd9edee78230ccb361d279ba2f416123806b2b4576fa735fc999a1260798cce43343b615c315ed1eefe72262e3cc6ef5ebad999f74d7d0f4409595e8a37fa16d AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524ced84d3ae90082571148c563c4cdedf3085b246f8a8b5babc56c7cf742ea48f1f68165c443373f57efcd2139 SHA512 04ea288a2b51480db5ebde3926d453006aad1b8b028e6e60663ba8a11ad876ce2c4070a20715645187dd7e90898d2e865a286df170c82930622042ea14798359 DIST xmr-stak-2.4.3.tar.gz 335672 BLAKE2B 570fbb86144ba1a283c9a1733476e90caf24dcf0048733007ec189342a0e375f65cca74afb88ca7b08370a7db9a9a7d146f0c9a4a2cd57c480ec5b26928e98fa SHA512 a1e38c25827af8f88c1fdeed0fb3e731e92ac632d846f63dfe6fcb634eec0496e1d64b2745e6dc040dabc55a90963f587442e912c5aa72c9208cebffcc06db7c DIST xmr-stak-2.4.4.tar.gz 337845 BLAKE2B d66e650aea8a299ec77c183b321330ca1a3faee11a17046e0d88e8a11bb4649f2305de1287d77f9346071e217762d2e6a44bd26a37173db05ab648ed1e20ba60 SHA512 3cd0bbf2b489458888aa02302a1652093ceae38c085a16441bc2f6e315a82e0e00755544df0c75178a66e567a44e9d7537056b0fa5f3e7c7aee9a13b013c2411 DIST xmr-stak-2.4.5.tar.gz 338482 BLAKE2B 4f51925d86baab4a7a78803b45264ad731ac51d837e7f84138f4e82e14cd13a57b7f870f6e66f8306a09df0211dd65ca6998bfa1b0a55e97020cb63287b70c9c SHA512 22cb3c97b9e85ec50091e093488256beb484a9bcdd0496185531095c5e64289814873ac659dc0c71d01adccacf1394019aeff33d7fab4e71af3ae65545219f04 EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc +EBUILD xmr-stak-2.4.5-r1.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35 EBUILD xmr-stak-2.4.5.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc -EBUILD xmr-stak-9999.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc +EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb diff --git a/net-p2p/xmr-stak/files/xmr-stak b/net-p2p/xmr-stak/files/xmr-stak new file mode 100644 index 000000000000..21f2d35ae99d --- /dev/null +++ b/net-p2p/xmr-stak/files/xmr-stak @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms fo the GNU General Public License, v2 +# /etc/init.d/xmr-stak +name="xmr-stak" +description="Unified all-in-one Monero miner" +pidfile=/run/xmr.pid +command=/usr/bin/xmr-stak +command_args="--cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt" +start_stop_daemon_args="--background --make-pidfile" + +start_pre() { + if [ ! -r /etc/xmr-stak/main.config ]; then + eerror "/etc/xmr-stak/main.config is missing." + errror "Run:" + eerror "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt" + errror "xmr-stak can now be terminated and this service can be started" + return 1 + fi +} + +depend() { + use dns net +} diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.5-r1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.5-r1.ebuild new file mode 100644 index 000000000000..8a521d6793d7 --- /dev/null +++ b/net-p2p/xmr-stak/xmr-stak-2.4.5-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils systemd + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git" + EGIT_BRANCH="dev" + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Unified all-in-one Monero miner" +HOMEPAGE="https://github.com/fireice-uk/xmr-stak" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda devfee hwloc opencl ssl webserver" + +DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit ) + hwloc? ( sys-apps/hwloc ) + opencl? ( virtual/opencl ) + ssl? ( dev-libs/openssl:0= ) + webserver? ( net-libs/libmicrohttpd )" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake-utils_src_prepare + if ! use devfee; then + sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die + fi +} + +src_configure() { + local mycmakeargs=( + -DCUDA_ENABLE=$(usex cuda) + -DHWLOC_ENABLE=$(usex hwloc) + -DMICROHTTPD_ENABLE=$(usex webserver) + -DOpenCL_ENABLE=$(usex opencl) + -DOpenSSL_ENABLE=$(usex ssl) + -DLIBRARY_OUTPUT_PATH=$(get_libdir) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service + doinitd "${FILESDIR}"/${PN} + dodir /etc/xmr-stak +} + +pkg_postinst() { + if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then + ewarn "To use xmr-stack:" + if use cuda || use opencl; then + ewarn "As root or as a user that is a member of the 'video' group," + fi + ewarn "run:" + ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt" + ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used." + fi +} diff --git a/net-p2p/xmr-stak/xmr-stak-9999.ebuild b/net-p2p/xmr-stak/xmr-stak-9999.ebuild index 0b8976d77f85..8a521d6793d7 100644 --- a/net-p2p/xmr-stak/xmr-stak-9999.ebuild +++ b/net-p2p/xmr-stak/xmr-stak-9999.ebuild @@ -50,6 +50,7 @@ src_configure() { src_install() { cmake-utils_src_install systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service + doinitd "${FILESDIR}"/${PN} dodir /etc/xmr-stak } @@ -60,7 +61,7 @@ pkg_postinst() { ewarn "As root or as a user that is a member of the 'video' group," fi ewarn "run:" - ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config" - ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used." + ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt" + ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used." fi } |