Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package btrfsprogs for openSUSE:Factory checked in at 2023-09-01 14:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old) and /work/SRC/openSUSE:Factory/.btrfsprogs.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "btrfsprogs" Fri Sep 1 14:21:55 2023 rev:149 rq:1108408 version:6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2023-08-31 13:42:45.293868804 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsprogs.new.1766/btrfsprogs.changes 2023-09-01 14:22:24.443077267 +0200 @@ -2,46 +1,0 @@ -Mon Aug 28 00:00:00 CEST 2023 - dsterba@suse.cz - -- update to 6.3.3: - * add btrfs-find-root to btrfs.box - * replace: properly enqueue if there's another replace running - * other: - * CI updates, more tests enabled, code coverage, badges - * documentation updates - * build warning fixes - -------------------------------------------------------------------- -Thu Jul 6 13:45:20 UTC 2023 - Dominik Heidler <dheidler@suse.de> - -- Let btrfsprogs-bash-completion conflict with btrfsprogs <= 6.2.1 - as there is a file conflict with the bash completion scripts - still being bundled with btrfsprogs in these versions. - -------------------------------------------------------------------- -Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin <info@paolostivanin.com> - -- update to 6.3.2: - * fix mkfs and others on big endian hosts - * mkfs: don't print changed defaults notice with --quiet - * scrub: fix wrong stats of processed bytes in background and foreground mode - * convert: actually create free-space-tree instead of v1 space cache - * print-tree: recognize and print CHANGING_FSID_V2 flag (for the - metadata_uuid change in progress) - * other: documentation updates -- update to 6.3.1: - * convert: fix checksum of a block relocated from 0-1M range - * qgroup show: fix formatting of limit values in json output - * receive: report paret subovl UUID on errors - * btrfsune: new option --convert-to-free-space-tree to convert from - block-group-tree back to extent tree for block group tracking - * mkfs: make option --rootdir more verbose and report start when filling - from the given directory starts - * experimental: - * btrfstune: checksum switch logic reimplemented, conversion of all - metadata and data now works, resume from various states also supported - * other: - * test updates and fixes - * CI cleanups and old files removed - * integration with Github actions -- Remove patch: btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch (upstreamed) - -------------------------------------------------------------------- Old: ---- btrfs-progs-v6.3.3.tar.gz btrfs-progs-v6.3.3.tar.sign New: ---- btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch btrfs-progs-v6.3.tar.gz btrfs-progs-v6.3.tar.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ btrfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.SC34Zq/_old 2023-09-01 14:22:25.891128949 +0200 +++ /var/tmp/diff_new_pack.SC34Zq/_new 2023-09-01 14:22:25.895129092 +0200 @@ -34,7 +34,7 @@ %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 6.3.3 +Version: 6.3 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0-only @@ -55,6 +55,7 @@ Provides: btrfs-progs(%_arch) = %{version}-%{release} Patch1: mkfs-default-features.patch +Patch2: btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch %if %build_docs BuildRequires: python3-Sphinx @@ -197,8 +198,6 @@ Group: System/Shells Requires: %{name} Requires: bash-completion -# versions below 6.2.1 had bash completion files builtin and will create a file conflict -Conflicts: %{name} <= 6.2.1 %if 0%{?suse_version} >= 1500 Supplements: (%{name} and bash-completion) %else @@ -209,7 +208,9 @@ bash command line completion support for btrfsprogs. %prep -%autosetup -p1 -n btrfs-progs-v%{version} +%setup -q -n btrfs-progs-v%{version} +%patch1 -p1 +%patch2 -p1 %build ./autogen.sh ++++++ btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch ++++++ From ab32c4445d0d14632e5ae717e56d57455eb98294 Mon Sep 17 00:00:00 2001 From: David Sterba <dsterba@suse.com> Date: Fri, 26 May 2023 17:04:11 +0200 Subject: [PATCH] btrfs-progs: qgroup show: fix formatting of limit values in json output There are reports that json output of 'qgroup show' crashes due to internal error when printing the limit values: INTERNAL ERROR: unknown unit base, mode 2304 btrfs(internal_error+0x10a)[0x5605c37ce48a] btrfs(pretty_size_snprintf+0x5c)[0x5605c37d105c] btrfs(fmt_print+0x44e)[0x5605c37d178e] btrfs(+0x7ed1d)[0x5605c3800d1d] btrfs(main+0x8f)[0x5605c379beff] /lib64/libc.so.6(+0x27bb0)[0x7f83924ddbb0] /lib64/libc.so.6(__libc_start_main+0x8b)[0x7f83924ddc79] btrfs(_start+0x25)[0x5605c379d405] common/units.c:82: pretty_size_snprintf: Assertion `0` failed, value 0 btrfs(+0x1d4b1)[0x5605c379f4b1] btrfs(pretty_size_snprintf+0x7b)[0x5605c37d107b] btrfs(fmt_print+0x44e)[0x5605c37d178e] btrfs(+0x7ed1d)[0x5605c3800d1d] btrfs(main+0x8f)[0x5605c379beff] /lib64/libc.so.6(+0x27bb0)[0x7f83924ddbb0] /lib64/libc.so.6(__libc_start_main+0x8b)[0x7f83924ddc79] btrfs(_start+0x25)[0x5605c379d405] This is caused by "size" format that requires the unit mode, but it was not specified and some stack value used. As json prints the raw values, use the plain %llu format. Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1206960 Link: https://bugzilla.opensuse.org/show_bug.cgi?id=1209136#c15 Signed-off-by: David Sterba <dsterba@suse.com> --- cmds/qgroup.c | 4 ++-- tests/cli-tests/005-qgroup-show/test.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmds/qgroup.c b/cmds/qgroup.c index 654fca4bb7d67e..4c66ee0ad5e41f 100644 --- a/cmds/qgroup.c +++ b/cmds/qgroup.c @@ -1439,10 +1439,10 @@ static const struct rowspec qgroup_show_rowspec[] = { { .key = "qgroupid", .fmt = "qgroupid", .out_json = "qgroupid" }, { .key = "referenced", .fmt = "%llu", .out_json = "referenced" }, { .key = "exclusive", .fmt = "%llu", .out_json = "exclusive" }, - { .key = "max_referenced", .fmt = "size", .out_json = "max_referenced" }, + { .key = "max_referenced", .fmt = "%llu", .out_json = "max_referenced" }, /* Special value if limits not set. */ { .key = "max_referenced-none", .fmt = "%s", .out_json = "max_referenced" }, - { .key = "max_exclusive", .fmt = "size", .out_json = "max_exclusive" }, + { .key = "max_exclusive", .fmt = "%llu", .out_json = "max_exclusive" }, /* Special value if limits not set. */ { .key = "max_exclusive-none", .fmt = "%s", .out_json = "max_exclusive" }, { .key = "path", .fmt = "str", .out_json = "path" }, diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 455f2d3c2da101..97e51273aa6929 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -17,6 +17,7 @@ run_mayfail "$TOP/btrfs" --format json qgroup show "$TEST_MNT" run_mayfail $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" run_mayfail $SUDO_HELPER "$TOP/btrfs" --format json qgroup show "$TEST_MNT" run_check $SUDO_HELPER "$TOP/btrfs" quota enable "$TEST_MNT" +run_check $SUDO_HELPER "$TOP/btrfs" qgroup limit 128m "$TEST_MNT" run_mayfail "$TOP/btrfs" qgroup show "$TEST_MNT" run_mayfail "$TOP/btrfs" --format json qgroup show "$TEST_MNT" run_check $SUDO_HELPER "$TOP/btrfs" qgroup show "$TEST_MNT" -- 2.40.0 ++++++ btrfs-progs-v6.3.3.tar.gz -> btrfs-progs-v6.3.tar.gz ++++++ ++++ 34868 lines of diff (skipped)