summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-18 11:23:05 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-08-04 08:35:17 +0200
commit1b9df240c24b2c927e926b49b4addcd93a86fa59 (patch)
tree7bb26f08a9ff4a7a619e3eba06205ffc24c51388 /kde-apps/kio-extras
parentkde-apps/kget: drop 19.12.3* (diff)
downloadgentoo-1b9df240c24b2c927e926b49b4addcd93a86fa59.tar.gz
gentoo-1b9df240c24b2c927e926b49b4addcd93a86fa59.tar.bz2
gentoo-1b9df240c24b2c927e926b49b4addcd93a86fa59.zip
kde-apps/kio-extras: drop 19.12.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kio-extras')
-rw-r--r--kde-apps/kio-extras/Manifest1
-rw-r--r--kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch26
-rw-r--r--kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch171
-rw-r--r--kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild89
4 files changed, 0 insertions, 287 deletions
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 8e5ea974c039..3df9cec449b7 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,2 +1 @@
-DIST kio-extras-19.12.3.tar.xz 581020 BLAKE2B b4f9ca0812d535222c1a156ef2ce056df95dfab0786b108418fc98da860617c272ffaab044d0faf8559dee04d8bbc799da6eb004bea170c41a1b3bd30e91a40f SHA512 289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7
DIST kio-extras-20.04.3.tar.xz 618056 BLAKE2B 35f0760948634407e02193ffcdd60176153e37ead99545a39bb777bda600f5685c3ed3bd76aeabc2620ba5ddc11aa094aeaf25c896150acb8da53e894c78e6dc SHA512 25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3
diff --git a/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
deleted file mode 100644
index 188eb28f1043..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d813cef3cecdec9af1532a40d677a203ff979145 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sat, 9 May 2020 11:20:48 +0200
-Subject: Only store password in KWallet if the user asked for it
-
----
- fish/fish.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fish/fish.cpp b/fish/fish.cpp
-index a18ef34..ccd71d3 100644
---- a/fish/fish.cpp
-+++ b/fish/fish.cpp
-@@ -595,7 +595,9 @@ int fishProtocol::establishConnection(const QByteArray &buffer) {
- infoMessage(i18n("Initiating protocol..."));
- if (!connectionAuth.password.isEmpty()) {
- connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
-- cacheAuthentication(connectionAuth);
-+ if (connectionAuth.keepPassword) {
-+ cacheAuthentication(connectionAuth);
-+ }
- }
- isLoggedIn = true;
- return 0;
---
-cgit v1.1
diff --git a/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
deleted file mode 100644
index 4bdf9af413a7..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From a0a7ccb17fbb702ebc9122015f40fa9b112cedc6 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 27 Nov 2018 23:37:13 +0100
-Subject: [PATCH 1/2] Add FindTIRPC.cmake
-
-Taken from https://phabricator.kde.org/D12761
----
- cmake/FindTIRPC.cmake | 60 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
- create mode 100644 cmake/FindTIRPC.cmake
-
-diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake
-new file mode 100644
-index 00000000..20e78f9f
---- /dev/null
-+++ b/cmake/FindTIRPC.cmake
-@@ -0,0 +1,60 @@
-+# - Try to find TI-RPC
-+#
-+# The following variables will be available once found :
-+#
-+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location
-+# TIRPC_LIBRARIES - Link these to use TI-RPC
-+# TIRPC_VERSION - The TIRPC version
-+#
-+#=============================================================================
-+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+# derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_TIRPC libtirpc)
-+
-+find_path(TIRPC_INCLUDE_DIRS
-+ NAMES netconfig.h
-+ PATH_SUFFIXES tirpc
-+ HINTS ${PC_TIRPC_INCLUDE_DIRS}
-+)
-+
-+find_library(TIRPC_LIBRARIES
-+ NAMES tirpc
-+ HINTS ${PC_TIRPC_LIBRARY_DIRS}
-+)
-+
-+set(TIRPC_VERSION ${PC_TIRPC_VERSION})
-+
-+include(FindPackageHandleStandardArgs)
-+
-+find_package_handle_standard_args(TIRPC
-+ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS
-+ VERSION_VAR TIRPC_VERSION
-+)
-+
-+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES)
---
-2.25.1
-
-
-From 7cd0142ada663ac1bfcf4926f80f7ac53ccfb37c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 27 Nov 2018 23:43:18 +0100
-Subject: [PATCH 2/2] Build kio_nfs against standalone libtirpc
-
-Summary:
-Since glibc-2.26, cmake skipped over nfs when standalone tirpc
-was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...)
-
-Use FindTIRPC and make kio_nfs optional that way
-FindTIRPC taken from https://phabricator.kde.org/D12761
-
-Test Plan: Built with libtirpc successfully.
-
-Reviewers: #dolphin, dfaure, rdieter, sitter
-
-Subscribers: kde-frameworks-devel, cgiboudeaux, arojas, kfm-devel, meven
-
-Tags: #dolphin, #frameworks
-
-Differential Revision: https://phabricator.kde.org/D17205
----
- CMakeLists.txt | 9 ++++++---
- nfs/CMakeLists.txt | 15 +++++++++------
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 347caaad..37d56b3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,6 +134,11 @@ if(UNIX)
- set_package_properties(Gperf PROPERTIES TYPE OPTIONAL
- PURPOSE "Needed to build the man kioslave"
- )
-+
-+ find_package(TIRPC)
-+ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL
-+ PURPOSE "Needed to build the NFS kioslave"
-+ )
- else()
- # FIXME: on windows we ignore support until trash gets integrated
- endif()
-@@ -178,9 +183,7 @@ if(NOT WIN32)
- if(Gperf_FOUND)
- add_subdirectory( man )
- endif()
-- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
-- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
-- if(HAVE_RPC_RPC_H)
-+ if(TIRPC_FOUND)
- add_subdirectory( nfs )
- endif()
- endif()
-diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt
-index 6436e0d1..7189b25a 100644
---- a/nfs/CMakeLists.txt
-+++ b/nfs/CMakeLists.txt
-@@ -1,10 +1,12 @@
- ## Check for XDR functions
--include(CheckFunctionExists)
-+include(CheckCXXSymbolExists)
-
--CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T)
--CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T)
--CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER)
--CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T)
-+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES})
-+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS})
-+check_cxx_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T)
-+check_cxx_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T)
-+check_cxx_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER)
-+check_cxx_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T)
-
- if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T)
- message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!")
-@@ -24,9 +26,10 @@ if (HAVE_XDR_U_LONGLONG_T)
- endif (HAVE_XDR_U_LONGLONG_T)
-
- add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\")
-+include_directories(${TIRPC_INCLUDE_DIRS})
-
- add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c)
--target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network)
-+target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES})
- set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs")
-
- install(TARGETS kio_nfs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
---
-2.25.1
-
diff --git a/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild b/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild
deleted file mode 100644
index d217f1c9cabf..000000000000
--- a/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://invent.kde.org/network/kio-extras"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib"
-
-BDEPEND="
- man? ( dev-util/gperf )
-"
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdnssd-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kpty-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- activities? (
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- )
- mtp? ( >=media-libs/libmtp-1.1.16:= )
- nfs? ( net-libs/libtirpc:= )
- openexr? ( media-libs/openexr:= )
- phonon? ( media-libs/phonon[qt5(+)] )
- samba? ( net-fs/samba[client] )
- sftp? ( net-libs/libssh:=[sftp] )
- taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kded-${KFMIN}:5
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${P}-kio_nfs.patch"
- "${FILESDIR}/${P}-CVE-2020-12755.patch" # bug 722152
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package activities KF5ActivitiesStats)
- $(cmake_use_find_package man Gperf)
- $(cmake_use_find_package mtp Mtp)
- $(cmake_use_find_package nfs TIRPC)
- $(cmake_use_find_package openexr OpenEXR)
- $(cmake_use_find_package phonon Phonon4Qt5)
- $(cmake_use_find_package samba Samba)
- $(cmake_use_find_package sftp libssh)
- $(cmake_use_find_package taglib Taglib)
- )
-
- ecm_src_configure
-}