SHA256
1
0
forked from pool/kate

Accepting request 997791 from KDE:Applications

KDE Release Gear 22.08.0 (forwarded request 997667 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/997791
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2022-08-19 15:51:44 +00:00 committed by Git OBS Bridge
commit c1d4896533
7 changed files with 79 additions and 31 deletions

View File

@ -1,6 +1,6 @@
From 435ed5853b9451ab8fdfff722545c57a8f154625 Mon Sep 17 00:00:00 2001 From 52f948fe211fedc54c13c0baf067cd6d8e4cb0c3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de> From: Luca Beltrame <lbeltrame@kde.org>
Date: Sat, 18 Feb 2017 13:49:14 +0100 Date: Sun, 3 Apr 2022 09:26:48 +0200
Subject: [PATCH] Defuse root block Subject: [PATCH] Defuse root block
While the main point is correct as any application running in the same While the main point is correct as any application running in the same
@ -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. we allow (even encourage) running YaST on X11 as root.
That way it's only an impact on usability. That way it's only an impact on usability.
--- ---
kate/main.cpp | 3 +-- apps/kate/main.cpp | 15 ++-------------
kwrite/main.cpp | 3 +-- apps/kwrite/main.cpp | 17 +++--------------
2 files changed, 2 insertions(+), 4 deletions(-) 2 files changed, 5 insertions(+), 27 deletions(-)
Index: kate-19.11.70git.20220102T020433~0a4347e06/kate/main.cpp Index: kate-19.11.70git.20220404T014944~1f6e53f72/apps/kate/main.cpp
=================================================================== ===================================================================
--- kate-19.11.70git.20220102T020433~0a4347e06.orig/kate/main.cpp 2022-01-02 09:28:49.643692601 +0100 --- kate-19.11.70git.20220404T014944~1f6e53f72.orig/apps/kate/main.cpp 2022-04-04 03:49:44.000000000 +0200
+++ kate-19.11.70git.20220102T020433~0a4347e06/kate/main.cpp 2022-01-02 09:29:48.503285030 +0100 +++ kate-19.11.70git.20220404T014944~1f6e53f72/apps/kate/main.cpp 2022-04-04 05:55:46.476883480 +0200
@@ -48,19 +48,8 @@ @@ -49,19 +49,8 @@
#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU) #if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
// Prohibit using sudo or kdesu (but allow using the root user directly) // Prohibit using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) { if (getuid() == 0) {
@ -34,7 +34,33 @@ Index: kate-19.11.70git.20220102T020433~0a4347e06/kate/main.cpp
- return EXIT_FAILURE; - return EXIT_FAILURE;
- } - }
+ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; + std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl;
+ std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl; + std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl;
} }
#endif #endif
/** /**
Index: kate-19.11.70git.20220404T014944~1f6e53f72/apps/kwrite/main.cpp
===================================================================
--- kate-19.11.70git.20220404T014944~1f6e53f72.orig/apps/kwrite/main.cpp 2022-04-04 03:49:44.000000000 +0200
+++ kate-19.11.70git.20220404T014944~1f6e53f72/apps/kwrite/main.cpp 2022-04-04 05:57:17.276197192 +0200
@@ -27,19 +27,8 @@
#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
// Prohibit using sudo or kdesu (but allow using the root user directly)
if (getuid() == 0) {
- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- std::cout << "Running KWrite with sudo can cause bugs and expose you to security vulnerabilities. "
- "Instead 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 << "Running KWrite with kdesu can cause bugs and expose you to security vulnerabilities. "
- "Instead 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 <file>" << std::endl;
}
#endif

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e3e4f78c8c2b6a68ce8122dbcd1f1222ec18dd17aa1b4b155989a4659c8d436
size 7584932

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmLDvdQACgkQu0YzUNbv
Me+REA//WQxgNk7nB1k1a8NE5tVmT4KAfcY8koEpXTPR3nVM3Wy6j72UT5DW1FB5
e+JgIcUU+2AbJwSvqn13oeLNTupRctlEgbHKgK+PfJNJ+oB1+RMLcqes8R5jfdRd
MZCh9x5wzhvhv8V68rz1g5ed/GpS+oHpK8TQ98IqsOoQ4TCPA5ils4rEXOF0xmwc
+7gauNPdg+K+kJSpl/V0PcMt/lXr8DzsHH9U0cP4w2D1sp745doNbUhowaYg8B/J
2PUt8q3kv2mZQiECJtjtTmPxDGt9yjuCZQN4lEnw36IdqFBMpzPHRDcVttq+Eiup
8S9hU1Cd32+m/KvODvc5khCbnDHquUgMP5A9EfTdHchKVZ3KjRR2OzJf7EgX0xOM
jTYHV4QAiKkODI4gqlc62Ow7dPvN5yOa/9eCPpYo36gUv97BKT2MD71x2ZLO+Z1B
j1czupFKEwP/7MqUR+DrAbf3PJELM5iFJrTEMgr2nG/zd/I4S/8tsMIcxsa0I6Sw
DoJLdpHnVwwF7gWgXFA4nfqGB5wtKfDVjfmksDoyoFInghPzWN/SNvLeXdvHgsMz
PggHZSbvdWwqLnuDcmenZdyaH1YY1xV6xoYpjyNC3d09NUKPNuLd8U22xAZZ/L6t
P46JemTO9oxkjXZJo14lxBxDS7EAawqC4xoyGm/dp9P+8EUMvLw=
=Lbzg
-----END PGP SIGNATURE-----

3
kate-22.08.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2fd9b131e13a9598ab8358a5eaa33ea56ce6740a1ce18a5691334827886bb788
size 7655384

16
kate-22.08.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmL2HaEACgkQOmpNuDnq
ptfpqQ/7B3+bP66YX4sbEMHIVvgBfWWLHu6l5UhXBRF+cAkJNiiFI1Ny7XG2zz4z
Vny4tLrd10k4VTzWAK2kx8OB4W9lAE0hnn68xbYvByb4xymdUD1dQ8ItQw8rf5QC
TJLhHXmfBOky7toS9UA/AMQIIUU531nzgpI4EBLz6LqJmYE2YFL7o/g/n5HCUjc1
tcYOpV1avXTKltaNudKIkaMkVuMS/lkAtST7xj1/dkjdBx919uizwv6bjghubqch
of7JBwAZhhG7+P9lR1ttamNmE4ZCC3/RID5C9/t3PkqJ/J7FQ5M1jmzR+7LtTWst
3Kd9NR5WJbJn1i6IkIOeIYus667Hb5/TCLLYfAFMhPHF7I9HMmZmyPUlyTNmVZuC
9OxKKEt42OOSQLXakZAtkoKufOZ1QadmMeBPliclHLaOGO3oXw8zKIJCR6rGe/aI
x1pEtTkA+IUNfKSZNfruqkA80/GEs/7yQliZyDTu+z4yLW99saX9xHei3WhEp7EI
ynk5asUYINOkOWeW6i2l4kHqh0LeGj616KRAgFvNhwQh2N/d20sUzc7bZ50PsgcU
p4+uDPbbtcM3aIgj2BSpYmKJnaMvFujd6BQNi68AL0N/k23Fau1BLcHNMgiTP25b
Uzan0aDxAJeLKUOY8jTnZf6IrSQxFA6C/IMdaRpPgzOP5iSbk/o=
=Sy0/
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sun Aug 14 09:41:59 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.08.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/22.08.0/
-------------------------------------------------------------------
Fri Aug 5 12:10:34 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.07.90
* New feature release
-------------------------------------------------------------------
Sat Jul 16 08:27:47 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.07.80
* New feature release
- Rebase 0001-Defuse-root-block.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 5 17:03:00 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr> Tue Jul 5 17:03:00 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without released %bcond_without released
Name: kate Name: kate
Version: 22.04.3 Version: 22.08.0
Release: 0 Release: 0
Summary: Advanced Text Editor Summary: Advanced Text Editor
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -133,6 +133,7 @@ plugins and data files for Kate and KWrite editors.
%{_kf5_appstreamdir}/org.kde.kate.appdata.xml %{_kf5_appstreamdir}/org.kde.kate.appdata.xml
%{_kf5_bindir}/kate %{_kf5_bindir}/kate
%{_kf5_iconsdir}/hicolor/*/apps/kate.* %{_kf5_iconsdir}/hicolor/*/apps/kate.*
%{_kf5_libdir}/libkateprivate.so.*
%files -n kwrite %files -n kwrite
%doc README* %doc README*