diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-02-14 00:10:38 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-02-14 06:59:46 +0100 |
commit | 10e20be8c5d3f0a006f01df9aa95f3d70909ee7d (patch) | |
tree | 4e947fbe8a85ca6f2ca81003b6668022d397f5b1 /source/kde | |
parent | d41c15fb24f108fa844cb0e4e36a82ff9fab45e2 (diff) | |
download | current-10e20be8c5d3f0a006f01df9aa95f3d70909ee7d.tar.gz current-10e20be8c5d3f0a006f01df9aa95f3d70909ee7d.tar.xz |
Mon Feb 14 00:10:38 UTC 202220220214001038
ap/mariadb-10.6.7-x86_64-1.txz: Upgraded.
This update fixes potential denial-of-service vulnerabilities.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46665
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46664
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46661
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46668
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46663
(* Security fix *)
ap/zsh-5.8.1-x86_64-1.txz: Upgraded.
d/autoconf-archive-2022.02.11-noarch-1.txz: Upgraded.
d/guile-3.0.8-x86_64-1.txz: Upgraded.
kde/attica-5.91.0-x86_64-1.txz: Upgraded.
kde/baloo-5.91.0-x86_64-1.txz: Upgraded.
kde/bluez-qt-5.91.0-x86_64-1.txz: Upgraded.
kde/breeze-icons-5.91.0-noarch-1.txz: Upgraded.
kde/extra-cmake-modules-5.91.0-x86_64-1.txz: Upgraded.
kde/frameworkintegration-5.91.0-x86_64-1.txz: Upgraded.
kde/kactivities-5.91.0-x86_64-1.txz: Upgraded.
kde/kactivities-stats-5.91.0-x86_64-1.txz: Upgraded.
kde/kapidox-5.91.0-x86_64-1.txz: Upgraded.
kde/karchive-5.91.0-x86_64-1.txz: Upgraded.
kde/kauth-5.91.0-x86_64-1.txz: Upgraded.
kde/kbookmarks-5.91.0-x86_64-1.txz: Upgraded.
kde/kcalendarcore-5.91.0-x86_64-1.txz: Upgraded.
kde/kcmutils-5.91.0-x86_64-1.txz: Upgraded.
kde/kcodecs-5.91.0-x86_64-1.txz: Upgraded.
kde/kcompletion-5.91.0-x86_64-1.txz: Upgraded.
kde/kconfig-5.91.0-x86_64-1.txz: Upgraded.
kde/kconfigwidgets-5.91.0-x86_64-1.txz: Upgraded.
kde/kcontacts-5.91.0-x86_64-1.txz: Upgraded.
kde/kcoreaddons-5.91.0-x86_64-1.txz: Upgraded.
kde/kcrash-5.91.0-x86_64-1.txz: Upgraded.
kde/kdav-5.91.0-x86_64-1.txz: Upgraded.
kde/kdbusaddons-5.91.0-x86_64-1.txz: Upgraded.
kde/kdeclarative-5.91.0-x86_64-1.txz: Upgraded.
kde/kded-5.91.0-x86_64-1.txz: Upgraded.
kde/kdelibs4support-5.91.0-x86_64-1.txz: Upgraded.
kde/kdesignerplugin-5.91.0-x86_64-1.txz: Upgraded.
kde/kdesu-5.91.0-x86_64-1.txz: Upgraded.
kde/kdewebkit-5.91.0-x86_64-1.txz: Upgraded.
kde/kdnssd-5.91.0-x86_64-1.txz: Upgraded.
kde/kdoctools-5.91.0-x86_64-1.txz: Upgraded.
kde/kemoticons-5.91.0-x86_64-1.txz: Upgraded.
kde/kfilemetadata-5.91.0-x86_64-1.txz: Upgraded.
kde/kglobalaccel-5.91.0-x86_64-1.txz: Upgraded.
kde/kguiaddons-5.91.0-x86_64-1.txz: Upgraded.
kde/kholidays-5.91.0-x86_64-1.txz: Upgraded.
kde/khtml-5.91.0-x86_64-1.txz: Upgraded.
kde/ki18n-5.91.0-x86_64-1.txz: Upgraded.
kde/kiconthemes-5.91.0-x86_64-1.txz: Upgraded.
kde/kidletime-5.91.0-x86_64-1.txz: Upgraded.
kde/kimageformats-5.91.0-x86_64-1.txz: Upgraded.
kde/kinit-5.91.0-x86_64-1.txz: Upgraded.
kde/kio-5.91.0-x86_64-1.txz: Upgraded.
kde/kirigami2-5.91.0-x86_64-1.txz: Upgraded.
kde/kitemmodels-5.91.0-x86_64-1.txz: Upgraded.
kde/kitemviews-5.91.0-x86_64-1.txz: Upgraded.
kde/kjobwidgets-5.91.0-x86_64-1.txz: Upgraded.
kde/kjs-5.91.0-x86_64-1.txz: Upgraded.
kde/kjsembed-5.91.0-x86_64-1.txz: Upgraded.
kde/kmediaplayer-5.91.0-x86_64-1.txz: Upgraded.
kde/knewstuff-5.91.0-x86_64-1.txz: Upgraded.
kde/knotifications-5.91.0-x86_64-1.txz: Upgraded.
kde/knotifyconfig-5.91.0-x86_64-1.txz: Upgraded.
kde/kpackage-5.91.0-x86_64-1.txz: Upgraded.
kde/kparts-5.91.0-x86_64-1.txz: Upgraded.
kde/kpeople-5.91.0-x86_64-1.txz: Upgraded.
kde/kplotting-5.91.0-x86_64-1.txz: Upgraded.
kde/kpty-5.91.0-x86_64-1.txz: Upgraded.
kde/kquickcharts-5.91.0-x86_64-1.txz: Upgraded.
kde/kross-5.91.0-x86_64-1.txz: Upgraded.
kde/krunner-5.91.0-x86_64-1.txz: Upgraded.
kde/kservice-5.91.0-x86_64-1.txz: Upgraded.
kde/ktexteditor-5.91.0-x86_64-1.txz: Upgraded.
kde/ktextwidgets-5.91.0-x86_64-1.txz: Upgraded.
kde/kunitconversion-5.91.0-x86_64-1.txz: Upgraded.
kde/kwallet-5.91.0-x86_64-1.txz: Upgraded.
kde/kwayland-5.91.0-x86_64-1.txz: Upgraded.
kde/kwidgetsaddons-5.91.0-x86_64-1.txz: Upgraded.
kde/kwindowsystem-5.91.0-x86_64-1.txz: Upgraded.
kde/kxmlgui-5.91.0-x86_64-1.txz: Upgraded.
kde/kxmlrpcclient-5.91.0-x86_64-1.txz: Upgraded.
kde/modemmanager-qt-5.91.0-x86_64-1.txz: Upgraded.
kde/networkmanager-qt-5.91.0-x86_64-1.txz: Upgraded.
kde/oxygen-icons5-5.91.0-noarch-1.txz: Upgraded.
kde/plasma-framework-5.91.0-x86_64-1.txz: Upgraded.
kde/prison-5.91.0-x86_64-1.txz: Upgraded.
kde/purpose-5.91.0-x86_64-1.txz: Upgraded.
kde/qqc2-desktop-style-5.91.0-x86_64-1.txz: Upgraded.
kde/solid-5.91.0-x86_64-1.txz: Upgraded.
kde/sonnet-5.91.0-x86_64-1.txz: Upgraded.
kde/syndication-5.91.0-x86_64-1.txz: Upgraded.
kde/syntax-highlighting-5.91.0-x86_64-1.txz: Upgraded.
kde/threadweaver-5.91.0-x86_64-1.txz: Upgraded.
l/harfbuzz-3.4.0-x86_64-1.txz: Upgraded.
l/imagemagick-7.1.0_24-x86_64-1.txz: Upgraded.
l/libspectre-0.2.10-x86_64-1.txz: Upgraded.
l/libxkbcommon-1.4.0-x86_64-1.txz: Upgraded.
n/mutt-2.2.0-x86_64-1.txz: Upgraded.
xap/hexchat-2.16.1-x86_64-1.txz: Upgraded.
xfce/xfce4-notifyd-0.6.3-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/kglobalaccel | 2 | ||||
-rw-r--r-- | source/kde/kde/build/ktexteditor | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/ktexteditor.patch | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/ktexteditor/804e4944.patch | 104 | ||||
-rw-r--r-- | source/kde/kde/patch/ktexteditor/c80f935c.patch | 55 |
5 files changed, 2 insertions, 163 deletions
diff --git a/source/kde/kde/build/kglobalaccel b/source/kde/kde/build/kglobalaccel index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kglobalaccel +++ b/source/kde/kde/build/kglobalaccel @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/ktexteditor b/source/kde/kde/build/ktexteditor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/ktexteditor +++ b/source/kde/kde/build/ktexteditor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/ktexteditor.patch b/source/kde/kde/patch/ktexteditor.patch deleted file mode 100644 index c658b7739..000000000 --- a/source/kde/kde/patch/ktexteditor.patch +++ /dev/null @@ -1,2 +0,0 @@ -cat $CWD/patch/ktexteditor/804e4944.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/ktexteditor/c80f935c.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/ktexteditor/804e4944.patch b/source/kde/kde/patch/ktexteditor/804e4944.patch deleted file mode 100644 index 854cf0da4..000000000 --- a/source/kde/kde/patch/ktexteditor/804e4944.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Thu, 20 Jan 2022 09:46:34 +0100 -Subject: [PATCH] only start programs in user's path - -don't use QProcess with just program name -first search the right program in the user's path ---- - src/document/katedocument.cpp | 29 ++++++++++++++++------------ - src/swapfile/kateswapdiffcreator.cpp | 17 ++++++++++++---- - 2 files changed, 30 insertions(+), 16 deletions(-) - -diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp -index 01f74da1..05d0e91b 100644 ---- a/src/document/katedocument.cpp -+++ b/src/document/katedocument.cpp -@@ -72,6 +72,7 @@ - #include <QMimeDatabase> - #include <QProcess> - #include <QRegularExpression> -+#include <QStandardPaths> - #include <QTemporaryFile> - #include <QTextCodec> - #include <QTextStream> -@@ -5054,18 +5055,22 @@ void KTextEditor::DocumentPrivate::slotDelayedHandleModOnHd() - // skip that, if document is modified! - // only do that, if the file is still there, else reload makes no sense! - if (m_modOnHd && !isModified() && QFile::exists(url().toLocalFile())) { -- QProcess git; -- const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)}; -- git.start(QStringLiteral("git"), args); -- if (git.waitForStarted()) { -- git.closeWriteChannel(); -- if (git.waitForFinished()) { -- if (git.exitCode() == 0) { -- // this hash exists still in git => just reload -- m_modOnHd = false; -- m_modOnHdReason = OnDiskUnmodified; -- m_prevModOnHdReason = OnDiskUnmodified; -- documentReload(); -+ // we only want to use git from PATH, cache this -+ static const QString fullGitPath = QStandardPaths::findExecutable(QStringLiteral("git")); -+ if (!fullGitPath.isEmpty()) { -+ QProcess git; -+ const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)}; -+ git.start(fullGitPath, args); -+ if (git.waitForStarted()) { -+ git.closeWriteChannel(); -+ if (git.waitForFinished()) { -+ if (git.exitCode() == 0) { -+ // this hash exists still in git => just reload -+ m_modOnHd = false; -+ m_modOnHdReason = OnDiskUnmodified; -+ m_prevModOnHdReason = OnDiskUnmodified; -+ documentReload(); -+ } - } - } - } -diff --git a/src/swapfile/kateswapdiffcreator.cpp b/src/swapfile/kateswapdiffcreator.cpp -index 5c515c45..a185123a 100644 ---- a/src/swapfile/kateswapdiffcreator.cpp -+++ b/src/swapfile/kateswapdiffcreator.cpp -@@ -14,6 +14,7 @@ - #include <KMessageBox> - - #include <QDir> -+#include <QStandardPaths> - #include <QTextCodec> - - // BEGIN SwapDiffCreator -@@ -85,17 +86,25 @@ void SwapDiffCreator::viewDiff() - connect(&m_proc, &QProcess::readyRead, this, &SwapDiffCreator::slotDataAvailable, Qt::UniqueConnection); - connect(&m_proc, &QProcess::finished, this, &SwapDiffCreator::slotDiffFinished, Qt::UniqueConnection); - -- // try to start diff process, if we can't be started be done with error -- m_proc.start(QStringLiteral("diff"), QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName()); -- if (!m_proc.waitForStarted()) { -+ // use diff from PATH only => inform if not found at all -+ const QString fullDiffPath = QStandardPaths::findExecutable(QStringLiteral("diff")); -+ if (fullDiffPath.isEmpty()) { - KMessageBox::sorry(nullptr, -- i18n("The diff command could not be started. Please make sure that " -+ i18n("The diff command could not be found. Please make sure that " - "diff(1) is installed and in your PATH."), - i18n("Error Creating Diff")); - deleteLater(); - return; - } - -+ // try to start the diff program, might fail, too -+ m_proc.start(fullDiffPath, QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName()); -+ if (!m_proc.waitForStarted()) { -+ KMessageBox::sorry(nullptr, i18n("The diff command '%1' could not be started.").arg(fullDiffPath), i18n("Error Creating Diff")); -+ deleteLater(); -+ return; -+ } -+ - // process is up and running, we can write data to it - QTextStream ts(&m_proc); - int lineCount = recoverDoc.lines(); --- -GitLab - diff --git a/source/kde/kde/patch/ktexteditor/c80f935c.patch b/source/kde/kde/patch/ktexteditor/c80f935c.patch deleted file mode 100644 index 8cccfe3a9..000000000 --- a/source/kde/kde/patch/ktexteditor/c80f935c.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Thu, 20 Jan 2022 10:30:20 +0100 -Subject: [PATCH] only execute diff in path - ---- - src/dialogs/katedialogs.cpp | 5 +++-- - src/dialogs/katedialogs.h | 1 + - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp -index 5b949f36..63a58aee 100644 ---- a/src/dialogs/katedialogs.cpp -+++ b/src/dialogs/katedialogs.cpp -@@ -1317,6 +1317,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi - : QObject(doc) - , m_doc(doc) - , m_modtype(modtype) -+ , m_fullDiffPath(QStandardPaths::findExecutable(QStringLiteral("diff"))) - , m_proc(nullptr) - , m_diffFile(nullptr) - , m_diffAction(nullptr) -@@ -1334,7 +1335,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi - m_message->addAction(aAutoReload, false); - connect(aAutoReload, &QAction::triggered, this, &KateModOnHdPrompt::autoReloadTriggered); - -- if (!QStandardPaths::findExecutable(QStringLiteral("diff")).isEmpty()) { -+ if (!m_fullDiffPath.isEmpty()) { - m_diffAction = new QAction(i18n("View &Difference"), this); - m_diffAction->setIcon(QIcon::fromTheme(QStringLiteral("document-multiple"))); - m_diffAction->setToolTip(i18n("Shows a diff of the changes")); -@@ -1394,7 +1395,7 @@ void KateModOnHdPrompt::slotDiff() - // Start a KProcess that creates a diff - m_proc = new KProcess(this); - m_proc->setOutputChannelMode(KProcess::MergedChannels); -- *m_proc << QStringLiteral("diff") << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile(); -+ *m_proc << m_fullDiffPath << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile(); - connect(m_proc, &KProcess::readyRead, this, &KateModOnHdPrompt::slotDataAvailable); - connect(m_proc, &KProcess::finished, this, &KateModOnHdPrompt::slotPDone); - -diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h -index 80b611d9..e5574023 100644 ---- a/src/dialogs/katedialogs.h -+++ b/src/dialogs/katedialogs.h -@@ -376,6 +376,7 @@ private: - KTextEditor::DocumentPrivate *m_doc; - QPointer<KTextEditor::Message> m_message; - KTextEditor::ModificationInterface::ModifiedOnDiskReason m_modtype; -+ QString m_fullDiffPath; - KProcess *m_proc; - QTemporaryFile *m_diffFile; - QAction *m_diffAction; --- -GitLab - |