diff --git a/0001-Defuse-root-block.patch b/0001-Defuse-root-block.patch index b22e81f..802e300 100644 --- a/0001-Defuse-root-block.patch +++ b/0001-Defuse-root-block.patch @@ -1,4 +1,4 @@ -From 5cec675834a722a6cb55858074eb7a2d13ec685e Mon Sep 17 00:00:00 2001 +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 @@ -8,15 +8,15 @@ 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 | 15 ++------------- - kwrite/main.cpp | 15 ++------------- - 2 files changed, 4 insertions(+), 26 deletions(-) + 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 cea01d6..37d418f 100644 ---- a/kate/main.cpp -+++ b/kate/main.cpp -@@ -48,19 +48,8 @@ int main(int argc, char **argv) +Index: kate-19.11.70git.20210322T053556~5fffa661f/kate/main.cpp +=================================================================== +--- kate-19.11.70git.20210322T053556~5fffa661f.orig/kate/main.cpp 2021-03-22 06:53:49.515846104 +0100 ++++ kate-19.11.70git.20210322T053556~5fffa661f/kate/main.cpp 2021-03-22 06:55:33.758224989 +0100 +@@ -48,19 +48,8 @@ #ifndef Q_OS_WIN // Prohibit using sudo or kdesu (but allow using the root user directly) if (getuid() == 0) { @@ -34,36 +34,7 @@ index cea01d6..37d418f 100644 - return EXIT_FAILURE; - } + std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; -+ std::cout << "SUDO_EDITOR=kate sudoedit " << std::endl; - } - #endif - /** -diff --git a/kwrite/main.cpp b/kwrite/main.cpp -index 87cac6f..4f0bad2 100644 ---- a/kwrite/main.cpp -+++ b/kwrite/main.cpp -@@ -40,19 +40,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv) - #ifndef Q_OS_WIN - // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { -- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities. " -- "It is also not necessary; simply use KWrite normally, and you will be prompted for " -- "elevated privileges when saving documents if needed." -- << std::endl; -- return EXIT_FAILURE; -- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities. " -- "It is also not necessary; simply use KWrite normally, and you will be prompted for " -- "elevated privileges when saving documents if needed." -- << std::endl; -- return EXIT_FAILURE; -- } -+ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; + std::cout << "SUDO_EDITOR=kwrite sudoedit " << std::endl; } #endif - --- -2.30.2 - + /** diff --git a/kate-21.04.3.tar.xz b/kate-21.04.3.tar.xz deleted file mode 100644 index 963774d..0000000 --- a/kate-21.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b44ea77cf77d579e9ade0af98f9a27a02292bc1b7edff387a386ab7e9e84f7eb -size 7283360 diff --git a/kate-21.04.3.tar.xz.sig b/kate-21.04.3.tar.xz.sig deleted file mode 100644 index accf82d..0000000 --- a/kate-21.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj5scACgkQu0YzUNbv -Me8hsg//a8Ew0g7beUXhgAoILOmRfs+Ma6t15KY+caqEAka054+axjWJk5klS6tU -jF3mneTjMUCFkM0YRUNTgMVro/waJ0+ftzGxPu1dz2qtuLFKjVPxhW1MOlNOWdbN -lOWypKYO3BHRYFtnhS2GRVDLqkauvEFrfm8PsKvA+8OkxpbzRv1Sgb1FFWRpUFZ6 -ffRkjMMBsoZFdCG1aP5t40rHExs27g+ltx0+IHv/LBpxFV1btDCOEINsHMKfyd3W -+ZQ7aHc2cX4vxtjtMBb2sc8EOYm8qtohMxUwvT+1EKjP2yEfNv8CrWBadtQVgvse -E1t93BjQEsSZX/n7qhsTQdDlM7b35lcB3C4gqKm6zp6TCW4n7kDl8xdOtVqTxgic -XJ62JPLSHuf3qh4Q56qAWmPZ9LtNB2CndG3UXm3YK43zPMhul7E44/B/p9sH0jip -NhHMxkYiv+v4GravsukQ3U0R5qYU/zZSSxux1jMmpDMGdN96nB+BHoQQmqw9XyF7 -5pBnbXtYFMq9Vv9xYCNEIOc0aW3o48HiWK0BL3gugIBWi3fzDVu/Y+NoXYRgbboM -ncND4F4URz/3bA72K5x4mAze0QD6yfxOLz1MHG0wxIhQdsPi1k0kXgAH/CcbE6mc -MaMilqsnSGeRmOkwxxIwOXjSnuieqdOVNSMHRVODZPgaLM2xrY4= -=AEUW ------END PGP SIGNATURE----- diff --git a/kate-21.07.80.tar.xz b/kate-21.07.80.tar.xz new file mode 100644 index 0000000..516db1b --- /dev/null +++ b/kate-21.07.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d574f6e4355e9187772cea7394dc2cf6a0f3325a79141a868da04c4f33669f4e +size 7281740 diff --git a/kate-21.07.80.tar.xz.sig b/kate-21.07.80.tar.xz.sig new file mode 100644 index 0000000..5a256f6 --- /dev/null +++ b/kate-21.07.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi4oACgkQOmpNuDnq +pteEWg/+PBoQy64POeM6CPMbR4mkuLIA1wRcroMUfTmatC1cbTlcehxiN2DArDEa +QIXJRsaCrPcMrEV0pMa58BvmUJb0sN0NtfYucxIknUsiFZs4+MeNNH6CHCLUcWPM +oPZsmR7J9GB1uAzWZ9JpXt72TNbU9EKUE6AkZI3bTsPbvoYcjfTEDDeze4OTHMZX +65iIi0AsPZUUY99js/3ZKAx1DB53NWcG685GBu9MWjhlXhYniV5dV2OX40oBSuVb +BXxruIlM9F7PFTQP/YtPyeMyMSXXJoJYO9VomeHHvWKgY5jtXS3W7SaZm/1u36lr +NsylSV6kJB9AKA0PJ7HDLNWeRi0+VbVi2zzRC9O2bX5VR619IHW7li2wfGok60aE +4OKeOeqgjRVOgVS98UKttH4ejRfDGInpmbklk0cSnBpPjhYDgqz1vfm+X1ky+Exy +AUKVvj8NIZiDND6VW2eCDnIseH/VH45Ksk1frcl0nezBPPLjQcWRKXi1yZKzT3ax +QI/EQERBxbBw8APCSHDAQjREeP4VkTIPMJ9i9emIkmtYaLmLrrwTaM4S6elJBUEf +L0J0ly4i30JfZtYW1uf/lKdWE7otkVsEjdWkO8WaUj11Omm0TjfvFnrQfLm31wVU +0xvzu/0NnbDFev+1idfUsy5Ds44zK2AE/4ddVTGV8PhJOETqD8U= +=t4Uh +-----END PGP SIGNATURE----- diff --git a/kate.changes b/kate.changes index edf6070..5b6951a 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Jul 17 20:05:46 UTC 2021 - Christophe Giboudeaux + +- Update to 21.07.80 + * New feature release +- Too many changes since 21.04.3, only listing bugfixes: + * ensure we unify line endings (kde#436753) + * add missing name for hot new stuff (kde#438018) + * lspclient: bypass shutdown delay if not needed and cleanup defunct code (kde#438790) + * ensure to not crash on missing context menu (kde#426939) + * lspclient: add action to request and apply quick fix code action (kde#437746) + * Prevent crash in git-blame for HUGE git commits (kde#437683) + * Work around conflicting shortcuts in preview plugin (kde#386265) + * S&R: Fix matching ^ and $ in multi-line expressions (kde#318232) + * Prevent storing diff files in recent files history (kde#436906) + * Downgrade .git not found warning to info message (kde#435945) + * Fix S&R not recovering from canceled folder search (kde#435689) + * Add a widget to view projects TODOs/FIXMEs in project info toolview (kde#423968) +- Only install the license files once + ------------------------------------------------------------------- Wed Jul 7 08:57:08 UTC 2021 - Christophe Giboudeaux diff --git a/kate.spec b/kate.spec index aa82a76..e4851ac 100644 --- a/kate.spec +++ b/kate.spec @@ -22,15 +22,15 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kate -Version: 21.04.3 +Version: 21.07.80 Release: 0 Summary: Advanced Text Editor License: GPL-3.0-or-later Group: Productivity/Text/Editors URL: https://kate-editor.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif # PATCH-FIX-OPENSUSE @@ -65,7 +65,6 @@ BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) Requires: %{name}-plugins = %{version} -Recommends: %{name}-lang Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} @@ -109,7 +108,6 @@ plugins and data files for Kate and KWrite editors. %endif %files -%license LICENSES/* %doc README* %dir %{_kf5_iconsdir}/hicolor/150x150/ %dir %{_kf5_iconsdir}/hicolor/150x150/apps @@ -130,7 +128,6 @@ plugins and data files for Kate and KWrite editors. %{_kf5_iconsdir}/hicolor/*/apps/kate.* %files -n kwrite -%license LICENSES/* %doc README* %doc %lang(en) %{_kf5_htmldir}/en/kwrite/ %{_kf5_applicationsdir}/org.kde.kwrite.desktop @@ -152,7 +149,6 @@ plugins and data files for Kate and KWrite editors. %if %{with lang} %files lang -f %{name}.lang -%license LICENSES/* %endif %changelog