From c02932003dd69655a555d3008fe9a9f59e8ee138836fb3f2184d956200fe9d23 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 21 Sep 2020 06:29:51 +0000 Subject: [PATCH 1/2] Plasma 5.20 Beta again - untested and needs a bit of cleanup still OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=231 --- 0001-Disable-the-seccomp-sandbox.patch | 51 -------------------------- kscreenlocker-5.19.5.tar.xz | 3 -- kscreenlocker-5.19.5.tar.xz.sig | 11 ------ kscreenlocker-5.19.90.tar.xz | 3 ++ kscreenlocker-5.19.90.tar.xz.sig | 11 ++++++ kscreenlocker.changes | 30 +++++++++++++++ kscreenlocker.spec | 11 +++--- 7 files changed, 50 insertions(+), 70 deletions(-) delete mode 100644 0001-Disable-the-seccomp-sandbox.patch delete mode 100644 kscreenlocker-5.19.5.tar.xz delete mode 100644 kscreenlocker-5.19.5.tar.xz.sig create mode 100644 kscreenlocker-5.19.90.tar.xz create mode 100644 kscreenlocker-5.19.90.tar.xz.sig diff --git a/0001-Disable-the-seccomp-sandbox.patch b/0001-Disable-the-seccomp-sandbox.patch deleted file mode 100644 index e791915..0000000 --- a/0001-Disable-the-seccomp-sandbox.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cd2d031b191c6b4e6a0eb4bd51ed8b2c72c21f76 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -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 . - #include - #include - #include -+#include - - #include - #include -@@ -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 - diff --git a/kscreenlocker-5.19.5.tar.xz b/kscreenlocker-5.19.5.tar.xz deleted file mode 100644 index 6f136f1..0000000 --- a/kscreenlocker-5.19.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b13b2081971db1347d6a77dec416725995ca20a5b7bf05f21c72a68e15d6a5b9 -size 126420 diff --git a/kscreenlocker-5.19.5.tar.xz.sig b/kscreenlocker-5.19.5.tar.xz.sig deleted file mode 100644 index 8439369..0000000 --- a/kscreenlocker-5.19.5.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/kscreenlocker-5.19.90.tar.xz b/kscreenlocker-5.19.90.tar.xz new file mode 100644 index 0000000..eb519de --- /dev/null +++ b/kscreenlocker-5.19.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd1fb3fc23fc3fe9e4834374f1c8f60190a73ee29eb098c58d66ec0f284f6344 +size 115020 diff --git a/kscreenlocker-5.19.90.tar.xz.sig b/kscreenlocker-5.19.90.tar.xz.sig new file mode 100644 index 0000000..bbb8572 --- /dev/null +++ b/kscreenlocker-5.19.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jQxwACgkQEZaMRJKM +rvyLJgf7BMH4TQjJr7LAfFofAlabLmWVhJI9Wq3Z1GrepPSxGxC2PeWq5ynC6srR +zxkbmI0sdrQdw4sdoUwa844rYV6b+2noExZsgYOr1smammh22T7VQoYJNbxg0X/W +xKlGtc2PmoLY8kyq2ty/TXDjtmZbqweSr0N2weNPRj1ljLuUHuVERCrhV4M8M8RU +NX+K2JQoPr6wXfs08qdrE4FI6pojn0TuUbdg97512Z3HteL3RLGAAYgflnj+hcsj +SHNxn2QDMabNxKUveqm6N5Y/FIgbn10Scb3mnoYglQxah3mB6tfjrc69DZkXxT/1 +VicPW9EQSwMILrZGWOUZOwUBs9c0YQ== +=nE3R +-----END PGP SIGNATURE----- diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 829ee82..36481b9 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 17 20:02:59 UTC 2020 - Fabian Vogt + +- 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 + +- Drop patches, now upstream: + * 0001-Disable-the-seccomp-sandbox.patch + ------------------------------------------------------------------- Tue Sep 1 11:38:49 UTC 2020 - Fabian Vogt diff --git a/kscreenlocker.spec b/kscreenlocker.spec index bf94241..902c777 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -20,20 +20,18 @@ %bcond_without lang Name: kscreenlocker -Version: 5.19.5 +Version: 5.19.90 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 @@ -139,6 +137,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* From cf5399e02a8e0761409cc4d1f0e0c167ce75f1141e188c145b8c281606179233 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 11 Oct 2020 11:01:02 +0000 Subject: [PATCH 2/2] Plasma 5.20.0, second try OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=232 --- kscreenlocker-5.19.90.tar.xz | 3 --- kscreenlocker-5.19.90.tar.xz.sig | 11 ----------- kscreenlocker-5.20.0.tar.xz | 3 +++ kscreenlocker-5.20.0.tar.xz.sig | 11 +++++++++++ kscreenlocker.changes | 11 +++++++++++ kscreenlocker.spec | 5 ++--- 6 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 kscreenlocker-5.19.90.tar.xz delete mode 100644 kscreenlocker-5.19.90.tar.xz.sig create mode 100644 kscreenlocker-5.20.0.tar.xz create mode 100644 kscreenlocker-5.20.0.tar.xz.sig diff --git a/kscreenlocker-5.19.90.tar.xz b/kscreenlocker-5.19.90.tar.xz deleted file mode 100644 index eb519de..0000000 --- a/kscreenlocker-5.19.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd1fb3fc23fc3fe9e4834374f1c8f60190a73ee29eb098c58d66ec0f284f6344 -size 115020 diff --git a/kscreenlocker-5.19.90.tar.xz.sig b/kscreenlocker-5.19.90.tar.xz.sig deleted file mode 100644 index bbb8572..0000000 --- a/kscreenlocker-5.19.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jQxwACgkQEZaMRJKM -rvyLJgf7BMH4TQjJr7LAfFofAlabLmWVhJI9Wq3Z1GrepPSxGxC2PeWq5ynC6srR -zxkbmI0sdrQdw4sdoUwa844rYV6b+2noExZsgYOr1smammh22T7VQoYJNbxg0X/W -xKlGtc2PmoLY8kyq2ty/TXDjtmZbqweSr0N2weNPRj1ljLuUHuVERCrhV4M8M8RU -NX+K2JQoPr6wXfs08qdrE4FI6pojn0TuUbdg97512Z3HteL3RLGAAYgflnj+hcsj -SHNxn2QDMabNxKUveqm6N5Y/FIgbn10Scb3mnoYglQxah3mB6tfjrc69DZkXxT/1 -VicPW9EQSwMILrZGWOUZOwUBs9c0YQ== -=nE3R ------END PGP SIGNATURE----- diff --git a/kscreenlocker-5.20.0.tar.xz b/kscreenlocker-5.20.0.tar.xz new file mode 100644 index 0000000..ec8e6aa --- /dev/null +++ b/kscreenlocker-5.20.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8a3b5a7137b4f6c9fe0ad0b625ebc16f5c024e527f77f9a3f6744570a1c46a2 +size 114332 diff --git a/kscreenlocker-5.20.0.tar.xz.sig b/kscreenlocker-5.20.0.tar.xz.sig new file mode 100644 index 0000000..16796fd --- /dev/null +++ b/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----- diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 36481b9..579b167 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 8 16:55:21 UTC 2020 - Fabian Vogt + +- 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 diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 902c777..dd5ccd0 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -20,7 +20,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.19.90 +Version: 5.20.0 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0-or-later @@ -53,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) @@ -113,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