vagrantc pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit e2afea05bb60d3f281e3e1cada2fde3d5008554f Author: Maxim Cournoyer <[email protected]> AuthorDate: Sun Oct 31 01:33:47 2021 -0400 gnu: libblockdev: Update to 2.26. * gnu/packages/disk.scm (libblockdev): Update to 2.26. [source]: Remove patches field. [inputs]: Add xfsprogs. * gnu/packages/patches/libblockdev-glib-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/disk.scm | 8 ++- gnu/packages/patches/libblockdev-glib-compat.patch | 61 ---------------------- 3 files changed, 3 insertions(+), 67 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index d575232..385526a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1315,7 +1315,6 @@ dist_patch_DATA = \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-tracker-16-compat.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ - %D%/packages/patches/libblockdev-glib-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0ed7402..1a25729 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -923,16 +923,15 @@ to create devices with respective mappings for the ATARAID sets discovered.") (define-public libblockdev (package (name "libblockdev") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (string-append "https://github.com/storaged-project/"; "libblockdev/releases/download/" version "-1/libblockdev-" version ".tar.gz")) - (patches (search-patches "libblockdev-glib-compat.patch")) (sha256 (base32 - "0s0nazkpzpn4an00qghjkk9n7gdm5a8dqfr5hfnlk5mk5lma8njm")))) + "0sg068jb87ljhn8yazrqxi6ri10ic2sh1lp6ikd2nqxc6l5y3h64")))) (build-system gnu-build-system) (arguments `(#:phases @@ -963,8 +962,7 @@ to create devices with respective mappings for the ATARAID sets discovered.") ("nss" ,nss) ("parted" ,parted) ("volume-key" ,volume-key) - ;; ("xfsprogs" ,xfsprogs) ; TODO: Package? - )) + ("xfsprogs" ,xfsprogs))) (home-page "https://github.com/storaged-project/libblockdev";) (synopsis "Library for manipulating block devices") (description diff --git a/gnu/packages/patches/libblockdev-glib-compat.patch b/gnu/packages/patches/libblockdev-glib-compat.patch deleted file mode 100644 index bb25d5d..0000000 --- a/gnu/packages/patches/libblockdev-glib-compat.patch +++ /dev/null @@ -1,61 +0,0 @@ -Don't use g_memdup() which is removed in newer versions of GLib. - -See <https://github.com/storaged-project/libblockdev/pull/623>. - -Taken from upstream: -https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940 - -diff --git a/src/lib/plugin_apis/vdo.api b/src/lib/plugin_apis/vdo.api ---- a/src/lib/plugin_apis/vdo.api -+++ b/src/lib/plugin_apis/vdo.api -@@ -170,7 +170,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) { - * Deprecated: 2.24: Use LVM-VDO integration instead. - */ - BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) { -- return g_memdup (stats, sizeof (BDVDOStats)); -+ if (stats == NULL) -+ return NULL; -+ -+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1); -+ -+ new_stats->block_size = stats->block_size; -+ new_stats->logical_block_size = stats->logical_block_size; -+ new_stats->physical_blocks = stats->physical_blocks; -+ new_stats->data_blocks_used = stats->data_blocks_used; -+ new_stats->overhead_blocks_used = stats->overhead_blocks_used; -+ new_stats->logical_blocks_used = stats->logical_blocks_used; -+ new_stats->used_percent = stats->used_percent; -+ new_stats->saving_percent = stats->saving_percent; -+ new_stats->write_amplification_ratio = stats->write_amplification_ratio; -+ -+ return new_stats; - } - - GType bd_vdo_stats_get_type () { -diff --git a/src/plugins/vdo.c b/src/plugins/vdo.c ---- a/src/plugins/vdo.c -+++ b/src/plugins/vdo.c -@@ -81,7 +81,22 @@ void bd_vdo_stats_free (BDVDOStats *stats) { - } - - BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) { -- return g_memdup (stats, sizeof (BDVDOStats)); -+ if (stats == NULL) -+ return NULL; -+ -+ BDVDOStats *new_stats = g_new0 (BDVDOStats, 1); -+ -+ new_stats->block_size = stats->block_size; -+ new_stats->logical_block_size = stats->logical_block_size; -+ new_stats->physical_blocks = stats->physical_blocks; -+ new_stats->data_blocks_used = stats->data_blocks_used; -+ new_stats->overhead_blocks_used = stats->overhead_blocks_used; -+ new_stats->logical_blocks_used = stats->logical_blocks_used; -+ new_stats->used_percent = stats->used_percent; -+ new_stats->saving_percent = stats->saving_percent; -+ new_stats->write_amplification_ratio = stats->write_amplification_ratio; -+ -+ return new_stats; - } - -
