From bb302924e4b6d75204ec4851e2acae7d134e8cb8b6aa07b8b7b3a31e6257c20f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 9 Mar 2023 16:45:08 +0000 Subject: [PATCH] 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.1.3.tar.gz | 3 --- btrfs-progs-v6.1.3.tar.sign | Bin 566 -> 0 bytes btrfs-progs-v6.2.1.tar.gz | 3 +++ btrfs-progs-v6.2.1.tar.sign | Bin 0 -> 566 bytes btrfsprogs.changes | 23 +++++++++++++++++++++++ btrfsprogs.spec | 32 +++++++++++--------------------- check-qgroup-init.diff | 15 +++++++++++++++ 7 files changed, 52 insertions(+), 24 deletions(-) delete mode 100644 btrfs-progs-v6.1.3.tar.gz delete mode 100644 btrfs-progs-v6.1.3.tar.sign create mode 100644 btrfs-progs-v6.2.1.tar.gz create mode 100644 btrfs-progs-v6.2.1.tar.sign create mode 100644 check-qgroup-init.diff diff --git a/btrfs-progs-v6.1.3.tar.gz b/btrfs-progs-v6.1.3.tar.gz deleted file mode 100644 index 065a826..0000000 --- a/btrfs-progs-v6.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:747d6367cbf88d2a997befe72f49c66339ebfb28ca60880f4f5b4e0ec779bcce -size 2882830 diff --git a/btrfs-progs-v6.1.3.tar.sign b/btrfs-progs-v6.1.3.tar.sign deleted file mode 100644 index 175fec08abc2e5e365cfd8f3b6f6fd5b38bef49c0407113e5d2db571dbc3d2b3..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j-kv=RWtPWv!83>Q|#W!3rDZCE=60%Os4e*g*z5XEKH z`PXe&J6EC*0FTs`cT>+tTk_=*fs+B>COj7_kUtf-ri?Z0(A>V5oWNva7%Qrh#4XGB z{$`rOVn7|UcdpH%=1T%l_;mWLW6n$w2wE4VK!Mupmj9GovU94>2!IN~u1OMM=}(DB zBn8j}udnl~d@p6gj;GT(K6q4lb|JkWfliY)eLU3zUa_+a}>_oIVFCaZ@*>&|az z1Ig1t(k;7yo~uljX8-QS#y>m_`)c7Su5P(nRrU`M#mnHyRy~*3e%_@Z7Nd+*Md7u} zL8M5LDhifEJPzV^-oKok4`XYoR*?T_10&xwEd670R>J_&qN;fC zK3QHIu8ODb^7aJvyKfL9aoy=jN}ZB?!O=}nAoC68;glsP7otAES@;{vHzlUEGHc<> zJJ$#}H;eo=zOQ@R6omc?-)j zRp_RCvf>u)H>eDOw#oCb2AevwOwMKsduGJ;l!dmJknrt*0~wUAAtwc8KBd}E?|2mx zDM;z^zdD^ED65uE+~Rb8>4LXi-Qj|5XUm3_kEJ+h%n`~T*qT%u8?$xQ$ZbAKOzY`whTAd>Q|#W!3rDZCE=60%QUlG5`t*5XEKH z`PXe&J2G<+0E2g5UEB!b^r(8YPAn9|(IO8y$C&}9!+F54q;gWaW%(T9;+U86*~twz z${khLzJq5O1BtQN2R=@}xSD2_%8WKjoU}cDS+rs4$`fqwW>n>Xrck2Rd&&7K>1NF<)LhXD;2~Xk_I*MgF215EW2{AhF3|4do_8#r z%_M0#n@&rgDo8y3Th*$(>gIp(l5OhEZe%Y9Ax|#io_fBk5#G57z43q-W>|vwo^mj@ zY^M%bN7h4~7nRn@oii|do699OqfHM!Z!_jdlXm{4voaM&z9?U2X!H~n>1f8Wu8jGq z08|(7;Z7t4x~1M1+W#{z2uoXUC&gbtKB#ehwI%|%3aOEjB6ZWLfcPOmEbjW*hXH( zLahM|3u|^~3tYa;@`3_PDV`zcMp#LkkI0Ya44S+{D!=a%vw(aKo~$NryGb>u9DHy& E!wP!~WB>pF literal 0 HcmV?d00001 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 0420cbe..f56e948 100644 --- a/btrfsprogs.changes +++ b/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 diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 9425a60..0dea0d2 100644 --- a/btrfsprogs.spec +++ b/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 diff --git a/check-qgroup-init.diff b/check-qgroup-init.diff new file mode 100644 index 0000000..674a548 --- /dev/null +++ b/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); +