diff --git a/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch b/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch index a53b1bf..339c4fe 100644 --- a/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch +++ b/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch @@ -35,14 +35,12 @@ big problems. Signed-off-by: Jeff Mahoney --- - repair/dinode.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 178 insertions(+), 6 deletions(-) + repair/dinode.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 180 insertions(+), 6 deletions(-) -Index: xfsprogs-5.10.0/repair/dinode.c -=================================================================== ---- xfsprogs-5.10.0.orig/repair/dinode.c -+++ xfsprogs-5.10.0/repair/dinode.c -@@ -2179,6 +2179,160 @@ _("Bad %s nsec %u on inode %" PRIu64 ", +--- a/repair/dinode.c ++++ b/repair/dinode.c +@@ -2229,6 +2229,160 @@ } } @@ -203,7 +201,7 @@ Index: xfsprogs-5.10.0/repair/dinode.c /* * returns 0 if the inode is ok, 1 if the inode is corrupt * check_dups can be set to 1 *only* when called by the -@@ -2203,7 +2357,8 @@ process_dinode_int(xfs_mount_t *mp, +@@ -2253,7 +2407,8 @@ * duplicate blocks */ int extra_attr_check, /* 1 == do attribute format and value checks */ int *isa_dir, /* out == 1 if inode is a directory */ @@ -213,10 +211,10 @@ Index: xfsprogs-5.10.0/repair/dinode.c { xfs_rfsblock_t totblocks = 0; xfs_rfsblock_t atotblocks = 0; -@@ -2319,6 +2474,25 @@ process_dinode_int(xfs_mount_t *mp, +@@ -2369,6 +2524,25 @@ * memory and hence invalidated the CRC. */ - if (xfs_sb_version_hascrc(&mp->m_sb)) { + if (xfs_has_crc(mp)) { + int good_uuid = 1; + + if (platform_uuid_compare(&dino->di_uuid, @@ -239,7 +237,7 @@ Index: xfsprogs-5.10.0/repair/dinode.c if (be64_to_cpu(dino->di_ino) != lino) { if (!uncertain) do_warn( -@@ -2329,8 +2503,7 @@ _("inode identifier %llu mismatch on ino +@@ -2379,8 +2553,7 @@ return 1; goto clear_bad_out; } @@ -249,7 +247,7 @@ Index: xfsprogs-5.10.0/repair/dinode.c if (!uncertain) do_warn( _("UUID mismatch on inode %" PRIu64 "\n"), lino); -@@ -2911,7 +3084,8 @@ process_dinode( +@@ -2942,7 +3115,8 @@ #endif return process_dinode_int(mp, dino, agno, ino, was_free, dirty, used, verify_mode, uncertain, ino_discovery, @@ -259,7 +257,7 @@ Index: xfsprogs-5.10.0/repair/dinode.c } /* -@@ -2938,7 +3112,7 @@ verify_dinode( +@@ -2969,7 +3143,7 @@ return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used, verify_mode, uncertain, ino_discovery, @@ -268,7 +266,7 @@ Index: xfsprogs-5.10.0/repair/dinode.c } /* -@@ -2964,5 +3138,5 @@ verify_uncertain_dinode( +@@ -2995,5 +3169,5 @@ return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used, verify_mode, uncertain, ino_discovery, diff --git a/xfsprogs-5.14.2.tar.sign b/xfsprogs-5.14.2.tar.sign deleted file mode 100644 index 78995ac..0000000 --- a/xfsprogs-5.14.2.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------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/xfsprogs-5.14.2.tar.xz b/xfsprogs-5.14.2.tar.xz deleted file mode 100644 index 731e083..0000000 --- a/xfsprogs-5.14.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01ccd3ef9df2837753a5d876b8da84ea957d13d7a461b8c46e8afa4eb09aabc8 -size 1308912 diff --git a/xfsprogs-5.15.0.tar.sign b/xfsprogs-5.15.0.tar.sign new file mode 100644 index 0000000..d52acaa --- /dev/null +++ b/xfsprogs-5.15.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJiTgchAAoJECCuFpLhPd7g9pUP/2WideIFztX/8tbth0KDSCX2 +ugKVNnM76piaFRt70dkYIT7iAfZ8GIvuZi+Yrkyh2ZQhcECHgl7nwT18jZDpp6yH +zmdRmDP1AZ3iAPkRq3BUBiF9LOKxFcs0/aibVf7oNLOJo2vOFCOSDFeOWc8UzgGp +MGQ80VGS7MZTVOO8C6kh/2CnjO7iiU0IbOYAzfeCxT0hv8kPdt4BYIbkoabL9aCv +AlxPMfoswVuznzl22w6rTt+Egw0n/YaWKrAn/bUKt21B4aIu96EhOM7iGvWcVPID +TN68zxItcs2caEXEjJh763iiDxIf6oRUS6SAJoy0AJa7S1CEHPSSpUXwq/FUBdqy +dDgilWG26L+3KCWhYGPs1vC4WqoGZUtakdcm/qgquu8diPADfzrpCizR3iiOSYng +Jm4OU0R/VB5fUlTY9aYRFLzRxaY9ufKklxV8K1dugm0OqOR/1675OSCP+McOV15P +fWSPz10WSQ2xVIqz94+3OuaUFvaAMX6uBo4ZdyO/WNJGsi9pA55nuWZxZPEHQ7KL +shhiGt4xRqfolGcqFr3+BScFDX4mIAEGZM/mTgSf51mvs9gO96fZwzoR4FDZNAX5 +K4DbzpnobVqiJtSZUNSXWUuoFt2mR2oHpizvWovCNz0bJN6V0/iW1NMbBrq9xh3r +89tEY8iKqE1l6XxCBhuU +=fxPf +-----END PGP SIGNATURE----- diff --git a/xfsprogs-5.15.0.tar.xz b/xfsprogs-5.15.0.tar.xz new file mode 100644 index 0000000..7925327 --- /dev/null +++ b/xfsprogs-5.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13d2bf3830eba0027ab558825439dd521f61c7266783d7917213432872e74d56 +size 1303080 diff --git a/xfsprogs-docdir.diff b/xfsprogs-docdir.diff index 61ad312..de26a73 100644 --- a/xfsprogs-docdir.diff +++ b/xfsprogs-docdir.diff @@ -1,13 +1,13 @@ diff --git a/include/builddefs.in b/include/builddefs.in -index fd274ddc66d8..659fb04691ca 100644 +index 0bb364310d78..07775ac2d5e7 100644 --- a/include/builddefs.in +++ b/include/builddefs.in -@@ -60,7 +60,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ +@@ -54,7 +54,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ PKG_INC_DIR = @includedir@/xfs DK_INC_DIR = @includedir@/disk PKG_MAN_DIR = @mandir@ -PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +PKG_DOC_DIR = @datadir@/doc/packages/@pkg_name@ PKG_LOCALE_DIR = @datadir@/locale - - CC = @cc@ + PKG_DATA_DIR = @datadir@/@pkg_name@ + MKFS_CFG_DIR = @datadir@/@pkg_name@/mkfs diff --git a/xfsprogs.changes b/xfsprogs.changes index 34b7fc4..e4e9950 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Apr 26 23:22:02 UTC 2022 - Anthony Iliopoulos + +- update to 5.15.0: + - mkfs: increase the min log size to 64MB when possible + - xfs_scrub: retry items that are ok except for XFAIL + - xfs_scrub: fix xfrog_scrub_metadata error reporting + - mkfs: enable inobtcount and bigtime by default + - mkfs: prevent corruption of suboption string values + - mkfs: document sample configuration file location + - mkfs: add configuration files for a few LTS kernels + - mkfs: add a config file for x86_64 pmem filesystems + - xfs_quota: don't exit on "project" cmd failure + - xfs_repair: don't guess about failure reason in phase6 + - xfs_repair: update 2ndary superblocks after upgrades + - xfs_scrub: fix reporting if we can't open devices + - xfs_scrub: report optional features in version + - libxcmd: use emacs mode for command history editing + - libfrog: always use the kernel GETFSMAP definitions + - mkfs.xfs(8): fix default inode allocator description + - xfs_quota(8): fix up dump and report documentation + - xfs_quota(8): document units in limit command + - misc: add a crc32c self test to mkfs and repair + - libxfs changes merged from kernel 5.15 + ------------------------------------------------------------------- Wed Dec 15 21:02:32 UTC 2021 - Dirk Müller diff --git a/xfsprogs.spec b/xfsprogs.spec index 53ba6bc..d22fa2b 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package xfsprogs # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %endif %define libname libhandle1 Name: xfsprogs -Version: 5.14.2 +Version: 5.15.0 Release: 0 Summary: Utilities for managing the XFS file system License: GPL-2.0-or-later @@ -37,7 +37,7 @@ Source2: %{name}.keyring Source3: module-setup.sh.in Source4: dracut-fsck-help.txt Patch0: xfsprogs-docdir.diff -Patch2: 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch +Patch1: 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel @@ -110,7 +110,7 @@ on xfs filesystems. %prep %setup -q %patch0 -p1 -%patch2 -p1 +%patch1 -p1 %build aclocal -I m4 @@ -189,6 +189,9 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/ %dir %{_dracutmodulesdir}/95suse-xfs/ %{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt %{_dracutmodulesdir}/95suse-xfs/module-setup.sh +%dir %{_prefix}/share/xfsprogs/ +%dir %{_prefix}/share/xfsprogs/mkfs +%{_prefix}/share/xfsprogs/mkfs/* %files -n %{libname} %defattr(-,root,root,755)