From 4702eb2080eb03590f7b3d257bfcc34ae7df8bde650c10b6cceeb81b2c4728c1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 12 Jun 2023 13:24:48 +0000 Subject: [PATCH 1/7] Updating link to change in openSUSE:Factory/btrfsprogs revision 147 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=ae7f9df9609278e0b65a595325e1921e --- ...up-show-fix-formatting-of-limit-valu.patch | 72 ++++++++++++++++++ btrfs-progs-v6.3.1.tar.gz | 3 - btrfs-progs-v6.3.1.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 | 22 ------ btrfsprogs.spec | 4 +- 7 files changed, 78 insertions(+), 26 deletions(-) create mode 100644 btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch delete mode 100644 btrfs-progs-v6.3.1.tar.gz delete mode 100644 btrfs-progs-v6.3.1.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.1.tar.gz b/btrfs-progs-v6.3.1.tar.gz deleted file mode 100644 index cc5b313..0000000 --- a/btrfs-progs-v6.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6456dbe2801a70d7d9b175e1cbcf2b4d9bd20b29058fc190e4d71daac4a1215 -size 3754400 diff --git a/btrfs-progs-v6.3.1.tar.sign b/btrfs-progs-v6.3.1.tar.sign deleted file mode 100644 index e208a8e464b76d11401f1e6929a1a4ad1ba4ad45c3c547c135ec28bfa032d74d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%UZ&qW}sC5XEKH z`PXe&J4BTa|86HCO$eNczkhv$S}UPEY=179x(}@A6V;Brojqu1Bh7xHeI{VwI*>M; z2=g8XE+45rGlD~fqr|(bU1ZCn;xzc4FOh8P6ECUT$SSB;l2!Q+^Fx+Fo#;~?{B$Y z%yb;!J^ysQf(<8;D|e3tI}cgVw>F#noS(KIe-rkPl4q~eJ&A%sL~g$40;vJ*B*UfY zyXfEmI4Kc~M1Ysaz&NbMhbn;AAwvJ-)45R4Olq1+jF3TpE+gDe=PwNfMc|qU(VC@_ z;B@X;zDwaZ@c4T{U=Rvl_$}ZWr?6A1ocglZ?;SdfaPIqGnJskApSc_YM0irQwuQgp z!I$C6a?oW@_Yp#*Z`YA#1f;R>Jb2CA9L%fM>pS3Nr-=j>rZeLOhueUBZ*3QQjW=*G El0``m@Bjb+ diff --git a/btrfs-progs-v6.3.tar.gz b/btrfs-progs-v6.3.tar.gz new file mode 100644 index 0000000..9eb8f62 --- /dev/null +++ b/btrfs-progs-v6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:058685b9f3074a3504edd5b92f7878d6986b1ebe6f681bfedec298caa812ade7 +size 3045903 diff --git a/btrfs-progs-v6.3.tar.sign b/btrfs-progs-v6.3.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..03fd6d477ac4822f9f6c16a71b6431daa29cb8cec064abd8e93064ea996988e3 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#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 7d2b73d..5e2c73b 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 9 00:00:00 CEST 2023 - dsterba@suse.cz - -- 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: - * more CI github actions test coverage - * more kernel/userspace source code sync - * warning fixes - * code cleanups - * documentation updates -- Removed patch: btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch (upstream) - ------------------------------------------------------------------- Mon May 29 00:00:00 CEST 2023 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 833caca..3ea5a16 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -34,7 +34,7 @@ %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 6.3.1 +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 @@ -209,6 +210,7 @@ bash command line completion support for btrfsprogs. %prep %setup -q -n btrfs-progs-v%{version} %patch1 -p1 +%patch2 -p1 %build ./autogen.sh From 7b0cce9f4e286058aebc3cf0df564d620f52104e22112675be9f9444bdcf9d34 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 20 Jun 2023 11:08:45 +0000 Subject: [PATCH 2/7] Accepting request 1093896 from home:polslinux:branches:filesystems - update to 6.3.2: * mkfs: option -R deprecated, options unified in -O (-R still works) * mkfs: fix potential race with udev leading to EBUSY due to repeatedly opened file descriptors * block-group-tree is out of experimental mode * available as 'mkfs.btrfs -O block-group-tree' * btrfstune can do in-place conversion to/from (use with care) * balance: fix recognizing old and new syntax * subvol snapshot: specific error if a failure is caused by an active swapfile * tree-stats: rephrase warning when run on a mounted filesystem * completion: 'filesystem du' also completes files * check: fix docs, help text and warning that --force + --repair works on a mounted filesystem * build: fix static build when static libudev is available * 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 - drop btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch since it has been upstreamed. OBS-URL: https://build.opensuse.org/request/show/1093896 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=397 --- ...up-show-fix-formatting-of-limit-valu.patch | 72 ------------------ btrfs-progs-v6.3.2.tar.gz | 3 + btrfs-progs-v6.3.2.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 | 34 +++++++++ btrfsprogs.spec | 7 +- 7 files changed, 39 insertions(+), 80 deletions(-) delete mode 100644 btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch create mode 100644 btrfs-progs-v6.3.2.tar.gz create mode 100644 btrfs-progs-v6.3.2.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.2.tar.gz b/btrfs-progs-v6.3.2.tar.gz new file mode 100644 index 0000000..8437305 --- /dev/null +++ b/btrfs-progs-v6.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8560f9993f621c7d63e1acbf143b76827954909792bf4ba2ed02f4542675943 +size 3758695 diff --git a/btrfs-progs-v6.3.2.tar.sign b/btrfs-progs-v6.3.2.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..b98d9ca1591941bd05595fed5277384f0235d6945671ac2af0a2ed495c9f7d5f GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%VH#B>)Nu5XEKH z`PXe&I~W%a|8bx9+)dCQG5+~Lb)PNtZF!HUu7C}|EBvX{jJo8Q(%Ne?fDqv{S#%Y~ zRfnsh1SP(ok%zPBt~|_jV@a*U9Kx?oT;FPUa{@C2EdPt;)8a4M@w*!yRPVirr(N}J z^;DVa*Pg!OPiq!;_gqgqRs?QPCRksM%WqYs8c5RO!?rFErmQ}RT%PvkP!aB-X-!$t z3#R$N2?pD+=4Y2#bZ-ijZecwTWz;%h2XO3CvL3UcUo1v&ikR} z5$;znkT?JPjYl#el-xZO3;?>y5~=j`>M9xm#&TZ|#q~udD5Q36 z1KMuHN?I+N)?uZ!5T4>Vum=m}`x6KGVtVc^7$}^FJ}o>OIVtrO9wj_zL8>+qc9jbr zXkKrF<Q|#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..0f9f3fa 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin + +- update to 6.3.2: + * mkfs: option -R deprecated, options unified in -O (-R still works) + * mkfs: fix potential race with udev leading to EBUSY due to repeatedly + opened file descriptors + * block-group-tree is out of experimental mode + * available as 'mkfs.btrfs -O block-group-tree' + * btrfstune can do in-place conversion to/from (use with care) + * balance: fix recognizing old and new syntax + * subvol snapshot: specific error if a failure is caused by an active swapfile + * tree-stats: rephrase warning when run on a mounted filesystem + * completion: 'filesystem du' also completes files + * check: fix docs, help text and warning that --force + --repair works on a + mounted filesystem + * build: fix static build when static libudev is available + * 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 +- drop btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch + since it has been upstreamed. + ------------------------------------------------------------------- Mon May 29 00:00:00 CEST 2023 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 3ea5a16..72285b2 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.2 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 @@ -208,9 +207,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 06304f34a2b674ceff8fc504e190555a5b283e144bfb0e110cc7568c92a080b6 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 20 Jun 2023 11:13:04 +0000 Subject: [PATCH 3/7] chanelog fixup OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=398 --- btrfsprogs.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 0f9f3fa..fb485a5 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -15,6 +15,7 @@ Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin * check: fix docs, help text and warning that --force + --repair works on a mounted filesystem * build: fix static build when static libudev is available +- 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 From 23f8242d9bfcbc6fcf7d196e77cf3d6edbefbaca7a823ccca9452655f535c005 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 20 Jun 2023 16:54:20 +0000 Subject: [PATCH 4/7] fix changelog, add bsc reference OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=399 --- btrfsprogs.changes | 51 ++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index fb485a5..ce99c7b 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -2,36 +2,29 @@ Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin - update to 6.3.2: - * mkfs: option -R deprecated, options unified in -O (-R still works) - * mkfs: fix potential race with udev leading to EBUSY due to repeatedly - opened file descriptors - * block-group-tree is out of experimental mode - * available as 'mkfs.btrfs -O block-group-tree' - * btrfstune can do in-place conversion to/from (use with care) - * balance: fix recognizing old and new syntax - * subvol snapshot: specific error if a failure is caused by an active swapfile - * tree-stats: rephrase warning when run on a mounted filesystem - * completion: 'filesystem du' also completes files - * check: fix docs, help text and warning that --force + --repair works on a - mounted filesystem - * build: fix static build when static libudev is available + * fix mkfs and others on big endian hosts (bsc#1212217) + * 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 -- drop btrfs-progs-qgroup-show-fix-formatting-of-limit-valu.patch - since it has been upstreamed. + * 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 From 9dc051695083dd4d3d424d530349ad6515f5f1a06951b6544c2dfe0c4ea3af8c Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 20 Jun 2023 16:57:44 +0000 Subject: [PATCH 5/7] * fix mkfs and others on big endian hosts OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=400 --- btrfsprogs.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index ce99c7b..949ceec 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -2,7 +2,7 @@ Tue Jun 20 07:12:59 UTC 2023 - Paolo Stivanin - update to 6.3.2: - * fix mkfs and others on big endian hosts (bsc#1212217) + * 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 From 22c8e1899317b2d7529e47385a67b4acc31974282d4a9e4da9e9b44ded89ebf1 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 10 Jul 2023 10:10:41 +0000 Subject: [PATCH 6/7] Accepting request 1097158 from home:dheidler:branches:filesystems - 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. OBS-URL: https://build.opensuse.org/request/show/1097158 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=401 --- btrfsprogs.changes | 7 +++++++ btrfsprogs.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 949ceec..f6d4a92 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 72285b2..863bd27 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -197,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 From c270540db2d6e1ae40a788976a7c05c58be3308dfccacecdc2873cd0c9df25fd Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 28 Aug 2023 14:54:48 +0000 Subject: [PATCH 7/7] Accepting request 1107776 from home:dsterba:branches:filesystems - update to 6.3.3: OBS-URL: https://build.opensuse.org/request/show/1107776 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=402 --- btrfs-progs-v6.3.2.tar.gz | 3 --- btrfs-progs-v6.3.2.tar.sign | Bin 566 -> 0 bytes btrfs-progs-v6.3.3.tar.gz | 3 +++ btrfs-progs-v6.3.3.tar.sign | Bin 0 -> 566 bytes btrfsprogs.changes | 11 +++++++++++ btrfsprogs.spec | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 btrfs-progs-v6.3.2.tar.gz delete mode 100644 btrfs-progs-v6.3.2.tar.sign create mode 100644 btrfs-progs-v6.3.3.tar.gz create mode 100644 btrfs-progs-v6.3.3.tar.sign diff --git a/btrfs-progs-v6.3.2.tar.gz b/btrfs-progs-v6.3.2.tar.gz deleted file mode 100644 index 8437305..0000000 --- a/btrfs-progs-v6.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8560f9993f621c7d63e1acbf143b76827954909792bf4ba2ed02f4542675943 -size 3758695 diff --git a/btrfs-progs-v6.3.2.tar.sign b/btrfs-progs-v6.3.2.tar.sign deleted file mode 100644 index b98d9ca1591941bd05595fed5277384f0235d6945671ac2af0a2ed495c9f7d5f..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%VH#B>)Nu5XEKH z`PXe&I~W%a|8bx9+)dCQG5+~Lb)PNtZF!HUu7C}|EBvX{jJo8Q(%Ne?fDqv{S#%Y~ zRfnsh1SP(ok%zPBt~|_jV@a*U9Kx?oT;FPUa{@C2EdPt;)8a4M@w*!yRPVirr(N}J z^;DVa*Pg!OPiq!;_gqgqRs?QPCRksM%WqYs8c5RO!?rFErmQ}RT%PvkP!aB-X-!$t z3#R$N2?pD+=4Y2#bZ-ijZecwTWz;%h2XO3CvL3UcUo1v&ikR} z5$;znkT?JPjYl#el-xZO3;?>y5~=j`>M9xm#&TZ|#q~udD5Q36 z1KMuHN?I+N)?uZ!5T4>Vum=m}`x6KGVtVc^7$}^FJ}o>OIVtrO9wj_zL8>+qc9jbr zXkKrF<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~ORdH9 diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 863bd27..fc06779 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -34,7 +34,7 @@ %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut) Name: btrfsprogs -Version: 6.3.2 +Version: 6.3.3 Release: 0 Summary: Utilities for the Btrfs filesystem License: GPL-2.0-only