Sync from SUSE:SLFO:Main btrfsprogs revision 4618263b432ea174e06c8bf10529dcf1

btrfsprogs.changes

@@ -1,3 +1,194 @@
+-------------------------------------------------------------------
+Thu Apr  3 00:00:00 CEST 2025 - dsterba@suse.cz
+
+- update to 6.14
+  * mkfs:
+    * allow --sectorsize to be 2K for testing purposes of subpage mode (needs
+      the same block size supported by kernel)
+    * fix false error when no compression is requested and lzo is not compiled in
+  * convert: support 2K block size in the source filesystem
+  * defrag: new parameter -L/--level to specify compression levels (kernel 6.15),
+    also supports the realtime levels
+  * subvol delete: show names of recursively deleted child subvolumes
+  * qgroup show: use sysfs to detect up to date consistency status
+  * zoned mode: support zone capacity tracking
+  * other:
+    * CI new and updated workflows
+    * documentation updates
+- spec file:
+  - update subpackage descriptions
+  - drop conditional build of documentation, always use source
+  - drop pre-systemd udev workarounds (version 190)
+
+-------------------------------------------------------------------
+Mon Mar 31 00:00:00 CEST 2025 - dsterba@suse.cz
+
+- update to 6.13
+  * mkfs:
+    * allow --sectorsize to be 2K for testing purposes of subpage mode (needs
+      the same block size supported by kernel)
+    * fix false error when no compression is requested and lzo is not compiled in
+  * convert: support 2K block size in the source filesystem
+  * defrag: new parameter -L/--level to specify compression levels (kernel 6.15),
+    also supports the realtime levels
+  * subvol delete: show names of recursively deleted child subvolumes
+  * qgroup show: use sysfs to detect up to date consistency status
+  * zoned mode: support zone capacity tracking
+  * other:
+    * CI new and updated workflows
+    * documentation updates
+- spec: package btrfs-find-root unconditionally (bsc#1239992)
+- Refresh patches: mkfs-default-features.patch (context)
+
+-------------------------------------------------------------------
+Mon Jan  6 00:00:00 CET 2025 - dsterba@suse.cz
+
+- update to 6.12
+  * subvolume delete: add new option to do recursive subvolume deletion (for
+    regular user delete only accessible subvolumes)
+  * mkfs:
+    * new option --subvol to create subvolumes in given paths, read-write,
+      read-only and default
+    * add hard link detection support for --rootdir option
+  * fixes:
+    * receive: message verbosity fixes
+    * check: fix false positive report of missing checksum for extent holes
+    * check: handle compressed extents when checking tree log
+    * when asking Y/N user questions, flush the terminal so the question is
+      displayed (e.g. btrfstune -S)
+  * other
+    * code refactoring, error handling
+    * python packaging fixes
+    * documentation updates
+    * new tests
+- update to 6.11
+  * check:
+    * check items in tree-log
+    * detect invalid file extent items for symlinks
+    * properly detect inode cache and suggest removal by 'clear-ino-cache'
+  * convert: fix symlink length checks
+  * fi show: remove stray newline at the end of the output
+  * fixes:
+    * open devices in write-exclusive mode in most commands, prevent
+      concurrent mount by other programs
+    * rescue clear-ino-cache: fix subvolume iteration that can fail in some cases
+    * map-logical: fix first extent searching condition
+    * fi resize: warn if new size is below 256M
+  * tree-checker:
+    * slightly stricter file type validation
+    * verify device extent items
+  * other:
+    * documentation updates
+    * ship btrfs-ioctl manual page (incomplete)
+
+-------------------------------------------------------------------
+Thu Aug 15 00:00:00 CEST 2024 - dsterba@suse.cz
+
+- update to 6.10.1
+  * mkfs: rework --rootdir traversal, skip hardlinks and create new inodes
+    instead, also warn about them, this did not work as expected and will be
+    fixed in the future
+  * receive: search in older trees for UUIDs when detecting clone sources
+  * libbtrfsutil: bindings available at https://pypi.org/project/btrfsutil
+  * libbtrfs:
+    * patchlevel version update 0.1.4
+    * cleanup in headers, removed unused definitions, no functional changes
+    * don't ship list.h and rbtree.h
+  * other: documentation updates
+
+-------------------------------------------------------------------
+Wed Jul 31 00:00:00 CEST 2024 - dsterba@suse.cz
+
+- update to 6.10
+  * inspect:
+    * list-chunks: new command to print information about chunks (i.e.
+      the physical chunks as stored on devices), sortable; requires root as
+      it's using SEARCH_TREE ioctl
+    * tree-stats:
+      * new option -t to print only the given tree
+      * add long options for size units
+  * filesystem df: with increased verbosity print per-type information from sysfs
+  * version: print a line with built-in features or options (+FEATURE1 -FEATURE2)
+  * image: document option -s and its potential problems
+  * fixes:
+    * scrub status: user selected base for Rate values
+    * receive: escape special characters in paths and xattrs
+    * dump-tree: escape special characters in paths and xattrs
+    * image: sanitizing filenames did not work properly in all cases
+    * convert: fix displayed restored image path on rollback
+    * tune change csum: do conversion in smaller batches
+  * other:
+    * build fixes for uClibc
+    * build fix for python 3.13
+    * documentation updates
+
+-------------------------------------------------------------------
+Thu Jul  4 00:00:00 CEST 2024 - dsterba@suse.cz
+
+- update to 6.9.2
+  * subvol list: fix accidental trimming of subvolume name
+  * check: revert checking file extent item 'ram_bytes'
+  * libbtrfsutil:
+    * patchlevel version update 1.3.2
+    * fix accidentally closing fd passed to subvolume iterator
+- update to 6.9.1
+  * fix detection of intermediate super block flags (e.g. csum change and
+    other conversions)
+  * raid-stripe-tree support (still experimental):
+    * moved under experimental build flags (mkfs, convert)
+    * format change, removed encoding type; backward incompatible
+  * receive dump: escape special chars in xattr names and values, and clone
+    source path
+  * tune change csum: fix reservation size when starting a transaction
+  * other:
+    * new and updated tests
+    * updated CI images, new reference build targets
+    * cleanups and refactoring
+
+-------------------------------------------------------------------
+Fri Jun 21 13:19:59 UTC 2024 - Dominik Heidler <dheidler@suse.de>
+
+- Let btrfsprogs-bash-completion require btrfsprogs with same version
+  as there is a file conflict with the bash completion scripts
+  still being bundled with btrfsprogs in older versions shipped with 15.6
+
+-------------------------------------------------------------------
+Wed Jun 19 00:00:00 CEST 2024 - dsterba@suse.cz
+
+- update to 6.9
+  * mkfs:
+     * if --force used, don't continue if the mount status cannot be
+       determined (e.g. due to permissions)
+     * fix minimum size calculation on zoned devices, make it work with option -b
+  * check:
+     * option --clear-ino-cache removed (functionality still provided in
+       'rescue' command group)
+     * detect and repair wrong file extent item ram_bytes value
+  * qgroup clear-stale:
+     * sync the filesystem before search to read the up to date state
+     * handle cases where qgroup cannot be deleted due to uncleaned subvolume
+       or when squota is enabled
+  * qgroup show: display status of qgroup regarding the cleaning of the
+    subvolume or if it's squota
+  * receive: fix stream parsing on strict alignment hosts (e.g. ARM v5 or v6)
+  * tune change-csum: fix check of dev-replace status item, continue if no
+    dev-replace in progress
+  * dump-tree: print contents of dev-replace status item
+  * convert: fix extent iteration to handle prealloc/unwritten extents
+  * libbtrfsutil:
+     * patchlevel version update 1.3.1
+     * fix potentially unaligned access to send stream
+     * create library links to all version levels
+  * libbtrfs:
+     * patchlevel version update 0.1.3
+     * fix potentially unaligned access to send stream
+     * create library links to all version levels
+  * build:
+     * fix compatibility with e2fsprogs 1.47.1
+     * fix header file dependency tracking
+  * other:
+     * documentation updates
+
 -------------------------------------------------------------------
 Thu May  2 00:00:00 CEST 2024 - dsterba@suse.cz
 

btrfsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package btrfsprogs
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,6 @@
 #
 
 
-%define udev_with_btrfs_builtin 190
-%define udev_version %(pkg-config --modversion udev)
-%define package_udev_rules %{udev_version} >= %{udev_with_btrfs_builtin}
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 
 # enable building of btrfsprogs-static
@@ -28,13 +25,10 @@
 %define build_static	1
 %endif
 
-# the tarball contains prebuilt documentation
-%define build_docs	0
-
 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut)
 
 Name:           btrfsprogs
-Version:        6.8.1
+Version:        6.14
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0-only
@@ -56,9 +50,6 @@ Provides:       btrfs-progs(%_arch) = %{version}-%{release}
 
 Patch1:         mkfs-default-features.patch
 
-%if %build_docs
-BuildRequires:  python3-Sphinx
-%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  dracut
@@ -88,13 +79,12 @@ Requires(postun):coreutils
 %endif
 Supplements:    filesystem(btrfs)
 Recommends:     btrfsmaintenance
-%if %{package_udev_rules}
 Requires:       btrfsprogs-udev-rules
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Utilities needed to create and maintain btrfs file systems under Linux.
+Utilities needed to create and maintain Btrfs file systems under Linux (btrfs,
+mkfs.btrfs, btrfs-convert, btrfs-image, ...).
 
 %if %build_static
 %package -n btrfsprogs-static
@@ -114,11 +104,12 @@ BuildRequires:  lzo-devel-static
 BuildRequires:  zlib-devel-static
 
 %description -n btrfsprogs-static
-Static build of utilities needed to create and maintain btrfs file systems
+Static build of utilities needed to create and maintain Btrfs file systems
-under Linux. Suitable for limited or rescue environments.
+under Linux (btrfs, mkfs.btrfs, btrfs-convert, btrfs-image, ...).
+Suitable for limited or rescue environments.
 
-Warning: the zlib and lzo libraries are statically linked in and may lack
+Warning: the zlib, lzo and zstd libraries are statically linked in and may lack
-important updates
+important updates as their version is fixed and not linked to system libaries.
 %endif
 
 %package -n libbtrfs0
@@ -126,8 +117,7 @@ Summary:        Library for interacting with Btrfs
 Group:          System/Libraries
 
 %description -n libbtrfs0
-This package contains the libbtrfs.so shared library needed for some
+This package contains the versioned libbtrfs.so shared library.
-applications to interface with btrfs.
 
 %package -n libbtrfs-devel
 Summary:        Include Files and Libraries for developing with Btrfs
@@ -136,33 +126,28 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       libbtrfs0 = %{version}
 
 %description -n libbtrfs-devel
-This package contains the libraries and headers files for developers to
+This package contains the libbtrfs.so shared library and limited API to access
-build applications to interface with Btrfs.
+Btrfs filesystems.
 
-# rpm < 4.6.0 (SLE11 uses 4.4) doesn't support noarch subpackages.
-# Fortunately, it doesn't use systemd either so we can just skip it.
-%if %{package_udev_rules}
 %package udev-rules
 Summary:        Udev rules for configuring btrfs file systems
 Group:          System/Kernel
-Conflicts:      udev < %{udev_with_btrfs_builtin}
 BuildArch:      noarch
 
 %description udev-rules
 This package contains the udev rule file for configuring device mapper
-devices that are components of btrfs file systems.  It is meant to be
+devices that are components of Btrfs filesystems.  It is meant to be
 used with versions of udev that contain the "built-in" btrfs command
 (v190 and newer).  Older versions of udev will call the version of
 "btrfs ready" contained in the btrfsprogs package, which does the right
 thing.
-%endif
 
 %package -n libbtrfsutil1
 Summary:        Utility library for interacting with Btrfs
 Group:          System/Libraries
 
 %description -n libbtrfsutil1
-This package contains the libbtrfsutil.so shared library. This library is
+This package contains the versioned libbtrfsutil.so shared library. This library is
 LGPL unlike libbtrfs.so and can be used by applications to interact with Btrfs
 filesystems.
 
@@ -192,18 +177,17 @@ with Btrfs using libbtrfsutil.
 %package bash-completion
 Summary:        Bash completion for btrfsprogs
 Group:          System/Shells
-Requires:       %{name}
+# older versions had bash completion files builtin and will create a file conflict
+Requires:       %{name} = %{version}
 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)
+Supplements:    (%{name} = %{version} and bash-completion)
 %else
 Supplements:    packageand(%{name}:bash-completion)
 %endif
 
 %description bash-completion
-bash command line completion support for btrfsprogs.
+Command line completion support for bas for utilities from btrfsprogs.
 
 %prep
 %autosetup -p1 -n  btrfs-progs-v%{version}
@@ -213,9 +197,7 @@ bash command line completion support for btrfsprogs.
 
 %configure			\
 			--enable-python	\
-%if !%{build_docs}
 			--disable-documentation	\
-%endif
 %if 0%{?suse_version} <= 1500
 			--disable-zoned	\
 %if 0%{?sle_version} < 150600
@@ -236,14 +218,12 @@ make install		\
 	DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir} \
 	install_python
 
-%if !%{build_docs}
 cd Documentation
 install -m 0755 -d %{buildroot}/%{_mandir}/man5
 install -m 0755 -d %{buildroot}/%{_mandir}/man8
 install -m 0644 *.5 %{buildroot}/%{_mandir}/man5
 install -m 0644 *.8 %{buildroot}/%{_mandir}/man8
 cd ..
-%endif
 
 %if %{build_static}
 make install-static DESTDIR=%{buildroot} prefix=%{_prefix} bindir=%{_sbindir} mandir=%{_mandir} libdir=%{_libdir}
@@ -286,10 +266,7 @@ rm -f module-setup.sh
 install -m 0644 -D %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/dracut-fsck-help.txt
 
 %if 0%{!?for_debugging:1}
-DEBUG_FILES="/sbin/btrfs-find-root
+DEBUG_FILES="/sbin/btrfs-select-super
-  %{_sbindir}/btrfs-find-root
-  %{_mandir}/man8/btrfs-find-root.8
-  /sbin/btrfs-select-super
   %{_sbindir}/btrfs-select-super"
 for file in $DEBUG_FILES; do
   rm -f %{buildroot}$file
@@ -331,6 +308,7 @@ done
 /sbin/btrfstune
 /sbin/btrfsck
 /sbin/mkfs.btrfs
+/sbin/btrfs-find-root
 %endif
 %{_sbindir}/btrfs
 %{_sbindir}/btrfs-convert
@@ -339,6 +317,7 @@ done
 %{_sbindir}/btrfsck
 %{_sbindir}/fsck.btrfs
 %{_sbindir}/mkfs.btrfs
+%{_sbindir}/btrfs-find-root
 %if 0%{?suse_version} < 1310
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
@@ -359,6 +338,7 @@ done
 %{_mandir}/man8/btrfs-check.8%{?ext_man}
 %{_mandir}/man8/btrfs-device.8%{?ext_man}
 %{_mandir}/man8/btrfs-filesystem.8%{?ext_man}
+%{_mandir}/man8/btrfs-find-root.8%{?ext_man}
 %{_mandir}/man8/btrfs-inspect-internal.8%{?ext_man}
 %{_mandir}/man8/btrfs-property.8%{?ext_man}
 %{_mandir}/man8/btrfs-qgroup.8%{?ext_man}
@@ -373,9 +353,6 @@ done
 %{_mandir}/man8/btrfs-select-super.8%{?ext_man}
 
 %if 0%{?for_debugging:1}
-/sbin/btrfs-find-root
-%{_sbindir}/btrfs-find-root
-%{_mandir}/man8/btrfs-find-root.8%{?ext_man}
 /sbin/btrfs-select-super
 %{_sbindir}/btrfs-select-super
 %endif
@@ -415,13 +392,11 @@ done
 %{_libdir}/libbtrfsutil.so
 %{_libdir}/pkgconfig/libbtrfsutil.pc
 
-%if %{package_udev_rules}
 %files udev-rules
 %defattr(-, root, root)
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/64-btrfs-dm.rules
 %{_udevrulesdir}/64-btrfs-zoned.rules
-%endif
 
 %files -n python-btrfsutil
 %{python3_sitearch}/*

mkfs-default-features.patch

@@ -11,13 +11,13 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  utils.h |    4 ++++
  1 file changed, 4 insertions(+)
 
-Index: btrfs-progs-v6.5.3/common/fsfeatures.h
+Index: btrfs-progs-v6.13/common/fsfeatures.h
 ===================================================================
---- btrfs-progs-v6.5.3.orig/common/fsfeatures.h
+--- btrfs-progs-v6.13.orig/common/fsfeatures.h
-+++ btrfs-progs-v6.5.3/common/fsfeatures.h
++++ btrfs-progs-v6.13/common/fsfeatures.h
-@@ -21,7 +21,9 @@
+@@ -22,7 +22,9 @@
- #include <stdio.h>
  #include "kernel-lib/sizes.h"
+ #include "kernel-shared/uapi/btrfs.h"
  
 +#ifndef BTRFS_MKFS_DEFAULT_NODE_SIZE
  #define BTRFS_MKFS_DEFAULT_NODE_SIZE SZ_16K
@@ -25,7 +25,7 @@ Index: btrfs-progs-v6.5.3/common/fsfeatures.h
  
  /*
   * Since one feature can set at least one bit in either
-@@ -44,11 +46,20 @@ struct btrfs_mkfs_features {
+@@ -45,11 +47,20 @@ struct btrfs_mkfs_features {
  #define BTRFS_FEATURE_STRING_BUF_SIZE		(512)
  
  static const struct btrfs_mkfs_features btrfs_mkfs_default_features = {