Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plasma6-workspace for
openSUSE:Factory checked in at 2024-06-11 18:27:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma6-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma6-workspace.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma6-workspace"
Tue Jun 11 18:27:21 2024 rev:8 rq:1179716 version:6.0.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma6-workspace/plasma6-workspace.changes
2024-06-04 12:51:20.232275272 +0200
+++
/work/SRC/openSUSE:Factory/.plasma6-workspace.new.19518/plasma6-workspace.changes
2024-06-11 18:27:40.289317409 +0200
@@ -1,0 +2,7 @@
+Mon Jun 10 12:38:47 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix a regression introduced by the preceding change
+ (kde#487912, boo#1226110):
+ * 0001-Fix-writing-ICEAuthority-file.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-writing-ICEAuthority-file.patch
BETA DEBUG BEGIN:
New: (kde#487912, boo#1226110):
* 0001-Fix-writing-ICEAuthority-file.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma6-workspace.spec ++++++
--- /var/tmp/diff_new_pack.88NimX/_old 2024-06-11 18:27:41.621366020 +0200
+++ /var/tmp/diff_new_pack.88NimX/_new 2024-06-11 18:27:41.625366166 +0200
@@ -45,6 +45,7 @@
# PATCH-FIX-UPSTREAM
Patch1: 0001-Authenticate-local-clients.patch
Patch2: 0002-Remove-iceauth-dependency.patch
+Patch3: 0001-Fix-writing-ICEAuthority-file.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus6.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
++++++ 0001-Fix-writing-ICEAuthority-file.patch ++++++
>From 918cb38c3522ffcc241ac6a22b6741e41cdd3c30 Mon Sep 17 00:00:00 2001
From: David Edmundson <da...@davidedmundson.co.uk>
Date: Sun, 9 Jun 2024 08:25:11 +0000
Subject: [PATCH] Fix writing ICEAuthority file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth
dependency" introduced two bugs:
1) "fp" is never closed, so the generated auth data stays buffered in
memory for some indeterminate time and the file stays empty on disk.
This completely breaks authentication and thus also session restore.
2) Checking the return value of IceWriteAuthFileEntry() is inverted (the
function returns non-zero on success), so warnings are printed iff
everything goes well.
BUG: 487912
(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa)
Co-authored-by: Tomáš Trnka <tomastr...@gmx.com>
---
ksmserver/server.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 84b82b4851..493bed5016 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -364,7 +364,7 @@ Status SetAuthentication(int count, IceListenObj
*listenObjs, IceAuthDataEntry *
file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
file_entry->auth_data = strdup((*authDataEntries)[i].auth_data);
file_entry->auth_data_length = MAGIC_COOKIE_LEN;
- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
+ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
qWarning("Failed to write ice auth file entry");
}
IceFreeAuthFileEntry(file_entry);
@@ -388,7 +388,7 @@ Status SetAuthentication(int count, IceListenObj
*listenObjs, IceAuthDataEntry *
file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
file_entry->auth_data = strdup((*authDataEntries)[i +
1].auth_data);
file_entry->auth_data_length = MAGIC_COOKIE_LEN;
- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
+ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
qWarning("Failed to write xsmp ice auth file entry");
}
IceFreeAuthFileEntry(file_entry);
@@ -397,6 +397,11 @@ Status SetAuthentication(int count, IceListenObj
*listenObjs, IceAuthDataEntry *
IceSetPaAuthData(2, &(*authDataEntries)[i]);
}
+ if (fclose(fp) != 0) {
+ qWarning() << "Could not close ICEAuthority file";
+ return 0;
+ }
+
return (1);
}
--
2.45.1
