Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1289821
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libblockdev?expand=0&rev=26

0001-dont-allow-suid-and-dev-set-on-fs-resize.patch

@@ -0,0 +1,27 @@
+From 8e072f794744bd17c57cceabb3884d3f0f6a1602 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+Date: Fri, 16 May 2025 14:27:10 +0200
+Subject: [PATCH] dont allow suid and dev set on fs resize
+
+---
+ src/plugins/fs/generic.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/fs/generic.c b/src/plugins/fs/generic.c
+index 69333944..1a6dd960 100644
+--- a/src/plugins/fs/generic.c
++++ b/src/plugins/fs/generic.c
+@@ -683,7 +683,9 @@ static gchar* fs_mount (const gchar *device, gchar *fstype, gboolean read_only,
+                              "Failed to create temporary directory for mounting '%s'.", device);
+                 return NULL;
+             }
+-            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "ro" : NULL, NULL, &l_error);
++
++            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "nosuid,nodev,ro" : "nosuid,nodev", NULL, &l_error);
++
+             if (!ret) {
+                 g_propagate_prefixed_error (error, l_error, "Failed to mount '%s': ", device);
+                 g_rmdir (mountpoint);
+-- 
+2.48.1
+

libblockdev.changes

@@ -1,5 +1,12 @@
 -------------------------------------------------------------------
-Wed Apr 10 11:29:31 UTC 2024 - Dirk Müller <dmueller@suse.com>
+Mon Jun 23 14:54:35 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
+
+- suppress privilege escalation during xfs fs resize (CVE-2025-6019)
+  (bsc#1243285)
+  * add 0001-dont-allow-suid-and-dev-set-on-fs-resize.patch
+
+-------------------------------------------------------------------
+Fri Feb 14 12:17:27 UTC 2025 - Thomas Blume <thomas.blume@suse.com>
 
 - update to 3.1.1:
   * Use glib2 G_GNUC_UNUSED in place of UNUSED locally defined
@@ -15,9 +22,6 @@ Wed Apr 10 11:29:31 UTC 2024 - Dirk Müller <dmueller@suse.com>
   * nvme: Add bd_nvme_is_tech_avail to the API file
   * lvm-dbus: Fix passing size for pvresize over DBus
 
--------------------------------------------------------------------
-Mon Feb 12 10:06:44 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
-
 - Update to 3.1.0:
   * Add BDPluginSpec constructor and use it in plugin_specs_from_names
   * overrides: Remove unused 'sys' import
@@ -34,14 +38,8 @@ Mon Feb 12 10:06:44 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
   * utils: Add expected printf string annotation
   * fs: Report reason for open() and ioctl() failures
 
--------------------------------------------------------------------
-Sat Nov 11 18:11:14 UTC 2023 - Sarah Kriesch <sarah.kriesch@opensuse.org>
-
 - Add %{_libdir}/libbd_s390.so for s390x because missing file identitied
 
--------------------------------------------------------------------
-Fri Oct 13 08:09:53 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
-
 - Update to 3.0.4:
   * plugins: use g_autofree for free'ing g_char's
   * plugins: btrfs: use g_autofree where possible for g_free
@@ -58,9 +56,6 @@ Fri Oct 13 08:09:53 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
   * lvm-dbus: Replace g_critical calls with bd_utils_log_format
   * tests: Fail early when recompilation fails in library_test
 
--------------------------------------------------------------------
-Fri Sep 29 07:48:57 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
-
 - Update to version 3.0.3:
   * Always use "--fs ignore" with lvresize
   * nvme:
@@ -76,9 +71,6 @@ Fri Sep 29 07:48:57 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
     - Fix memory leak
   * crypto: Correctly convert passphrases from Python to C
 
--------------------------------------------------------------------
-Wed Aug 23 01:16:38 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
-
 - Update to version 3.0.2:
   * Use ntfsinfo instead of ntfscluster for faster
     bd_fs_ntfs_get_info.
@@ -93,9 +85,6 @@ Wed Aug 23 01:16:38 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
 - Restructure all sub-packages in the spec file to enhance
   maintainability.
 
--------------------------------------------------------------------
-Fri Jun 30 10:16:53 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
-
 - Update to 3.0.1:
   * New bugfix release of the libblockdev library with multiple
     fixes.
@@ -259,7 +248,7 @@ Thu Aug 20 22:11:53 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
 - udpate to 2.24:
   * VDO plugin has been deprecated in this release (functionality
-    replaced by LVM VDO)
+    replaced by LVM VDO) 
   * support for creating and managing LVM VDO volumes added
   * support for unlocking of BitLocker-compatible format BITLK
     added

libblockdev.spec

@@ -49,6 +49,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://github.com/storaged-project/libblockdev
 Source0:        %{url}/releases/download/%{version}-1/libblockdev-%{version}.tar.gz
 Source1:        %{url}/raw/%{version}-1/NEWS.rst
+Patch0:         0001-dont-allow-suid-and-dev-set-on-fs-resize.patch
 
 ###############################################################################
 #                          M A I N  P A C K A G E