diff --git a/udisks-2.9.1.tar.bz2 b/udisks-2.9.1.tar.bz2 deleted file mode 100644 index 65bcd6b..0000000 --- a/udisks-2.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da25c348edebefd5614c727fd6a7c286ba114479aa3279dcd5df274da6f28646 -size 1680327 diff --git a/udisks-2.9.2.tar.bz2 b/udisks-2.9.2.tar.bz2 new file mode 100644 index 0000000..b9635fd --- /dev/null +++ b/udisks-2.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bda6f9d7edc632c57e55862731a8ffeff2413fa4346708a22bf31ed72b0fe058 +size 1701377 diff --git a/udisks2-Fix-memory-leaks.patch b/udisks2-Fix-memory-leaks.patch deleted file mode 100644 index c1fda95..0000000 --- a/udisks2-Fix-memory-leaks.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 7c23020e3b6931395f85a08f6ab2b764a5625e43 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Tue, 29 Sep 2020 13:00:53 +0200 -Subject: [PATCH] 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 96b2d66ad..2c64eb9d3 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 4ba66d09a..f4e848c52 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 3ae11c329..279d952b6 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 3b0a48e56..7a5de65d2 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); - } - - diff --git a/udisks2-lvm2-Fix-leaking-BDLVMVDOPooldata.patch b/udisks2-lvm2-Fix-leaking-BDLVMVDOPooldata.patch deleted file mode 100644 index 2388aa8..0000000 --- a/udisks2-lvm2-Fix-leaking-BDLVMVDOPooldata.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f8ff05687c8163ee361d170b5e1f344d9e79d10e Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Mon, 23 Nov 2020 16:58:17 +0100 -Subject: [PATCH] lvm2: Fix leaking BDLVMVDOPooldata - ---- - modules/lvm2/udiskslinuxvolumegroupobject.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/lvm2/udiskslinuxvolumegroupobject.c b/modules/lvm2/udiskslinuxvolumegroupobject.c -index e3bc8dfc0..ce941cb25 100644 ---- a/modules/lvm2/udiskslinuxvolumegroupobject.c -+++ b/modules/lvm2/udiskslinuxvolumegroupobject.c -@@ -652,6 +652,9 @@ update_vg (GObject *source_obj, - else - udisks_linux_logical_volume_object_update (volume, lv_info, meta_lv_info, vdo_info, &needs_polling); - -+ if (vdo_info) -+ bd_lvm_vdopooldata_free (vdo_info); -+ - g_hash_table_insert (new_lvs, (gchar *)lv_name, volume); - } - diff --git a/udisks2.changes b/udisks2.changes index e6c7e11..db0e540 100644 --- a/udisks2.changes +++ b/udisks2.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Feb 12 00:00:13 UTC 2021 - Dirk Müller + +- update to 2.9.2: + * udiskslinuxblock: Survive a missing /etc/crypttab + * lvm2: Fix leaking BDLVMVDOPooldata + * tests: Test modules that are actually enabled during build + * build: Exclude VDO module from distcheck build + * udisksfstabentry: Add udisks_fstab_entry_has_opt() + * udiskslinuxblock: Reflect fstab "noauto" mount option in HintAuto + * udiskslinuxblock: Update hints after fstab change + * tests: Add tests for Block hints + * udiskslinuxfilesystemhelpers: Make TakeOwnership() race free + * tests: Extend filesystem test_take_ownership tests with symlinks + * mount options: Allow 'nosymfollow' mount option for unprivileged mounts + * udisksstate: Silence the block device busy messages on cleanup lock + * udev: Distinguish mmcblk-class device types + * udev: Propagate mmcblk disk attributes to mmcblk_boot devices + * udiskslinuxdrive: Tweak the 'removable'/'ejectable' hints for mmcblk-class devices + * udiskslinuxblock: Tweak the hints for mmcblk-class devices + * udisksdaemonutil: Refactor udisks_daemon_util_trigger_uevent() out of UDisksLinuxBlockObject + * udiskslinuxmanager: Trigger uevent after loop device setup + * tests: Remove scsi_debug serial number checks + * tests: Skip zram tests if zram module is already loaded + * treewide: Fix typos + * AUTHORS: Add tbzatek as the maintainer + * tests: Do not use nilfs2 as an example of non-resizable FS + * Memory leak fixes + * doc: Update config file path +- drop udisks2-Fix-memory-leaks.patch, udisks2-lvm2-Fix-leaking-BDLVMVDOPooldata.patch (upstream) + ------------------------------------------------------------------- Sat Dec 19 16:16:59 UTC 2020 - Bjørn Lie diff --git a/udisks2.spec b/udisks2.spec index 34bc001..b3e7da5 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,7 +1,7 @@ # # spec file for package udisks2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,16 +21,13 @@ %define libblockdev_version 2.19 Name: udisks2 -Version: 2.9.1 +Version: 2.9.2 Release: 0 Summary: Disk Manager License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: System/Daemons URL: https://github.com/storaged-project/udisks Source0: %{url}/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 -Patch0: udisks2-Fix-memory-leaks.patch -Patch1: udisks2-lvm2-Fix-leaking-BDLVMVDOPooldata.patch - BuildRequires: chrpath BuildRequires: docbook-xsl-stylesheets BuildRequires: gobject-introspection-devel >= 0.6.2