From 3f1bd56dfdd6b6c9a7718261ba2b1351c732a605eb21e9df168f62331eddf7f6 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 31 Aug 2023 11:42:20 +0000 Subject: [PATCH 1/2] Accepting request 1107777 from filesystems - update to 6.3.3: (forwarded request 1107776 from dsterba) OBS-URL: https://build.opensuse.org/request/show/1107777 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=148 --- ...up-show-fix-formatting-of-limit-valu.patch | 72 ------------------ btrfs-progs-v6.3.3.tar.gz | 3 + btrfs-progs-v6.3.3.tar.sign | Bin 0 -> 566 bytes btrfs-progs-v6.3.tar.gz | 3 - btrfs-progs-v6.3.tar.sign | Bin 566 -> 0 bytes btrfsprogs.changes | 46 +++++++++++ btrfsprogs.spec | 9 +-- 7 files changed, 53 insertions(+), 80 deletions(-) delete mode 100644 btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch create mode 100644 btrfs-progs-v6.3.3.tar.gz create mode 100644 btrfs-progs-v6.3.3.tar.sign delete mode 100644 btrfs-progs-v6.3.tar.gz delete mode 100644 btrfs-progs-v6.3.tar.sign diff --git a/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch b/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch deleted file mode 100644 index 6913969..0000000 --- a/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ab32c4445d0d14632e5ae717e56d57455eb98294 Mon Sep 17 00:00:00 2001 -From: David Sterba -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 ---- - 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 - diff --git a/btrfs-progs-v6.3.3.tar.gz b/btrfs-progs-v6.3.3.tar.gz new file mode 100644 index 0000000..64bcc8e --- /dev/null +++ b/btrfs-progs-v6.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cefae20fe4b52bcf0149e6cd972fc73457b31581a769caafde2136f698f84683 +size 3762548 diff --git a/btrfs-progs-v6.3.3.tar.sign b/btrfs-progs-v6.3.3.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..da87c6b7a4a113a09fb47bf2581f8186eef747ff37081c2b3f0fcb258f8668ab GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%XEuV*m;X5XEKH z`PXe&JC_0v|5WjWEx%*ttYHV_(|Lp>!qqZkI>>1CB*+Z6;`;KEYz?te#tcTP3AC9= zK4CIs7y7TYLc!Wq-MjKaH}*8?5|(mFr=eO-+XK2kso0xSuV>dWY2JC^`oU=+%i`7g zQqOlBw(vs90(_tk&k1_$8eZivO=ZHo4Vfkc_@3(k#GpNWNR<#Sf}_6A3zL9C?e)8? zFigeAucqS1*;qY$@!a)6YtTfyb#}(SGQ5lZAv%_LbCij3YsrpMfn9siqT~$0Jhroz z%Xeln3T3WSKU^8-7u49??V83uY9PJVbh4iy zt3*95T2?}|0O~bu=?ecN_M{{U)R4jtMK}*~E~1qfiaQNtu!pR6mR9U+?0qO*yVz6% zs7zS6_sZ773T3Lk^j-b+`F?wFWL5c$hdvT~d`B!)JTtl-5*(3yAb+jUC7Al_6_<*q ztpqDCLO+Ac*-mU{R;&kf#Ee%;ODOAOAC!98m`~rHhO9&-%VXH>XnnRjh{ti~qb1r0 z^v)K;Wes^!>d=hJE7SRKb?cXm)fF;gnRuA$Vi8Fq!)MC2 zE2qgGID@@3M{2rrXpwUcHiXPQBWJ>wPf#uTfgcBW!^vo_^Mom~ORdH9Q|#W!3rDZCE=60%S^R1ON&N5XEKH z`PXe&J9-rl|48=&bb+w6`47v44y&BX4w->p0TEVsK-QKaTyAVilz>p?Db8gWw2nrW z0EGl`NORm$ub zL0B#lv#gJ)*W2i&PPs&9C?cO4i}xOJhzR!7C8S+@Ci%@K;X^z8B+=73N$yRfz+7b@ zvF4(vY@Cu1t;>V$Peg0DI$6`0oK`7iQx4P6><8)d$dq8u;Ap(Ne@4lhW~H+jjW@Uu zAb@z@`ZxjMFE1POU7k28!G83dp_!%6tQGeTgER#R_ue)lb3sfr1(^pu?#b7JV!4Xt z8TY_|%lZIPEiUbv5;n(mwR_ZI1Kfx2X{PI39tRslZEo;$97yL~0NShGE^_!5`tjF-|aZTT+ogpC~ps zx;D8S3fm&_Y3qFc>??-T6aY6K#g5rp&@#cJH1KqhL;9zdw&C#tWY#3-wH!#Nj`jsr zxo~~q&1Tz}2-5DRjN0R-X!n1={Sr7uFP$vcfp#l%%Kz|N5n~Nb-1np+k{}bM=hHIK zDEXz1KhvFcRD;QA@VMjOSv8|jdBb$ap6V)9L@wMH5}_3q1JJUzBBflRr^~p0Td;_N E`0m3GaR2}S diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 5e2c73b..535af48 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +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 + +- 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 + +- 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) + ------------------------------------------------------------------- Mon May 29 00:00:00 CEST 2023 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 3ea5a16..fc06779 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -34,7 +34,7 @@ %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 6.3 +Version: 6.3.3 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0-only @@ -55,7 +55,6 @@ Provides: btrfs-progs = %{version}-%{release} 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 @@ -198,6 +197,8 @@ Summary: Bash completion for btrfsprogs 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 @@ -208,9 +209,7 @@ Supplements: packageand(%{name}:bash-completion) bash command line completion support for btrfsprogs. %prep -%setup -q -n btrfs-progs-v%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n btrfs-progs-v%{version} %build ./autogen.sh From 19b5c8bb6d30e418ceb0cfe9082b383e8874810c8c40500019fdee02ee461152 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Fri, 1 Sep 2023 12:21:55 +0000 Subject: [PATCH 2/2] Accepting request 1108408 from openSUSE:Factory https://bugzilla.opensuse.org/show_bug.cgi?id=1212217 - ABI break OBS-URL: https://build.opensuse.org/request/show/1108408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=149 --- ...up-show-fix-formatting-of-limit-valu.patch | 72 ++++++++++++++++++ btrfs-progs-v6.3.3.tar.gz | 3 - btrfs-progs-v6.3.3.tar.sign | Bin 566 -> 0 bytes btrfs-progs-v6.3.tar.gz | 3 + btrfs-progs-v6.3.tar.sign | Bin 0 -> 566 bytes btrfsprogs.changes | 46 ----------- btrfsprogs.spec | 9 ++- 7 files changed, 80 insertions(+), 53 deletions(-) create mode 100644 btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch delete mode 100644 btrfs-progs-v6.3.3.tar.gz delete mode 100644 btrfs-progs-v6.3.3.tar.sign create mode 100644 btrfs-progs-v6.3.tar.gz create mode 100644 btrfs-progs-v6.3.tar.sign diff --git a/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch b/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch new file mode 100644 index 0000000..6913969 --- /dev/null +++ b/btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch @@ -0,0 +1,72 @@ +From ab32c4445d0d14632e5ae717e56d57455eb98294 Mon Sep 17 00:00:00 2001 +From: David Sterba +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 +--- + 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 + diff --git a/btrfs-progs-v6.3.3.tar.gz b/btrfs-progs-v6.3.3.tar.gz deleted file mode 100644 index 64bcc8e..0000000 --- a/btrfs-progs-v6.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cefae20fe4b52bcf0149e6cd972fc73457b31581a769caafde2136f698f84683 -size 3762548 diff --git a/btrfs-progs-v6.3.3.tar.sign b/btrfs-progs-v6.3.3.tar.sign deleted file mode 100644 index da87c6b7a4a113a09fb47bf2581f8186eef747ff37081c2b3f0fcb258f8668ab..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%XEuV*m;X5XEKH z`PXe&JC_0v|5WjWEx%*ttYHV_(|Lp>!qqZkI>>1CB*+Z6;`;KEYz?te#tcTP3AC9= zK4CIs7y7TYLc!Wq-MjKaH}*8?5|(mFr=eO-+XK2kso0xSuV>dWY2JC^`oU=+%i`7g zQqOlBw(vs90(_tk&k1_$8eZivO=ZHo4Vfkc_@3(k#GpNWNR<#Sf}_6A3zL9C?e)8? zFigeAucqS1*;qY$@!a)6YtTfyb#}(SGQ5lZAv%_LbCij3YsrpMfn9siqT~$0Jhroz z%Xeln3T3WSKU^8-7u49??V83uY9PJVbh4iy zt3*95T2?}|0O~bu=?ecN_M{{U)R4jtMK}*~E~1qfiaQNtu!pR6mR9U+?0qO*yVz6% zs7zS6_sZ773T3Lk^j-b+`F?wFWL5c$hdvT~d`B!)JTtl-5*(3yAb+jUC7Al_6_<*q ztpqDCLO+Ac*-mU{R;&kf#Ee%;ODOAOAC!98m`~rHhO9&-%VXH>XnnRjh{ti~qb1r0 z^v)K;Wes^!>d=hJE7SRKb?cXm)fF;gnRuA$Vi8Fq!)MC2 zE2qgGID@@3M{2rrXpwUcHiXPQBWJ>wPf#uTfgcBW!^vo_^Mom~ORdH9Q|#W!3rDZCE=60%S^R1ON&N5XEKH z`PXe&J9-rl|48=&bb+w6`47v44y&BX4w->p0TEVsK-QKaTyAVilz>p?Db8gWw2nrW z0EGl`NORm$ub zL0B#lv#gJ)*W2i&PPs&9C?cO4i}xOJhzR!7C8S+@Ci%@K;X^z8B+=73N$yRfz+7b@ zvF4(vY@Cu1t;>V$Peg0DI$6`0oK`7iQx4P6><8)d$dq8u;Ap(Ne@4lhW~H+jjW@Uu zAb@z@`ZxjMFE1POU7k28!G83dp_!%6tQGeTgER#R_ue)lb3sfr1(^pu?#b7JV!4Xt z8TY_|%lZIPEiUbv5;n(mwR_ZI1Kfx2X{PI39tRslZEo;$97yL~0NShGE^_!5`tjF-|aZTT+ogpC~ps zx;D8S3fm&_Y3qFc>??-T6aY6K#g5rp&@#cJH1KqhL;9zdw&C#tWY#3-wH!#Nj`jsr zxo~~q&1Tz}2-5DRjN0R-X!n1={Sr7uFP$vcfp#l%%Kz|N5n~Nb-1np+k{}bM=hHIK zDEXz1KhvFcRD;QA@VMjOSv8|jdBb$ap6V)9L@wMH5}_3q1JJUzBBflRr^~p0Td;_N E`0m3GaR2}S literal 0 HcmV?d00001 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 535af48..5e2c73b 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,49 +1,3 @@ -------------------------------------------------------------------- -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 - -- 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 - -- 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) - ------------------------------------------------------------------- Mon May 29 00:00:00 CEST 2023 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index fc06779..3ea5a16 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -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 = %{version}-%{release} 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 @@ Summary: Bash completion for btrfsprogs 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 @@ Supplements: packageand(%{name}:bash-completion) 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