Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package solid for openSUSE:Factory checked
in at 2021-07-25 20:09:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solid (Old)
and /work/SRC/openSUSE:Factory/.solid.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid"
Sun Jul 25 20:09:09 2021 rev:99 rq:907747 version:5.84.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/solid/solid.changes 2021-07-16
00:02:09.968753359 +0200
+++ /work/SRC/openSUSE:Factory/.solid.new.1899/solid.changes 2021-07-25
20:09:14.691444923 +0200
@@ -1,0 +2,8 @@
+Thu Jul 22 12:10:30 UTC 2021 - Luca Beltrame <lbeltr...@kde.org>
+
+- Add libmount to BuildRequires to enable support for bind mounts
+- Add upstream patch 0001-Use-qstrcmp-instead-of-strcmp.patch
+ to fix potential crashes in dolphin and plasmashell with
+ libmount support enabled in Solid
+
+-------------------------------------------------------------------
New:
----
0001-Use-qstrcmp-instead-of-strcmp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ solid.spec ++++++
--- /var/tmp/diff_new_pack.g4NZJR/_old 2021-07-25 20:09:15.183444374 +0200
+++ /var/tmp/diff_new_pack.g4NZJR/_new 2021-07-25 20:09:15.187444371 +0200
@@ -32,6 +32,8 @@
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Use-qstrcmp-instead-of-strcmp.patch
BuildRequires: bison
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: fdupes
@@ -45,6 +47,7 @@
BuildRequires: cmake(Qt5Test) >= 5.15.0
BuildRequires: cmake(Qt5Xml) >= 5.15.0
BuildRequires: pkgconfig(libimobiledevice-1.0)
+BuildRequires: pkgconfig(mount)
%if %{?suse_version} >= 1550
BuildRequires: pkgconfig(libplist-2.0)
%else
++++++ 0001-Use-qstrcmp-instead-of-strcmp.patch ++++++
>From e5964d13f36901e7768ca38064125a5c5c28a939 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samir...@gmail.com>
Date: Thu, 22 Jul 2021 01:26:37 +0200
Subject: [PATCH] Use qstrcmp instead of strcmp
qstrcmp can handle NULL args.
This fixes an issue on Slackware, which doesn't use systemd and /var/run
is a bind mount of /run, and for some reason mnt_fs_get_root(fs) would return
NULL, which led to crashes in dolphin and plasmashell, see:
https://invent.kde.org/frameworks/solid/-/commit/ef0b0dfa00b1de70c6d8e6913bbfdb79e7d3d1b6#note_276583
---
src/solid/devices/backends/udisks2/udisksstorageaccess.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
index 1566787..35d1aa8 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
@@ -92,9 +92,9 @@ static QString baseMountPoint(const QByteArray &dev)
const QByteArray devicePath = dev.endsWith('\x00') ?
dev.chopped(1) : dev;
while (mnt_table_next_fs(table, itr, &fs) == 0) {
- if (mnt_fs_get_srcpath(fs) == devicePath
- // Base mount point will have "/" as root fs
- && (strcmp(mnt_fs_get_root(fs), "/") == 0)) {
+ if (mnt_fs_get_srcpath(fs) == devicePath //
+ && (qstrcmp(mnt_fs_get_root(fs), "/") == 0) // Base mount
point will have "/" as root fs
+ ) {
mountPoint = QFile::decodeName(mnt_fs_get_target(fs));
break;
}
--
2.32.0
