diff --git a/.gitignore b/.gitignore index 6fd086a..051e4ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xfsprogs-5.12.0.tar.xz +SOURCES/xfsprogs-5.14.2.tar.xz diff --git a/.xfsprogs.metadata b/.xfsprogs.metadata index 62fe3f9..d6a41b4 100644 --- a/.xfsprogs.metadata +++ b/.xfsprogs.metadata @@ -1 +1 @@ -d6dab1dacfd379795b94ed7540e50f315b2c5dbb SOURCES/xfsprogs-5.12.0.tar.xz +035e552cf4a08d5dbe1330ec1e3e6ceeb21b6bc9 SOURCES/xfsprogs-5.14.2.tar.xz diff --git a/SOURCES/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch b/SOURCES/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch index 5a70307..ed4f52b 100644 --- a/SOURCES/xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch +++ b/SOURCES/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/SOURCES/xfsprogs-5.12.0.tar.sign b/SOURCES/xfsprogs-5.12.0.tar.sign deleted file mode 100644 index 4a6ee60..0000000 --- a/SOURCES/xfsprogs-5.12.0.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJgrAF/AAoJECCuFpLhPd7g/4cP/AqM8sloc3rl3mfFcap8hE4e -2nnokwM09mMKWWgx1REmoUvjpACpy9DRC+4+PfzzyIhfsSCj2fCq8+iNby/62KfZ -j9Y8uvRk21C/y/fQ3GaGIdfCen4HsYHOqv/6c783b4R16VeGQHZ5uybgAdqNunoO -6toarvAdHw4Enj8UNxxrVOaqKgNGgq7JyoqAAdZV2BaculT5yW8kFrVF+qXvr3wk -zR9NzvHjZRBCASsy0/MBXyMFmBha0pw0XEHw3B2XsRTZX3q1gCa3x21Js4iRYE/R -feKCxmzHB7L0/6aPY1YN02xOZTYzYWwu6uLjKV9FOdpgJ+TAWQ6KqGtJwsev0Myr -LaAMK2+VSX/GCm/FV2RNxImF1tKcHVbz9xBzkT35qY3+EOfG3YIgthmOC0h8j9jY -CB2pkS0/fl7yvr88KSU1MC4cIXrxSX8K+s6oSRwWmVcxZ9MDExfBf7UeEk1yyK1X -qUZQdSxyRQnYeXdeMvM1QkLR55q8acJ8e835LaYMW321f4HiH+9T34S4wfTaKuRm -QQ9fOx38YhJ1HMCLJj+8Le48j9q+aXsoApUwRfAlw8l2buSI1WqouLrrSuJ53omk -gkDyoD6CW1fPajRkbs3/QeOf+2HTmTsx0tiP8e4CFDiLPMNV9KQmgHxOBUEZ54TD -eNxPtWveuOqFPVkgtab9 -=tk9A ------END PGP SIGNATURE----- diff --git a/SOURCES/xfsprogs-5.14.2.tar.sign b/SOURCES/xfsprogs-5.14.2.tar.sign new file mode 100644 index 0000000..78995ac --- /dev/null +++ b/SOURCES/xfsprogs-5.14.2.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJhrpYSAAoJECCuFpLhPd7gIH4P/1KdoaOWy77MqSmd5RWVN+D3 +PQTD4YIjPtpLnec/dnX8972jX+WeeT0ydkviOAE3J6gejlHa10S+5SvpXTQLl9Cm +jDbNgLh7bV/mdH9H9RNmNM8xtCMufhO09BLt7O6MyXu1g3T+Np1kaG+hoNtS5oze +fx7r/nh9ZCeCyMRTGrRlso5xNXL92qL9SkgbPWAtTjvvrcsaTkhNrC4o08tyv8BN +oMeZU1IHSiiFXs4RlUtmzZKXVrWiWWJTVOdnb107qNAchghbOivqo9zuoxqtkl2R +Yb3YQfYD7eyGVdXgY6CTGCnE9HEVE3sa/2MjZ1KTWP9ZK/F9gZT2izEF/dtbpV8G +7IdKBpKda7tDKJcUw994HyUiZfYiHVqcTwcPDvK18fKqxd1khSKbhShc3nvjo4P2 +yGSGrDaOp8pkPc3QJrSMYQQAYVWtle9Y2Uj+TDMu8/XJi+pJxbxn5B7XtKlP6MWm +5pNjA4mh3zX63D78NCWa/XimSFUpramlDI1LE9enaUidvdRMg6vMn8XYh4g0uGgP +2Yp1F2Z2VGX0NxrulHowMqxGcgtneC5bZcsJ2GeZ4r6i+p8VIS5ZJjNLZ2p993c8 +w/32yLouC2j+pcKn3Ljwd2aPQBnGO5IK9CWn93PSG7kWvuN8S8RC0MoCH/a/xXCz +Xbg1NICCCVKczfyFtQM7 +=J/Jr +-----END PGP SIGNATURE----- diff --git a/SPECS/xfsprogs.spec b/SPECS/xfsprogs.spec index a3e900a..859f182 100644 --- a/SPECS/xfsprogs.spec +++ b/SPECS/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