!14 update udisks2 version to 2.9.4

Merge pull request !14 from Li Jinlin/master

0001-udiskslinuxmountoptions-Prevent-a-memory-leak.patch

@@ -1,33 +0,0 @@
-From e30be251c101ca17e16648f703af224459601498 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Wed, 27 May 2020 14:16:44 +0200
-Subject: [PATCH 349/363] udiskslinuxmountoptions: Prevent a memory leak
-
-Absolutely improbable scenario though.
----
- src/udiskslinuxmountoptions.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/udiskslinuxmountoptions.c b/src/udiskslinuxmountoptions.c
-index 1071e29a..c9368560 100644
---- a/src/udiskslinuxmountoptions.c
-+++ b/src/udiskslinuxmountoptions.c
-@@ -259,12 +259,12 @@ compute_mount_options_for_fs_type (UDisksDaemon           *daemon,
- 
-   config_manager = udisks_daemon_get_config_manager (daemon);
- 
--  fsmo = g_malloc0 (sizeof (FSMountOptions));
--  fsmo_any = g_malloc0 (sizeof (FSMountOptions));
--
-   /* Builtin options, two-level hashtable */
-   builtin_opts = g_object_get_data (G_OBJECT (daemon), "mount-options");
-   g_return_val_if_fail (builtin_opts != NULL, NULL);
-+
-+  fsmo = g_malloc0 (sizeof (FSMountOptions));
-+  fsmo_any = g_malloc0 (sizeof (FSMountOptions));
-   compute_block_level_mount_options (builtin_opts, block, fstype, fsmo, fsmo_any);
- 
-   /* Global config file overrides, two-level hashtable */
--- 
-2.21.1 (Apple Git-122.3)
-

0002-Memory-leak-fixes.patch

@@ -1,79 +0,0 @@
-From 7c23020e3b6931395f85a08f6ab2b764a5625e43 Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Tue, 29 Sep 2020 13:00:53 +0200
-Subject: [PATCH 30/30] Memory leak fixes
-
-Fixes for leaks found by new version of coverity.
----
- modules/zram/udiskszramutil.c | 3 +++
- src/udiskslinuxdriveata.c     | 1 +
- src/udiskslinuxfilesystem.c   | 2 +-
- tools/udisksctl.c             | 2 ++
- 4 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/modules/zram/udiskszramutil.c b/modules/zram/udiskszramutil.c
-index 96b2d66..2c64eb9 100644
---- a/modules/zram/udiskszramutil.c
-+++ b/modules/zram/udiskszramutil.c
-@@ -95,8 +95,11 @@ set_conf_property (char *filename,
-   if (rename (tmpfname, filename))
-   {
-     g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno),"%m");
-+    g_free (tmpfname);
-     return FALSE;
-   }
- 
-+  g_free (tmpfname);
-+
-   return TRUE;
- }
-diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c
-index 4ba66d0..f4e848c 100644
---- a/src/udiskslinuxdriveata.c
-+++ b/src/udiskslinuxdriveata.c
-@@ -582,6 +582,7 @@ udisks_linux_drive_ata_refresh_smart_sync (UDisksLinuxDriveAta  *drive,
-                        UDISKS_ERROR,
-                        UDISKS_ERROR_FAILED,
-                        "sk_disk_open: %m");
-+          g_free (blob);
-           goto out;
-         }
- 
-diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
-index 3ae11c3..279d952 100644
---- a/src/udiskslinuxfilesystem.c
-+++ b/src/udiskslinuxfilesystem.c
-@@ -697,9 +697,9 @@ calculate_mount_point (UDisksDaemon  *daemon,
-         }
-     }
-   g_free (orig_mount_point);
--  g_free (mount_dir);
- 
-  out:
-+  g_free (mount_dir);
-   g_clear_object (&object);
-   g_free (escaped_user_name);
-   return mount_point;
-diff --git a/tools/udisksctl.c b/tools/udisksctl.c
-index 3b0a48e..7a5de65 100644
---- a/tools/udisksctl.c
-+++ b/tools/udisksctl.c
-@@ -1282,6 +1282,7 @@ handle_command_unlock_lock (gint        *argc,
-         g_printerr ("Error unlocking %s: %s\n",
-                     udisks_block_get_device (block),
-                     error->message);
-+        g_clear_error (&error);
-         goto out;
-       }
-       g_variant_builder_add (&builder,
-@@ -3103,6 +3104,7 @@ handle_command_status (gint        *argc,
-                serial,
-                block);
-       g_free (block);
-+      g_free (vendor_model);
-     }
- 
- 
--- 
-1.8.3.1
-

udisks2.spec

@@ -57,15 +57,13 @@
 
 Name:    udisks2
 Summary: Disk Manager
-Version: 2.9.1
+Version: 2.9.4
 Release: 1
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
 
-Patch1:  0001-udiskslinuxmountoptions-Prevent-a-memory-leak.patch
-Patch2:  0002-Memory-leak-fixes.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@@ -438,7 +436,10 @@ udevadm trigger
 %endif
 
 %changelog
-* Thu Jan 14 2020 yanglongkang <yanglongkang@huawei.com> - 2.9.1-1
+* Mon Nov 22 2021 Li Jinlin <lijinlin3@huawei.com> - 2.9.4-1
+- update udisks2 version to 2.9.4
+
+* Tue Jan 14 2020 yanglongkang <yanglongkang@huawei.com> - 2.9.1-1
 - update to 2.9.1
 
 * Thu Oct 29 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 2.9.0-3