Accepting request 911633 from KDE:Applications

KDE Gear 21.08.0

OBS-URL: https://build.opensuse.org/request/show/911633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kate?expand=0&rev=135
This commit is contained in:
Richard Brown 2021-08-16 08:06:15 +00:00 committed by Git OBS Bridge
commit 8e5c32011d
7 changed files with 66 additions and 32 deletions

View File

@ -1,4 +1,4 @@
From 5cec675834a722a6cb55858074eb7a2d13ec685e Mon Sep 17 00:00:00 2001
From bfe1b2dd63d410c8365b2197a313193ab29ebe5e Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sat, 18 Feb 2017 13:49:14 +0100
Subject: [PATCH] Defuse root block
@ -13,11 +13,11 @@ That way it's only an impact on usability.
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/kate/main.cpp b/kate/main.cpp
index cea01d6..37d418f 100644
index 5cdaa6c4d..042c0cfc8 100644
--- a/kate/main.cpp
+++ b/kate/main.cpp
@@ -48,19 +48,8 @@ int main(int argc, char **argv)
#ifndef Q_OS_WIN
#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")) {
@ -33,17 +33,17 @@ index cea01d6..37d418f 100644
- << std::endl;
- return EXIT_FAILURE;
- }
+ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl;
+ std::cout << "SUDO_EDITOR=kate sudoedit <file>" << 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;
}
#endif
/**
diff --git a/kwrite/main.cpp b/kwrite/main.cpp
index 87cac6f..4f0bad2 100644
index 4daa7c3a2..d3b83686c 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
#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")) {
@ -65,5 +65,5 @@ index 87cac6f..4f0bad2 100644
#endif
--
2.30.2
2.32.0

View File

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

View File

@ -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-----

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49272edb8b649c4ac558bd5e10b891a7c9807075007654397d74cc2b6cd567e8
size 7285604

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEMffcACgkQu0YzUNbv
Me876A/+KapX/cxNk/kXib5eSRixMbx147POzUgMzFIFIklAlhvS6g+eFQo0AkTM
Z7aRcqYRBPORBFKd85JcXY3NUDP8Gziv0Lr8pWYGihgnOxC/0Y0+CE9KsKt09foe
s7T/bKmBBjiruWk9YEH0jr+jWzzVFQkrk+fZlmYaoVkfXUXlugN2lwGJDgOHK+NJ
icIxbmUfRn0LhFm/1GV/j6qDFXZSBZFqCaOsPyJmR6ylOM/e+XLCWyHXOCn0HQdR
AkJY/NKp3jjU0UgIC25aYY5RKKLARuG4VeTANS2LCpdoeNvvT58vlbZnqC3al3hF
N2VXbKmZKrSfBCb8z6/fooJZ6zoC1g/o3zNW53Sx8so6p85LJGiuceux0RPJmeeG
2vspoBGRNv1o4i3p0y+3zBl4fkLpVQCFuutJGUIh98n91NsnioN2mBuukh7RD2d6
Rc9lvKnh3Gt3S99f+vxTFqrLCO7LytGYW5VSnaoA1oWtSJfEs04PooNhooxcKLgX
+6sPbJjB/xgeyCNmXv2JNrBlkBlOuYqJOb/ogDr1UVuD2JeKs67CjYVqgR74/eo0
3VO/2iqGPUI9UWYREvUX1nbKnzoKqYQ2g9QI/BtgPrYQGDp8bAVzpfgpn8Ra0JsC
hX/PJjyWEwYG+YQydbtHB4cDNhcUgF84KjZ2iv3xuQNATuZk+O8=
=K1pd
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Aug 6 09:36:12 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.08.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/21.08.0
- Changes since 21.07.90:
* improve kate on haiku os
* avoid double branch name computation
- Rebase 0001-Defuse-root-block.patch
-------------------------------------------------------------------
Fri Jul 30 10:04:41 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.07.90
* New feature release
- Changes since 21.07.80:
* LocHistory: When limiting size, also rewind currentLocation
* Location history improvements
* handle nullptr return of screenAt() (kde#439804)
-------------------------------------------------------------------
Sat Jul 17 20:05:46 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- 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)
* 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)
- Only install the license files once
-------------------------------------------------------------------
Wed Jul 7 08:57:08 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kate
Version: 21.04.3
Version: 21.08.0
Release: 0
Summary: Advanced Text Editor
License: GPL-3.0-or-later
@ -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