diff --git a/.gitignore b/.gitignore index 01b8a03..d969006 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,7 @@ xfsprogs-3.1.2.tar.gz /xfsprogs-5.10.0.tar.xz /xfsprogs-5.12.0.tar.xz /xfsprogs-5.12.0.tar.sign +/xfsprogs-5.14.0.tar.sign +/xfsprogs-5.14.0.tar.xz +/xfsprogs-5.14.2.tar.sign +/xfsprogs-5.14.2.tar.xz diff --git a/sources b/sources index 0f62531..17066d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xfsprogs-5.12.0.tar.xz) = d31263529cd5e0aad2b4414aca91f352c6df9de9a241655e43b5592a3ca120efdcfcd8cf84401ebd1b3fcf67027f0923fecc6f961bdaf12fb00c3ac67abd5fe7 -SHA512 (xfsprogs-5.12.0.tar.sign) = 9d7eda04107684e349a9c51d979652d9ba61dec25e52e4c8e284e370aaf7c3ddc12e21ce32d7cfd59a1ce537c9cdb68b01e115ff09c321683856d8247a514f86 +SHA512 (xfsprogs-5.14.2.tar.sign) = 4f61784b4c95b596f8923a54a9a2bcce6381d19c0a8b3728de274797b0bb8a8b73f426f68efde1125416088b4012a2f13c7196b250d914ac3bb576df8c9705d5 +SHA512 (xfsprogs-5.14.2.tar.xz) = cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e diff --git a/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch b/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch index 5a70307..ed4f52b 100644 --- a/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch +++ b/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch @@ -1,5 +1,3 @@ -Index: xfsprogs-5.12.0/man/man8/mkfs.xfs.8 -=================================================================== --- xfsprogs-5.12.0.orig/man/man8/mkfs.xfs.8 +++ xfsprogs-5.12.0/man/man8/mkfs.xfs.8 @@ -203,7 +203,7 @@ December 1901 to January 2038, and quota @@ -20,19 +18,8 @@ Index: xfsprogs-5.12.0/man/man8/mkfs.xfs.8 This feature is only available for filesystems created with the (default) .B \-m finobt=1 option set. -Index: xfsprogs-5.12.0/mkfs/xfs_mkfs.c -=================================================================== --- xfsprogs-5.12.0.orig/mkfs/xfs_mkfs.c +++ xfsprogs-5.12.0/mkfs/xfs_mkfs.c -@@ -12,6 +12,8 @@ - #include "libfrog/topology.h" - #include "libfrog/convert.h" - #include -+#include -+#include - - #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) - #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) @@ -3795,6 +3797,23 @@ cfgfile_parse( cli->cfgfile); } @@ -85,3 +72,14 @@ Index: xfsprogs-5.12.0/mkfs/xfs_mkfs.c platform_uuid_generate(&cli.uuid); progname = basename(argv[0]); setlocale(LC_ALL, ""); +--- xfsprogs-5.14.0/mkfs/xfs_mkfs.c.orig ++++ xfsprogs-5.14.0/mkfs/xfs_mkfs.c +@@ -12,6 +12,8 @@ + #include "libfrog/convert.h" + #include "proto.h" + #include ++#include ++#include + + #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) + #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) diff --git a/xfsprogs.spec b/xfsprogs.spec index a3e900a..859f182 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 5.12.0 -Release: 5%{?dist} +Version: 5.14.2 +Release: 1%{?dist} License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org Source0: http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz @@ -15,6 +15,7 @@ BuildRequires: libtool, gettext, libattr-devel, libuuid-devel BuildRequires: libedit-devel, libblkid-devel >= 2.17-0.1.git5e51568 Buildrequires: lvm2-devel, libicu-devel >= 4.6 BuildRequires: gnupg2, xz, inih-devel +BuildRequires: userspace-rcu-devel Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} Provides: xfsprogs-qa-devel @@ -135,6 +136,10 @@ install -m 0644 %{SOURCE3} %{buildroot}%{mkfsdir} %{_libdir}/*.so %changelog +* Fri Jan 21 2022 Pavel Reichl - 5.14.2-1 +- New upstream release + Related: rhbz#2041525 + * Wed Dec 01 2021 Pavel Reichl - 5.12.0-5 - Add an example of backward compatible conf. file for mkfs Related: rhbz#2026002