diff --git a/xfs_io-stat-fix-typo-in-statfs-f_flags.patch b/xfs_io-stat-fix-typo-in-statfs-f_flags.patch deleted file mode 100644 index 266e976..0000000 --- a/xfs_io-stat-fix-typo-in-statfs-f_flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 00f71e74694f14eb4fdceafea1f16c984c70c7e8 Mon Sep 17 00:00:00 2001 -From: Jeff Mahoney -Date: Fri, 17 Nov 2017 14:24:01 -0500 -Subject: [PATCH] xfs_io: stat: fix typo in statfs->f_flags - -The field name is f_flags. - -Signed-off-by: Jeff Mahoney ---- - io/stat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/io/stat.c b/io/stat.c -index 060ff833..6ab10abf 100644 ---- a/io/stat.c -+++ b/io/stat.c -@@ -199,7 +199,7 @@ statfs_f( - printf(_("statfs.f_bavail = %lld\n"), (long long) st.f_bavail); - printf(_("statfs.f_files = %lld\n"), (long long) st.f_files); - printf(_("statfs.f_ffree = %lld\n"), (long long) st.f_ffree); -- printf(_("statfs.f_fflags = 0x%llx\n"), (long long) st.f_flags); -+ printf(_("statfs.f_flags = 0x%llx\n"), (long long) st.f_flags); - } - if (file->flags & IO_FOREIGN) - return 0; --- -2.14.2 - diff --git a/xfs_io-stat-treat-statfs.f_flags-as-optional.patch b/xfs_io-stat-treat-statfs.f_flags-as-optional.patch deleted file mode 100644 index f7662ad..0000000 --- a/xfs_io-stat-treat-statfs.f_flags-as-optional.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1c2113fd2f67bad534d75900ca5db0a7826cb8d7 Mon Sep 17 00:00:00 2001 -From: Jeff Mahoney -Date: Fri, 17 Nov 2017 14:39:52 -0500 -Subject: [PATCH] xfs_io: stat: treat statfs.f_flags as optional - -Kernels prior to 2.6.36 didn't contain statfs.f_flags. Distros with -initial releases with kernels prior to this may not have updated -headers with this member. Only attempt to print it if we have the -header with the member defined. - -Signed-off-by: Jeff Mahoney ---- - configure.ac | 1 + - include/builddefs.in | 1 + - io/stat.c | 2 ++ - m4/package_libcdev.m4 | 14 ++++++++++++++ - 4 files changed, 18 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4161c3b4..939d802b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,6 +143,7 @@ AC_HAVE_FSETXATTR - AC_HAVE_MREMAP - AC_NEED_INTERNAL_FSXATTR - AC_HAVE_GETFSMAP -+AC_HAVE_STATFS_FLAGS - - if test "$enable_blkid" = yes; then - AC_HAVE_BLKID_TOPO -diff --git a/include/builddefs.in b/include/builddefs.in -index ec630bd9..13756d79 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -113,6 +113,7 @@ HAVE_FSETXATTR = @have_fsetxattr@ - HAVE_MREMAP = @have_mremap@ - NEED_INTERNAL_FSXATTR = @need_internal_fsxattr@ - HAVE_GETFSMAP = @have_getfsmap@ -+HAVE_STATFS_FLAGS = @have_statfs_flags@ - - GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall - # -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl -diff --git a/io/stat.c b/io/stat.c -index 6ab10abf..1ca5b0d6 100644 ---- a/io/stat.c -+++ b/io/stat.c -@@ -199,7 +199,9 @@ statfs_f( - printf(_("statfs.f_bavail = %lld\n"), (long long) st.f_bavail); - printf(_("statfs.f_files = %lld\n"), (long long) st.f_files); - printf(_("statfs.f_ffree = %lld\n"), (long long) st.f_ffree); -+#ifdef HAVE_STATFS_FLAGS - printf(_("statfs.f_flags = 0x%llx\n"), (long long) st.f_flags); -+#endif - } - if (file->flags & IO_FOREIGN) - return 0; -diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 -index fa5b6397..bc395acd 100644 ---- a/m4/package_libcdev.m4 -+++ b/m4/package_libcdev.m4 -@@ -297,3 +297,17 @@ AC_DEFUN([AC_HAVE_GETFSMAP], - AC_MSG_RESULT(no)) - AC_SUBST(have_getfsmap) - ]) -+ -+AC_DEFUN([AC_HAVE_STATFS_FLAGS], -+ [ -+ AC_CHECK_TYPE(struct statfs, -+ [ -+ AC_CHECK_MEMBER(struct statfs.f_flags, -+ have_statfs_flags=yes,, -+ [#include ] -+ ) -+ ],, -+ [#include ] -+ ) -+ AC_SUBST(have_statfs_flags) -+ ]) --- -2.14.2 - diff --git a/xfsprogs-4.13.1.tar.sign b/xfsprogs-4.13.1.tar.sign deleted file mode 100644 index 58d7e84..0000000 --- a/xfsprogs-4.13.1.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAABAgAGBQJZywnKAAoJECCuFpLhPd7gIQUP/0LWah3X8XchXnPn1FlmVR5C -OL/hhPzwBfF7HmWd27hbn/GIBAEkSeIXc2QRJAkXg+Zpq2s6p4qM149SW6MmUgAy -F3xa/D0sVZez6jnO4vBvKJ2XeKeINaBlM/9IyWIPXzXm2LsvC9Z1AHe0w0TzQG8U -8HHXsXzqIQk4vyipldH22KRrXUPUn4Bdys3plQldGjke5QvoEDrNuRLTwOkxacAF -swuZaUIhQz4XSGTrnRGXbHRDA9QIcf3vwK9Vl3UeKnuMAJ/G9H6Bb7OuKH/Gdtin -8EzjfOU7HOvvWTWVzoy9WdCIfQNW0R/vchRS3ivY2VT5FnnH9wD72DC14qsMD1gB -QdawrYozk9gWR5FEF1FszUjNRkHMPAPm3HkXYFz0hOySabEWdqOJnN4NjIElMdTV -OAz9NtrKb2BjqD/hO6iI+h0f+0bAygMuB9RcLlWk2rYVbWUSwr1WBxLte3x7egN6 -vAQM7pNBCgjDpaaHJFCQ7VE92uE4iTELiN514Q797TKD7z+UxiZs2ipZzdAaT4O1 -wK2pkkdcVicV3XkILVHZl8szmF30sUb3WsTazUgZPRbqryw6t4qA2liow+qzLc+d -d3wKmD8yM8JTT0XcsVX+qyw1oNZtRYIuS4bIHep/4XKwAHx2zHVK8B3Dl7Aoscah -BTOvcClfvuDSVGD6/egX -=iocA ------END PGP SIGNATURE----- diff --git a/xfsprogs-4.13.1.tar.xz b/xfsprogs-4.13.1.tar.xz deleted file mode 100644 index f7d4857..0000000 --- a/xfsprogs-4.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c64d349d191e24c84eeb1611be767e4a11b81016bd5b73f3a20a0bf39dd3536 -size 1133556 diff --git a/xfsprogs-4.14.0.tar.sign b/xfsprogs-4.14.0.tar.sign new file mode 100644 index 0000000..0878651 --- /dev/null +++ b/xfsprogs-4.14.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJaHEVNAAoJECCuFpLhPd7gJZ4QALgMWM2JEGa0Y9QewhV/HdC7 +X5lRWXsRnHB31yPg/Uc1uP/yWrbOnvaHCfgnEHUikbCPuymAyI1C0m2gICDa1e66 +udtEHUgSv1TUtbooS52TrbCHEo9IFVNkfvWFVg2dwYgydtr4z+Fq2AbCe2Fk+Y1d +UrHfQYPMgJ/1x1DKHuol/i9CtwJPWbFmWrLcoNixnasSFPiyj4UiF1C7k/7tdKZC +lQaWkul9vwNesbarAIOzl8DlQYSEUrTv8vSAVy1fHek665cKDsQiXtb4LDt+6hdN +Nx9xGIGcwsMi28RA4aE2hra/WDXs420G2pSYA3W5Hd5R+4Qk9X3rXIi5lkoB60rp +BSD5TfsmJJFpnRw6bkf9Jhit3TjDIK286rN+LFCo2g0oepysbnSi4S2jDER5u7wp ++51js1UlB9ormDl09QeIBa+IMVRkolmbM5X/gEd7WX1YZTZYldvaDn432AjyJ0io +b8xYqcULgYchkyNi8mLzV7YlWJaHCJUNl1CGN+SeBRKlvquXZnTuthgXVaZh0i1r +2TgJFIYvVixeC/VLZIu1W9UWggap0zIiwYIcP63WLYUCyvbqF8Xl7eK/fQsmK8Ab +Lz6n4t04u6cpFAk7w6X4DW9zUrQYblyk2fYmcGsMOU5e1D7ZGRba4eTdjYDAY3Yx +JdiUGqrIKYfvj1NdLaye +=rvCY +-----END PGP SIGNATURE----- diff --git a/xfsprogs-4.14.0.tar.xz b/xfsprogs-4.14.0.tar.xz new file mode 100644 index 0000000..56930fe --- /dev/null +++ b/xfsprogs-4.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec +size 1137048 diff --git a/xfsprogs-docdir.diff b/xfsprogs-docdir.diff index e574862..61ad312 100644 --- a/xfsprogs-docdir.diff +++ b/xfsprogs-docdir.diff @@ -1,7 +1,7 @@ -Index: include/builddefs.in -=================================================================== ---- include/builddefs.in.orig -+++ include/builddefs.in +diff --git a/include/builddefs.in b/include/builddefs.in +index fd274ddc66d8..659fb04691ca 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in @@ -60,7 +60,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ PKG_INC_DIR = @includedir@/xfs DK_INC_DIR = @includedir@/disk diff --git a/xfsprogs.changes b/xfsprogs.changes index b33d687..7ed0931 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Tue Dec 19 17:12:09 UTC 2017 - lurodriguez@suse.com + +- Deletes already merged xfs_io-stat-fix-typo-in-statfs-f_flags.patch +- Deletes already merged xfs_io-stat-treat-statfs.f_flags-as-optional.patch +- Refreshes patch xfsprogs-docdir.diff +- Update to v4.14.0: + * xfs_io: stat: treat statfs.f_flags as optional + * xfs_io: stat: fix typo in statfs->f_flags + * xfsprogs: fix wrong variable types in pwrite/pread code + * xfs_io: Allow partial writes + * xfs_io: Add RWF_NOWAIT to pwritev2() + * xfs_io: Add support for pwritev2() + * xfs_io: Disable -V if pwritev is not available + * xfs_repair: always release btree buffers when refcountbt checks fail + * misc: fix ubsan warnings + * misc: enable thread sanitizer if the builder wants it + * misc: enable gcc/clang address sanitizer if the builder wants it + * misc: enable ubsan if the builder wants it + * xfs_repair: fix cowextsize field checking and repairing + * xfs_repair: clear DAX flag from non-file inodes + * xfs_repair: fix bag memory overwrite problems + * xfs_io: add new error injection knobs to inject command + * xfsprogs: explicitly cast troublesome types to match printf format specifiers + * db: increase metadump's default overly long extent discard threshold + * build: define _DEFAULT_SOURCE with _BSD_SOURCE for preadv + * xfsprogs: add xfs_spaceman to .gitignore + * xfs_io: report io error for pwrite -W and -w + * xfs_metadump: zap stale data in DIR2_LEAF1 dirs + * metadump: update manpage for dirty log/obfuscation issue + * kill off u_int*_t types + * xfs: trim writepage mapping to within eof + * xfs: handle error if xfs_btree_get_bufs fails + * xfs: Fix bool initialization/comparison + * xfs: Don't log uninitialised fields in inode structures + * xfs: revert "xfs: factor rmap btree size into the indlen calculations" + * xfs: perag initialization should only touch m_ag_max_usable for AG 0 + * xfs: fix compiler warnings + * xfs: simplify the rmap code in xfs_bmse_merge + * xfs: use xfs_iext_*_extent helpers in xfs_bmap_split_extent_at + * xfs: use xfs_iext_*_extent helpers in xfs_bmap_shift_extents + * xfs: move some code around inside xfs_bmap_shift_extents + * xfs: use xfs_iext_get_extent in xfs_bmap_first_unused + * xfs: switch xfs_bmap_local_to_extents to use xfs_iext_insert + * xfs: add a xfs_iext_update_extent helper + * xfs: relog dirty buffers during swapext bmbt owner change + * xfs: skip bmbt block ino validation during owner change + * xfs: don't log dirty ranges for ordered buffers + * xfs: remove the ip argument to xfs_defer_finish + * xfs: rename xfs_defer_join to xfs_defer_ijoin + * xfs: refactor xfs_trans_roll + * xfs: stop searching for free slots in an inode chunk when there are none + ------------------------------------------------------------------- Fri Nov 17 19:46:15 UTC 2017 - jeffm@suse.com diff --git a/xfsprogs.spec b/xfsprogs.spec index 46296a7..e2ea4a5 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -19,7 +19,7 @@ %define _dracutmodulesdir %{_libexecdir}/dracut/modules.d Name: xfsprogs -Version: 4.13.1 +Version: 4.14.0 Release: 0 Summary: Utilities for managing the XFS file system License: GPL-2.0+ @@ -31,8 +31,6 @@ Source2: %{name}.keyring Source3: module-setup.sh.in Source4: dracut-fsck-help.txt Patch0: xfsprogs-docdir.diff -Patch1: xfs_io-stat-fix-typo-in-statfs-f_flags.patch -Patch2: xfs_io-stat-treat-statfs.f_flags-as-optional.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel @@ -79,10 +77,8 @@ want to install xfsprogs. %prep %setup -q %if 0%{?suse_version} -%patch0 +%patch0 -p1 %endif -%patch1 -p1 -%patch2 -p1 %build aclocal -I m4