From b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Jun 2021 14:47:38 +0100 Subject: gentoo resync : 24.06.2021 --- net-p2p/Manifest.gz | Bin 7589 -> 7588 bytes net-p2p/amule/Manifest | 12 - net-p2p/amule/amule-2.3.2-r5.ebuild | 155 ---- ...le-2.3.2-Fixed-compilation-with-newer-bfd.patch | 33 - net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch | 25 - .../amule/files/amule-2.3.2-desktop-mimetype.patch | 30 - ...2.3.2-fix-crash-closing-last-search-tab-1.patch | 97 --- ...2.3.2-fix-crash-closing-last-search-tab-2.patch | 159 ----- .../amule-2.3.2-fix-crash-shared-dir-utf8.patch | 78 -- ...2.3.2-fix-crash-when-shared-files-changed.patch | 50 -- net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch | 24 - 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/classified-ads/Manifest | 2 +- .../classified-ads/classified-ads-0.13-r1.ebuild | 83 +++ net-p2p/classified-ads/classified-ads-0.13.ebuild | 83 --- net-p2p/syncthing/Manifest | 2 - net-p2p/syncthing/syncthing-1.16.1.ebuild | 783 --------------------- net-p2p/vuze/Manifest | 2 +- net-p2p/vuze/vuze-5.7.6.0-r2.ebuild | 2 +- 20 files changed, 86 insertions(+), 2147 deletions(-) delete mode 100644 net-p2p/amule/amule-2.3.2-r5.ebuild delete mode 100644 net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch delete mode 100644 net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch create mode 100644 net-p2p/classified-ads/classified-ads-0.13-r1.ebuild delete mode 100644 net-p2p/classified-ads/classified-ads-0.13.ebuild delete mode 100644 net-p2p/syncthing/syncthing-1.16.1.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 1574ea27417c..02a2d6781dd7 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 f715dfce8c60..6251c814da30 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,21 +1,9 @@ -AUX amule-2.3.2-Fixed-compilation-with-newer-bfd.patch 931 BLAKE2B 5506a79dfaa15578cee4da734ad27549a0c9c300acd7dc4c9dcf72148f464901a1939e013aa2acc347499ec4dbdb1aaada0730115498534b0a399d09c607d991 SHA512 7bcf505f9e5cdd0a7e282b7d35afa2277df6d5e359d8836cfbf41d10165ab859ca9ba896df171b50195d3a7acfe882bc4547254bc4ffb4774ea787e40e24a3dc -AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26 -AUX amule-2.3.2-desktop-mimetype.patch 760 BLAKE2B 6865cd597ba061ae3d10b07d96e20754edf020155b293d73a6d694f68f45986d6dba7c7276292a18f1469b37d09c233cf65ce7639608eadbca91e3ebc5dea9a9 SHA512 010a9daeefadbe6c864c5db683faece1cfb5ac1eb263062ee865bca1fec047b0389d346d4ce536883bc4137a4b19199bdf649c20eddc398cffd613c58f5bd140 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 amule-2.3.2-fix-crash-when-shared-files-changed.patch 1648 BLAKE2B f3bf70c65b374d468935f8b2f32519bbda66bb49387a81727fd52efaa15156bc0a8a5cb49ba8bbcfa212c7ec79b8b141e27e318bee95ceb8f37e35cdd98b2988 SHA512 748d8746e01d2aeefe7084030db190302c71b57c97fa438fc958d5fe7eb415b2b624f04f6bb436ca612731061b863f9251bbd81a10e87d8acc0f9ff5fc948b7e -AUX amule-2.3.2-libupnp-1.14.patch 706 BLAKE2B 8091c7b74aa8e0f088413f685bc1b9d66def46f12d8e98daf0ab2aeab08a4bcf890eb70e465164f661e7aeb2b4680fe485fa3ba149adeaa2ae532da93b2ad814 SHA512 095843d2dc70e5f763ecc72883b7ddca2b4360971581aeaf26c790adcbe6f0e6ec3939499cd3fd680e6d9362b0b65d125ef378945b745da3f58b7b88fa382483 -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-r1 199 BLAKE2B e018a8827749b0b5266533adfc549d0c40b339470439fd5a04c9380b5489e3d58b49478c6a1fcc4954d97816e66bdbf8a6105de0aee7991defd1df553db46e27 SHA512 4b82864f874ea5ede360a88aa589baa4336d16074ed10e2841ea5e2cb0961fe8553c28368f3a9b31d19ccaf688d77ac636219e3693e044c735bbd9de5de96bd6 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6 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 DIST aMule-2.3.3.tar.xz 3699376 BLAKE2B 4b1fb98bd52e4c75f81773020d4fc258f8e7c4d7a5d40a7aadabc8fd27b3079705761650fdcd7cd089da77575a74f1950f02039ee14bf4b9894550b8b3d9191b SHA512 a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e -EBUILD amule-2.3.2-r5.ebuild 3606 BLAKE2B 5c66c13335cbb8602e11a72530be83a3efb32f12e10b79000d33161056b66ea82048966d5bfe278e73bc37dbef9622ac808a168e41655539e2b70cfc04298fd3 SHA512 acb3cc37cf8a2a537ce1ba999dec37c884af700c0005c0055e6d2fe1f5152318d1f6c02b44c31e91c8451ae616040271eedd2767ca34d3d6ba67cdc1cf7ac99c EBUILD amule-2.3.3.ebuild 3044 BLAKE2B 8bb5e3206f8d3eed12476eda608d4b468457f2b413eaea752fa5920409c64f432e4c5f566d2edae51194dac2f5ec06b61a86258643a4362da1936d6cfcf46604 SHA512 6ae4a5b40c733e3f250a00c21aa267df0ff44430b16e3dff2b5630122c987742f041e3630a58659317a2cbd3d44d6efa6910ce1637fdd4d19ee566a4d34ac3df EBUILD amule-9999.ebuild 2993 BLAKE2B 092bff5f6c925f5a4b76d5d1152cec75e450737200393a4103c6f6c618acf9369f7c8421eb80fb97a505261f17083a86edb6a0fb0b736728b9fadc4723f6a822 SHA512 f54c20bdfe58fab7e2f231f1ebbc4b1a6a55bbe3264b3d3409e9d6881a3bf94ad48b016458d5c7367ed7bc1c4d0fbc2f385b4a23f94c921adc78e90893d69b22 MISC metadata.xml 666 BLAKE2B 78cd275a4696b47315f134366e3b3c323293ab3e6dea14f08f2915e49219c5e3f56baff9d7154ae7a63667cab3c8a8c3176aa04d48d8df0d3672bb7620b8f739 SHA512 a10de471269ee6610f1a111f0d22ba1f10741c2ca0d63ae8f340bcd3472f52d8b101db85b2907e422aa5ef4574fb2c545dd438285e700cf47c8fff16803ef80b diff --git a/net-p2p/amule/amule-2.3.2-r5.ebuild b/net-p2p/amule/amule-2.3.2-r5.ebuild deleted file mode 100644 index 30856b930175..000000000000 --- a/net-p2p/amule/amule-2.3.2-r5.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# 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 xdg-utils - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/amule-project/amule" - inherit autotools git-r3 -else - MY_P="${PN/m/M}-${PV}" - SRC_URI="https://download.sourceforge.net/${PN}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86" -fi - -DESCRIPTION="aMule, the all-platform eMule p2p client" -HOMEPAGE="http://www.amule.org/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="daemon debug geoip nls remote stats upnp +X" - -RDEPEND=" - dev-libs/boost:= - dev-libs/crypto++:= - sys-libs/binutils-libs:0= - sys-libs/readline:0= - sys-libs/zlib - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?] - daemon? ( acct-user/amule ) - geoip? ( dev-libs/geoip ) - nls? ( virtual/libintl ) - remote? ( - acct-user/amule - media-libs/libpng:0= - ) - stats? ( media-libs/gd:=[jpeg,png] ) - upnp? ( net-libs/libupnp:0 ) -" -DEPEND="${RDEPEND} - X? ( dev-util/desktop-file-utils ) -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -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" - "${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch" - "${FILESDIR}/${PN}-2.3.2-desktop-mimetype.patch" - "${FILESDIR}/${PN}-2.3.2-libupnp-1.14.patch" -) - -pkg_setup() { - setup-wxwidgets -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - ./autogen.sh || die - fi -} - -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 - - use X && xdg_desktop_database_update -} - -pkg_postrm() { - use X && xdg_desktop_database_update -} diff --git a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch deleted file mode 100644 index 3ef8a21fa45c..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c0c28234a40b1b575ce51cdfe5ffa5dac3a7494c Mon Sep 17 00:00:00 2001 -From: Werner Mahr -Date: Fri, 31 Jan 2020 17:55:24 +0100 -Subject: [PATCH] Fixed compilation with newer bfd. Fixes: #174 - ---- - src/libs/common/MuleDebug.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp -index 5d8d75890..0ebf2ab07 100644 ---- a/src/libs/common/MuleDebug.cpp -+++ b/src/libs/common/MuleDebug.cpp -@@ -268,14 +268,14 @@ void get_file_line_info(bfd *abfd, asection *section, void* _address) - return; - } - -- bfd_vma vma = bfd_get_section_vma(abfd, section); -+ bfd_vma vma = section->vma; - - unsigned long address = (unsigned long)_address; - if (address < vma) { - return; - } - -- bfd_size_type size = bfd_section_size(abfd, section); -+ bfd_size_type size = section->size; - if (address > (vma + size)) { - return; - } --- -2.24.1 - 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 deleted file mode 100644 index d23534475603..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001 -From: Tommy Jerry Mairo -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(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-desktop-mimetype.patch b/net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch deleted file mode 100644 index cd8ba4c2fc50..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-desktop-mimetype.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 048e86d44e09ef9dc1897c432660a712109b263a Mon Sep 17 00:00:00 2001 -From: Werner Mahr -Date: Mon, 29 Apr 2019 18:37:35 +0200 -Subject: [PATCH] Added imetype-handler for amule ed2k-links. Patch taken from - debian. - ---- - amule.desktop | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/amule.desktop b/amule.desktop -index 70be367af..1cfb38010 100644 ---- a/amule.desktop -+++ b/amule.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Name=aMule --Exec=amule -+Exec=amule %u - Icon=amule - Terminal=false - Type=Application -@@ -8,3 +8,4 @@ Categories=Network;P2P; - Comment=A client for the eD2k network - Comment[fr]=Un client pour le réseau eD2k - Comment[tr]=eD2k ağı için istemci -+MimeType=x-scheme-handler/ed2k; --- -2.26.2 - 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 deleted file mode 100644 index c480165eb983..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0f0c5c220228aea81142c7c00f73414cdb1b507a Mon Sep 17 00:00:00 2001 -From: gaffa -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 deleted file mode 100644 index e47970beb0c8..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 4c94c2d9f3be8b9068966f15aebc29b8c9b706ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?D=C3=A9vai=20Tam=C3=A1s?= -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 - -+#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 deleted file mode 100644 index aa92ff6c81ee..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 17816ed02f59bab9c27310e7f24c73266b0a3003 Mon Sep 17 00:00:00 2001 -From: persmule -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/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch deleted file mode 100644 index 81e0ef7b6296..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 Mon Sep 17 00:00:00 2001 -From: xinhuang -Date: Thu, 4 Jan 2018 00:44:35 -0800 -Subject: [PATCH] fix crash when shared files changed on Shared files tab - ---- - src/extern/wxWidgets/listctrl.cpp | 10 ---------- - src/extern/wxWidgets/listctrl.h | 5 ----- - 2 files changed, 15 deletions(-) - -diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp -index 18a30f205..460700691 100644 ---- a/src/extern/wxWidgets/listctrl.cpp -+++ b/src/extern/wxWidgets/listctrl.cpp -@@ -5803,16 +5803,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) - #endif - } - --void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const --{ -- m_mainWin->DoClientToScreen(x, y); --} -- --void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const --{ -- m_mainWin->DoScreenToClient(x, y); --} -- - void wxGenericListCtrl::SetFocus() - { - // The test in window.cpp fails as we are a composite -diff --git a/src/extern/wxWidgets/listctrl.h b/src/extern/wxWidgets/listctrl.h -index b18a61866..e72f7eaf0 100644 ---- a/src/extern/wxWidgets/listctrl.h -+++ b/src/extern/wxWidgets/listctrl.h -@@ -232,11 +232,6 @@ public: - protected: - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); - -- // take into account the coordinates difference between the container -- // window and the list control window itself here -- virtual void DoClientToScreen( int *x, int *y ) const; -- virtual void DoScreenToClient( int *x, int *y ) const; -- - virtual wxSize DoGetBestSize() const; - - // return the text for the given column of the given item --- -2.21.0 - diff --git a/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch b/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch deleted file mode 100644 index d68e4776e0a6..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-libupnp-1.14.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/UPnPBase.cpp 2016-09-16 09:55:07.000000000 +0200 -+++ b/src/UPnPBase.cpp 2020-09-03 12:37:43.861231093 +0200 -@@ -824,13 +824,17 @@ m_WanService(NULL) - // Null string at first - std::ostringstream msg; - -+ // Declare those here to avoid -+ // "jump to label ‘error’ [-fpermissive] crosses initialization -+ // of ‘char* ipAddress’" -+ unsigned short port; -+ char *ipAddress; -+ - // Start UPnP - int ret; -- char *ipAddress = NULL; -- unsigned short port = 0; -- ret = UpnpInit(ipAddress, udpPort); -+ ret = UpnpInit2(0, udpPort); - if (ret != UPNP_E_SUCCESS) { -- msg << "error(UpnpInit): Error code "; -+ msg << "error(UpnpInit2): Error code "; - goto error; - } - port = UpnpGetServerPort(); 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 deleted file mode 100644 index 0fd0edfbd8f3..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-libupnp-1.6.patch +++ /dev/null @@ -1,350 +0,0 @@ -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 deleted file mode 100644 index 42672a85a6a5..000000000000 --- a/net-p2p/amule/files/amule-2.3.2-libupnp-1.8.patch +++ /dev/null @@ -1,263 +0,0 @@ -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/classified-ads/Manifest b/net-p2p/classified-ads/Manifest index cd137e5414e1..4456d7c6d5f2 100644 --- a/net-p2p/classified-ads/Manifest +++ b/net-p2p/classified-ads/Manifest @@ -1,4 +1,4 @@ DIST classified-ads-0.13.tar.gz 2656104 BLAKE2B d02f723d7371abc2a8c0a6bfde300c8a4f16e5fcc43a17c5d8b8cce4ab21371df82b734e5813ebded6672e8448b7e8ee19c68836926dcc7af1824bfa173de0ef SHA512 7b6114705ac5867223e4e74c13aad47a4a38c24cd5e062e50dd7c0a5829ff011151a93562b1a5ab37f04fe3d6a93258e9ca4845748bbb02db882818284fe4a3a DIST classified-ads-graphics-0.13.tar.gz 340476 BLAKE2B c9bac95f0e620a671959f0eb8c719cd70be5c9340ccb3bc3baa7eae669b5201d3127880b9006a4031e09be09e72754c8ec07824b3581e3af691c3944d5b32d21 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d -EBUILD classified-ads-0.13.ebuild 1741 BLAKE2B 73de73f0830144c00b5efe1920462fb2d5df595fc5577082f7662cd51a2d5048d3a31ff28a3427c9f4debb0768d2d0a5af4dd3983f8c9bc1422693fdb923b2de SHA512 929176f3f4869382cdd0719d27be4f73c5d465a7795980346bfe6e30ca179a4f877fe0246b2d0e0fb5755b93ea5c90e74bbbc2b7a457afe52f0f9ce05be6c8ed +EBUILD classified-ads-0.13-r1.ebuild 1742 BLAKE2B 998d6fc77825a194e771ca27663a258e8f67c81bcf39bfbcbec7f4f9d5680cd6a0c47cc5655d52e291c68b2395e0f36b02bc13226a60a1c914615a8f562a65da SHA512 c8b6ce10ada05c40fcb11cf1860229614e6e3214e3117f87e37602539be5746c18f0343cf22d8b21cf49e134303acc402d4e16c5627fc78a23657ce3cb421f19 MISC metadata.xml 1809 BLAKE2B b16dc75993e2af93067ef25fc63e090e7224aee742f3bfeea3b73e5477de353abe11e3bf99ab36add37f7572f4888a41c1f4913a5bc06bf055247bd006aa01d1 SHA512 426030930420118dbbc3d12137d3a8415ffa83d9dcd44ef0ebac29cfa8167f6a415800ce358fb664fc3e22f4bc8c3afae33a60340a503c145e0eb189fb8aebb0 diff --git a/net-p2p/classified-ads/classified-ads-0.13-r1.ebuild b/net-p2p/classified-ads/classified-ads-0.13-r1.ebuild new file mode 100644 index 000000000000..76c08d266204 --- /dev/null +++ b/net-p2p/classified-ads/classified-ads-0.13-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit qmake-utils virtualx xdg + +DESCRIPTION="Program for displaying classified advertisement items" +HOMEPAGE="http://katiska.org/classified-ads/" +SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz + -> classified-ads-${PV}.tar.gz + https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true + -> classified-ads-graphics-${PV}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND="app-arch/bzip2 + dev-lang/tcl:= + dev-lang/tk:= + dev-libs/openssl:0= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + media-libs/opus + net-libs/libnatpmp + net-libs/miniupnpc + sys-apps/file + sys-libs/zlib + virtual/libintl" + +DEPEND="${RDEPEND} + sys-devel/gettext + doc? ( app-doc/doxygen[dot] ) + test? ( dev-libs/libgcrypt:0 + dev-qt/qttest:5 + sys-devel/gdb:0 )" + +src_prepare() { + # preprocessed graphics are unpacked into wrong directory + # so lets move them into correct location: + mv ../ui/* ui/ || die + # possible patches + eapply_user +} + +src_configure() { + eqmake5 + if use test; then + cd testca || die + eqmake5 + fi +} + +src_compile() { + emake + if use doc; then + pushd doc > /dev/null || die + doxygen || die + popd > /dev/null || die + fi + if use test; then + emake -C testca + fi +} + +src_test() { + # testca will return 0 if all unit tests pass + virtx ./testca/testca +} + +src_install() { + docompress -x /usr/share/doc/ + emake install INSTALL_ROOT="${D}" DESTDIR="${D}" + use doc && dodoc -r doc/doxygen.generated/html/. +} diff --git a/net-p2p/classified-ads/classified-ads-0.13.ebuild b/net-p2p/classified-ads/classified-ads-0.13.ebuild deleted file mode 100644 index 2f0e86981d5d..000000000000 --- a/net-p2p/classified-ads/classified-ads-0.13.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qmake-utils virtualx xdg - -DESCRIPTION="Program for displaying classified advertisement items" -HOMEPAGE="http://katiska.org/classified-ads/" -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz - -> classified-ads-${PV}.tar.gz - https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true - -> classified-ads-graphics-${PV}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND="app-arch/bzip2 - dev-lang/tcl:= - dev-lang/tk:= - dev-libs/openssl:0 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - media-libs/opus - net-libs/libnatpmp - net-libs/miniupnpc - sys-apps/file - sys-libs/zlib - virtual/libintl" - -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( app-doc/doxygen[dot] ) - test? ( dev-libs/libgcrypt:0 - dev-qt/qttest:5 - sys-devel/gdb:0 )" - -src_prepare() { - # preprocessed graphics are unpacked into wrong directory - # so lets move them into correct location: - mv ../ui/* ui/ || die - # possible patches - eapply_user -} - -src_configure() { - eqmake5 - if use test; then - cd testca || die - eqmake5 - fi -} - -src_compile() { - emake - if use doc; then - pushd doc > /dev/null || die - doxygen || die - popd > /dev/null || die - fi - if use test; then - emake -C testca - fi -} - -src_test() { - # testca will return 0 if all unit tests pass - virtx ./testca/testca -} - -src_install() { - docompress -x /usr/share/doc/ - emake install INSTALL_ROOT="${D}" DESTDIR="${D}" - use doc && dodoc -r doc/doxygen.generated/html/. -} diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest index 25ce2f9393c5..b141cc0409d2 100644 --- a/net-p2p/syncthing/Manifest +++ b/net-p2p/syncthing/Manifest @@ -791,9 +791,7 @@ DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcff DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262 DIST syncthing-1.15.1.tar.gz 6110326 BLAKE2B 0d1db888cb5a23fd09856f3733433c0848658c6ceadbaf3acd2fa34e9e03a0477e24392251bdde3ab42f0f43ed1011225227fee28e37915e857720ff76e5f57f SHA512 fdcf9e5b43f8d7923553979bd7cbab8a65deac16def727c4982fb1aae6d43c0c38cc6e3e140cf04ceed3fe6661e8d5fc087df3034e9c32e1ba08ef71f0b96832 -DIST syncthing-1.16.1.tar.gz 6086133 BLAKE2B be66d9266527e7142e1c951e063b2dafb0bb60b391680fdf51495628ef057810e9b9340c3fc62e6462e496edb7b7a9e3240e8d67c1ef7c8f25a8dfdc4ec02898 SHA512 0f66fcfa8b95f78d68f877492d0697496a071b7562c5b1ff2021ab6d25b96a15f1ade6e99188b9cad16f6317c259b411f8e98bdf2ba98071c26eac3958191428 DIST syncthing-1.17.0.tar.gz 6093692 BLAKE2B 20ac82f916bb58c2390d49403e6d2934f5e26029d55750ddf03811294af23cb048d534e28953627d17e5c49532740acbe1c31fd5e3fd45139e0c0c8b4620930f SHA512 6ccc43bf21ce20543031e070b14e5383a1bee6a0c6df5a0e1a914d2fae51f04d7776f715e4874c2b854798cc89236028955be6a462574bdafb6bc9dd56bce854 EBUILD syncthing-1.15.1.ebuild 39791 BLAKE2B 8cd048b2e8bd021aec1da09b6493b19c82a97d2b144df685a0dc76c868506ca4a3fc82eb4626bb8091300903bb4c51f4745cc1a8a6f8cb224db384def1bd835f SHA512 8112c6436bfde905c6db91e7662b55c48879de2d737395b50faee7920abafe57a054a569632a185f93e323fd7b570dac06aaad859d7b36b953f847ae5eb7d796 -EBUILD syncthing-1.16.1.ebuild 39883 BLAKE2B 1c5a45994129d0a72c3e80ec51e5fa78d80abbafb07c43db09717219019ab61c438667590cfcaa3c403da2efe1c640ef35af93fbef534090d0b587cf927d3b77 SHA512 4391cc5a742a9e583511d885526a25c29f64e7f03e70912f3a7f58c902b064ac6af0d4436cf634a48bb1bf2714e611cfbd9dc5a98d766c32876402c676285b77 EBUILD syncthing-1.17.0.ebuild 41739 BLAKE2B 2d5359a16a521cb54d6f532b09e387f6fd9e53f1d843a46427cd12863dbbb33707fdcd3fd6c4e0755ac092bcd68dbb816dbac86a11c860f90af4d6d14d73e6e2 SHA512 2b8b53890c7961faeccbe0e25887f0d8a00b1016757e0d14623b002b2b24a203d4264509d7299ca73101e20c339cfde669694f7b0b414fd79adb7f85117c9e6b MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238 diff --git a/net-p2p/syncthing/syncthing-1.16.1.ebuild b/net-p2p/syncthing/syncthing-1.16.1.ebuild deleted file mode 100644 index 1230a2d030ef..000000000000 --- a/net-p2p/syncthing/syncthing-1.16.1.ebuild +++ /dev/null @@ -1,783 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop go-module systemd xdg-utils - -EGO_SUM=( - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.31.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.37.0/go.mod" - "dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod" - "dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod" - "dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod" - "dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod" - "git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod" - "github.com/AudriusButkevicius/pfilter v0.0.0-20210218141631-7468b85d810a" - "github.com/AudriusButkevicius/pfilter v0.0.0-20210218141631-7468b85d810a/go.mod" - "github.com/AudriusButkevicius/recli v0.0.5" - "github.com/AudriusButkevicius/recli v0.0.5/go.mod" - "github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c" - "github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod" - "github.com/Shopify/sarama v1.19.0/go.mod" - "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod" - "github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d" - "github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod" - "github.com/VividCortex/gohistogram v1.0.0/go.mod" - "github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod" - "github.com/alecthomas/kong v0.2.12" - "github.com/alecthomas/kong v0.2.12/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" - "github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod" - "github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod" - "github.com/apache/thrift v0.12.0/go.mod" - "github.com/apache/thrift v0.13.0/go.mod" - "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" - "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" - "github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod" - "github.com/aws/aws-lambda-go v1.13.3/go.mod" - "github.com/aws/aws-sdk-go v1.27.0/go.mod" - "github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/beorn7/perks v1.0.1" - "github.com/beorn7/perks v1.0.1/go.mod" - "github.com/bgentry/speakeasy v0.1.0/go.mod" - "github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e" - "github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod" - "github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod" - "github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod" - "github.com/calmh/xdr v1.1.0" - "github.com/calmh/xdr v1.1.0/go.mod" - "github.com/casbin/casbin/v2 v2.1.2/go.mod" - "github.com/ccding/go-stun v0.1.2" - "github.com/ccding/go-stun v0.1.2/go.mod" - "github.com/ccding/go-stun v0.1.3" - "github.com/ccding/go-stun v0.1.3/go.mod" - "github.com/cenkalti/backoff v2.2.1+incompatible/go.mod" - "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" - "github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054" - "github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod" - "github.com/cespare/xxhash/v2 v2.1.1" - "github.com/cespare/xxhash/v2 v2.1.1/go.mod" - "github.com/cheekybits/genny v1.0.0" - "github.com/cheekybits/genny v1.0.0/go.mod" - "github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5" - "github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod" - "github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod" - "github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod" - "github.com/coreos/go-semver v0.2.0/go.mod" - "github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod" - "github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod" - "github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/creack/pty v1.1.7/go.mod" - "github.com/d4l3k/messagediff v1.2.1" - "github.com/d4l3k/messagediff v1.2.1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dchest/siphash v1.2.2" - "github.com/dchest/siphash v1.2.2/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/eapache/go-resiliency v1.1.0/go.mod" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" - "github.com/eapache/queue v1.1.0/go.mod" - "github.com/edsrzf/mmap-go v1.0.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.6.9/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" - "github.com/fatih/color v1.7.0/go.mod" - "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568" - "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod" - "github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod" - "github.com/francoispqt/gojay v1.2.13/go.mod" - "github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod" - "github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/fsnotify/fsnotify v1.4.9" - "github.com/fsnotify/fsnotify v1.4.9/go.mod" - "github.com/getsentry/raven-go v0.2.0" - "github.com/getsentry/raven-go v0.2.0/go.mod" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/gliderlabs/ssh v0.1.1/go.mod" - "github.com/go-asn1-ber/asn1-ber v1.5.1" - "github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod" - "github.com/go-errors/errors v1.0.1/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-kit/kit v0.9.0/go.mod" - "github.com/go-kit/kit v0.10.0/go.mod" - "github.com/go-ldap/ldap/v3 v3.2.4" - "github.com/go-ldap/ldap/v3 v3.2.4/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-logfmt/logfmt v0.5.0/go.mod" - "github.com/go-ole/go-ole v1.2.4" - "github.com/go-ole/go-ole v1.2.4/go.mod" - "github.com/go-sql-driver/mysql v1.4.0/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/gobwas/glob v0.2.3" - "github.com/gobwas/glob v0.2.3/go.mod" - "github.com/gogo/googleapis v1.1.0/go.mod" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.0/go.mod" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/gogo/protobuf v1.3.1" - "github.com/gogo/protobuf v1.3.1/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" - "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" - "github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" - "github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.4.0/go.mod" - "github.com/golang/mock v1.4.4" - "github.com/golang/mock v1.4.4/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod" - "github.com/golang/protobuf v1.4.0-rc.2/go.mod" - "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod" - "github.com/golang/protobuf v1.4.0/go.mod" - "github.com/golang/protobuf v1.4.2/go.mod" - "github.com/golang/protobuf v1.4.3" - "github.com/golang/protobuf v1.4.3/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.4.0" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-github v17.0.0+incompatible/go.mod" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.0.0/go.mod" - "github.com/googleapis/gax-go v2.0.0+incompatible/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.3/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" - "github.com/gorilla/context v1.1.1/go.mod" - "github.com/gorilla/mux v1.6.2/go.mod" - "github.com/gorilla/mux v1.7.3/go.mod" - "github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod" - "github.com/greatroar/blobloom v0.5.0" - "github.com/greatroar/blobloom v0.5.0/go.mod" - "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" - "github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod" - "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" - "github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod" - "github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod" - "github.com/hashicorp/consul/api v1.3.0/go.mod" - "github.com/hashicorp/consul/sdk v0.3.0/go.mod" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" - "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" - "github.com/hashicorp/go-msgpack v0.5.3/go.mod" - "github.com/hashicorp/go-multierror v1.0.0/go.mod" - "github.com/hashicorp/go-rootcerts v1.0.0/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" - "github.com/hashicorp/go-syslog v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.1/go.mod" - "github.com/hashicorp/go-version v1.2.0/go.mod" - "github.com/hashicorp/go.net v0.0.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/logutils v1.0.0/go.mod" - "github.com/hashicorp/mdns v1.0.0/go.mod" - "github.com/hashicorp/memberlist v0.1.3/go.mod" - "github.com/hashicorp/serf v0.8.2/go.mod" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/hudl/fargo v1.3.0/go.mod" - "github.com/inconshreveable/mousetrap v1.0.0/go.mod" - "github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod" - "github.com/jackpal/gateway v1.0.6" - "github.com/jackpal/gateway v1.0.6/go.mod" - "github.com/jackpal/go-nat-pmp v1.0.2" - "github.com/jackpal/go-nat-pmp v1.0.2/go.mod" - "github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" - "github.com/jonboulle/clockwork v0.1.0/go.mod" - "github.com/jpillora/backoff v1.0.0/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.7/go.mod" - "github.com/json-iterator/go v1.1.8/go.mod" - "github.com/json-iterator/go v1.1.10/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/jtolds/gls v4.20.0+incompatible/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/julienschmidt/httprouter v1.3.0" - "github.com/julienschmidt/httprouter v1.3.0/go.mod" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/pty v1.1.3/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/lib/pq v1.8.0" - "github.com/lib/pq v1.8.0/go.mod" - "github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod" - "github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod" - "github.com/lucas-clemente/quic-go v0.19.3" - "github.com/lucas-clemente/quic-go v0.19.3/go.mod" - "github.com/lunixbochs/vtclean v1.0.0/go.mod" - "github.com/lyft/protoc-gen-validate v0.0.13/go.mod" - "github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod" - "github.com/marten-seemann/qpack v0.2.1/go.mod" - "github.com/marten-seemann/qtls v0.10.0" - "github.com/marten-seemann/qtls v0.10.0/go.mod" - "github.com/marten-seemann/qtls-go1-15 v0.1.1" - "github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod" - "github.com/maruel/panicparse v1.5.1" - "github.com/maruel/panicparse v1.5.1/go.mod" - "github.com/mattn/go-colorable v0.0.9/go.mod" - "github.com/mattn/go-colorable v0.1.6/go.mod" - "github.com/mattn/go-isatty v0.0.3/go.mod" - "github.com/mattn/go-isatty v0.0.4/go.mod" - "github.com/mattn/go-isatty v0.0.12" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-runewidth v0.0.2/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0" - "github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0/go.mod" - "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod" - "github.com/microcosm-cc/bluemonday v1.0.1/go.mod" - "github.com/miekg/dns v1.0.14/go.mod" - "github.com/minio/sha256-simd v0.1.1" - "github.com/minio/sha256-simd v0.1.1/go.mod" - "github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75" - "github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod" - "github.com/mitchellh/cli v1.0.0/go.mod" - "github.com/mitchellh/go-homedir v1.0.0/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" - "github.com/mitchellh/gox v0.4.0/go.mod" - "github.com/mitchellh/iochan v1.0.0/go.mod" - "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod" - "github.com/nats-io/jwt v0.3.0/go.mod" - "github.com/nats-io/jwt v0.3.2/go.mod" - "github.com/nats-io/nats-server/v2 v2.1.2/go.mod" - "github.com/nats-io/nats.go v1.9.1/go.mod" - "github.com/nats-io/nkeys v0.1.0/go.mod" - "github.com/nats-io/nkeys v0.1.3/go.mod" - "github.com/nats-io/nuid v1.0.1/go.mod" - "github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod" - "github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" - "github.com/nxadm/tail v1.4.4" - "github.com/nxadm/tail v1.4.4/go.mod" - "github.com/oklog/oklog v0.3.2/go.mod" - "github.com/oklog/run v1.0.0/go.mod" - "github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.7.0/go.mod" - "github.com/onsi/ginkgo v1.12.1/go.mod" - "github.com/onsi/ginkgo v1.14.0" - "github.com/onsi/ginkgo v1.14.0/go.mod" - "github.com/onsi/gomega v1.4.3/go.mod" - "github.com/onsi/gomega v1.7.1/go.mod" - "github.com/onsi/gomega v1.10.1/go.mod" - "github.com/onsi/gomega v1.10.3" - "github.com/onsi/gomega v1.10.3/go.mod" - "github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod" - "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod" - "github.com/opentracing/basictracer-go v1.0.0/go.mod" - "github.com/opentracing/opentracing-go v1.0.2/go.mod" - "github.com/opentracing/opentracing-go v1.1.0/go.mod" - "github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod" - "github.com/openzipkin/zipkin-go v0.1.1/go.mod" - "github.com/openzipkin/zipkin-go v0.1.6/go.mod" - "github.com/openzipkin/zipkin-go v0.2.1/go.mod" - "github.com/openzipkin/zipkin-go v0.2.2/go.mod" - "github.com/oschwald/geoip2-golang v1.4.0" - "github.com/oschwald/geoip2-golang v1.4.0/go.mod" - "github.com/oschwald/maxminddb-golang v1.6.0" - "github.com/oschwald/maxminddb-golang v1.6.0/go.mod" - "github.com/pact-foundation/pact-go v1.0.4/go.mod" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" - "github.com/pborman/uuid v1.2.0/go.mod" - "github.com/performancecopilot/speed v3.0.0+incompatible/go.mod" - "github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5" - "github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod" - "github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pkg/profile v1.2.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/posener/complete v1.1.1/go.mod" - "github.com/prometheus/client_golang v0.8.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_golang v1.3.0/go.mod" - "github.com/prometheus/client_golang v1.7.1/go.mod" - "github.com/prometheus/client_golang v1.8.0" - "github.com/prometheus/client_golang v1.8.0/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" - "github.com/prometheus/client_model v0.1.0/go.mod" - "github.com/prometheus/client_model v0.2.0" - "github.com/prometheus/client_model v0.2.0/go.mod" - "github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod" - "github.com/prometheus/common v0.2.0/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.7.0/go.mod" - "github.com/prometheus/common v0.10.0/go.mod" - "github.com/prometheus/common v0.14.0" - "github.com/prometheus/common v0.14.0/go.mod" - "github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/prometheus/procfs v0.0.8/go.mod" - "github.com/prometheus/procfs v0.1.3/go.mod" - "github.com/prometheus/procfs v0.2.0" - "github.com/prometheus/procfs v0.2.0/go.mod" - "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod" - "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0" - "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod" - "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/russross/blackfriday v1.5.2" - "github.com/russross/blackfriday v1.5.2/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" - "github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod" - "github.com/sasha-s/go-deadlock v0.2.0" - "github.com/sasha-s/go-deadlock v0.2.0/go.mod" - "github.com/sclevine/spec v1.4.0/go.mod" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" - "github.com/sergi/go-diff v1.0.0/go.mod" - "github.com/shirou/gopsutil/v3 v3.20.11" - "github.com/shirou/gopsutil/v3 v3.20.11/go.mod" - "github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod" - "github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod" - "github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod" - "github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod" - "github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod" - "github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod" - "github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod" - "github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod" - "github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod" - "github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod" - "github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod" - "github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod" - "github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod" - "github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod" - "github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod" - "github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod" - "github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod" - "github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod" - "github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod" - "github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod" - "github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/sirupsen/logrus v1.6.0/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" - "github.com/smartystreets/goconvey v1.6.4/go.mod" - "github.com/soheilhy/cmux v0.1.4/go.mod" - "github.com/sony/gobreaker v0.4.1/go.mod" - "github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod" - "github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod" - "github.com/spf13/cobra v0.0.3/go.mod" - "github.com/spf13/pflag v1.0.1/go.mod" - "github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod" - "github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod" - "github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939" - "github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939/go.mod" - "github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7" - "github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod" - "github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod" - "github.com/thejerf/suture/v4 v4.0.0" - "github.com/thejerf/suture/v4 v4.0.0/go.mod" - "github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod" - "github.com/urfave/cli v1.20.0/go.mod" - "github.com/urfave/cli v1.22.1/go.mod" - "github.com/urfave/cli v1.22.4" - "github.com/urfave/cli v1.22.4/go.mod" - "github.com/viant/assertly v0.4.8/go.mod" - "github.com/viant/toolbox v0.24.0/go.mod" - "github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0" - "github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod" - "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" - "github.com/yuin/goldmark v1.2.1/go.mod" - "go.etcd.io/bbolt v1.3.3/go.mod" - "go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod" - "go.opencensus.io v0.18.0/go.mod" - "go.opencensus.io v0.20.1/go.mod" - "go.opencensus.io v0.20.2/go.mod" - "go.opencensus.io v0.22.2/go.mod" - "go.uber.org/atomic v1.3.2/go.mod" - "go.uber.org/atomic v1.5.0/go.mod" - "go.uber.org/multierr v1.1.0/go.mod" - "go.uber.org/multierr v1.3.0/go.mod" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod" - "go.uber.org/zap v1.10.0/go.mod" - "go.uber.org/zap v1.13.0/go.mod" - "go4.org v0.0.0-20180809161055-417644f6feb5/go.mod" - "golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" - "golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod" - "golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod" - "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" - "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897" - "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/mod v0.3.0" - "golang.org/x/mod v0.3.0/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" - "golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod" - "golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod" - "golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod" - "golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" - "golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod" - "golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod" - "golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod" - "golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod" - "golang.org/x/net v0.0.0-20201031054903-ff519b6c9102" - "golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod" - "golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod" - "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" - "golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod" - "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" - "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod" - "golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod" - "golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod" - "golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod" - "golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod" - "golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod" - "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" - "golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod" - "golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod" - "golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod" - "golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod" - "golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod" - "golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod" - "golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod" - "golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4" - "golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod" - "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/text v0.3.4" - "golang.org/x/text v0.3.4/go.mod" - "golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" - "golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e" - "golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod" - "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod" - "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" - "golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod" - "golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod" - "golang.org/x/tools v0.1.0" - "golang.org/x/tools v0.1.0/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1" - "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod" - "google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod" - "google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod" - "google.golang.org/api v0.1.0/go.mod" - "google.golang.org/api v0.3.1/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.2.0/go.mod" - "google.golang.org/appengine v1.3.0/go.mod" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod" - "google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod" - "google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod" - "google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/grpc v1.14.0/go.mod" - "google.golang.org/grpc v1.16.0/go.mod" - "google.golang.org/grpc v1.17.0/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.0/go.mod" - "google.golang.org/grpc v1.22.1/go.mod" - "google.golang.org/grpc v1.23.0/go.mod" - "google.golang.org/grpc v1.23.1/go.mod" - "google.golang.org/grpc v1.26.0/go.mod" - "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod" - "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod" - "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod" - "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod" - "google.golang.org/protobuf v1.21.0/go.mod" - "google.golang.org/protobuf v1.23.0" - "google.golang.org/protobuf v1.23.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b" - "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod" - "gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/gcfg.v1 v1.2.3/go.mod" - "gopkg.in/inf.v0 v0.9.1/go.mod" - "gopkg.in/resty.v1 v1.12.0/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/warnings.v0 v0.1.2/go.mod" - "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.5/go.mod" - "gopkg.in/yaml.v2 v2.3.0" - "gopkg.in/yaml.v2 v2.3.0/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - "grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod" - "honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "rsc.io/quote/v3 v3.1.0/go.mod" - "rsc.io/sampler v1.3.0/go.mod" - "sigs.k8s.io/yaml v1.1.0/go.mod" - "sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod" - "sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod" - "sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod" -) - -go-module_set_globals - -DESCRIPTION="Open Source Continuous File Synchronization" -HOMEPAGE="https://syncthing.net" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="selinux tools" - -RDEPEND="acct-group/syncthing - acct-user/syncthing - tools? ( acct-group/stdiscosrv - acct-group/strelaysrv - acct-user/stdiscosrv - acct-user/strelaysrv ) - selinux? ( sec-policy/selinux-syncthing )" - -DOCS=( README.md AUTHORS CONTRIBUTING.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch -) - -src_prepare() { - # Bug #679280 - xdg_environment_reset - - default - sed -i \ - 's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \ - cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ - || die - - # We do not need this and it sometimes causes build failures - rm -rf cmd/stupgrades -} - -src_compile() { - go run build.go -version "v${PV}" -no-upgrade install \ - $(usex tools "all" "") || die "build failed" -} - -src_test() { - go run build.go test || die "test failed" -} - -src_install() { - doman man/*.[157] - einstalldocs - - dobin bin/syncthing - domenu etc/linux-desktop/*.desktop - if use tools ; then - exeinto /usr/libexec/syncthing - local exe - for exe in bin/* ; do - [[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}" - done - fi - - # openrc and systemd service files - systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service - systemd_douserunit etc/linux-systemd/user/${PN}.service - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd" ${PN} - - keepdir /var/log/${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - if use tools ; then - # openrc and systemd service files - - systemd_dounit "${FILESDIR}/stdiscosrv.service" - newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv - newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv - - systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service - newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv - newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv - - insinto /etc/logrotate.d - newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv - newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv - fi -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest index f251b438bdf8..d06204688e69 100644 --- a/net-p2p/vuze/Manifest +++ b/net-p2p/vuze/Manifest @@ -10,5 +10,5 @@ AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5 EBUILD vuze-5.7.6.0-r1.ebuild 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4 -EBUILD vuze-5.7.6.0-r2.ebuild 4068 BLAKE2B cc886730154ee78f0a29f3e92dc989a6ab2e25bebe9ac1ffe18b24dc1118289152b573620ecc3bd6f0e044dc18c706cb7346d5a019f8db78eeee30e7e81fb546 SHA512 d9b7faa5b51d359fce3a5812ceb9c3c6069bc8952d684bf0f58e72b119bb2e7682d3ec5d4ed7485fa83ef75cbbf281e8e0e546de5f5b8a4041155233ccde1266 +EBUILD vuze-5.7.6.0-r2.ebuild 4067 BLAKE2B 8014f5e9cc02a61e3c5010d9020780f862a731d4a4a62a01f3d7f86ff610059b230801ef66838f7447a0caf5ec2ad665307499cc3413c667c00e3faf706502b0 SHA512 d99b9030a56faa88ddb47b3f156d1f6dc3cde87e09dc26ae635ef768fa3d6336205f61e415c901e7c33e16066ffc7623e546b46eb27018a5ce1fdab1a8c17a79 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1 diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild index 32974b2ba0c8..05926fa4b78d 100644 --- a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild +++ b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" # bundles parts of http://www.programmers-friend.org/ # bundles bcprov - 1.37 required but not in the tree -- cgit v1.2.3