From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- net-p2p/retroshare/Manifest | 6 +- .../retroshare-0.6.6-fix-cxx17-compilation.patch | 58 +++++++++ net-p2p/retroshare/metadata.xml | 11 +- net-p2p/retroshare/retroshare-0.6.5-r3.ebuild | 142 +++++++++++++++++++++ net-p2p/retroshare/retroshare-0.6.6.ebuild | 122 ++++++++++++++++++ 5 files changed, 334 insertions(+), 5 deletions(-) create mode 100644 net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch create mode 100644 net-p2p/retroshare/retroshare-0.6.5-r3.ebuild create mode 100644 net-p2p/retroshare/retroshare-0.6.6.ebuild (limited to 'net-p2p/retroshare') diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index 924f5f4dc743..ea87cc248875 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1,4 +1,8 @@ AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37 +AUX retroshare-0.6.6-fix-cxx17-compilation.patch 1753 BLAKE2B aeba3e200eaf78867220227b766d2e396322d93e14afa885ba8ac5d8d5c88b9806a1fc90a00b2e7a364cdfcfa04776da9974293a394fc4d946ca30716daf931c SHA512 09f146aaaa9570eb4b01a9b325acbf6648d88ddde222128f709ecc89038ce5d8c9fba046abdf36547b4ee7e653bf058a3a51f775a78e71b760e0e513d43005e6 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb +DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d EBUILD retroshare-0.6.5-r2.ebuild 4114 BLAKE2B dbc08ddaf55fe725e61f03f85458d334b73e5d641a050d418b63b1b5368d6447b4cd3a6ca45f75a7d8cdffd089814adc62e24243507d72a9438ff2afff1f9784 SHA512 4dfb1b8cb8e941a593e806136823602974b1f9fd8a3fdfd4541ed4253404d9a679fb7f75bba5072e0f8302d75d57de5d3240d98145eaae59b026c04eec4b8e39 -MISC metadata.xml 1614 BLAKE2B dffe5895cc85e6c661b8ca6d2bddc3582caaf8e3c943098d2a64d5164850796d5ab7c33399fba8ae418b8665bf201d20821c3fd7c334d1033cab6ce1f16c237f SHA512 c1300b57b3a11349a434a5d32775e52390da7039aa319d45fa89f811fb3ffe74d3a5bbcbf397cdaa69c346398ff37eb62e3d949c3d66bf34984c2526d66e486d +EBUILD retroshare-0.6.5-r3.ebuild 3734 BLAKE2B f085af9005a35f126d45ad579cff0b907301ee6d3ed1280e4668c51a0db170e681cd2cc246d0306842c01e19dc1548407f38a4139c48498a28262bbabbb365df SHA512 cc3d8766f874e35365995ed5758d2711db05590ee76cf65f6ce2807ad4de611e45adec9c9fa486e60d55974fb3691c66f24b4889abcf0b059256968f5a3b39ad +EBUILD retroshare-0.6.6.ebuild 3481 BLAKE2B 4888c2ac8c7733dba086f0616d3a6e6421daeeadf2ed30c16043dc88a06fbb66e2812740c0ff3ddaa2f376858d2cef81580b6ea14245d4cafeb83d5a61ebd42e SHA512 50d1083dbd9fcd0e2333193473903b828e7b04341da6655bcefc8b249ab591f016731de2ef0ac61aa5e95b13532017d62505df2931ba31453a43657f8e9d05ad +MISC metadata.xml 1935 BLAKE2B 40f36d3a73ed7bfc919911bd67a4e342df9d7d83af0aee0bded6e881b91f7a99b8caefab1b0def6b9b92ee3c30cd9b142b044555c9e2ddf44e3dc8682f2fc5eb SHA512 99c7fb455b26a36349983e0f1f8cc35fc64960b4b7208f16a47e951b2c732b668e7a2edc76f97bb5c4b7eb6150efc94c781d897f25ac6dc983ba54af507c8a02 diff --git a/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch new file mode 100644 index 000000000000..73c5e1d18cc8 --- /dev/null +++ b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch @@ -0,0 +1,58 @@ +https://github.com/RetroShare/RetroShare/commit/8bed99cc9f3763269b6b1aada45a43c9993d7b80 +From: Gioacchino Mazzurco +Date: Fri, 6 Aug 2021 12:15:34 +0200 +Subject: [PATCH] Fix compilation with C++17 +--- a/libretroshare/src/util/rsdir.cc ++++ b/libretroshare/src/util/rsdir.cc +@@ -64,6 +64,26 @@ + * #define RSDIR_DEBUG 1 + ****/ + ++#if __cplusplus < 201703L ++bool std::filesystem::create_directories(const std::string& path) ++{ ++ for( std::string::size_type lastIndex = 0; lastIndex < std::string::npos; ++ lastIndex = path.find('/', lastIndex) ) ++ { ++ std::string&& curDir = path.substr(0, ++lastIndex); ++ if(!RsDirUtil::checkCreateDirectory(curDir)) ++ { ++ RsErr() << __PRETTY_FUNCTION__ << " failure creating: " << curDir ++ << " of: " << path << std::endl; ++ return false; ++ } ++ } ++ return true; ++} ++#else ++# include ++#endif // __cplusplus < 201703L ++ + std::string RsDirUtil::getTopDir(const std::string& dir) + { + std::string top; +@@ -528,24 +548,6 @@ bool RsDirUtil::checkCreateDirectory(const std::string& dir) + return true; + } + +-#if __cplusplus < 201703L +-bool std::filesystem::create_directories(const std::string& path) +-{ +- for( std::string::size_type lastIndex = 0; lastIndex < std::string::npos; +- lastIndex = path.find('/', lastIndex) ) +- { +- std::string&& curDir = path.substr(0, ++lastIndex); +- if(!RsDirUtil::checkCreateDirectory(curDir)) +- { +- RsErr() << __PRETTY_FUNCTION__ << " failure creating: " << curDir +- << " of: " << path << std::endl; +- return false; +- } +- } +- return true; +-} +-#endif // __cplusplus < 201703L +- + std::string RsDirUtil::removeSymLinks(const std::string& path) + { + #if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__ANDROID__) diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml index a2e56631bdb1..1d61cb0cbd88 100644 --- a/net-p2p/retroshare/metadata.xml +++ b/net-p2p/retroshare/metadata.xml @@ -18,14 +18,17 @@ RetroShare provides filesharing, chat, mails, forums and channels. - Enables the CLI version of RetroShare + Enables potentially insecure autologin capability via app-crypt/libsecret + Enables terminal login support for retroshare-service Enables API via Unix socket support - Enables potentially insecure autologin capability via Gnome Keyring + Enables potentially insecure autologin capability via gnome-base/gnome-keyring Enables the new RetroShare JSON API - Enables the new RetroShare service controllable only through JSON API + Enables UPnP port forwarding via net-libs/libupnp + Enables UPnP port forwarding via net-libs/miniupnpc + Enables the new RetroShare service Enables GXS database encryption via SQLCipher Enables Web interface and API support - Enables GXS content indexing and search through Xapian + Enables GXS content indexing and search via dev-libs/xapian https://github.com/RetroShare/RetroShare/issues diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild new file mode 100644 index 000000000000..4a653396a8f0 --- /dev/null +++ b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop edos2unix qmake-utils xdg-utils + +DESCRIPTION="P2P private sharing application" +HOMEPAGE="https://retroshare.cc" +SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="autologin +gui +jsonapi +service +sqlcipher" + +REQUIRED_USE=" + || ( gui service ) + service? ( jsonapi )" + +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:0= + >=dev-libs/rapidjson-1.1.0 + net-libs/miniupnpc:= + sys-libs/zlib + autologin? ( app-crypt/libsecret ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXScrnSaver + ) + service? ( dev-qt/qtcore:5 ) + sqlcipher? ( dev-db/sqlcipher ) + !sqlcipher? ( dev-db/sqlite:3 )" + +DEPEND="${RDEPEND} + dev-qt/qtcore:5 + gui? ( dev-qt/designer:5 )" + +BDEPEND="dev-util/cmake + virtual/pkgconfig + jsonapi? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) + +S="${WORKDIR}"/RetroShare + +src_prepare() { + # CRLF endings break patch... + edos2unix retroshare-gui/src/gui/elastic/elnode.h + default +} + +src_configure() { + local qConfigs=() + + qConfigs+=( $(usex autologin '' 'no_')rs_autologin ) + qConfigs+=( $(usex gui '' 'no_')retroshare_gui ) + qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi ) + qConfigs+=( $(usex service '' 'no_')retroshare_service ) + qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher ) + qConfigs+=( no_retroshare_nogui ) + qConfigs+=( no_libresapi ) + qConfigs+=( no_libresapi_settings ) + qConfigs+=( no_libresapilocalserver ) + qConfigs+=( no_libresapihttpserver ) + + eqmake5 CONFIG+="${qConfigs[*]}" \ + RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \ + RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \ + RS_UPNP_LIB=miniupnpc +} + +src_compile() { + use jsonapi && { + nonfatal emake || + elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal" + } + + emake +} + +src_install() { + use gui && dobin retroshare-gui/src/retroshare + use service && dobin retroshare-service/src/retroshare-service + + insinto /usr/share/retroshare + doins libbitdht/src/bitdht/bdboot.txt + + dodoc README.md + make_desktop_entry retroshare + + for i in 24 48 64 128 ; do + doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" + done +} + +pkg_pretend() { + if ! use sqlcipher; then + ewarn "You have disabled GXS database encryption, ${PN} will use SQLite" + ewarn "instead of SQLCipher for GXS databases." + ewarn "Builds using SQLite and builds using SQLCipher have incompatible" + ewarn "database format, so you will need to manually delete GXS" + ewarn "database (loosing all your GXS data and identities) when you" + ewarn "toggle sqlcipher USE flag." + fi +} + +pkg_preinst() { + local ver + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt 0.5.9999; then + ewarn "You are upgrading from Retroshare 0.5.* to ${PV}" + ewarn "Version 0.6.* is backward-incompatible with 0.5 branch" + ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*" + ewarn "It's recommended to drop all your configuration and either" + ewarn "generate a new certificate or import existing from a backup" + break + fi + if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then + elog "Main executable has been renamed upstream from RetroShare06 to retroshare" + break + fi + done +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild new file mode 100644 index 000000000000..d331568ada6f --- /dev/null +++ b/net-p2p/retroshare/retroshare-0.6.6.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop qmake-utils xdg + +DESCRIPTION="P2P private sharing application" +HOMEPAGE="https://retroshare.cc" +SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/RetroShare" + +LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher" + +REQUIRED_USE=" + || ( gui service ) + ?? ( libupnp miniupnp ) + service? ( || ( cli jsonapi ) )" + +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:0= + >=dev-libs/rapidjson-1.1.0 + sys-libs/zlib + autologin? ( app-crypt/libsecret ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXScrnSaver + ) + libupnp? ( net-libs/libupnp:= ) + miniupnp? ( net-libs/miniupnpc:= ) + service? ( dev-qt/qtcore:5 ) + sqlcipher? ( dev-db/sqlcipher ) + !sqlcipher? ( dev-db/sqlite:3 )" + +DEPEND="${RDEPEND} + dev-qt/qtcore:5 + gui? ( dev-qt/designer:5 )" + +BDEPEND="dev-util/cmake + virtual/pkgconfig + jsonapi? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" ) + +src_configure() { + local qconfigs=( + $(usex cli '' 'no_')rs_service_terminal_login + $(usex autologin '' 'no_')rs_autologin + $(usex gui '' 'no_')retroshare_gui + $(usex jsonapi '' 'no_')rs_jsonapi + $(usex service '' 'no_')retroshare_service + $(usex sqlcipher '' 'no_')sqlcipher + ) + + local qupnplibs="none" + use miniupnp && qupnplibs="miniupnpc" + use libupnp && qupnplibs="upnp ixml" + + eqmake5 CONFIG+="${qconfigs[*]}" \ + RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \ + RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \ + RS_UPNP_LIB="${qupnplibs}" +} + +src_install() { + use gui && dobin retroshare-gui/src/retroshare + use service && dobin retroshare-service/src/retroshare-service + + insinto /usr/share/retroshare + doins libbitdht/src/bitdht/bdboot.txt + + dodoc README.asciidoc + + if use gui; then + make_desktop_entry retroshare + + for i in 24 48 64 128 ; do + doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" + done + fi +} + +pkg_preinst() { + xdg_pkg_preinst + + if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then + ewarn "You have disabled GXS database encryption, ${PN} will use SQLite" + ewarn "instead of SQLCipher for GXS databases." + ewarn "Builds using SQLite and builds using SQLCipher have incompatible" + ewarn "database format, so you will need to manually delete GXS" + ewarn "database (loosing all your GXS data and identities) when you" + ewarn "toggle sqlcipher USE flag." + fi + + if [[ ${REPLACING_VERSIONS} ]]; then + if ver_test ${REPLACING_VERSIONS} -lt 0.6; then + ewarn "You are upgrading from Retroshare 0.5.* to ${PV}" + ewarn "Version 0.6.* is backward-incompatible with 0.5 branch" + ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*" + ewarn "It's recommended to drop all your configuration and either" + ewarn "generate a new certificate or import existing from a backup" + break + fi + if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then + elog "Main executable has been renamed upstream from RetroShare06 to retroshare" + break + fi + fi +} -- cgit v1.2.3