From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- kde-misc/kio-fuse/Manifest | 6 +-- .../kio-fuse-5.0.0-fix-segfault-on-links-1.patch | 32 -------------- .../kio-fuse-5.0.0-fix-segfault-on-links-2.patch | 49 ---------------------- kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild | 45 -------------------- kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild | 2 +- 5 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch delete mode 100644 kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch delete mode 100644 kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild (limited to 'kde-misc/kio-fuse') diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest index e938a3cddee6..439ce278f39e 100644 --- a/kde-misc/kio-fuse/Manifest +++ b/kde-misc/kio-fuse/Manifest @@ -1,7 +1,3 @@ -AUX kio-fuse-5.0.0-fix-segfault-on-links-1.patch 984 BLAKE2B b3c820a69a32a47c21c7f8e0112cd90f9a387cffd3f55bd3b1e5bd3435845d60f2a836a52e322dac74ac22b5452ba4fe3142ef8601cbf2e5fffa3a1bc12e1d4a SHA512 fb02b002a4669a8136f28f3c7b2783fddafa1c4d9523991e5a291eab50fe91b58091bc3d9e532b876de413d3115692991751a1ce883d250673e0fc4ab095b71c -AUX kio-fuse-5.0.0-fix-segfault-on-links-2.patch 2014 BLAKE2B 5279b07685d23b6eb0c7047ec168e59ab2272f05abcbbf1aaf58f7e9d80d325fc6907b1522600117dffc137cd0a60282d37e3095d2e73088144b3f51dfebd1e2 SHA512 36986f096f4c22f78ed4bb1ddd7a2b70cb589bdc12ae093328f5c7b6b1bf6ba22fd64934df64520874a6a857dbfef2ea7d6bf85efe3a1f725297a9c3edb56c59 -DIST kio-fuse-5.0.0.tar.xz 46672 BLAKE2B 4e3dbf9ad8c00140c6d3ca2c364bde1c4a8a9eacf875101cf5089460357e05421df73420f030cbef5c6aeab213eed18fa53490b335b0e00ee86cf284b3d02faf SHA512 3c75e1abc0c357be4291e9a93902e510f249e8a980ae39e997ba0f252058114b0a717667e32528afc055eccd96576acfd0942f9f45526c3be69627d399dbf575 DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd -EBUILD kio-fuse-5.0.0-r1.ebuild 936 BLAKE2B 877accf9fb9c6caca2fb002df8a9020a42dc67a4d008d36dd72143fe83406629fec2b89a0041878015e90bda2a4d6f3a541ecc6efffdd15f8012699faa8b0fff SHA512 e9639547a8bbbeebad3e05ce0940a59729aa036de03b4d07fdac3ff6998ca84b80af7a7f878ad328c2923bc0be3911e9e2226d29314a7ab931c9f4987c505fc6 -EBUILD kio-fuse-5.0.1.ebuild 855 BLAKE2B 75cac676eefbf3781647575d50cba35f8d4bd9d2dcd5f89147ce142b508bccb978ea0dd633523db09b3be8c2387822fbaaf166b9b6e46ec464ae6764e2c11dda SHA512 ca8fc02f65b367ec417fbbaa573b95d4a6db5deaaa5897c9a99546fd8faf411eb5418943a37498886b9889a743f27262698bdb92aac5e7ccd6aca8f20eb09f8b +EBUILD kio-fuse-5.0.1.ebuild 852 BLAKE2B 03cbb204f563a1bd970ee0d70d744e731b5938e5fa0b976a71767dae221b69152fbfc13ced5e0dedaf5c5975d3ba1a35602fab895916ab63e5eaf0676fef8306 SHA512 5bde049440f90401f171c994dc058f4abb80d8f93cb91ef4164dd315d54c25a08f1c804f972b06553b123e259898d4ed7f427438601327127c7fd1ff1ecc11e7 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch b/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch deleted file mode 100644 index 7ef61ca22028..000000000000 --- a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1ee510baa80c834bbcf77a008e5668dbf3eccf4d Mon Sep 17 00:00:00 2001 -From: Alexander Saoutkin -Date: Sat, 2 Jan 2021 20:01:16 +0000 -Subject: [PATCH] Check return value of createNodeFromUDSEntry() - -createNodeFromUDSEntry() can return a nullptr, which it does when -passed any URL from the baloosearch protocol. - -BUG: 431079 ---- - kiofusevfs.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/kiofusevfs.cpp b/kiofusevfs.cpp -index 6f275cb..fbf6e27 100644 ---- a/kiofusevfs.cpp -+++ b/kiofusevfs.cpp -@@ -393,6 +393,11 @@ void KIOFuseVFS::findAndCreateOrigin(QUrl url, QStringList pathElements, std::fu - if(!finalNode) - { - finalNode = createNodeFromUDSEntry(statJob->statResult(), currentNode->m_stat.st_ino, targetPathComponents.last()); -+ if(!finalNode) -+ { -+ qWarning(KIOFUSE_LOG) << "Unable to create a valid final node for" << url << "from its UDS Entry"; -+ return callback({}, EIO); -+ } - insertNode(finalNode); - } - --- -GitLab - diff --git a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch b/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch deleted file mode 100644 index a16da6d75357..000000000000 --- a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d69959e226b1b49a1fc2d1a566acd4fdde0f97c3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 7 Jan 2021 22:46:19 +0100 -Subject: [PATCH] UDS_URL is not meant for links, Use UDS_TARGET_URL instead - -The KIO documentation for UDS_URL says: -`use UDS_TARGET_URL if you want "links" to unrelated urls.` -So the use of UDS_URL here was probably wrong. -Switching to UDS_TARGET_URL fixes mounting of some slaves such as baloosearch, -which set UDS_URL to the URL of the entry itself for some reason. - -BUG: 431079 ---- - kiofusevfs.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/kiofusevfs.cpp b/kiofusevfs.cpp -index fbf6e27..5c775b7 100644 ---- a/kiofusevfs.cpp -+++ b/kiofusevfs.cpp -@@ -1736,12 +1736,12 @@ std::shared_ptr KIOFuseVFS::createNodeFromUDSEntry(const KIO::UDSEn - attr.st_gid = gr->gr_gid; - } - -- if(entry.contains(KIO::UDSEntry::UDS_LOCAL_PATH) || entry.contains(KIO::UDSEntry::UDS_URL)) -+ if(entry.contains(KIO::UDSEntry::UDS_LOCAL_PATH) || entry.contains(KIO::UDSEntry::UDS_TARGET_URL)) - { - // Create as symlink if possible - QString target = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH); - if(target.isEmpty()) -- target = QUrl(entry.stringValue(KIO::UDSEntry::UDS_URL)).toLocalFile(); -+ target = QUrl(entry.stringValue(KIO::UDSEntry::UDS_TARGET_URL)).toLocalFile(); - - if(!target.isEmpty()) - { -@@ -1760,7 +1760,9 @@ std::shared_ptr KIOFuseVFS::createNodeFromUDSEntry(const KIO::UDSEn - { - attr.st_mode |= S_IFREG; - std::shared_ptr ret = nullptr; -- const QUrl nodeUrl = QUrl{entry.stringValue(KIO::UDSEntry::UDS_URL)}; -+ const QUrl nodeUrl = QUrl{entry.stringValue(KIO::UDSEntry::UDS_TARGET_URL)}; -+ if(nodeUrl.isEmpty()) -+ return nullptr; - if(m_useFileJob && KProtocolManager::supportsOpening(nodeUrl) && KProtocolManager::supportsTruncating(nodeUrl)) - ret = std::make_shared(parentIno, name, attr); - else --- -GitLab - diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild deleted file mode 100644 index 17131a6858b5..000000000000 --- a/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.74.0 -QTMIN=5.15.1 -inherit ecm kde.org linux-info - -DESCRIPTION="FUSE interface for KIO" -HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc64 x86" -fi - -LICENSE="GPL-3+" -SLOT="5" -IUSE="" - -RESTRICT+=" test" # depend on fuse kernel module - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - sys-fs/fuse:3 -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-segfault-on-links-{1,2}.patch # KDE-Bug 431079 -) - -pkg_setup() { - local CONFIG_CHECK="~FUSE_FS" - linux-info_pkg_setup - - ecm_pkg_setup -} diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild index a7944ff15a1f..fe05a54a1581 100644 --- a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild +++ b/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc64 x86" fi LICENSE="GPL-3+" -- cgit v1.2.3