Accepting request 840987 from KDE:Frameworks5

Plasma 5.20.0

OBS-URL: https://build.opensuse.org/request/show/840987
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kscreenlocker?expand=0&rev=90

0001-Disable-the-seccomp-sandbox.patch

@@ -1,51 +0,0 @@
-From cd2d031b191c6b4e6a0eb4bd51ed8b2c72c21f76 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 24 Jul 2020 13:22:50 +0200
-Subject: [PATCH] Disable the seccomp sandbox
-References: boo#1174448
-
-In the referenced bug, it somehow fails to make the created context current,
-so no GL vendor detection is performed and it is assumed to not be Nvidia
-or on Wayland. This breaks rendering.
-While it would be enough to only disable the sandbox in this particular case,
-it's planned to drop sandboxing anyway
-(https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/9) so just do the
-same here, just in a simpler way with less side effects.
----
- greeter/seccomp_filter.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/greeter/seccomp_filter.cpp b/greeter/seccomp_filter.cpp
-index bca3001..8e2f156 100644
---- a/greeter/seccomp_filter.cpp
-+++ b/greeter/seccomp_filter.cpp
-@@ -28,6 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <QDBusConnection>
- #include <QOpenGLContext>
- #include <QOffscreenSurface>
-+#include <QDebug>
- 
- #include <seccomp.h>
- #include <sys/socket.h>
-@@ -62,11 +63,18 @@ void init()
-             else if (gl->isSoftwareEmulation() && KWindowSystem::isPlatformWayland()) {
-                 createSupported = writeSupported = false;
-             }
-+        } else {
-+            qWarning() << "Making the context current failed";
-+            return;
-         }
-+    } else {
-+        qWarning() << "Creating an offscreen context failed";
-+        return;
-     }
- 
-     // access DBus to have the socket open
-     QDBusConnection::sessionBus();
-+    return;
- 
-     // default action: allow
-     // we cannot use a whitelist approach of syscalls
--- 
-2.25.1
-

kscreenlocker-5.19.5.tar.xz

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

kscreenlocker-5.19.5.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9OIn0ACgkQ7JTRj38F
-mX7qwgf/fYr4RpWcIsMI6h6O7KSvjFjCNOI2JidQP9mv2iRxk2sq0kMaK/cXBufj
-eWcsxzpOfZED/39/gTsbhRUoD/1v3zb2aeNJ65iaYUsc0b8GSqPz8XQv9bgrRvc1
-HvTbbooqucCDRpHL4qbH3NxwNz6x9wNDihG6vDsrAkifAwUcDZzOWyg7esyqslJp
-tA5X1p403JfNwX9va2E+LBQRP05hWOjNgSCFPZA5BrdlaoOI0wKviaCt2sZFyYh+
-HyCO3TiMwVt4zrU8L3oQWvtWTTqysrXgGAfxi4fzAQ//OcfKqJJLPrq5B5Y9V/+i
-tDWm+OcMEz0VMsQOrYx7KuD5yoS24g==
-=/Z7e
------END PGP SIGNATURE-----

kscreenlocker-5.20.0.tar.xz

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

kscreenlocker-5.20.0.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/OsYACgkQ7JTRj38F
+mX5+vAgAprJF4crDanWSSNXDKPFEzqcoyJ6G/Uf3aU+mlQtWFK7FaeE71JBh1hAq
+m5MnpbWz770NwF1F56ECu+3lntOpaI2Hbh9aOcMteFLgCXkfMyFJGC1Yq2qD0QNf
+8SSMumaJj2fKPBz8yfqHVmnPfclQMsSt86qpuwOhAFyOdTcc++JCWDoGCzS6g/lf
+OyjaZaVMsnujNvaV3MnH3THy+/i91uAt0Ggzbg9GQMJOcFgB9xxyu8FbmbC/2ccA
+hJZngRcJtAI0sisHuQuYc3/QDD/mKHMP9VMicSAAKzrR+O/Igu8EUTa1tpY+3gqy
+RL8TqQIpOOOlcqvxbisAx8+J6gxCvg==
+=CPl0
+-----END PGP SIGNATURE-----

kscreenlocker.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Oct  8 16:55:21 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.20.0
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma-5.20.0
+- No code changes since 5.19.90
+- Drop unneeded seccomp build requirement
+- Kill quietly
+
+-------------------------------------------------------------------
+Thu Sep 17 20:02:59 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.19.90
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma-5.19.90
+- Changes since 5.19.5:
+  * Remove explicit ECM_KDE_MODULE_DIR
+  * Drop empty X-KDE-PluginInfo-Depends
+  * Update logind's SetLockedHint
+  * Drop seccomp sandboxing
+  * Build settings related code only once
+  * Fix the race condition fix
+  * enable notification for wallpaper configpropertymaps changes
+  * Do not require QuickWidgets that is not needed anymore
+  * Fix another race condition
+  * Fix race condition
+  * Fix translations
+  * This is a straightforward port of the kcm to qml.
+  * Add logo for the repo
+  * Fix minor typo
+  * Set componentDisplayName on the action collection
+
+-------------------------------------------------------------------
+Thu Sep 17 19:18:30 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Drop patches, now upstream:
+  * 0001-Disable-the-seccomp-sandbox.patch
+
 -------------------------------------------------------------------
 Tue Sep  1 11:38:49 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

kscreenlocker.spec

@@ -20,20 +20,18 @@
 
 %bcond_without lang
 Name:           kscreenlocker
-Version:        5.19.5
+Version:        5.20.0
 Release:        0
 Summary:        Library and components for secure lock screen architecture
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            https://projects.kde.org/kscreenlocker
-Source:         https://download.kde.org/stable/plasma/%{version}/kscreenlocker-%{version}.tar.xz
+Source:         kscreenlocker-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/stable/plasma/%{version}/kscreenlocker-%{version}.tar.xz.sig
+Source1:        kscreenlocker-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 Source3:        kde
-# PATCH-FIX-UPSTREAM (kind of, https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/9)
-Patch1:         0001-Disable-the-seccomp-sandbox.patch
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= 1.8.0
 BuildRequires:  kf5-filesystem
@@ -55,7 +53,6 @@ BuildRequires:  cmake(Qt5QuickWidgets) >= 5.5.0
 BuildRequires:  cmake(Qt5Test) >= 5.5.0
 BuildRequires:  cmake(Qt5Widgets) >= 5.5.0
 BuildRequires:  cmake(Qt5X11Extras) >= 5.5.0
-BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(x11)
@@ -115,7 +112,7 @@ exit 0
 %post
 /sbin/ldconfig
 if [ $1 = 2 ] && [ -f /run/kscreenlocker_restart ]; then
-    /usr/bin/killall -TERM kscreenlocker_greet || :
+    /usr/bin/killall -q -TERM kscreenlocker_greet || :
     rm /run/kscreenlocker_restart
 fi
 exit 0
@@ -139,6 +136,9 @@ exit 0
 %{_kf5_plugindir}/
 %{_kf5_notifydir}/
 %{_kf5_sharedir}/ksmserver/
+%dir %{_kf5_sharedir}/kpackage/
+%dir %{_kf5_sharedir}/kpackage/kcms
+%{_kf5_sharedir}/kpackage/kcms/kcm_screenlocker
 
 %files -n libKScreenLocker5
 %license COPYING*