diff --git a/0001-Defuse-root-block.patch b/0001-Defuse-root-block.patch new file mode 100644 index 0000000..95cb8f7 --- /dev/null +++ b/0001-Defuse-root-block.patch @@ -0,0 +1,47 @@ +From 435ed5853b9451ab8fdfff722545c57a8f154625 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 18 Feb 2017 13:49:14 +0100 +Subject: [PATCH] Defuse root block + +While the main point is correct as any application running in the same +X session (not sandboxed) can use kate's capability to open a console, +we allow (even encourage) running YaST on X11 as root. +That way it's only an impact on usability. +--- + kate/main.cpp | 3 +-- + kwrite/main.cpp | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/kate/main.cpp b/kate/main.cpp +index 342cd5db3..4845646aa 100644 +--- a/kate/main.cpp ++++ b/kate/main.cpp +@@ -64,9 +64,8 @@ int main(int argc, char **argv) + * Check whether we are running as root + **/ + if (getuid() == 0) { +- std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl; ++ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; + std::cout << "SUDO_EDITOR=kate sudoedit " << std::endl; +- return 0; + } + #endif + /** +diff --git a/kwrite/main.cpp b/kwrite/main.cpp +index 68a055edb..4937f72d3 100644 +--- a/kwrite/main.cpp ++++ b/kwrite/main.cpp +@@ -54,9 +54,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv) + * Check whether we are running as root + **/ + if (getuid() == 0) { +- std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl; ++ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; + std::cout << "SUDO_EDITOR=kwrite sudoedit " << std::endl; +- return 0; + } + #endif + /** +-- +2.12.2 + diff --git a/enable-numericMode-in-filetree.patch b/enable-numericMode-in-filetree.patch deleted file mode 100644 index 9c86724..0000000 --- a/enable-numericMode-in-filetree.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb9cab2e55ba9b7f9b86577ba12f673c40e07e67 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Fri, 14 Apr 2017 12:43:10 +0200 -Subject: Enable numericMode for sorting document list in filetree - -Turns on "natural" sorting for the document list in the filetree addon, - so that e.g. 10 comes after 9, not before. -That's how the KDE4 version behaved too. - -BUG: 375676 -FIXED-IN: 17.04.1 -Differential Revision: https://phabricator.kde.org/D5448 ---- - addons/filetree/katefiletreeproxymodel.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/addons/filetree/katefiletreeproxymodel.cpp b/addons/filetree/katefiletreeproxymodel.cpp -index 13a4d0e..206dfb8 100644 ---- a/addons/filetree/katefiletreeproxymodel.cpp -+++ b/addons/filetree/katefiletreeproxymodel.cpp -@@ -49,6 +49,7 @@ bool KateFileTreeProxyModel::lessThan(const QModelIndex &left, const QModelIndex - - QCollator collate; - collate.setCaseSensitivity(Qt::CaseInsensitive); -+ collate.setNumericMode(true); - - switch (sortRole()) { - case Qt::DisplayRole: { --- -cgit v0.11.2 - diff --git a/kate-17.04.0.tar.xz b/kate-17.04.0.tar.xz deleted file mode 100644 index 028b142..0000000 --- a/kate-17.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042 -size 5213352 diff --git a/kate-17.04.1.tar.xz b/kate-17.04.1.tar.xz new file mode 100644 index 0000000..4af5c29 --- /dev/null +++ b/kate-17.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34eee6c384e2c2776c7d0ab65e7217e730cdbdecb82578c9dc90380cb82affd2 +size 5214608 diff --git a/kate.changes b/kate.changes index 1b19db3..f1c27d9 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu May 18 18:29:45 UTC 2017 - fabian@ritter-vogt.de + +- Add patch to defuse root block: + * 0001-Defuse-root-block.patch + +------------------------------------------------------------------- +Wed May 17 20:35:54 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.1.php +- Changes since 17.04.0: + * Don't repeat work of KAboutData::setupCommandLine() + * Don't repeat work of KAboutData::setApplicationData() + * Enable numericMode for sorting document list in filetree (kde#375676) +- Drop upstreamed patches: + * enable-numericMode-in-filetree.patch + ------------------------------------------------------------------- Sun Apr 16 23:15:49 UTC 2017 - wbauer@tmo.at diff --git a/kate.spec b/kate.spec index 6592247..5175b94 100644 --- a/kate.spec +++ b/kate.spec @@ -19,7 +19,7 @@ %define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -Version: 17.04.0 +Version: 17.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) @@ -30,8 +30,8 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch: enable-numericMode-in-filetree.patch +# PATCH-FIX-OPENSUSE +Patch0: 0001-Defuse-root-block.patch BuildRequires: kactivities5-devel BuildRequires: kconfig-devel BuildRequires: kcrash-devel @@ -95,7 +95,7 @@ plugins and data files for Kate and KWrite editors. %prep %setup -q -%patch -p1 +%patch0 -p1 %build %cmake_kf5 -d build