Accepting request 1070012 from filesystems

- update to 6.2.1: (forwarded request 1070011 from dsterba)

OBS-URL: https://build.opensuse.org/request/show/1070012
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=138

btrfs-progs-v6.2.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7adda77fac7b58175552032f5ffc729cf983feaa2516fe50a636236201979d9d
+size 2985079

btrfsprogs.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Mar  7 00:00:00 CET 2023 - dsterba@suse.cz
+
+- update to 6.2.1:
+  * fix build with crypto libraries
+  * CI images updated, build tests extended
+- update to 6.2:
+  * receive: fix a corruption when decompressing zstd extents
+  * subvol sync: print total number and deletion progress
+  * accelerated hash algorithm implementations in fallback mode on x86_64
+  * fi mkswapfile: new option --uuid
+  * new global option --log=level to set the verbosity level directly
+  * other:
+    * experimental: update checksum conversion (not usable yet)
+    * build actually requires -std=gnu11
+    * refactor help option formatting, auto wrap long lines
+- spec changes:
+  - drop xmlto, not used anymore
+  - Add patch: check-qgroup-init.diff, fix build on SLE12SP5
+  - use packaged pregenerated documentation on <= SLE15
+  - drop conditional build of udev-rules (SLE12SP5 has version 228)
+  - add missing defattr directive to python package
+
 -------------------------------------------------------------------
 Sat Jan 28 18:29:53 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

btrfsprogs.spec

@@ -17,8 +17,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
@@ -29,12 +27,16 @@
 %endif
 
 # the tarball contains prebuilt documentation
+%if 0%{?suse_version} <= 1590
+%define build_docs	0
+%else
 %define build_docs	1
+%endif
 
 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut)
 
 Name:           btrfsprogs
-Version:        6.1.3
+Version:        6.2.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0-only
@@ -55,6 +57,7 @@ Provides:       btrfs-progs = %{version}-%{release}
 Provides:       btrfs-progs(%_arch) = %{version}-%{release}
 
 Patch1:         mkfs-default-features.patch
+Patch2:         check-qgroup-init.diff
 
 %if %build_docs
 BuildRequires:  python3-Sphinx
@@ -73,27 +76,18 @@ BuildRequires:  libuuid-devel
 %if 0%{?suse_version} > 1500
 BuildRequires:  libzstd-devel
 %endif
+BuildRequires:  libudev-devel
 BuildRequires:  lzo-devel
 BuildRequires:  pkg-config
-%if 0%{?suse_version} >= 1310
-BuildRequires:  suse-module-tools
-%endif
-BuildRequires:  libudev-devel
-BuildRequires:  pkgconfig(udev)
-%if %build_docs
-BuildRequires:  xmlto
-%endif
 BuildRequires:  python-rpm-macros
+BuildRequires:  suse-module-tools
 BuildRequires:  zlib-devel
-%if 0%{?suse_version} >= 1310
+BuildRequires:  pkgconfig(udev)
 Requires(post): coreutils
 Requires(postun):coreutils
-%endif
 Supplements:    filesystem(btrfs)
 Recommends:     btrfsmaintenance
-%if %{package_udev_rules}
 Requires:       btrfsprogs-udev-rules
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -142,9 +136,6 @@ Requires:       libbtrfs0 = %{version}
 This package contains the libraries and headers files for developers to
 build applications to interface with Btrfs.
 
-# 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
@@ -158,7 +149,6 @@ 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
@@ -195,6 +185,7 @@ with Btrfs using libbtrfsutil.
 %prep
 %setup -q -n btrfs-progs-v%{version}
 %patch1 -p1
+%patch2 -p0
 
 %build
 ./autogen.sh
@@ -404,15 +395,14 @@ 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
+%defattr(-, root, root)
 %{python3_sitearch}/*
 
 %changelog

check-qgroup-init.diff

@@ -0,0 +1,15 @@
+Fix build on SLE12SP5 with gcc 4.8 that does not support this way of compound
+intialization. RB_ROOT zeros the pointer, here we rely on the implicit zeroing
+of static variables.
+
+--- check/qgroup-verify.c.orig	2023-03-07 19:50:06.510639004 +0100
++++ check/qgroup-verify.c	2023-03-07 19:50:14.966639036 +0100
+@@ -86,7 +86,7 @@
+ 	unsigned int		rescan_running:1;
+ 	unsigned int		qgroup_inconsist:1;
+ 	u64			scan_progress;
+-} counts = { .root = RB_ROOT };
++} counts;
+ 
+ static LIST_HEAD(bad_qgroups);
+