From 192dfd20f2f9fa618631d542726f51c6474253c5a233c14142fa760555fe1bab Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 2 Nov 2022 11:59:24 +0000
Subject: [PATCH] Accepting request 1032864 from
 home:dsterba:branches:filesystems

- update to 6.0

OBS-URL: https://build.opensuse.org/request/show/1032864
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=374
---
 btrfs-progs-v5.19.1.tar.gz   |   3 ---
 btrfs-progs-v5.19.1.tar.sign | Bin 566 -> 0 bytes
 btrfs-progs-v6.0.tar.gz      |   3 +++
 btrfs-progs-v6.0.tar.sign    | Bin 0 -> 566 bytes
 btrfsprogs.changes           |  25 +++++++++++++++++++
 btrfsprogs.spec              |   2 +-
 mkfs-default-features.patch  |  46 +++++++++++++++++++++--------------
 7 files changed, 57 insertions(+), 22 deletions(-)
 delete mode 100644 btrfs-progs-v5.19.1.tar.gz
 delete mode 100644 btrfs-progs-v5.19.1.tar.sign
 create mode 100644 btrfs-progs-v6.0.tar.gz
 create mode 100644 btrfs-progs-v6.0.tar.sign

diff --git a/btrfs-progs-v5.19.1.tar.gz b/btrfs-progs-v5.19.1.tar.gz
deleted file mode 100644
index 91061be..0000000
--- a/btrfs-progs-v5.19.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8e8b001e5faa5b3f2728d2630dbbbb229c89a6e79d116bb01332da084f1c039
-size 2844289
diff --git a/btrfs-progs-v5.19.1.tar.sign b/btrfs-progs-v5.19.1.tar.sign
deleted file mode 100644
index c26b70ea804ed0af46bff2bf5af4d6523d310817fb0a37742b43b6a588069dfb..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%IR&Z~zJk5XEKH
z`PXe&I~LUt0E%`zRSRJN<t(h<LD-*E_A|Iz+q-~j4~6{85?#jAbn7U0p{2A>&q2bm
zPk65U($a)&0h=cOp2~;OHGemHBGEI5DiClrkb@qQ2jpUw|5GQ;cwwIw-w<uZrq=>s
z%Zv4NM6W>a32m?z=x}&g_X{hdw(dxCwTri%HDzh<OVgc7-(B400kxi$YN5=8-^U9L
zlJB2N*pU;!W*0U(o)e!WoPCKNZT4$VF4-HDA$oq&QvTbrFB?w%LvDJT1S{zu*vx?W
zc13FP6$bbJ9BA4mlzgW>>%fAG46W9C)>@-te{&*Y4_mnqC*!Ge5-BnMphT<}oA9*;
z_7Wf{1eb|eC#rabwVwP}#*<>BEe`ToTc*S)fXBM`oj`F~W2Eifmv;67qfUF=iFJ^p
z_>whanrrbBi@~^sJIm8h<KCQ!b4f4|bk@Tg4g3oa98nTq^+3PZZ_6`|viJZ3;UUbP
zi_(*|BVjugIpq|^=Lw?p<=l@T83im6(^pjAuyE6nlM=h(B+pbpAQKVM&CD6K%&@2A
zHs(#T;WnK-)I`d&1x7kzBxHXzd{H7gFZiUBppz3bwuVS*R0U(^MS@isHzhn6IR1BN
zKb9sQ=8z~wv@TWVy*BOuho%C{3mErq?RQ!<D<wJ%yS}xZOszckbR2Zo-*>E!>Wu46
EbB|#R%>V!Z

diff --git a/btrfs-progs-v6.0.tar.gz b/btrfs-progs-v6.0.tar.gz
new file mode 100644
index 0000000..2a2c32f
--- /dev/null
+++ b/btrfs-progs-v6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99e0912d738ce99d3757ba5580225026052e5252a06ce6b3219d0caabb8f9a03
+size 2845971
diff --git a/btrfs-progs-v6.0.tar.sign b/btrfs-progs-v6.0.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..bffffce804f6f00e06b887ddd8b387c5285ea81a11de6ac63e9713ff7cd201b0
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%JuV*8mC$5XEKH
z`PXe&JLt|2|9gGnR~KI)^K8hC-B$4Lioa5N=4K;>eEzlKXlP`;v6l5aHYfzQ9vuUK
zZlxP7uSkKl;`a+zTO<EyGmSjTPk2>0M=LopI0g4b5W%{5tAVkh(MgGbvFz4l*pzC|
zW%^h1yg8M7GAI+<Yb|&_jcgSId#1874+tPW9@&hoSpVj@_95eyO1h-yerR6Lt@azH
zV9?PRjGxr@+ZQH-Z+em82A!M=@bW|KOi*(#AI&=}WJ}J2QrSfE?rk?qaOBbn(wL0+
zv(LmuhqR%o9fqnXJZIdr<(vWG=>(ZcJXZ22WIqsBrt0b);5gZXBR|Rok@oy|c%aBE
zVHcZxxpr_9JndK}Syv?D(U*_nC{;6-9LDk!))PaYyEH_~tQF7Yy+B}ad!X^DbOxiV
zO-Z*dW~xa)e3qMG38kLH?G2j%W#|wei&m2O^xWg0{{C#tr<siLUV5zvO1uZpbEv?S
z00l<I+AJn3%k;`)GJZqVs^MP6XdYY`?BYpTG?Tt#68R<6Fv6mtOWZms3i}PNc_mqW
zU#AqX9n$12(1PW1rmM~UrNjU80wD;1g(FNLm4J?hOBijFcI}Cg3+&sZhiJjbon$+9
z5LG2#ZOAmK7gVk9&Y6F49c7RjVR7Tutf_u7mu|?P)m;z0sM7&1Uvsh-2vgNuLBTC)
E9n_f<G5`Po

literal 0
HcmV?d00001

diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index d2bf339..18892dc 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Nov  2 00:00:00 CET 2022 - dsterba@suse.cz
+
+- update to 6.0
+  * fi usage: in tabular output, print total size and slack size
+  * mkfs:
+    * option -O now accepts values from -R to unify the interface (-R will
+      continue to work)
+    * zone reset and discard is done in parallel on all devices
+    * removed option --leafsize, deprecated long time ago
+  * corrupt-block: recalculate checksum when changing generation
+  * fixes:
+    * convert: fix reserved range detection and overlaps
+    * mkfs: fix creating files with reserved inode numbers with --rootdir
+    * receive: escape filenames in command attributes
+    * fix extent buffer leaks after transaction abort
+  * experimental:
+    * mkfs: support for block-group-tree (kernel 6.1)
+    * fsverity in send (protocol v3, WIP)
+    * btrfstune -b converts to block-group-tree
+  * other:
+    * cleanups, refactoring
+    * new and updated tests
+    * update documentation
+
 -------------------------------------------------------------------
 Sat Sep 17 16:16:37 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 6bff84b..10c04ac 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -34,7 +34,7 @@
 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut)
 
 Name:           btrfsprogs
-Version:        5.19.1
+Version:        6.0
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0-only
diff --git a/mkfs-default-features.patch b/mkfs-default-features.patch
index 9165df9..0543de6 100644
--- a/mkfs-default-features.patch
+++ b/mkfs-default-features.patch
@@ -11,28 +11,38 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  utils.h |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: btrfs-progs-v5.15/common/fsfeatures.h
+Index: btrfs-progs-v6.0/common/fsfeatures.h
 ===================================================================
---- btrfs-progs-v5.15.orig/common/fsfeatures.h
-+++ btrfs-progs-v5.15/common/fsfeatures.h
-@@ -19,14 +19,20 @@
- 
- #include "kerncompat.h"
+--- btrfs-progs-v6.0.orig/common/fsfeatures.h
++++ btrfs-progs-v6.0/common/fsfeatures.h
+@@ -21,7 +21,9 @@
+ #include <stdio.h>
+ #include "kernel-lib/sizes.h"
  
 +#ifndef BTRFS_MKFS_DEFAULT_NODE_SIZE
  #define BTRFS_MKFS_DEFAULT_NODE_SIZE SZ_16K
 +#endif
-+#ifndef BTRFS_MKFS_DEFAULT_FEATURES
- #define BTRFS_MKFS_DEFAULT_FEATURES 				\
- 		(BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF		\
- 		| BTRFS_FEATURE_INCOMPAT_NO_HOLES		\
- 		| BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)
-+#endif
- 
-+#ifndef BTRFS_MKFS_DEFAULT_RUNTIME_FEATURES
- #define BTRFS_MKFS_DEFAULT_RUNTIME_FEATURES			\
- 	(BTRFS_RUNTIME_FEATURE_FREE_SPACE_TREE)
-+#endif
  
  /*
-  * Avoid multi-device features (RAID56), mixed block groups, and zoned mode
+  * Since one feature can set at least one bit in either
+@@ -44,11 +46,20 @@ struct btrfs_mkfs_features {
+ #define BTRFS_FEATURE_STRING_BUF_SIZE		(160)
+ 
+ static const struct btrfs_mkfs_features btrfs_mkfs_default_features = {
++#ifndef BTRFS_MKFS_DEFAULT_RUNTIME_FEATURES
+ 	.compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE |
+ 			   BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID,
++#else
++	.compat_ro_flags = BTRFS_MKFS_DEFAULT_RUNTIME_FEATURES ,
++#endif
++
++#ifndef BTRFS_MKFS_DEFAULT_FEATURES
+ 	.incompat_flags	 = BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |
+ 			   BTRFS_FEATURE_INCOMPAT_NO_HOLES |
+ 			   BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA,
++#else
++	.incompat_flags = BTRFS_MKFS_DEFAULT_FEATURES ,
++#endif
+ };
+ 
+ /*