diff --git a/make_xfs_scrub_interp_explicit.patch b/make_xfs_scrub_interp_explicit.patch new file mode 100644 index 0000000..6784840 --- /dev/null +++ b/make_xfs_scrub_interp_explicit.patch @@ -0,0 +1,10 @@ +diff --git a/scrub/xfs_scrub_all.in b/scrub/xfs_scrub_all.in +index fff05da3ea7a..80f07d5c8b02 100644 +--- a/scrub/xfs_scrub_all.in ++++ b/scrub/xfs_scrub_all.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + + # Run online scrubbers in parallel, but avoid thrashing. + # diff --git a/xfs_io-fix-copy_file_range-symbol-name-collision.patch b/xfs_io-fix-copy_file_range-symbol-name-collision.patch deleted file mode 100644 index 7ff9ecf..0000000 --- a/xfs_io-fix-copy_file_range-symbol-name-collision.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Darrick J. Wong -Subject: xfs_io: fix copy_file_range symbol name collision -References: bsc#1079756 -Patch-mainline: https://www.spinics.net/lists/linux-xfs/msg15553.html - -glibc 2.27 has a copy_file_range wrapper, so we need to change our -internal function out of the way to avoid compiler warnings. - -Reported-by: fredrik@crux.nu -Signed-off-by: Darrick J. Wong -Acked-by: Jeff Mahoney ---- - io/copy_file_range.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/io/copy_file_range.c b/io/copy_file_range.c -index d1dfc5a..99fba20 100644 ---- a/io/copy_file_range.c -+++ b/io/copy_file_range.c -@@ -42,13 +42,18 @@ copy_range_help(void) - ")); - } - -+/* -+ * Issue a raw copy_file_range syscall; for our test program we don't want the -+ * glibc buffered copy fallback. -+ */ - static loff_t --copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) -+copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len) - { - loff_t ret; - - do { -- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); -+ ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, -+ len, 0); - if (ret == -1) { - perror("copy_range"); - return errno; -@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv) - copy_dst_truncate(); - } - -- ret = copy_file_range(fd, &src, &dst, len); -+ ret = copy_file_range_cmd(fd, &src, &dst, len); - close(fd); - return ret; - } --- -To unsubscribe from this list: send the line "unsubscribe linux-xfs" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - - diff --git a/xfsprogs-4.14.0.tar.sign b/xfsprogs-4.14.0.tar.sign deleted file mode 100644 index fc3bbc5..0000000 --- a/xfsprogs-4.14.0.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------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 deleted file mode 100644 index 73eb5ae..0000000 --- a/xfsprogs-4.14.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec -size 1137048 diff --git a/xfsprogs-4.15.0.tar.sign b/xfsprogs-4.15.0.tar.sign new file mode 100644 index 0000000..a192c54 --- /dev/null +++ b/xfsprogs-4.15.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJakHKIAAoJECCuFpLhPd7g0xQP/1yGTPQyBg27fSycuRhRLOJo +Ymm+oS7yMIvO1mL8N3ZP/JtUXGtf/rHqbyc9OlEY0tNi+wQba09JLT8x5T+/Ht0L +/12D0jBaHrLqwuaQ22fYZ0nUrUKOpXJRbn5sh8Iwy3Y8P85xThkRpFJaMihMcTf2 +ehOz8PQ51Xz48YUM8yCoCsj758JGxvCY7awu8A4THZwUscBz9u8fQcHCL0Ku+Zik +pmcoDBxYuGgUvmSoNiJUr0E1Cy/uG3HEhOQmu1PbJLWLKMSMHJLvbI6FkGdSm4U9 +9HcTNkDZW04sY1cVofdphq6mooLkgeraE4vzadgxKBnnlPeVwSAhBECXG0ftyRT5 +CvYQ2GBrIxJuFXPxk97dTvQngANRrcJktUrv13c4cGg3d31zX1rtM/jqWGbSZxAX +Lm3Fl7vWAjSzwh+hBZokR6rLBaGYtRbwUuEsVEKUx58NZihv0Uo2kxPkBVBsDXbq +zD5UtNTF0QaMXPwaQ0YCVFH3t9OcaQU/ObsDAJDktCG/z6jWZFfA1CrclzMtsdlw +Sov5BbH6Kqxq+xn9sPmeOrnbU/a+/n/t5xDn2NfC2bhni5Ysdqy1VWJk8PKhhPbN +yn99F3IbV9sBxqQmWhrg52h4ImsnQ5QdtK7PMF8Pl2uijUIwPzP2vBWHOvrcpdSE +wfbirtQmJIjFbmL2Gehj +=Dozw +-----END PGP SIGNATURE----- diff --git a/xfsprogs-4.15.0.tar.xz b/xfsprogs-4.15.0.tar.xz new file mode 100644 index 0000000..5b62f33 --- /dev/null +++ b/xfsprogs-4.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17209a9b2aeb801b960cc4900f8a69e618da2ba1fbfe0131416a827a576cbf80 +size 1186416 diff --git a/xfsprogs.changes b/xfsprogs.changes index 77bc145..9d9b6ed 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,268 @@ +------------------------------------------------------------------- +Sat Feb 24 01:18:02 UTC 2018 - lurodriguez@suse.com + +- drops drop xfs_io-fix-copy_file_range-symbol-name-collision.patch, + this is now part of this release. +- adds make_xfs_scrub_interp_explicit.patch, rpm lint complains about + using env python, when this is used the dependency checker for rpm + will not be able to resolve dependencies correctly, so an explicit + interpreter is needed. +- Update to v4.15.0: + * Fix spelling mistake in mkfs lazy superblock diagnostic + * Fix grammar and spelling in strings and man pages + * Add xfs_scrub_fail systemd service file docs entry + * Update .gitignore list for generated scrub cron file + * Several updates to use more modern Debian packaging + * xfsprogs: Release v4.15.0-rc1 + * xfs_scrub: refactor outcome display into a separate helper + * xfs_scrub: always init phase information + * xfs_scrub: reclassify some of the warning messages + * xfs_scrub: reclassify runtime errors + * xfs_scrub: classify lack of ioctl support as a runtime error + * xfs_scrub: remove preen mode + * xfs_mdrestore: Don't rewind source file stream + * xfs_mdrestore: Add -i option to built-in help + * xfs_io: fix copy_file_range symbol name collision + * xfs_scrub: kill dead code + * xfs_scrub: close dir_fd if we don't get a DIR pointer + * mkfs: don't create realtime filesystems with reflink enabled + * xfs_scrub: handle scrub-only kernels more helpfully + * xfs_scrub: wire up repair ioctl + * debian/control: remove nonexistent libreadline5-dev build dependency + * xfs_scrub: integrate services with systemd + * xfs_scrub: create a script to scrub all xfs filesystems + * xfs_scrub: progress indicator + * xfs_scrub: fstrim the free areas if there are no errors on the filesystem + * xfs_scrub: check summary counters + * xfs_scrub: optionally use SCSI READ VERIFY commands to scrub data blocks on disk + * xfs_scrub: scrub file data blocks + * xfs_scrub: create infrastructure to read verify data blocks + * xfs_scrub: create a bitmap data structure + * xfs_scrub: warn about normalized Unicode name collisions + * xfs_scrub: warn about suspicious characters in directory/xattr names + * xfs_scrub: check directory connectivity + * xfs_scrub: scan inodes + * xfs_scrub: thread-safe stats counter + * xfs_scrub: scan filesystem and AG metadata + * xfs_scrub: wrap the scrub ioctl + * xfs_scrub: filesystem counter collection functions + * xfs_scrub: add file space map iteration functions + * xfs_scrub: add space map iteration functions + * xfs_scrub: add inode iteration functions + * xfs_scrub: find XFS filesystem geometry + * xfs_scrub: create an abstraction for a block device + * xfs_scrub: figure out how many threads we're going to need + * xfs_scrub: dispatch the various phases of the scrub program + * xfs_scrub: set up command line argument parsing + * xfs_scrub: common error handling + * xfs_scrub: create online filesystem scrub program + * mkfs: more sunit/swidth sanity checking + * mkfs: always explain why numeric inputs are invalid + * mkfs: don't call values 'illegal', they're invalid + * mkfs: don't crash on dswidth overflow + * misc: ubsan fixes + * xfs_db: interpret inode timestamps as signed integers + * xfsprogs: update dead urls + * xfs_copy: accept CRC version of ABTB_MAGIC in ASSERT + * xfs_logprint: fix v3 inode formatting + * libxfs: use a memory zone for log items + * libxfs: use a memory zone for transactions + * libxfs: remove unused buf_fsprivate3 + * xfs: add a proper transaction pointer to struct xfs_buf + * xfs: remove wrappers around b_fspriv + * find-api-violations: fix a broken grep pattern + * xfs_repair: fix libxfs namespace problems + * xfs_db: fix crash when field list selector string has trailing slash + * xfs_db: check should deal with cow staging extents correctly + * libhandle: zap fdhash in fshandle_destroy + * xfs_io: add a new 'log_writes' command + * xfs_io: add MAP_SYNC support to mmap() + * mkfs: do not allow both "dev" and "name" subopts for log or realtime + * mkfs: pass switch case value directly into getnum/getstr + * mkfs: un-document removed logarithm based CLI options + * mkfs: remove logarithm based CLI options + * mkfs: resolve sector size CLI conflicts + * mkfs: convert subopt name, val pairs to enums and declared arrays + * mkfs: support arbitrary conflict specification + * mkfs: protofile only needs to be set up once + * mkfs: simplify minimum log size calculation + * mkfs: use opts parameter during option parsing + * mkfs: remove use-once default macros + * mkfs: document sb_feat_args members + * mkfs: invert project id width boolean name + * mkfs: remove unused m_uuid in sb_feat_args + * mkfs: Don't emit default config message yet + * Merge branch 'libxfs-4.15-sync' into for-next + * xfs: only skip rmap owner checks for unknown-owner rmap removal + * xfs: always honor OWN_UNKNOWN rmap removal requests + * xfs: queue deferred rmap ops for cow staging extent alloc/free in the right order + * xfs: move xfs_iext_insert tracepoint to report useful information + * xfs: account for null transactions in bunmapi + * xfs: hold xfs_buf locked between shortform->leaf conversion and the addition of an attribute + * xfs: add the ability to join a held buffer to a defer_ops + * xfs: refactor buffer logging into buffer dirtying helper + * xfs: remove "no-allocation" reservations for file creations + * xfs: fix leaks on corruption errors in xfs_bmap.c + * libxfs: libxfs_nproc should never return negative numbers + * mkfs: tidy up definitions + * mkfs: move error functions + * mkfs: cleanup redundant temporary code + * mkfs: factor log size calculations + * mkfs: factor initial mount setup + * mkfs: rework imaxpct calculation + * mkfs: factor AG alignment + * mkfs: factor AG geometry calculations + * mkfs: factor rt device validation + * mkfs: factor log device validation + * mkfs: factor data device validation + * mkfs: factor device opening + * mkfs: rework stripe calculations + * mkfs: factor rtdev extent size validation + * mkfs: fix hidden parameter in DTOBT() + * mkfs: factor out device size calculations + * mkfs: factor inode size validation + * mkfs: factor directory blocksize validation + * mkfs: factor superblock feature validation + * mkfs: factor log sector size validation + * mkfs: factor blocksize validation + * mkfs: factor sectorsize validation + * mkfs: rename top level CLI parameters + * mkfs: introduce default configuration structure + * mkfs: factor secondary superblock updates + * mkfs: factor writing AG headers + * mkfs: factor out device preparation + * mkfs: factor in memory superblock setup + * mkfs: factor printing of mkfs config + * mkfs: Introduce mkfs configuration structure + * mkfs: factor sector subopts parser + * mkfs: factor rt subopts parser + * mkfs: factor naming subopts parser + * mkfs: factor meta subopts parser + * mkfs: factor log subopts parser + * mkfs: factor inode subopts parser + * mkfs: factor data subopts parser + * mkfs: factor block subopts parser + * mkfs: add generic subopt parsing table + * mkfs: introduce a structure to hold CLI options + * mkfs: make subopt table const + * mkfs: disallow specifying the sector size of internal log + * xfs_db: add missing padding fields + * xfs_db: print structure padding fields consistently + * xfs_repair: remove old workqueue stuff in favor of libfrog code + * libhandle: add missing destructor + * libfrog: add missing function fs_table_destroy + * libfrog: move paths.c out of libxcmd + * libfrog: move conversion factors out of libxcmd + * libfrog: move topology code out of libxcmd + * libfrog: create a threaded workqueue + * libfrog: promote avl64 code from xfs_repair + * libfrog: move list_sort out of libxfs + * libfrog: add bit manipulation functions + * libfrog: move libxfs_log2_roundup to libfrog + * libfrog: move all the userspace support stuff into a new library + * man: describe the metadata scrubbing ioctl + * xfs_io: provide an interface to the scrub ioctls + * xfs_io: add buf_lru_ref tag to inject table + * xfs_io: pull xfs errortag definitions from libxfs + * xfs_io: implement ranged fiemap query + * xfs_io: fix gcc-7 related printf warnings + * Merge branch 'libxfs-4.15-sync' into for-next + * xfs: abstract out dev_t conversions + * xfs: fix memory leak in xfs_iext_free_last_leaf + * xfs: fix type usage + * xfs: remove u_int* type usage + * xfs: handle zero entries case in xfs_iext_rebalance_leaf + * xfs: add comments documenting the rebalance algorithm + * xfs: trivial indentation fixup for xfs_iext_remove_node + * xfs: remove a superflous assignment in xfs_iext_remove_node + * xfs: add some comments to xfs_iext_insert/xfs_iext_insert_node + * xfs: fix number of records handling in xfs_iext_split_leaf + * xfs: mark xfs_btree_check_lblock and xfs_btree_check_ptr static + * xfs: move xfs_bmbt_irec and xfs_exntst_t to xfs_types.h + * xfs: pass struct xfs_bmbt_irec to xfs_bmbt_validate_extent + * xfs: remove the nr_extents argument to xfs_iext_remove + * xfs: remove the nr_extents argument to xfs_iext_insert + * xfs: use a b+tree for the in-core extent list + * xfs: allow unaligned extent records in xfs_bmbt_disk_set_all + * xfs: remove support for inlining data/extents into the inode fork + * xfs: simplify xfs_reflink_convert_cow + * xfs: introduce the xfs_iext_cursor abstraction + * xfs: iterate over extents in xfs_bmap_extents_to_btree + * xfs: iterate over extents in xfs_iextents_copy + * xfs: pass an on-disk extent to xfs_bmbt_validate_extent + * xfs: treat idx as a cursor in xfs_bmap_collapse_extents + * xfs: treat idx as a cursor in xfs_bmap_del_extent_* + * xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_real + * xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_real + * xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_delay + * xfs: treat idx as a cursor in xfs_bmap_add_extent_delay_real + * xfs: remove a duplicate assignment in xfs_bmap_add_extent_delay_real + * xfs: don't create overlapping extents in xfs_bmap_add_extent_delay_real + * xfs: convert remaining xfs_sb_version_... checks to bool + * xfs: move error injection tags into their own file + * xfs: remove inode log format typedef + * xfs: remove the inode log format from the inode log item + * xfs: remove redundant assignment to variable bit + * xfs: compare btree block keys to parent block's keys during scrub + * xfs: abort dir/attr btree operation if btree is obviously weird + * xfs: add a new xfs_iext_lookup_extent_before helper + * xfs: merge xfs_bmap_read_extents into xfs_iread_extents + * xfs: rewrite xfs_bmap_first_unused to make better use of xfs_iext_get_extent + * xfs: don't rely on extent indices in xfs_bmap_insert_extents + * xfs: don't rely on extent indices in xfs_bmap_collapse_extents + * xfs: update got in xfs_bmap_shift_update_extent + * xfs: remove xfs_bmse_shift_one + * xfs: split xfs_bmap_shift_extents + * xfs: remove XFS_BMAP_MAX_SHIFT_EXTENTS + * xfs: remove if_rdev + * xfs: remove the never fully implemented UUID fork format + * xfs: remove XFS_BMAP_TRACE_EXLIST + * xfs: move pre/post-bmap tracing into xfs_iext_update_extent + * xfs: remove post-bmap tracing in xfs_bmap_local_to_extents + * xfs: make better use of the 'state' variable in xfs_bmap_del_extent_real + * xfs: add a xfs_bmap_fork_to_state helper + * xfs: scrub quota information + * xfs: scrub realtime bitmap/summary + * xfs: scrub directory parent pointers + * xfs: scrub symbolic links + * xfs: scrub extended attributes + * xfs: scrub directory metadata + * xfs: scrub inode block mappings + * xfs: scrub inodes + * xfs: scrub refcount btrees + * xfs: scrub rmap btrees + * xfs: scrub inode btrees + * xfs: scrub free space btrees + * xfs: scrub the AGI + * xfs: scrub AGF and AGFL + * xfs: scrub the secondary superblocks + * xfs: scrub the shape of a metadata btree + * xfs: probe the scrub ioctl + * xfs: create an ioctl to scrub AG metadata + * xfs: create inode pointer verifiers + * xfs: refactor btree block header checking functions + * xfs: refactor btree pointer checks + * xfs: create block pointer check functions + * xfs: remove xfs_bmbt_get_state + * xfs: remove all xfs_bmbt_set_* helpers except for xfs_bmbt_set_all + * xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first + * xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_lookup_eq + * xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update + * xfs: refactor xfs_bmap_add_extent_unwritten_real + * xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real + * xfs: refactor xfs_bmap_add_extent_delay_real + * xfs: refactor xfs_bmap_add_extent_hole_real + * xfs: refactor xfs_bmap_add_extent_hole_delay + * xfs: refactor xfs_del_extent_real + * xfs: use the state defines in xfs_bmap_del_extent_real + * xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} + * xfs: move some more code into xfs_bmap_del_extent_real + * xfs: use xfs_bmap_del_extent_delay for the data fork as well + * xfs: rename bno to end in __xfs_bunmapi + * xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi + * xfs: use xfs_iext_get_extent instead of open coding it + * xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real + ------------------------------------------------------------------- Wed Feb 7 14:24:01 UTC 2018 - jeffm@suse.com diff --git a/xfsprogs.spec b/xfsprogs.spec index b2c3d35..77cf76d 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -19,7 +19,7 @@ %define _dracutmodulesdir %{_libexecdir}/dracut/modules.d Name: xfsprogs -Version: 4.14.0 +Version: 4.15.0 Release: 0 Summary: Utilities for managing the XFS file system License: GPL-2.0+ @@ -31,7 +31,7 @@ Source2: %{name}.keyring Source3: module-setup.sh.in Source4: dracut-fsck-help.txt Patch0: xfsprogs-docdir.diff -Patch1: xfs_io-fix-copy_file_range-symbol-name-collision.patch +Patch1: make_xfs_scrub_interp_explicit.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel @@ -134,7 +134,9 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/ %{_sbindir}/* # this is only used by xfs cmds, therefore no urgent need for a shlib package %{_libdir}/libhandle.so.* -%doc %{_mandir}/man[58]/* +%dir %{_libdir}/xfsprogs/ +%{_libdir}/xfsprogs/xfs_scrub_all.cron +%doc %{_mandir}/man[258]/* %doc %{_defaultdocdir}/%{name} %dir %{_libexecdir}/dracut %dir %{_libexecdir}/dracut/modules.d