diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /kde-plasma/discover/files | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'kde-plasma/discover/files')
-rw-r--r-- | kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch | 28 | ||||
-rw-r--r-- | kde-plasma/discover/files/discover-5.21.90-tests-optional.patch | 94 |
2 files changed, 94 insertions, 28 deletions
diff --git a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch b/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch deleted file mode 100644 index 1a2685dbc8d1..000000000000 --- a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 94478827aab63d2e2321f0ca9ec5553718798e60 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Wed, 10 Mar 2021 21:48:53 +0100 -Subject: [PATCH] Only turn http[s] links into clickable links - -CVE-2021-28117 - -(cherry picked from commit d375031ff0262cedac7d6ee2b26d6a164ddebb67) ---- - libdiscover/backends/KNSBackend/KNSResource.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdiscover/backends/KNSBackend/KNSResource.cpp b/libdiscover/backends/KNSBackend/KNSResource.cpp -index 4394d5df..f7670c55 100644 ---- a/libdiscover/backends/KNSBackend/KNSResource.cpp -+++ b/libdiscover/backends/KNSBackend/KNSResource.cpp -@@ -87,7 +87,7 @@ QString KNSResource::longDescription() - ret.remove(QRegularExpression(QStringLiteral("\\[\\/?[a-z]*\\]"))); - // Find anything that looks like a link (but which also is not some html - // tag value or another already) and make it a link -- static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)([-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption); -+ static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)(http[-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption); - ret.replace(urlRegExp, QStringLiteral("<a href=\"\\2\">\\2</a>")); - return ret; - } --- -GitLab - diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch new file mode 100644 index 000000000000..43976d145baf --- /dev/null +++ b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch @@ -0,0 +1,94 @@ +From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 14 May 2021 12:38:57 +0200 +Subject: [PATCH] Use BUILD_TESTING to make tests optional + +Variable is provided by KDECMakeSettings and default enabled. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 6 +++++- + libdiscover/CMakeLists.txt | 4 +++- + libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- + 5 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73061dde..7d230317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings NO_POLICY_SCOPE) +@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) + include(KDEClangFormat) + include(KDEGitCommitHooks) + ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ + find_package(PkgConfig REQUIRED) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime) +diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt +index 661c371b..56c72008 100644 +--- a/libdiscover/CMakeLists.txt ++++ b/libdiscover/CMakeLists.txt +@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ + + add_subdirectory(backends) + add_subdirectory(notifiers) +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(discovercommon_SRCS + Category/Category.cpp +diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt +index 5b4aef10..38377d80 100644 +--- a/libdiscover/backends/DummyBackend/CMakeLists.txt ++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(dummy-backend_SRCS + DummyResource.cpp +diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +index 2006a829..810238f0 100644 +--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt ++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(flatpak-backend_SRCS + FlatpakResource.cpp +diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt +index e2cb4e52..195cb98a 100644 +--- a/libdiscover/backends/KNSBackend/CMakeLists.txt ++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + add_library(kns-backend MODULE + KNSBackend.cpp +-- +2.31.1 + |