* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kde-cli-tools/files/, kde-plasma/kde-cli-tools/
@ 2016-09-29 16:36 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2016-09-29 16:36 UTC (permalink / raw
To: gentoo-commits
commit: d35f109306617f42f57b31169cdf2a6797850297
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 16:34:24 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 16:36:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35f1093
kde-plasma/kde-cli-tools: backport patch from upstream to resolve CVE-2016-7787
Gentoo-bug: 595534
Package-Manager: portage-2.3.1
.../files/kde-cli-tools-5.6.5-CVE-2016-7787.patch | 44 +++++++++++++++
.../kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild | 62 ++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
new file mode 100644
index 00000000..cce11d8
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
@@ -0,0 +1,44 @@
+From 5eda179a099ba68a20dc21dc0da63e85a565a171 Mon Sep 17 00:00:00 2001
+From: Martin Sandsmark <martin.sandsmark@kde.org>
+Date: Fri, 9 Sep 2016 09:05:57 +0200
+Subject: [PATCH] Make sure people are not trying to sneak invisible characters
+ on the kdesu label
+
+i18n: Sorry for the new string
+
+CCMAIL: kde-i18n-doc@kde.org
+---
+ kdesu/kdesu.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
+index b7a66a2..b0efbc7 100644
+--- a/kdesu/kdesu.cpp
++++ b/kdesu/kdesu.cpp
+@@ -162,6 +162,10 @@ int main(int argc, char *argv[])
+ {
+ KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
+ }
++ if (result == -2)
++ {
++ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
++ }
+
+ return result;
+ }
+@@ -387,6 +391,12 @@ static int startApp(QCommandLineParser& p)
+ qDebug() << "Don't need password!!\n";
+ }
+
++ for (const QChar character : QString::fromLocal8Bit(command)) {
++ if (!character.isPrint() && character.category() != QChar::Other_Surrogate) {
++ return -2;
++ }
++ }
++
+ // Start the dialog
+ QString password;
+ if (needpw)
+--
+2.7.3
+
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
new file mode 100644
index 00000000..67d1dde
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ kdesu? ( $(add_frameworks_dep kdesu) )
+ X? (
+ $(add_frameworks_dep kdelibs4support)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2016-7787.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package kdesu KF5Su)
+ $(cmake-utils_use_find_package X KF5KDELibs4Support)
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+ use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kde-cli-tools/files/, kde-plasma/kde-cli-tools/
@ 2023-05-12 13:04 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-05-12 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 280ea0002174c05d0e9250fa674d76ebb43bead7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 13:00:43 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 12 13:03:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280ea000
kde-plasma/kde-cli-tools: Fix use kcmshell5 instead of kcmshell6
Closes: https://bugs.gentoo.org/906198
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kde-cli-tools-5.27.5-kcmshell5.patch | 22 +++++++
.../kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 95 insertions(+)
diff --git a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch
new file mode 100644
index 000000000000..4fa2309c6b37
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch
@@ -0,0 +1,22 @@
+From 726690b34c1b75307fb8c830ba05dd00b98aa85a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Tue, 9 May 2023 21:29:52 +0200
+Subject: [PATCH] kinfo: Use kcmshell5 with Plasma *5*
+
+---
+ kinfo/kinfo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kinfo/kinfo b/kinfo/kinfo
+index ddb5de31..6f911965 100644
+--- a/kinfo/kinfo
++++ b/kinfo/kinfo
+@@ -3,4 +3,4 @@
+ # SPDX-FileCopyrightText: 2023 Harald Sitter <sitter@kde.org>
+
+ export QT_LOGGING_RULES="*=false"
+-exec kcmshell6 kcm_about-distro --args dump --platform offscreen
++exec kcmshell5 kcm_about-distro --args dump --platform offscreen
+--
+GitLab
+
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild
new file mode 100644
index 000000000000..ddfd91e6dc29
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+# requires running kde environment
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-plasma/libkworkspace-${PVCUT}:5
+ kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ kdesu? ( sys-apps/dbus[X] )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+ "${FILESDIR}/${P}-kcmshell5.patch" # bug 906198
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package kdesu KF5Su)
+ $(cmake_use_find_package X Qt5X11Extras)
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+ use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kde-cli-tools/files/, kde-plasma/kde-cli-tools/
@ 2024-11-27 18:44 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-11-27 18:44 UTC (permalink / raw
To: gentoo-commits
commit: bce22ce7e31335f2d5db9a4d3b36e868b19063f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 18:36:25 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 18:44:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce22ce7
kde-plasma/kde-cli-tools: Unrequire Qt6/KF6 modules
Closes: https://bugs.gentoo.org/945119
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...e-cli-tools-6.2.4-unrequire-kf-qt-modules.patch | 35 ++++++++++++++++++++++
.../kde-cli-tools/kde-cli-tools-6.2.4.ebuild | 3 ++
2 files changed, 38 insertions(+)
diff --git a/kde-plasma/kde-cli-tools/files/kde-cli-tools-6.2.4-unrequire-kf-qt-modules.patch b/kde-plasma/kde-cli-tools/files/kde-cli-tools-6.2.4-unrequire-kf-qt-modules.patch
new file mode 100644
index 000000000000..e7bb7cfd9d3e
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/files/kde-cli-tools-6.2.4-unrequire-kf-qt-modules.patch
@@ -0,0 +1,35 @@
+From aca455335ebcbc8818aacb75ffb7ef026ccc82e4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 2 Sep 2024 23:18:46 +0200
+Subject: [PATCH] Make all KF6 and Qt6 modules optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1092bf8..4667f06d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(ECMDeprecationSettings)
+
+ include(KDEGitCommitHooks)
+
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
++find_package(Qt6 ${QT_MIN_VERSION} CONFIG COMPONENTS
+ Widgets
+ Svg
+ DBus
+@@ -44,7 +44,7 @@ if (NOT Qt6Test_FOUND)
+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+ endif()
+
+-find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
++find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS
+ Config
+ DocTools
+ IconThemes
+--
+2.46.0
+
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.4.ebuild
index 727f3af926c0..ad812ce0d5a8 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.2.4.ebuild
@@ -33,6 +33,9 @@ RDEPEND="${DEPEND}
"
BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+# downstream split
+PATCHES=( "${FILESDIR}/${P}-unrequire-kf-qt-modules.patch" )
+
src_prepare() {
ecm_src_prepare
ecm_punt_po_install
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-27 18:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-12 13:04 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kde-cli-tools/files/, kde-plasma/kde-cli-tools/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-27 18:44 Andreas Sturmlechner
2016-09-29 16:36 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox