From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- net-p2p/Manifest.gz | Bin 7939 -> 7933 bytes net-p2p/amule/Manifest | 6 +- net-p2p/amule/amule-2.3.2-r3.ebuild | 106 ------- net-p2p/amule/amule-2.3.2-r4.ebuild | 126 ++++++++ net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch | 350 ++++++++++++++++++++++ net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch | 263 ++++++++++++++++ net-p2p/amule/files/amuled.confd-r1 | 9 + net-p2p/amule/files/amuleweb.confd-r1 | 24 ++ net-p2p/cpuminer-opt/Manifest | 2 + net-p2p/cpuminer-opt/cpuminer-opt-3.11.4.ebuild | 50 ++++ net-p2p/qbittorrent/Manifest | 8 +- net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild | 70 ----- net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild | 70 ----- net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild | 70 ----- net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild | 4 +- 15 files changed, 832 insertions(+), 326 deletions(-) delete mode 100644 net-p2p/amule/amule-2.3.2-r3.ebuild create mode 100644 net-p2p/amule/amule-2.3.2-r4.ebuild create mode 100644 net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch create mode 100644 net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch create mode 100644 net-p2p/amule/files/amuled.confd-r1 create mode 100644 net-p2p/amule/files/amuleweb.confd-r1 create mode 100644 net-p2p/cpuminer-opt/cpuminer-opt-3.11.4.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 77d319a174d9..d1071bc9bc0f 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 912d232d830b..fdc13bbe9ec3 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -4,11 +4,15 @@ AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba749 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 amule-2.3.2-fix-crash-when-shared-files-changed.patch 1648 BLAKE2B f3bf70c65b374d468935f8b2f32519bbda66bb49387a81727fd52efaa15156bc0a8a5cb49ba8bbcfa212c7ec79b8b141e27e318bee95ceb8f37e35cdd98b2988 SHA512 748d8746e01d2aeefe7084030db190302c71b57c97fa438fc958d5fe7eb415b2b624f04f6bb436ca612731061b863f9251bbd81a10e87d8acc0f9ff5fc948b7e +AUX amule-2.3.2-libupnp-1.6.patch 10759 BLAKE2B b17237b087467dd6204296939cc4ea8bf76d7d95ed766d3a1c967fd15126e71c18ca014afc07dbe7312c807f132e4d35817521b8fb7d77b97bc4e10f5e45de5f SHA512 565f240fb05093c567f1cab4b23a6ce3d59587078e7179568e1b87dd105b0a9a2dd505f296db5208fe121c7580de9384a1e9986ef0f309f7e87e25ab37bc23f1 +AUX amule-2.3.2-libupnp-1.8.patch 9618 BLAKE2B e04d9346fe86e724af925c7494857bb9a0d8a84f6bd753d103f9c4fea636f556b5c40218b96d44743415aba2ea2b371d3ebd15459663f653fe99fec615fee9d6 SHA512 1b74c7bd94acc70dee5e10572b3b9707448e09f4f8d07a7e41c09c5f97276d94de5b905f6b2e34c8a54332f8b3fca62d8c824682f33bbcdbbdeb58b620b918ea AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901 +AUX amuled.confd-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6 AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41 +AUX amuleweb.confd-r1 619 BLAKE2B 7140f6d957760f8184c3c73db0a58a3b7b308a6d8548700cab8517bba5274fbad35ebb940ea11f96527553807b1365b7f7c27a6e7d8b656b51f60072cabe5ab8 SHA512 d9fcfc96f4c1bcd7bdae8ed4da19b4edec05e1b55149c664589c267539d183500a732f70670f0cde935c5f509f9dfbc97fd0e92b7047e1690f1342fa6504994d 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-r2.ebuild 2339 BLAKE2B 16698d20edb786d3a1be426c65a89c53d3127dca0b6b0ce38adff0d37bf03ac2cb428f30935f75fd99ef62ba1f900a30c8e7eec3ae79a088885b74c26638dce7 SHA512 490dec5064d9e560626931616e4c9d9188f68815cc477df4ea39a4ff4a82af25f5ceea12a223c7b5188c8e661990a960534bffeca35ce97afb402713b5e1029c -EBUILD amule-2.3.2-r3.ebuild 2409 BLAKE2B 9b6c0d8bfd0a5b9be5dae5ea88fb13f2209b8be7cb0f28e8503ad3ec8500e89ee446876c025ce4c1c9664c401cdaa9133a832a737d1923de7589b7c93352cd85 SHA512 ad6380175c73b4f53751a28eefbfe4b6623e2d68bbfdeb1b6d08657c29c637b664bd6acd9073b2b945a9c27e75fb65c481c6e87a96a2bb418c751908fa0e5e3b +EBUILD amule-2.3.2-r4.ebuild 3018 BLAKE2B 9425d4949bd4bb98c369ec13407f2c299c269c6a38ac660d8d8fc23d42d145fc3274c9c0e81af41fdf97074107a82b0d4722897705d749195f074c9792bd0b56 SHA512 1ef3b5c99bc50a3ab2caac5bcb00ed6ae904a85820a0ca1a5f2d9b710bcca4bc9f9f6f382abc351a4723e3e13196fe9d12a63d9c859b6790da60bf23b49e9a14 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f diff --git a/net-p2p/amule/amule-2.3.2-r3.ebuild b/net-p2p/amule/amule-2.3.2-r3.ebuild deleted file mode 100644 index 7a7035ef43eb..000000000000 --- a/net-p2p/amule/amule-2.3.2-r3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0-gtk3" - -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-3.0.4:${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" - "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.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 - myconf=" - $(use_enable remote amule-gui) - $(use_enable stats alc) - $(use_enable stats wxcas) - " - else - myconf=" - --disable-monolithic - --disable-amule-gui - --disable-alc - --disable-wxcas - " - 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/amule-2.3.2-r4.ebuild b/net-p2p/amule/amule-2.3.2-r4.ebuild new file mode 100644 index 000000000000..8199a8471f05 --- /dev/null +++ b/net-p2p/amule/amule-2.3.2-r4.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0-gtk3" + +inherit wxwidgets + +MY_P="${PN/m/M}-${PV}" + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" +SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="daemon debug geoip nls remote stats upnp +X" + +RDEPEND=" + dev-libs/boost:= + dev-libs/crypto++:= + sys-libs/binutils-libs:0= + sys-libs/zlib + >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] + daemon? ( acct-user/amule ) + geoip? ( dev-libs/geoip ) + remote? ( + acct-user/amule + media-libs/libpng:0= + ) + stats? ( media-libs/gd:=[jpeg,png] ) + upnp? ( net-libs/libupnp:0 ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +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" + "${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch" + "${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch" + "${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch" +) + +pkg_setup() { + setup-wxwidgets +} + +src_configure() { + local myconf=( + --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) + ) + + if use X; then + myconf+=( + $(use_enable remote amule-gui) + $(use_enable stats alc) + $(use_enable stats wxcas) + ) + else + myconf+=( + --disable-monolithic + --disable-amule-gui + --disable-alc + --disable-wxcas + ) + fi + + econf "${myconf[@]}" +} + +src_install() { + default + + if use daemon; then + newconfd "${FILESDIR}"/amuled.confd-r1 amuled + newinitd "${FILESDIR}"/amuled.initd amuled + fi + if use remote; then + newconfd "${FILESDIR}"/amuleweb.confd-r1 amuleweb + newinitd "${FILESDIR}"/amuleweb.initd amuleweb + fi + + if use daemon || use remote; then + keepdir /var/lib/${PN} + fowners amule:amule /var/lib/${PN} + fperms 0750 /var/lib/${PN} + fi +} + +pkg_postinst() { + local ver + + if use daemon || use remote; then + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt "2.3.2-r4"; then + elog "Default user under which amuled and amuleweb daemons are started" + elog "have been changed from p2p to amule. Default home directory have been" + elog "changed as well." + echo + elog "If you want to preserve old download/share location, you can create" + elog "symlink /var/lib/amule/.aMule pointing to the old location and adjust" + elog "files ownership *or* restore AMULEUSER and AMULEHOME variables in" + elog "/etc/conf.d/{amuled,amuleweb} to the old values." + + break + fi + done + fi +} diff --git a/net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch b/net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch new file mode 100644 index 000000000000..0fd0edfbd8f3 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch @@ -0,0 +1,350 @@ +From cb30875bd4e45736ff4ee1137ff97316295ff7be Mon Sep 17 00:00:00 2001 +From: Pablo Barciela +Date: Sat, 24 Nov 2018 01:23:58 +0100 +Subject: [PATCH] Fix build with libupnp 1.6 + +--- + src/UPnPBase.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++++- + src/UPnPBase.h | 6 +++ + 2 files changed, 142 insertions(+), 2 deletions(-) + +diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp +index d4063a136..774ebfc32 100644 +--- a/src/UPnPBase.cpp ++++ b/src/UPnPBase.cpp +@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping( + + + // This function is static ++#if UPNP_VERSION >= 10800 + int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, void * /*Cookie*/) ++#else ++int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/) ++#endif + { + std::ostringstream msg; + std::ostringstream msg2; +@@ -1149,25 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, v + msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: "; + // UPnP Discovery + upnpDiscovery: ++#if UPNP_VERSION >= 10800 + UpnpDiscovery *d_event = (UpnpDiscovery *)Event; ++#else ++ struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event; ++#endif + IXML_Document *doc = NULL; ++#if UPNP_VERSION >= 10800 + int errCode = UpnpDiscovery_get_ErrCode(d_event); + if (errCode != UPNP_E_SUCCESS) { + msg << UpnpGetErrorMessage(errCode) << "."; ++#else ++ int ret; ++ if (d_event->ErrCode != UPNP_E_SUCCESS) { ++ msg << UpnpGetErrorMessage(d_event->ErrCode) << "."; ++#endif + AddDebugLogLineC(logUPnP, msg); + } + // Get the XML tree device description in doc ++#if UPNP_VERSION >= 10800 + const char *location = UpnpDiscovery_get_Location_cstr(d_event); + int ret = UpnpDownloadXmlDoc(location, &doc); ++#else ++ ret = UpnpDownloadXmlDoc(d_event->Location, &doc); ++#endif + if (ret != UPNP_E_SUCCESS) { + msg << "Error retrieving device description from " << ++#if UPNP_VERSION >= 10800 + location << ": " << ++#else ++ d_event->Location << ": " << ++#endif + UpnpGetErrorMessage(ret) << + "(" << ret << ")."; + AddDebugLogLineC(logUPnP, msg); + } else { + msg2 << "Retrieving device description from " << ++#if UPNP_VERSION >= 10800 + location << "."; ++#else ++ d_event->Location << "."; ++#endif + AddDebugLogLineN(logUPnP, msg2); + } + if (doc) { +@@ -1195,9 +1221,14 @@ upnpDiscovery: + AddDebugLogLineC(logUPnP, msg); + } + // Add the root device to our list ++#if UPNP_VERSION >= 10800 + int expires = UpnpDiscovery_get_Expires(d_event); + upnpCP->AddRootDevice(rootDevice, urlBase, + location, expires); ++#else ++ upnpCP->AddRootDevice(rootDevice, urlBase, ++ d_event->Location, d_event->Expires); ++#endif + } + // Free the XML doc tree + IXML::Document::Free(doc); +@@ -1218,35 +1249,62 @@ upnpDiscovery: + case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: { + //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n"); + // UPnP Device Removed ++#if UPNP_VERSION >= 10800 + UpnpDiscovery *dab_event = (UpnpDiscovery *)Event; + int errCode = UpnpDiscovery_get_ErrCode(dab_event); + if (errCode != UPNP_E_SUCCESS) { ++#else ++ struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event; ++ if (dab_event->ErrCode != UPNP_E_SUCCESS) { ++#endif + msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " << ++#if UPNP_VERSION >= 10800 + UpnpGetErrorMessage(errCode) << ++#else ++ UpnpGetErrorMessage(dab_event->ErrCode) << ++#endif + "."; + AddDebugLogLineC(logUPnP, msg); + } ++#if UPNP_VERSION >= 10800 + std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event); ++#else ++ std::string devType = dab_event->DeviceType; ++#endif + // Check for an InternetGatewayDevice and removes it from the list +- std::transform(devType.begin(), devType.end(), +- devType.begin(), tolower); ++ ++ std::transform(devType.begin(), devType.end(), devType.begin(), tolower); ++ + if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) { ++#if UPNP_VERSION >= 10800 + const char *deviceID = + UpnpDiscovery_get_DeviceID_cstr(dab_event); + upnpCP->RemoveRootDevice(deviceID); ++#else ++ upnpCP->RemoveRootDevice(dab_event->DeviceId); ++#endif + } + break; + } + case UPNP_EVENT_RECEIVED: { + //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n"); + // Event reveived ++#if UPNP_VERSION >= 10800 + UpnpEvent *e_event = (UpnpEvent *)Event; + int eventKey = UpnpEvent_get_EventKey(e_event); + IXML_Document *changedVariables = + UpnpEvent_get_ChangedVariables(e_event); + const std::string sid = UpnpEvent_get_SID_cstr(e_event); ++#else ++ struct Upnp_Event *e_event = (struct Upnp_Event *)Event; ++ const std::string Sid = e_event->Sid; ++#endif + // Parses the event ++#if UPNP_VERSION >= 10800 + upnpCP->OnEventReceived(sid, eventKey, changedVariables); ++#else ++ upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables); ++#endif + break; + } + case UPNP_EVENT_SUBSCRIBE_COMPLETE: +@@ -1261,19 +1319,38 @@ upnpDiscovery: + //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n"); + msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): "; + upnpEventRenewalComplete: ++#if UPNP_VERSION >= 10800 + UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; + int errCode = UpnpEventSubscribe_get_ErrCode(es_event); + if (errCode != UPNP_E_SUCCESS) { ++#else ++ struct Upnp_Event_Subscribe *es_event = ++ (struct Upnp_Event_Subscribe *)Event; ++ if (es_event->ErrCode != UPNP_E_SUCCESS) { ++#endif + msg << "Error in Event Subscribe Callback"; ++#if UPNP_VERSION >= 10800 + UPnP::ProcessErrorMessage(msg.str(), errCode, NULL, NULL); ++#else ++ UPnP::ProcessErrorMessage( ++ msg.str(), es_event->ErrCode, NULL, NULL); ++#endif + } else { + #if 0 ++#if UPNP_VERSION >= 10800 ++ + const UpnpString *publisherUrl = + UpnpEventSubscribe_get_PublisherUrl(es_event); + const char *sid = UpnpEvent_get_SID_cstr(es_event); + int timeOut = UpnpEvent_get_TimeOut(es_event); + TvCtrlPointHandleSubscribeUpdate( + publisherUrl, sid, timeOut); ++#else ++ TvCtrlPointHandleSubscribeUpdate( ++ GET_UPNP_STRING(es_event->PublisherUrl), ++ es_event->Sid, ++ es_event->TimeOut ); ++#endif + #endif + } + break; +@@ -1288,31 +1365,56 @@ upnpEventRenewalComplete: + msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): "; + msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: "; + upnpEventSubscriptionExpired: ++#if UPNP_VERSION >= 10800 + UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; ++#else ++ struct Upnp_Event_Subscribe *es_event = ++ (struct Upnp_Event_Subscribe *)Event; ++#endif + Upnp_SID newSID; + memset(newSID, 0, sizeof(Upnp_SID)); + int TimeOut = 1801; ++#if UPNP_VERSION >= 10800 + const char *publisherUrl = + UpnpEventSubscribe_get_PublisherUrl_cstr(es_event); ++#endif + int ret = UpnpSubscribe( + upnpCP->m_UPnPClientHandle, ++#if UPNP_VERSION >= 10800 + publisherUrl, ++#else ++ GET_UPNP_STRING(es_event->PublisherUrl), ++#endif + &TimeOut, + newSID); + if (ret != UPNP_E_SUCCESS) { + msg << "Error Subscribing to EventURL"; ++#if UPNP_VERSION >= 10800 + int errCode = UpnpEventSubscribe_get_ErrCode(es_event); ++#endif + UPnP::ProcessErrorMessage( ++#if UPNP_VERSION >= 10800 + msg.str(), errCode, NULL, NULL); ++#else ++ msg.str(), es_event->ErrCode, NULL, NULL); ++#endif + } else { + ServiceMap::iterator it = ++#if UPNP_VERSION >= 10800 + upnpCP->m_ServiceMap.find(publisherUrl); ++#else ++ upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl)); ++#endif + if (it != upnpCP->m_ServiceMap.end()) { + CUPnPService &service = *(it->second); + service.SetTimeout(TimeOut); + service.SetSID(newSID); + msg2 << "Re-subscribed to EventURL '" << ++#if UPNP_VERSION >= 10800 + publisherUrl << ++#else ++ GET_UPNP_STRING(es_event->PublisherUrl) << ++#endif + "' with SID == '" << + newSID << "'."; + AddDebugLogLineC(logUPnP, msg2); +@@ -1331,19 +1433,34 @@ upnpEventSubscriptionExpired: + case UPNP_CONTROL_ACTION_COMPLETE: { + //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n"); + // This is here if we choose to do this asynchronously ++#if UPNP_VERSION >= 10800 + UpnpActionComplete *a_event = (UpnpActionComplete *)Event; + int errCode = UpnpActionComplete_get_ErrCode(a_event); + IXML_Document *actionResult = + UpnpActionComplete_get_ActionResult(a_event); + if (errCode != UPNP_E_SUCCESS) { ++#else ++ struct Upnp_Action_Complete *a_event = ++ (struct Upnp_Action_Complete *)Event; ++ if (a_event->ErrCode != UPNP_E_SUCCESS) { ++#endif + UPnP::ProcessErrorMessage( + "UpnpSendActionAsync", ++#if UPNP_VERSION >= 10800 + errCode, NULL, + actionResult); ++#else ++ a_event->ErrCode, NULL, ++ a_event->ActionResult); ++#endif + } else { + // Check the response document + UPnP::ProcessActionResponse( ++#if UPNP_VERSION >= 10800 + actionResult, ++#else ++ a_event->ActionResult, ++#endif + ""); + } + /* No need for any processing here, just print out results. +@@ -1354,17 +1471,28 @@ upnpEventSubscriptionExpired: + case UPNP_CONTROL_GET_VAR_COMPLETE: { + //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n"); + msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): "; ++#if UPNP_VERSION >= 10800 + UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event; + int errCode = UpnpStateVarComplete_get_ErrCode(sv_event); + if (errCode != UPNP_E_SUCCESS) { ++#else ++ struct Upnp_State_Var_Complete *sv_event = ++ (struct Upnp_State_Var_Complete *)Event; ++ if (sv_event->ErrCode != UPNP_E_SUCCESS) { ++#endif + msg << "m_UpnpGetServiceVarStatusAsync"; + UPnP::ProcessErrorMessage( ++#if UPNP_VERSION >= 10800 + msg.str(), errCode, NULL, NULL); ++#else ++ msg.str(), sv_event->ErrCode, NULL, NULL); ++#endif + } else { + #if 0 + // Warning: The use of UpnpGetServiceVarStatus and + // UpnpGetServiceVarStatusAsync is deprecated by the + // UPnP forum. ++#if UPNP_VERSION >= 10800 + const char *ctrlUrl = + UpnpStateVarComplete_get_CtrlUrl(sv_event); + const char *stateVarName = +@@ -1373,6 +1501,12 @@ upnpEventSubscriptionExpired: + UpnpStateVarComplete_get_CurrentVal(sv_event); + TvCtrlPointHandleGetVar( + ctrlUrl, stateVarName, currentVal); ++#else ++ TvCtrlPointHandleGetVar( ++ sv_event->CtrlUrl, ++ sv_event->StateVarName, ++ sv_event->CurrentVal ); ++#endif + #endif + } + break; +diff --git a/src/UPnPBase.h b/src/UPnPBase.h +index 92753b86a..efe63bf0f 100644 +--- a/src/UPnPBase.h ++++ b/src/UPnPBase.h +@@ -489,9 +489,15 @@ public: + + // Callback function + static int Callback( ++#if UPNP_VERSION >= 10800 + Upnp_EventType_e EventType, + const void *Event, + void *Cookie); ++#else ++ Upnp_EventType EventType, ++ void* Event, ++ void* Cookie); ++#endif + + private: + void OnEventReceived( +-- +2.24.1 + diff --git a/net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch b/net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch new file mode 100644 index 000000000000..42672a85a6a5 --- /dev/null +++ b/net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch @@ -0,0 +1,263 @@ +From f6dccde218fed8dabd3c61efce02d29b320858fe Mon Sep 17 00:00:00 2001 +From: Marcelo Roberto Jimenez +Date: Tue, 2 Oct 2018 18:17:43 -0300 +Subject: [PATCH] Make aMule compatible with libupnp 1.8 + +--- + src/UPnPBase.cpp | 110 +++++++++++++++++++++++++++-------------------- + src/UPnPBase.h | 6 +-- + 2 files changed, 66 insertions(+), 50 deletions(-) + +diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp +index 01a7c3a05..d4063a136 100644 +--- a/src/UPnPBase.cpp ++++ b/src/UPnPBase.cpp +@@ -1127,7 +1127,7 @@ bool CUPnPControlPoint::PrivateDeletePortMapping( + + + // This function is static +-int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/) ++int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, void * /*Cookie*/) + { + std::ostringstream msg; + std::ostringstream msg2; +@@ -1149,24 +1149,25 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /* + msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: "; + // UPnP Discovery + upnpDiscovery: +- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event; ++ UpnpDiscovery *d_event = (UpnpDiscovery *)Event; + IXML_Document *doc = NULL; +- int ret; +- if (d_event->ErrCode != UPNP_E_SUCCESS) { +- msg << UpnpGetErrorMessage(d_event->ErrCode) << "."; ++ int errCode = UpnpDiscovery_get_ErrCode(d_event); ++ if (errCode != UPNP_E_SUCCESS) { ++ msg << UpnpGetErrorMessage(errCode) << "."; + AddDebugLogLineC(logUPnP, msg); + } + // Get the XML tree device description in doc +- ret = UpnpDownloadXmlDoc(d_event->Location, &doc); ++ const char *location = UpnpDiscovery_get_Location_cstr(d_event); ++ int ret = UpnpDownloadXmlDoc(location, &doc); + if (ret != UPNP_E_SUCCESS) { + msg << "Error retrieving device description from " << +- d_event->Location << ": " << ++ location << ": " << + UpnpGetErrorMessage(ret) << + "(" << ret << ")."; + AddDebugLogLineC(logUPnP, msg); + } else { + msg2 << "Retrieving device description from " << +- d_event->Location << "."; ++ location << "."; + AddDebugLogLineN(logUPnP, msg2); + } + if (doc) { +@@ -1194,8 +1195,9 @@ upnpDiscovery: + AddDebugLogLineC(logUPnP, msg); + } + // Add the root device to our list ++ int expires = UpnpDiscovery_get_Expires(d_event); + upnpCP->AddRootDevice(rootDevice, urlBase, +- d_event->Location, d_event->Expires); ++ location, expires); + } + // Free the XML doc tree + IXML::Document::Free(doc); +@@ -1216,28 +1218,35 @@ upnpDiscovery: + case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: { + //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n"); + // UPnP Device Removed +- struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event; +- if (dab_event->ErrCode != UPNP_E_SUCCESS) { ++ UpnpDiscovery *dab_event = (UpnpDiscovery *)Event; ++ int errCode = UpnpDiscovery_get_ErrCode(dab_event); ++ if (errCode != UPNP_E_SUCCESS) { + msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " << +- UpnpGetErrorMessage(dab_event->ErrCode) << ++ UpnpGetErrorMessage(errCode) << + "."; + AddDebugLogLineC(logUPnP, msg); + } +- std::string devType = dab_event->DeviceType; ++ std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event); + // Check for an InternetGatewayDevice and removes it from the list +- std::transform(devType.begin(), devType.end(), devType.begin(), tolower); ++ std::transform(devType.begin(), devType.end(), ++ devType.begin(), tolower); + if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) { +- upnpCP->RemoveRootDevice(dab_event->DeviceId); ++ const char *deviceID = ++ UpnpDiscovery_get_DeviceID_cstr(dab_event); ++ upnpCP->RemoveRootDevice(deviceID); + } + break; + } + case UPNP_EVENT_RECEIVED: { + //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n"); + // Event reveived +- struct Upnp_Event *e_event = (struct Upnp_Event *)Event; +- const std::string Sid = e_event->Sid; ++ UpnpEvent *e_event = (UpnpEvent *)Event; ++ int eventKey = UpnpEvent_get_EventKey(e_event); ++ IXML_Document *changedVariables = ++ UpnpEvent_get_ChangedVariables(e_event); ++ const std::string sid = UpnpEvent_get_SID_cstr(e_event); + // Parses the event +- upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables); ++ upnpCP->OnEventReceived(sid, eventKey, changedVariables); + break; + } + case UPNP_EVENT_SUBSCRIBE_COMPLETE: +@@ -1252,24 +1261,23 @@ upnpDiscovery: + //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n"); + msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): "; + upnpEventRenewalComplete: +- struct Upnp_Event_Subscribe *es_event = +- (struct Upnp_Event_Subscribe *)Event; +- if (es_event->ErrCode != UPNP_E_SUCCESS) { ++ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; ++ int errCode = UpnpEventSubscribe_get_ErrCode(es_event); ++ if (errCode != UPNP_E_SUCCESS) { + msg << "Error in Event Subscribe Callback"; +- UPnP::ProcessErrorMessage( +- msg.str(), es_event->ErrCode, NULL, NULL); ++ UPnP::ProcessErrorMessage(msg.str(), errCode, NULL, NULL); + } else { + #if 0 ++ const UpnpString *publisherUrl = ++ UpnpEventSubscribe_get_PublisherUrl(es_event); ++ const char *sid = UpnpEvent_get_SID_cstr(es_event); ++ int timeOut = UpnpEvent_get_TimeOut(es_event); + TvCtrlPointHandleSubscribeUpdate( +- GET_UPNP_STRING(es_event->PublisherUrl), +- es_event->Sid, +- es_event->TimeOut ); ++ publisherUrl, sid, timeOut); + #endif + } +- + break; + } +- + case UPNP_EVENT_AUTORENEWAL_FAILED: + //fprintf(stderr, "Callback: UPNP_EVENT_AUTORENEWAL_FAILED\n"); + msg << "error(UPNP_EVENT_AUTORENEWAL_FAILED): "; +@@ -1280,29 +1288,31 @@ upnpEventRenewalComplete: + msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): "; + msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: "; + upnpEventSubscriptionExpired: +- struct Upnp_Event_Subscribe *es_event = +- (struct Upnp_Event_Subscribe *)Event; ++ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event; + Upnp_SID newSID; + memset(newSID, 0, sizeof(Upnp_SID)); + int TimeOut = 1801; ++ const char *publisherUrl = ++ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event); + int ret = UpnpSubscribe( + upnpCP->m_UPnPClientHandle, +- GET_UPNP_STRING(es_event->PublisherUrl), ++ publisherUrl, + &TimeOut, + newSID); + if (ret != UPNP_E_SUCCESS) { + msg << "Error Subscribing to EventURL"; ++ int errCode = UpnpEventSubscribe_get_ErrCode(es_event); + UPnP::ProcessErrorMessage( +- msg.str(), es_event->ErrCode, NULL, NULL); ++ msg.str(), errCode, NULL, NULL); + } else { + ServiceMap::iterator it = +- upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl)); ++ upnpCP->m_ServiceMap.find(publisherUrl); + if (it != upnpCP->m_ServiceMap.end()) { + CUPnPService &service = *(it->second); + service.SetTimeout(TimeOut); + service.SetSID(newSID); + msg2 << "Re-subscribed to EventURL '" << +- GET_UPNP_STRING(es_event->PublisherUrl) << ++ publisherUrl << + "' with SID == '" << + newSID << "'."; + AddDebugLogLineC(logUPnP, msg2); +@@ -1321,17 +1331,19 @@ upnpEventSubscriptionExpired: + case UPNP_CONTROL_ACTION_COMPLETE: { + //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n"); + // This is here if we choose to do this asynchronously +- struct Upnp_Action_Complete *a_event = +- (struct Upnp_Action_Complete *)Event; +- if (a_event->ErrCode != UPNP_E_SUCCESS) { ++ UpnpActionComplete *a_event = (UpnpActionComplete *)Event; ++ int errCode = UpnpActionComplete_get_ErrCode(a_event); ++ IXML_Document *actionResult = ++ UpnpActionComplete_get_ActionResult(a_event); ++ if (errCode != UPNP_E_SUCCESS) { + UPnP::ProcessErrorMessage( + "UpnpSendActionAsync", +- a_event->ErrCode, NULL, +- a_event->ActionResult); ++ errCode, NULL, ++ actionResult); + } else { + // Check the response document + UPnP::ProcessActionResponse( +- a_event->ActionResult, ++ actionResult, + ""); + } + /* No need for any processing here, just print out results. +@@ -1342,21 +1354,25 @@ upnpEventSubscriptionExpired: + case UPNP_CONTROL_GET_VAR_COMPLETE: { + //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n"); + msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): "; +- struct Upnp_State_Var_Complete *sv_event = +- (struct Upnp_State_Var_Complete *)Event; +- if (sv_event->ErrCode != UPNP_E_SUCCESS) { ++ UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event; ++ int errCode = UpnpStateVarComplete_get_ErrCode(sv_event); ++ if (errCode != UPNP_E_SUCCESS) { + msg << "m_UpnpGetServiceVarStatusAsync"; + UPnP::ProcessErrorMessage( +- msg.str(), sv_event->ErrCode, NULL, NULL); ++ msg.str(), errCode, NULL, NULL); + } else { + #if 0 + // Warning: The use of UpnpGetServiceVarStatus and + // UpnpGetServiceVarStatusAsync is deprecated by the + // UPnP forum. ++ const char *ctrlUrl = ++ UpnpStateVarComplete_get_CtrlUrl(sv_event); ++ const char *stateVarName = ++ UpnpStateVarComplete_get_StateVarName(sv_event); ++ const DOMString currentVal = ++ UpnpStateVarComplete_get_CurrentVal(sv_event); + TvCtrlPointHandleGetVar( +- sv_event->CtrlUrl, +- sv_event->StateVarName, +- sv_event->CurrentVal ); ++ ctrlUrl, stateVarName, currentVal); + #endif + } + break; +diff --git a/src/UPnPBase.h b/src/UPnPBase.h +index 9eafbd143..92753b86a 100644 +--- a/src/UPnPBase.h ++++ b/src/UPnPBase.h +@@ -489,9 +489,9 @@ public: + + // Callback function + static int Callback( +- Upnp_EventType EventType, +- void* Event, +- void* Cookie); ++ Upnp_EventType_e EventType, ++ const void *Event, ++ void *Cookie); + + private: + void OnEventReceived( +-- +2.24.1 + diff --git a/net-p2p/amule/files/amuled.confd-r1 b/net-p2p/amule/files/amuled.confd-r1 new file mode 100644 index 000000000000..2f018dd3b88b --- /dev/null +++ b/net-p2p/amule/files/amuled.confd-r1 @@ -0,0 +1,9 @@ +# owner of amuled process (must be existing) +AMULEUSER="amule" + +# home directory for amuled (must be existing) +AMULEHOME="/var/lib/amule" + +# log file (/dev/null for nowhere) +LOG=/var/log/amuled.log + diff --git a/net-p2p/amule/files/amuleweb.confd-r1 b/net-p2p/amule/files/amuleweb.confd-r1 new file mode 100644 index 000000000000..1bb754a2f043 --- /dev/null +++ b/net-p2p/amule/files/amuleweb.confd-r1 @@ -0,0 +1,24 @@ +# owner of amuleweb process (must be existing) +AMULEUSER="amule" + +# home directory for amuleweb (from where to read configuration) (must be existing) +AMULEHOME="/var/lib/amule" + +# log file (/dev/null for nowhere) +LOG=/var/log/amuleweb.log + +# aMule password (note: not your webserver password, but the external +# connection one) +AMULEPWD="secret" + +# Full (admin) access password for webserver +WEBPWD="secret2" + +# aMule host (this could be a remote host or usually localhost) +AMULEHOST="localhost" + +# aMule external connection port +AMULEPORT="4712" + +# aMuleweb template (default, php-default, chicane) +TEMPLATE="default" diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest index 1ae6eea51aa3..61333f53060a 100644 --- a/net-p2p/cpuminer-opt/Manifest +++ b/net-p2p/cpuminer-opt/Manifest @@ -2,8 +2,10 @@ AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e DIST cpuminer-opt-3.11.1.tar.gz 1924178 BLAKE2B 1ed7f07f89c94e7e15ac370e7873e5b37ec45c5b0132c3a8f2772558eb37666f1db41fbf78311f539d69f2b0858ef91478a9b1b469220e09fe07e20bd0147db3 SHA512 af6a70e0e60d7c6ab904fe29f37ba3f18327d9eb7b9700b53c28ca5d4f6693d124b01a9f382f608f4449f5a412ca57216bac354bc40d1793a1f1d40f7191dd7b DIST cpuminer-opt-3.11.2.tar.gz 1923535 BLAKE2B 24ee1f4e64771ac1f007fd5934569e53959692f95dfd9fe4a7b38d4d32cbd4d5dd3731a285ad4e9e1e9bbbfd56a86bc9a69de9d5392d6d9a858a816ad031575f SHA512 bdbe99b358e37d8170259e5575f28d0b8c2e7faa6159b389f173e1a74299483ae6c5b2173f7565943f4c36e8e99d436ffbb485e3012f53337599d9dbd004b1b9 DIST cpuminer-opt-3.11.3.tar.gz 1924724 BLAKE2B 1e0cd26b7400b1d09fcc74bcadedb7da478f8b0be9c4c8ad8ce097e0a4c438068214139e9eb4901f0fa80a3c997ff9bb802788198236aba418703bdfc5edd0f8 SHA512 fd061644b15b5d2e68bca949a67bc6d2eab53e5d309c4e0c6766ccea0e956f49229e385e582144ef2dadf805eeee30a16b7409df3aad3184d68eb03c32ef1258 +DIST cpuminer-opt-3.11.4.tar.gz 1926931 BLAKE2B ecec5bb87c7d1d72d42d516b791ce925a2bc3499bf1e8eb4e66a318e12bf60b99eb3d83ca39da04d78e68e84e08b8e7708489cdd77c997d9295f3e97cb8bf140 SHA512 a32d7080badf9d89030a4887a5c181c3dec2bac329b25052f060f7134e00111e8aac458d3f248bb9374be5558bee628c7fa8b1e6ef0c78d0cc4942dd5a513d2c EBUILD cpuminer-opt-3.11.1.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f EBUILD cpuminer-opt-3.11.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f EBUILD cpuminer-opt-3.11.3.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f +EBUILD cpuminer-opt-3.11.4.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656 diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.4.ebuild new file mode 100644 index 000000000000..a5d436b3b8b8 --- /dev/null +++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.11.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic systemd + +DESCRIPTION="Optimized multi algo CPU miner" +HOMEPAGE="https://github.com/JayDDee/cpuminer-opt" +IUSE="cpu_flags_x86_sse2 curl libressl" +LICENSE="GPL-2" +SLOT="0" +REQUIRED_USE="cpu_flags_x86_sse2" +DEPEND=" + dev-libs/gmp:0 + dev-libs/jansson + >=net-misc/curl-7.15[ssl] + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) +" +RDEPEND="${DEPEND}" +if [[ ${PV} == "9999" ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-ldflags -Wl,-z,noexecstack + econf --with-crypto --with-curl +} + +src_install() { + default + systemd_dounit "${FILESDIR}"/${PN}.service + insinto "/etc/${PN}" + doins cpuminer-conf.json +} + +src_test() { + ./cpuminer --cputest || die +} diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 4f3637724f3c..229ec59d3bd7 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,10 +1,4 @@ -DIST qbittorrent-4.1.7.tar.gz 7803389 BLAKE2B 6a8cf01c2bd86b63b629877fd3446db4aedd1591058af24c14dd4b69f0abae7f3ca715190fa0496b1a3ec742d4ee12585dd27e27c1465a1d22a149c2d47608ca SHA512 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4 -DIST qbittorrent-4.1.8.tar.gz 7803739 BLAKE2B ee56e004945025f06b179b08e938c6a3182f252c3bed6990158634ea1fdfd525fd67d105fd7ecdf0217a4bd73d847c5007d1e95f492f4f4e41c32d22dd6b7523 SHA512 8920e98f8db5dd738caab8815cc4a10950c34ba2eaa19b50479bb2ab548f6f297534759d71791caa4c8bfbea92d4b71d223a27fae150e00cc0a262eb3370a1e3 -DIST qbittorrent-4.1.9.1.tar.gz 7804066 BLAKE2B b5fddfdef8773318991ee5a3a818101b46fd0f258c24eebe2a9dde3f9e806544159c373406f609a911b330e32257b3d58a7d81e830ed91cce205182cde16052a SHA512 2a132202762461293ee8e4248bf7d512b3c33ec73670bf4c5c22261be546a69a69775b6c4baacd97a3f9055145cdb4153de17704b6b574b33370f3b454b1def9 DIST qbittorrent-4.2.1.tar.gz 7824636 BLAKE2B 06aa493b4e59f8e064955c604846cd4e4d404988819aa4f0b7a555cd3d8c74f42d4b40b581bc5c2360e5b75f0ce33f77882051360453176a9540d03d4d5de82d SHA512 345c702a49d284fe28b45e52719a79195a784ba07339ea49c340d10d387482d3ba59335b2e41616de97e3813531e808c41239e597ef4b710fcebceb0c837483c -EBUILD qbittorrent-4.1.7.ebuild 1471 BLAKE2B 4425b0c76189dc80766092cfcea3939951918051fe73c14c9b7bc270ce4cdd4cea1bf9d879ca0aa1791d197bd331e4426fdb195eae78d59e0764cbff948d45d5 SHA512 e3660d0920d56b236f0309eeb9af01b4fe83d091687a814970ea33d7c5ed7be242bb1f7996b0cbbbacfd3b3e998250b175c412d0abca05a42b53bf80fc35bada -EBUILD qbittorrent-4.1.8.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db -EBUILD qbittorrent-4.1.9.1.ebuild 1473 BLAKE2B 38ea60d9fb804e3aeb123b1d38c4d56531824be5b161394bc592f2d42becb3addfc91056758538d4bb1f6308893be44a15b50879a7a13e239b9223bb041a6aba SHA512 25c6f38eda2e3726814578c313eeb8c67f1b3e903ead60a53421255771f3e73346518182c6fc4e483f2ba392ea1dd09bc49dbc79854357facba9a00ef08091db -EBUILD qbittorrent-4.2.1.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da +EBUILD qbittorrent-4.2.1.ebuild 1452 BLAKE2B 72f0e7e3868f2b3ef02ad0ed32853fe00d5a578c75a09fb757ea1ee347bd4b42ffb04efb0fd80599672c4a0ece708ed4697cfff0002fc82a9a07e96e8435cf78 SHA512 aa63a6e96b2266506efb622db789151cd56f49244eb8ba2b8e92b3b7455fb73cc98abe094325a8876f6a36eaae1c9463bb42f737bba223e8226c6418c4113ff6 EBUILD qbittorrent-9999.ebuild 1454 BLAKE2B 75fbb4665d379be568ace2bac666e1de1c7c7ce63e1b6b4666bf2bde3ec9af3121eca69e0b59ad8d776af4ff20f14a43c5cca955b329c1fd62c15267b1ea04a0 SHA512 890a73066f960497a8663758a32344bb33c90684780b5d873023262f23c7d680e4bab7917e6cbf182d76d5c215c12a482555072b12ffa26a42e9591adc81b0da MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild deleted file mode 100644 index 19a8c92ab041..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.1.7.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" -else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64 x86" - S="${WORKDIR}/qBittorrent-release-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus debug webui +X" -REQUIRED_USE="dbus? ( X )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/boost-1.62.0-r1:= - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] - dev-qt/qtxml:5 - =net-libs/libtorrent-rasterbar-1.1*:0= - sys-libs/zlib - dbus? ( dev-qt/qtdbus:5 ) - X? ( - dev-libs/geoip - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) - -src_configure() { - econf --with-qtsingleapplication=system \ - $(use_enable dbus qt-dbus) \ - $(use_enable debug) \ - $(use_enable webui) \ - $(use_enable X gui) -} - -src_install() { - emake STRIP="/bin/false" INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild deleted file mode 100644 index e4e1c16a3150..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.1.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" -else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" - S="${WORKDIR}/qBittorrent-release-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus debug webui +X" -REQUIRED_USE="dbus? ( X )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/boost-1.62.0-r1:= - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] - dev-qt/qtxml:5 - =net-libs/libtorrent-rasterbar-1.1*:0= - sys-libs/zlib - dbus? ( dev-qt/qtdbus:5 ) - X? ( - dev-libs/geoip - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) - -src_configure() { - econf --with-qtsingleapplication=system \ - $(use_enable dbus qt-dbus) \ - $(use_enable debug) \ - $(use_enable webui) \ - $(use_enable X gui) -} - -src_install() { - emake STRIP="/bin/false" INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild deleted file mode 100644 index e4e1c16a3150..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.1.9.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" -else - SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" - S="${WORKDIR}/qBittorrent-release-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus debug webui +X" -REQUIRED_USE="dbus? ( X )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-libs/boost-1.62.0-r1:= - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] - dev-qt/qtxml:5 - =net-libs/libtorrent-rasterbar-1.1*:0= - sys-libs/zlib - dbus? ( dev-qt/qtdbus:5 ) - X? ( - dev-libs/geoip - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) - -src_configure() { - econf --with-qtsingleapplication=system \ - $(use_enable dbus qt-dbus) \ - $(use_enable debug) \ - $(use_enable webui) \ - $(use_enable X gui) -} - -src_install() { - emake STRIP="/bin/false" INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild index 22b2a5ad4a47..91e0d2f3769d 100644 --- a/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" else SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~ppc64 x86" S="${WORKDIR}/qBittorrent-release-${PV}" fi -- cgit v1.2.3