- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-xfsprogs-3.0.3.tar.gz

.gitignore

@@ -0,0 +1,39 @@
+xfsprogs-3.1.2.tar.gz
+/xfsprogs-3.1.3.tar.gz
+/xfsprogs-3.1.4.tar.gz
+/xfsprogs-3.1.5.tar.gz
+/xfsprogs-3.1.6.tar.gz
+/xfsprogs-3.1.7.tar.gz
+/xfsprogs-3.1.8.tar.gz
+/xfsprogs-3.1.9.tar.gz
+/xfsprogs-3.1.10.tar.gz
+/xfsprogs-3.1.11.tar.gz
+/xfsprogs-3.2.0-alpha1.tar.gz
+/xfsprogs-3.2.0-alpha2.tar.gz
+/xfsprogs-3.2.0-rc2.tar.gz
+/xfsprogs-3.2.0-rc3.tar.gz
+/xfsprogs-3.2.0.tar.gz
+/xfsprogs-3.2.1.tar.gz
+/xfsprogs-3.2.2.tar.gz
+/xfsprogs-3.2.3.tar.gz
+/xfsprogs-3.2.4.tar.gz
+/xfsprogs-4.2.0.tar.gz
+/xfsprogs-4.3.0.tar.gz
+/xfsprogs-4.5.0.tar.gz
+/xfsprogs-4.7.0.tar.gz
+/xfsprogs-4.8.0.tar.gz
+/xfsprogs-4.9.0.tar.xz
+/xfsprogs-4.10.0.tar.xz
+/xfsprogs-4.11.0.tar.xz
+/xfsprogs-4.12.0.tar.xz
+/xfsprogs-4.13.1.tar.xz
+/xfsprogs-4.14.0.tar.xz
+/xfsprogs-4.15.0.tar.xz
+/xfsprogs-4.15.1.tar.xz
+/xfsprogs-4.16.0.tar.xz
+/xfsprogs-4.17.0.tar.xz
+/xfsprogs-4.18.0.tar.xz
+/xfsprogs-4.19.0.tar.xz
+/xfsprogs-4.20.0.tar.xz
+/xfsprogs-5.0.0.tar.xz
+/xfsprogs-5.1.0.tar.xz

Makefile

@@ -4,7 +4,7 @@ NAME := xfsprogs
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

sources

@@ -1 +1 @@
-41bac47fb49a98857f346bbc1c164872  xfsprogs-3.0.3.tar.gz
+SHA512 (xfsprogs-5.1.0.tar.xz) = ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881

xfsprogs-3.0.1-mkfs-lazy-count-default.patch

@@ -1,33 +0,0 @@
-Not yet upstream but planned to be so.
-
-Index: xfsprogs-2.10.2/mkfs/xfs_mkfs.c
-===================================================================
---- xfsprogs-2.10.2.orig/mkfs/xfs_mkfs.c
-+++ xfsprogs-2.10.2/mkfs/xfs_mkfs.c
-@@ -733,7 +733,7 @@ main(
- 	nodsflag = norsflag = 0;
- 	force_overwrite = 0;
- 	worst_freelist = 0;
--	lazy_sb_counters = 0;
-+	lazy_sb_counters = 1;
- 	memset(&fsx, 0, sizeof(fsx));
- 
- 	memset(&xi, 0, sizeof(xi));
-Index: xfsprogs-2.10.2/man/man8/mkfs.xfs.8
-===================================================================
---- xfsprogs-2.10.2.orig/man/man8/mkfs.xfs.8
-+++ xfsprogs-2.10.2/man/man8/mkfs.xfs.8
-@@ -455,9 +455,10 @@ counter values without needed to keep th
- This gives significant improvements in performance on some configurations.
- The default
- .I value
--is 0 (off) so you must specify
--.B lazy-count=1
--if you want to make use of this feature.
-+is 1 (on) so you must specify
-+.B lazy-count=0
-+if you want to disable this feature for older kernels which don't support
-+it.
- .RE
- .TP
- .BI \-n " naming_options"

xfsprogs-3.0.3-libblkid.patch

@@ -1,388 +0,0 @@
-From: Christoph Hellwig <hch@lst.de>
-Date: Sat, 10 Oct 2009 21:05:32 +0000 (-0400)
-Subject: allow linking against libblkid instead of libdisk
-X-Git-Url: http://git.kernel.org/?p=fs%2Fxfs%2Fxfsprogs-dev.git;a=commitdiff_plain;h=e4da994184266c7f89da03a86a3f52dde478137b
-
-allow linking against libblkid instead of libdisk
-
-Add a new --enable-blkid switch to use libblkid from util-linux to detect
-the device geometry and check for existing partitions or filesystem on a
-device.  Note that this requires the latest blkid from util-linux-ng git
-for the topology calls, odler ones won't work.  If I had a little more
-autoconf fu we might be able to detect a too early one, but right now it
-just fails if it's too old and --enable-blkid is specified.  We also
-stop building libdisk in the blkid case as it's an internal static library
-not otherwise used.
-
-For the actual checks I tried to stay as close as possible to the old
-code, so we still don't check topology for external log devices.  I hope
-to add this at a later stage.
-
-As a small addition we also print a warning if trying to create a filesystem
-on a partition that is not properly aligned.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
----
-
-Index: xfsprogs-3.0.3/Makefile
-===================================================================
---- xfsprogs-3.0.3.orig/Makefile
-+++ xfsprogs-3.0.3/Makefile
-@@ -18,10 +18,14 @@ LDIRT = config.log .dep config.status co
- 	Logs/* built .census install.* install-dev.* *.gz autom4te.cache/* \
- 	libtool include/builddefs include/platform_defs.h
- 
--LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
-+LIB_SUBDIRS = libxfs libxlog libxcmd libhandle $(LDISK)
- TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
- 		mdrestore repair rtcp m4 man doc po debian build
- 
-+ifneq ($(ENABLE_BLKID), yes)
-+LIB_SUBDIRS += libdisk
-+endif
-+
- SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
- 
- default: include/builddefs include/platform_defs.h
-@@ -38,10 +42,14 @@ db logprint: libxfs libxlog
- fsr: libhandle
- growfs: libxfs libxcmd
- io: libxcmd libhandle
--mkfs: libxfs libdisk
-+mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
- 
-+ifneq ($(ENABLE_BLKID), yes)
-+mkfs: libdisk
-+endif
-+
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
- else
-Index: xfsprogs-3.0.3/configure.in
-===================================================================
---- xfsprogs-3.0.3.orig/configure.in
-+++ xfsprogs-3.0.3/configure.in
-@@ -35,6 +35,12 @@ AC_ARG_ENABLE(termcap,
- 	test $enable_termcap = yes && libtermcap="-ltermcap",)
- AC_SUBST(libtermcap)
- 
-+AC_ARG_ENABLE(blkid,
-+[ --enable-blkid=[yes/no] Enable block device id library [default=no]],
-+	test $enable_blkid = yes && libblkid="-lblkid",)
-+AC_SUBST(libblkid)
-+AC_SUBST(enable_blkid)
-+
- AC_ARG_ENABLE(lib64,
- [ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
- 	enable_lib64=no)
-Index: xfsprogs-3.0.3/include/builddefs.in
-===================================================================
---- xfsprogs-3.0.3.orig/include/builddefs.in
-+++ xfsprogs-3.0.3/include/builddefs.in
-@@ -31,6 +31,7 @@ LIBPTHREAD = @libpthread@
- LIBTERMCAP = @libtermcap@
- LIBEDITLINE = @libeditline@
- LIBREADLINE = @libreadline@
-+LIBBLKID = @libblkid@
- LIBXFS = $(TOPDIR)/libxfs/libxfs.la
- LIBXCMD = $(TOPDIR)/libxcmd/libxcmd.la
- LIBXLOG = $(TOPDIR)/libxlog/libxlog.la
-@@ -85,6 +86,7 @@ ENABLE_SHARED	= @enable_shared@
- ENABLE_GETTEXT	= @enable_gettext@
- ENABLE_EDITLINE	= @enable_editline@
- ENABLE_READLINE	= @enable_readline@
-+ENABLE_BLKID	= @enable_blkid@
- 
- HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
- 
-Index: xfsprogs-3.0.3/mkfs/Makefile
-===================================================================
---- xfsprogs-3.0.3.orig/mkfs/Makefile
-+++ xfsprogs-3.0.3/mkfs/Makefile
-@@ -11,14 +11,27 @@ FSTYP = fstyp
- HFILES = xfs_mkfs.h
- CFILES = maxtrres.c proto.c xfs_mkfs.c
- 
--LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) $(LIBRT) $(LIBPTHREAD)
--LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)
-+LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
-+LTDEPENDENCIES = $(LIBXFS)
- LLDFLAGS = -static
- 
-+ifeq ($(ENABLE_BLKID),yes)
-+LLDLIBS += $(LIBBLKID)
-+CFLAGS += -DENABLE_BLKID
-+else
-+LLDLIBS += $(LIBDISK)
-+LTDEPENDENCIES += $(LIBDISK)
-+endif
-+
-+
- LSRCFILES = $(FSTYP).c
- LDIRT = $(FSTYP)
- 
--default: $(FSTYP) $(LTCOMMAND)
-+default: $(LTCOMMAND)
-+
-+ifneq ($(ENABLE_BLKID),yes)
-+default: $(FSTYP)
-+endif
- 
- include $(BUILDRULES)
- 
-Index: xfsprogs-3.0.3/mkfs/xfs_mkfs.c
-===================================================================
---- xfsprogs-3.0.3.orig/mkfs/xfs_mkfs.c
-+++ xfsprogs-3.0.3/mkfs/xfs_mkfs.c
-@@ -17,12 +17,26 @@
-  */
- 
- #include <xfs/libxfs.h>
-+#include <ctype.h>
-+#ifdef ENABLE_BLKID
-+#include <blkid/blkid.h>
-+#else
- #include <disk/fstyp.h>
- #include <disk/volume.h>
--#include <ctype.h>
-+#endif
- #include "xfs_mkfs.h"
- 
- /*
-+ * Device topology information.
-+ */
-+struct fs_topology {
-+	int	dsunit;		/* stripe unit - data subvolume */
-+	int	dswidth;	/* stripe width - data subvolume */
-+	int	rtswidth;	/* stripe width - rt subvolume */
-+	int	sectoralign;
-+};
-+
-+/*
-  * Prototypes for internal functions.
-  */
- static void conflict(char opt, char *tab[], int oldidx, int newidx);
-@@ -266,6 +280,105 @@ calc_stripe_factors(
- 	}
- }
- 
-+#ifdef ENABLE_BLKID
-+static int
-+check_overwrite(
-+	char		*device)
-+{
-+	const char	*type;
-+	blkid_probe	pr;
-+	int		ret = 0;
-+
-+	if (!device || !*device)
-+		return 0;
-+
-+	pr = blkid_new_probe_from_filename(device);
-+	if (!pr)
-+		return -1;
-+
-+	if (blkid_probe_enable_partitions(pr, 1))
-+		goto out_free_probe;
-+
-+	if (blkid_do_fullprobe(pr))
-+		goto out_free_probe;
-+
-+	if (!blkid_probe_lookup_value(pr, "TYPE", &type, NULL)) {
-+		fprintf(stderr,
-+			_("%s: %s appears to contain an existing "
-+			"filesystem (%s).\n"), progname, device, type);
-+		ret = 1;
-+	} else if (!blkid_probe_lookup_value(pr, "PTTYPE", &type, NULL)) {
-+		fprintf(stderr,
-+			_("%s: %s appears to contain a partition "
-+			"table (%s).\n"), progname, device, type);
-+		ret = 1;
-+	}
-+
-+out_free_probe:
-+	blkid_free_probe(pr);
-+	return ret;
-+}
-+
-+static void blkid_get_topology(const char *device, int *sunit, int *swidth)
-+{
-+	blkid_topology tp;
-+	blkid_probe pr;
-+	unsigned long val;
-+
-+	pr = blkid_new_probe_from_filename(device);
-+	if (!pr)
-+		return;
-+
-+	tp = blkid_probe_get_topology(pr);
-+	if (!tp)
-+		goto out_free_probe;
-+
-+	/*
-+	 * Blkid reports the information in terms of bytes, but we want it in
-+	 * terms of 512 bytes blocks (just to convert it to bytes later..)
-+	 *
-+	 * If the reported values are just the normal 512 byte block size
-+	 * do not bother to report anything.  It will just causes warnings
-+	 * if people specifier larger stripe units or widths manually.
-+	 */
-+	val = blkid_topology_get_minimum_io_size(tp) >> 9;
-+	if (val > 1)
-+		*sunit = val;
-+	val = blkid_topology_get_optimal_io_size(tp) >> 9;
-+	if (val > 1)
-+		*swidth = val;
-+
-+	if (blkid_topology_get_alignment_offset(tp) != 0) {
-+		fprintf(stderr,
-+			_("warning: device is not properly aligned %s\n"),
-+			device);
-+	}
-+
-+	blkid_free_probe(pr);
-+	return;
-+
-+out_free_probe:
-+	blkid_free_probe(pr);
-+	fprintf(stderr,
-+		_("warning: unable to probe device toplology for device %s\n"),
-+		device);
-+}
-+
-+static void get_topology(libxfs_init_t *xi, struct fs_topology *ft)
-+{
-+	if (!xi->disfile) {
-+		const char *dfile = xi->volname ? xi->volname : xi->dname;
-+
-+		blkid_get_topology(dfile, &ft->dsunit, &ft->dswidth);
-+	}
-+
-+	if (xi->rtname && !xi->risfile) {
-+		int dummy;
-+
-+		blkid_get_topology(xi->rtname, &dummy, &ft->rtswidth);
-+	}
-+}
-+#else /* ENABLE_BLKID */
- static int
- check_overwrite(
- 	char		*device)
-@@ -289,6 +402,24 @@ check_overwrite(
- 	return 0;
- }
- 
-+static void get_topology(libxfs_init_t *xi, struct fs_topology *ft)
-+{
-+	char *dfile = xi->volname ? xi->volname : xi->dname;
-+
-+	if (!xi->disfile) {
-+		get_subvol_stripe_wrapper(dfile, SVTYPE_DATA,
-+				&ft->dsunit, &ft->dswidth, &ft->sectoralign);
-+	}
-+
-+	if (xi->rtname && !xi->risfile) {
-+		int dummy1;
-+
-+		get_subvol_stripe_wrapper(dfile, SVTYPE_RT, &dummy1,
-+					  &ft->rtswidth, &dummy1);
-+	}
-+}
-+#endif /* ENABLE_BLKID */
-+
- static void
- fixup_log_stripe_unit(
- 	int		lsflag,
-@@ -691,7 +822,6 @@ main(
- 	char			*rtfile;
- 	char			*rtsize;
- 	xfs_sb_t		*sbp;
--	int			sectoralign;
- 	int			sectorlog;
- 	unsigned int		sectorsize;
- 	__uint64_t		sector_mask;
-@@ -701,8 +831,7 @@ main(
- 	uuid_t			uuid;
- 	int			worst_freelist;
- 	libxfs_init_t		xi;
--	int 			xlv_dsunit;
--	int			xlv_dswidth;
-+	struct fs_topology	ft;
- 	int			lazy_sb_counters;
- 
- 	progname = basename(argv[0]);
-@@ -1392,12 +1521,10 @@ main(
- 		usage();
- 	}
- 
--	sectoralign = 0;
--	xlv_dsunit = xlv_dswidth = 0;
--	if (!xi.disfile)
--		get_subvol_stripe_wrapper(dfile, SVTYPE_DATA,
--				&xlv_dsunit, &xlv_dswidth, &sectoralign);
--	if (sectoralign) {
-+	memset(&ft, 0, sizeof(ft));
-+	get_topology(&xi, &ft);
-+
-+	if (ft.sectoralign) {
- 		sectorsize = blocksize;
- 		sectorlog = libxfs_highbit32(sectorsize);
- 		if (loginternal) {
-@@ -1545,14 +1672,15 @@ main(
- 		 * and the underlying volume is striped, then set rtextblocks
- 		 * to the stripe width.
- 		 */
--		int		dummy1, rswidth;
-+		int		rswidth;
- 		__uint64_t	rtextbytes;
- 
--		dummy1 = rswidth = 0;
-+		rswidth = 0;
- 
- 		if (!norsflag && !xi.risfile && !(!rtsize && xi.disfile))
--			get_subvol_stripe_wrapper(dfile, SVTYPE_RT, &dummy1,
--						  &rswidth, &dummy1);
-+			rswidth = ft.rtswidth;
-+		else
-+			rswidth = 0;
- 
- 		/* check that rswidth is a multiple of fs blocksize */
- 		if (!norsflag && rswidth && !(BBTOB(rswidth) % blocksize)) {
-@@ -1793,27 +1921,27 @@ _("size %s specified for log subvolume i
- 		agsize = dblocks / agcount + (dblocks % agcount != 0);
- 	else
- 		calc_default_ag_geometry(blocklog, dblocks,
--				xlv_dsunit | xlv_dswidth, &agsize, &agcount);
-+				ft.dsunit | ft.dswidth, &agsize, &agcount);
- 
- 	if (!nodsflag) {
- 		if (dsunit) {
--			if (xlv_dsunit && xlv_dsunit != dsunit) {
-+			if (ft.dsunit && ft.dsunit != dsunit) {
- 				fprintf(stderr,
- 					_("%s: Specified data stripe unit %d "
- 					"is not the same as the volume stripe "
- 					"unit %d\n"),
--					progname, dsunit, xlv_dsunit);
-+					progname, dsunit, ft.dsunit);
- 			}
--			if (xlv_dswidth && xlv_dswidth != dswidth) {
-+			if (ft.dswidth && ft.dswidth != dswidth) {
- 				fprintf(stderr,
- 					_("%s: Specified data stripe width %d "
- 					"is not the same as the volume stripe "
- 					"width %d\n"),
--					progname, dswidth, xlv_dswidth);
-+					progname, dswidth, ft.dswidth);
- 			}
- 		} else {
--			dsunit = xlv_dsunit;
--			dswidth = xlv_dswidth;
-+			dsunit = ft.dsunit;
-+			dswidth = ft.dswidth;
- 			nodsflag = 1;
- 		}
- 	} /* else dsunit & dswidth can't be set if nodsflag is set */

xfsprogs-3.0.3-trim.patch

@@ -1,181 +0,0 @@
-From: Christoph Hellwig <hch@lst.de>
-Date: Tue, 13 Oct 2009 22:28:52 +0000 (+0200)
-Subject: mkfs: add discard support
-X-Git-Url: http://git.kernel.org/?p=fs%2Fxfs%2Fxfsprogs-dev.git;a=commitdiff_plain;h=ad136b3382919e93cc692b54f735fad8b35e88fe
-
-mkfs: add discard support
-
-Call the BLKDISCARD ioctl to mark the whole disk as unused before creating
-a new filesystem.  This will allow SSDs, Arrays with thin provisioning support
-and virtual machines to make smarter allocation decisions.
-
-Add a new -K option to prevent mkfs from discarding blocks to aid
-trouble-shooting or specialized requirements.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
-Reviewed-by: Andi Kleen <andi@firstfloor.org>
----
-
-Index: xfsprogs-3.0.3/include/darwin.h
-===================================================================
---- xfsprogs-3.0.3.orig/include/darwin.h
-+++ xfsprogs-3.0.3/include/darwin.h
-@@ -154,4 +154,10 @@ typedef unsigned char	uchar_t;
- 
- #define HAVE_FID	1
- 
-+static __inline__ int
-+platform_discard_blocks(int fd, off64_t start, off64_t end)
-+{
-+	return 0;
-+}
-+
- #endif	/* __XFS_DARWIN_H__ */
-Index: xfsprogs-3.0.3/include/freebsd.h
-===================================================================
---- xfsprogs-3.0.3.orig/include/freebsd.h
-+++ xfsprogs-3.0.3/include/freebsd.h
-@@ -139,4 +139,10 @@ static __inline__ void platform_uuid_cop
- 	memcpy(dst, src, sizeof(uuid_t));
- }
- 
-+static __inline__ int
-+platform_discard_blocks(int fd, off64_t start, off64_t end)
-+{
-+	return 0;
-+}
-+
- #endif	/* __XFS_FREEBSD_H__ */
-Index: xfsprogs-3.0.3/include/irix.h
-===================================================================
---- xfsprogs-3.0.3.orig/include/irix.h
-+++ xfsprogs-3.0.3/include/irix.h
-@@ -337,6 +337,12 @@ static __inline__ void platform_uuid_cop
- 	memcpy(dst, src, sizeof(uuid_t));
- }
- 
-+static __inline__ int
-+platform_discard_blocks(int fd, off64_t start, off64_t end)
-+{
-+	return 0;
-+}
-+
- static __inline__ char * strsep(char **s, const char *ct)
- {
- 	char *sbegin = *s, *end;
-Index: xfsprogs-3.0.3/include/linux.h
-===================================================================
---- xfsprogs-3.0.3.orig/include/linux.h
-+++ xfsprogs-3.0.3/include/linux.h
-@@ -93,6 +93,20 @@ static __inline__ void platform_uuid_cop
- 	uuid_copy(*dst, *src);
- }
- 
-+#ifndef BLKDISCARD
-+#define BLKDISCARD	_IO(0x12,119)
-+#endif
-+
-+static __inline__ int
-+platform_discard_blocks(int fd, off64_t start, off64_t end)
-+{
-+	__uint64_t range[2] = { start, end };
-+
-+	if (ioctl(fd, BLKDISCARD, &range) < 0)
-+		return errno;
-+	return 0;
-+}
-+
- #if (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ <= 1))
- # define constpp	const char * const *
- #else
-Index: xfsprogs-3.0.3/man/man8/mkfs.xfs.8
-===================================================================
---- xfsprogs-3.0.3.orig/man/man8/mkfs.xfs.8
-+++ xfsprogs-3.0.3/man/man8/mkfs.xfs.8
-@@ -36,6 +36,8 @@ mkfs.xfs \- construct an XFS filesystem
- .I label
- ] [
- .B \-N
-+] [
-+.B \-K
- ]
- .I device
- .SH DESCRIPTION
-@@ -715,6 +717,9 @@ manual entries for additional informatio
- .B \-N
- Causes the file system parameters to be printed out without really
- creating the file system.
-+.TP
-+.B \-K
-+Do not attempt to discard blocks at mkfs time.
- .SH SEE ALSO
- .BR xfs (5),
- .BR mkfs (8),
-Index: xfsprogs-3.0.3/mkfs/xfs_mkfs.c
-===================================================================
---- xfsprogs-3.0.3.orig/mkfs/xfs_mkfs.c
-+++ xfsprogs-3.0.3/mkfs/xfs_mkfs.c
-@@ -735,6 +735,20 @@ done:
- 	free(buf);
- }
- 
-+static void
-+discard_blocks(dev_t dev, __uint64_t nsectors)
-+{
-+	int fd;
-+
-+	/*
-+	 * We intentionally ignore errors from the discard ioctl.  It is
-+	 * not necessary for the mkfs functionality but just an optimization.
-+	 */
-+	fd = libxfs_device_to_fd(dev);
-+	if (fd > 0)
-+		platform_discard_blocks(fd, 0, nsectors << 9);
-+}
-+
- int
- main(
- 	int			argc,
-@@ -811,6 +825,7 @@ main(
- 	int			nvflag;
- 	int			nci;
- 	int			Nflag;
-+	int			discard = 1;
- 	char			*p;
- 	char			*protofile;
- 	char			*protostring;
-@@ -869,7 +884,7 @@ main(
- 	xi.isdirect = LIBXFS_DIRECT;
- 	xi.isreadonly = LIBXFS_EXCLUSIVELY;
- 
--	while ((c = getopt(argc, argv, "b:d:i:l:L:n:Np:qr:s:CfV")) != EOF) {
-+	while ((c = getopt(argc, argv, "b:d:i:l:L:n:KNp:qr:s:CfV")) != EOF) {
- 		switch (c) {
- 		case 'C':
- 		case 'f':
-@@ -1385,6 +1400,9 @@ main(
- 		case 'N':
- 			Nflag = 1;
- 			break;
-+		case 'K':
-+			discard = 0;
-+			break;
- 		case 'p':
- 			if (protofile)
- 				respec('p', NULL, 0);
-@@ -1772,6 +1790,14 @@ main(
- 		}
- 	}
- 
-+	if (discard) {
-+		discard_blocks(xi.ddev, xi.dsize);
-+		if (xi.rtdev)
-+			discard_blocks(xi.rtdev, xi.rtsize);
-+		if (xi.logdev && xi.logdev != xi.ddev)
-+			discard_blocks(xi.logdev, xi.logBBsize);
-+	}
-+
- 	if (!liflag && !ldflag)
- 		loginternal = xi.logdev == 0;
- 	if (xi.logname)

xfsprogs-wrapper.h

@@ -1,24 +0,0 @@
-/* This file is here to prevent a file conflict on multiarch systems. A
- * conflict will occur because platform_defs.h has arch-specific definitions.
- *
- * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-
-#if defined(__i386__)
-#include "platform_defs-i386.h"
-#elif defined(__x86_64__)
-#include "platform_defs-x86_64.h"
-#elif defined(__powerpc64__)
-#include "platform_defs-ppc64.h"
-#elif defined(__powerpc__)
-#include "platform_defs-ppc.h"
-#elif defined(__s390x__)
-#include "platform_defs-s390x.h"
-#elif defined(__s390__)
-#include "platform_defs-s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "platform_defs-sparc64.h"
-#elif defined(__sparc__)
-#include "platform_defs-sparc.h"
-#else
-#error "This xfsprogs-devel package does not work your architecture?"
-#endif

xfsprogs.spec

@@ -1,28 +1,21 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	3.0.3
+Version:	5.1.0
 Release:	2%{?dist}
-# Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
-# in source, with no mention of version.
-# doc/COPYING file specifies what is GPL and what is LGPL
-# but no mention of versions in the source.
 License:	GPL+ and LGPLv2+
-Group:		System Environment/Base
-URL:		http://oss.sgi.com/projects/xfs/
-Source0:	ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-Source1:	xfsprogs-wrapper.h
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libtool, gettext, libuuid-devel, readline-devel
+URL:		https://xfs.wiki.kernel.org
+Source0:	http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz
+Requires:	util-linux
+BuildRequires:	gcc
+BuildRequires:	libtool, gettext, libattr-devel, libuuid-devel
+BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
+Buildrequires:	lvm2-devel, libicu-devel >= 4.6
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
+Provides:	xfsprogs-qa-devel
+Obsoletes:	xfsprogs-qa-devel <= %{version}
 Conflicts:	xfsdump < 3.0.1
-
-# Upstream patches:
-Patch1:		xfsprogs-3.0.3-trim.patch
-Patch2:		xfsprogs-3.0.3-libblkid.patch
-
-# Not-yet-upstream patches:
-Patch10:	xfsprogs-3.0.1-mkfs-lazy-count-default.patch
+Suggests:	xfsprogs-xfs_scrub
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -34,384 +27,222 @@ variable block sizes, is extent based, and makes extensive use of
 Btrees (directories, extents, free space) to aid both performance
 and scalability.
 
-Refer to the documentation at http://oss.sgi.com/projects/xfs/
-for complete details.  This implementation is on-disk compatible
-with the IRIX version of XFS.
+This implementation is on-disk compatible with the IRIX version
+of XFS.
 
 %package devel
-Summary: XFS filesystem-specific static libraries and headers
-Group: Development/Libraries
-Requires: xfsprogs = %{version}-%{release}
+Summary: XFS filesystem-specific headers
+Requires: xfsprogs = %{version}-%{release}, libuuid-devel
 
 %description devel
-xfsprogs-devel contains the libraries and header files needed to
-develop XFS filesystem-specific programs.
+xfsprogs-devel contains the header files needed to develop XFS
+filesystem-specific programs.
 
 You should install xfsprogs-devel if you want to develop XFS
 filesystem-specific programs,  If you install xfsprogs-devel, you'll
 also want to install xfsprogs.
 
-%package qa-devel
-Summary: XFS QA filesystem-specific static libraries and headers
-Group: Development/Libraries
-Requires: xfsprogs = %{version}-%{release}
-Requires: xfsprogs-devel = %{version}-%{release}
+%package xfs_scrub
+Summary: XFS filesystem online scrubbing utilities
+Requires: xfsprogs = %{version}-%{release}, python3
 
-%description qa-devel
-xfsprogs-qa-devel contains headers and libraries needed to build
-the xfstests QA suite.
-
-You should install xfsprogs-qa-devel only if you are interested
-in building or running the xfstests QA suite.
+%description xfs_scrub
+xfs_scrub attempts to check and repair all metadata in a mounted XFS filesystem.
+WARNING!  This program is EXPERIMENTAL, which means that its behavior and
+interface could change at any time!
 
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p1
-
-%patch10 -p1
-
 %build
-export tagname=CC DEBUG=-DNDEBUG
-# xfsprogs abuses libexecdir
+export tagname=CC
+
 %configure \
-        --sbindir=/sbin         \
-        --libdir=/%{_lib}       \
-        --libexecdir=%{_libdir} \
-        --bindir=%{_sbindir}	\
-        --enable-readline=yes
+        --enable-readline=yes	\
+	--enable-blkid=yes	\
+	--enable-lto=no
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa
+make DIST_ROOT=$RPM_BUILD_ROOT install install-dev \
+	PKG_ROOT_SBIN_DIR=%{_sbindir} PKG_ROOT_LIB_DIR=%{_libdir}
 
 # nuke .la files, etc
-rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
-# fix up symlink to be correct
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*
+rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}}
 
 # remove non-versioned docs location
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
 
-# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
-%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x %{sparc}
-
-%ifarch %{multilib_arches}
-mv -f $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h \
-      $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs-%{_arch}.h
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/xfs/platform_defs.h
-%endif
-
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README
-/sbin/fsck.xfs
-/sbin/mkfs.xfs
-/sbin/xfs_repair
-/%{_lib}/*.so.*
-%{_mandir}/man8/*
+%doc doc/CHANGES README
+%{_libdir}/*.so.*
+%dir %{_usr}/%{_lib}/xfsprogs
+%{_usr}/%{_lib}/xfsprogs/*
 %{_mandir}/man5/*
+%{_mandir}/man8/*
 %{_sbindir}/*
+%{_unitdir}/*
+%exclude %{_sbindir}/xfs_scrub*
+%exclude %{_mandir}/man8/xfs_scrub*
+%exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub*
+%exclude %{_mandir}/man8/xfs_scrub_all*
+%exclude %{_unitdir}/xfs_scrub*
+
+%files xfs_scrub
+%{_sbindir}/xfs_scrub*
+%{_mandir}/man8/xfs_scrub*
+%{_usr}/%{_lib}/xfsprogs/xfs_scrub*
+%{_mandir}/man8/xfs_scrub_all*
+%{_unitdir}/xfs_scrub*
 
 %files devel
-%defattr(-,root,root)
+%{_mandir}/man2/*
 %{_mandir}/man3/*
 %dir %{_includedir}/xfs
 %{_includedir}/xfs/handle.h
 %{_includedir}/xfs/jdm.h
 %{_includedir}/xfs/linux.h
-%ifarch %{multilib_arches}
-%{_includedir}/xfs/platform_defs-%{_arch}.h
-%endif
-%{_includedir}/xfs/platform_defs.h
 %{_includedir}/xfs/xfs.h
+%{_includedir}/xfs/xfs_arch.h
 %{_includedir}/xfs/xfs_fs.h
+%{_includedir}/xfs/xfs_types.h
+%{_includedir}/xfs/xfs_format.h
+%{_includedir}/xfs/xfs_da_format.h
+%{_includedir}/xfs/xfs_log_format.h
 %{_includedir}/xfs/xqm.h
-%{_libdir}/*.a
+
 %{_libdir}/*.so
 
-%files qa-devel
-%defattr(-,root,root)
-%{_includedir}/xfs/bitops.h
-%{_includedir}/xfs/cache.h
-%{_includedir}/xfs/kmem.h
-%{_includedir}/xfs/libxfs.h
-%{_includedir}/xfs/libxlog.h
-%{_includedir}/xfs/list.h
-%{_includedir}/xfs/parent.h
-%{_includedir}/xfs/swab.h
-%{_includedir}/xfs/xfs_ag.h
-%{_includedir}/xfs/xfs_alloc.h
-%{_includedir}/xfs/xfs_alloc_btree.h
-%{_includedir}/xfs/xfs_arch.h
-%{_includedir}/xfs/xfs_attr_leaf.h
-%{_includedir}/xfs/xfs_attr_sf.h
-%{_includedir}/xfs/xfs_bit.h
-%{_includedir}/xfs/xfs_bmap.h
-%{_includedir}/xfs/xfs_bmap_btree.h
-%{_includedir}/xfs/xfs_btree.h
-%{_includedir}/xfs/xfs_btree_trace.h
-%{_includedir}/xfs/xfs_buf_item.h
-%{_includedir}/xfs/xfs_da_btree.h
-%{_includedir}/xfs/xfs_dfrag.h
-%{_includedir}/xfs/xfs_dinode.h
-%{_includedir}/xfs/xfs_dir2.h
-%{_includedir}/xfs/xfs_dir2_block.h
-%{_includedir}/xfs/xfs_dir2_data.h
-%{_includedir}/xfs/xfs_dir2_leaf.h
-%{_includedir}/xfs/xfs_dir2_node.h
-%{_includedir}/xfs/xfs_dir2_sf.h
-%{_includedir}/xfs/xfs_dir_leaf.h
-%{_includedir}/xfs/xfs_dir_sf.h
-%{_includedir}/xfs/xfs_extfree_item.h
-%{_includedir}/xfs/xfs_ialloc.h
-%{_includedir}/xfs/xfs_ialloc_btree.h
-%{_includedir}/xfs/xfs_imap.h
-%{_includedir}/xfs/xfs_inode.h
-%{_includedir}/xfs/xfs_inode_item.h
-%{_includedir}/xfs/xfs_inum.h
-%{_includedir}/xfs/xfs_log.h
-%{_includedir}/xfs/xfs_log_priv.h
-%{_includedir}/xfs/xfs_log_recover.h
-%{_includedir}/xfs/xfs_metadump.h
-%{_includedir}/xfs/xfs_mount.h
-%{_includedir}/xfs/xfs_quota.h
-%{_includedir}/xfs/xfs_rtalloc.h
-%{_includedir}/xfs/xfs_sb.h
-%{_includedir}/xfs/xfs_trans.h
-%{_includedir}/xfs/xfs_trans_space.h
-%{_includedir}/xfs/xfs_types.h
-
 %changelog
-* Tue Nov 10 2009 Eric Sandeen <sandeen@redhat.com> 3.0.3-2
-- Add trim/discard & libblkid support
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Tue Sep 01 2009 Eric Sandeen <sandeen@redhat.com> 3.0.3-1
+* Fri Jul 19 2019 Eric Sandeen <sandeen@redhat.com> 5.1.0-1
 - New upstream release
 
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed May 08 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-2
+- Create new xfs_scrub subpackage (#1666839)
 
-* Tue Jun 30 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-9
-- Fix block overflows in xfs_repair and xfs_metadump
-
-* Tue Jun 30 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-8
-- Fix up build-requires after e2fsprogs splitup
-
-* Thu Jun 18 2009 Dennis Gilmore <dennis@ausil.us> 3.0.1-7
-- update sparc multilib handling
-
-* Mon Jun 15 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-6
-- Make lazy superblock counters the default
-
-* Mon Jun 15 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-5
-- Add fallocate command to config script & fix for 32-bit
-
-* Mon Jun 15 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-4
-- Add fallocate command to xfs_io
-
-* Fri May 15 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-3
-- Fix and re-enable readline
-
-* Tue May 05 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-2
-- Conflict with xfsdump < 3.0.1 since files moved between them
-
-* Tue May 05 2009 Eric Sandeen <sandeen@redhat.com> 3.0.1-1
+* Fri May 03 2019 Eric Sandeen <sandeen@redhat.com> 5.0.0-1
 - New upstream release
 
-* Sat Apr 18 2009 Eric Sandeen <sandeen@redhat.com> 3.0.0-4
-- Fix build for non-multilib arches, oops.
-
-* Sat Apr 18 2009 Eric Sandeen <sandeen@redhat.com> 3.0.0-3
-- Create new xfsprogs-qa-devel subpackage
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 04 2009 Eric Sandeen <sandeen@redhat.com> 3.0.0-1
+* Fri Feb 22 2019 Eric Sandeen <sandeen@redhat.com> 4.20.0-1
 - New upstream release
 
-* Thu Jan 08 2009 Eric Sandeen <sandeen@redhat.com> 2.10.2-3
-- Fix perms of libhandle.so in specfile, not makefile
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.19.0-4
+- Rebuild for readline 8.0
 
-* Wed Jan 07 2009 Eric Sandeen <sandeen@redhat.com> 2.10.2-2
-- Fix perms of libhandle.so so that it's properly stripped
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Sun Dec 07 2008 Eric Sandeen <sandeen@redhat.com> 2.10.2-1
-- New upstream release, bugfix only.
+* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 4.19.0-2
+- Rebuild for ICU 63
 
-* Wed Nov 26 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-4
-- Add protection from borken sys_ustat
-- Add final upstream versions of gfs2 & parallel build patches
+* Tue Nov 13 2018 Eric Sandeen <sandeen@redhat.com> 4.19.0-1
+- New upstream release
 
-* Wed Nov 12 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-2
-- Recognize gfs/gfs2 in libdisk
-- Enable parallel builds
+* Fri Aug 24 2018 Eric Sandeen <sandeen@redhat.com> 4.18.0-1
+- New upstream release
 
-* Fri Sep 05 2008 Eric Sandeen <sandeen@redhat.com> 2.10.1-1
-- Update to xfsprogs 2.10.1
-- Add ASCII case-insensitive support to xfsprogs.
-- xfs_repair fixes
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.17.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Wed Jun 04 2008 Dennis Gilmore <dennis@ausil.us> 2.9.8-3
-- sparc32 is built using the sparcv9 variant 
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 4.17.0-2
+- Rebuild for ICU 62
 
-* Wed Jun 04 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-2
-- Tidy up multilib hack for non-multilib arches & add sparc (#448452)
+* Thu Jun 28 2018 Eric Sandeen <sandeen@redhat.com> 4.17.0-1
+- New upstream release
 
-* Wed Apr 23 2008 Eric Sandeen <sandeen@redhat.com> 2.9.8-1
-- Update to xfsprogs 2.9.8
-- Add support for sb_features2 in wrong location
-- Add -c option to xfs_admin to turn lazy-counters on/off
-- Added support for mdp in libdisk/mkfs.xfs
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 4.16.0-2
+- Rebuild for ICU 61.1
 
-* Sun Mar 02 2008 Eric Sandeen <sandeen@redhat.com> 2.9.7-1
-- Update to xfsprogs 2.9.7
-- Lazy sb counters back off by default; other misc fixes
+* Thu Apr 26 2018 Eric Sandeen <sandeen@redhat.com> 4.16.0-1
+- New upstream release
+- Clean up specfile
 
-* Wed Feb 06 2008 Eric Sandeen <sandeen@redhat.com> 2.9.6-1
-- Update to xfsprogs 2.9.6 - fixes mkfs sizing problem.
-- Trim down BuildRequires to what's actually required now
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.1-1
+- New upstream release
+- Update Polish translation
 
-* Mon Jan 21 2008 Eric Sandeen <sandeen@redhat.com> 2.9.5-1
-- Update to xfsprogs 2.9.5
-- Contains more optimal mkfs defaults
-- specfile cleanup, & don't restate config defaults
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.0-2
+- BuildRequires: gcc
 
-* Tue Oct 23 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-4
-- Add arm to multilib header wrapper
+* Sat Feb 24 2018 Eric Sandeen <sandeen@redhat.com> 4.15.0-1
+- New upstream release
+- Adds new xfs_scrub utility and services
 
-* Tue Oct 02 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-3
-- mkfs.xfs: Fix wiping old AG headers and purge whack buffers
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Mon Oct 01 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-2
-- Add alpha to the multilib wrapper (#310411)
+* Mon Nov 27 2017 Eric Sandeen <sandeen@redhat.com> 4.14.0-1
+- New upstream release
 
-* Mon Sep 10 2007 Eric Sandeen <sandeen@redhat.com> 2.9.4-1
-- Update to xfsprogs 2.9.4
+* Wed Sep 27 2017 Eric Sandeen <sandeen@redhat.com> 4.13.1-1
+- New upstream release
+- Trim ancient changelog
 
-* Fri Aug 24 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-3
-- Add gawk to buildrequires
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
-* Thu Aug 16 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-2
-- Update license tag
+* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 4.12.0-3
+- Rebuild with binutils fix for ppc64le (#1475636)
 
-* Thu Jul 26 2007 Eric Sandeen <sandeen@redhat.com> 2.9.3-1
-- Upgrade to xfsprogs 2.9.2, quota, xfs_repair, and filestreams changes
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Thu Jul  6 2007 Eric Sandeen <sandeen@redhat.com> 2.8.21-1
-- Upgrade to xfsprogs 2.8.21, lazy sb counters enabled,
-  xfs_quota fix (#236746)
+* Mon Jul 24 2017 Eric Sandeen <sandeen@redhat.com> 4.12.0-1
+- New upstream release
 
-* Thu May 31 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-2
-- Fix ppc64 build... again
+* Fri May 05 2017 Eric Sandeen <sandeen@redhat.com> 4.11.0-1
+- New upstream release
 
-* Fri May 25 2007 Eric Sandeen <sandeen@redhat.com> 2.8.20-1
-- Upgrade to xfsprogs 2.8.20, several xfs_repair fixes
+* Sun Feb 26 2017 Eric Sandeen <sandeen@redhat.com> 4.10.0-1
+- New upstream release
 
-* Tue Mar 06 2007 Miroslav Lichvar <mlichvar@redhat.com> 2.8.18-3
-- Remove libtermcap-devel from BuildRequires
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-* Wed Feb 14 2007 Miroslav Lichvar <mlichvar@redhat.com> 2.8.18-2
-- Disable readline support for now (#223781)
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 4.9.0-2
+- Rebuild for readline 7.x
 
-* Sun Feb 04 2007 Jarod Wilson <jwilson@redhat.com> 2.8.18-1
-- Post-facto changelog addition to note bump to 2.8.18
+* Thu Jan 05 2017 Eric Sandeen <sandeen@redhat.com> 4.9.0-1
+- New upstream release
 
-* Wed Sep 27 2006 Russell Cattelan <cattelan@thebarn.com> 2.8.11-3
-- bump build version to 3 for a new brew build
+* Tue Oct 18 2016 Eric Sandeen <sandeen@redhat.com> 4.8.0-1
+- New upstream release
 
-* Tue Sep 26 2006 Russell Cattelan <cattelan@thebarn.com> 2.8.11-2
-- add ppc64 build patch
+* Tue Sep 06 2016 Eric Sandeen <sandeen@redhat.com> 4.7.0-2
+- Add libattr-devel build dependency to fix xfs_fsr
 
-* Thu Sep 21 2006 Russell Cattelan <cattelan@redhat.com> 2.8.11-1
-- Upgrade to xfsprogs 2.8.11 Need to pick up important repair fixes
+* Sun Sep 04 2016 Eric Sandeen <sandeen@redhat.com> 4.7.0-1
+- New upstream release
 
-* Tue Jul 18 2006 Jeremy Katz <katzj@redhat.com> - 2.8.4-3
-- exclude arch ppc64 for now (#199315)
+* Tue Mar 15 2016 Eric Sandeen <sandeen@redhat.com> 4.5.0-1
+- New upstream release
 
-* Mon Jul 17 2006 Jesse Keating <jkeating@redhat.com> - 2.8.4-2
-- rebuild
+* Thu Mar 10 2016 Eric Sandeen <sandeen@redhat.com> 4.3.0-3
+- Fix build w/ new kernels which have [sg]etxattr promotion
 
-* Tue Jul 04 2006 Robert Scheck <redhat@linuxnetz.de> 2.8.4-1
-- Upgrade to 2.8.4 (#196599 #c2)
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Sun Jun 25 2006 Robert Scheck <redhat@linuxnetz.de> 2.8.3-1
-- Upgrade to 2.8.3 (#196599)
-- Applied Russell Coker's suggested patch to improve the
-  performance for SELinux machines significantly (#120622)
+* Mon Nov 30 2015 Eric Sandeen <sandeen@redhat.com> 4.3.0-1
+- New upstream release
 
-* Sun Jun 25 2006 Robert Scheck <redhat@linuxnetz.de> 2.7.11-2
-- Fixed multilib conflict of xfs/platform_defs.h (#192755)
+* Wed Sep 09 2015 Eric Sandeen <sandeen@redhat.com> 4.2.0-1
+- New upstream release
 
-* Sun Mar 12 2006 Robert Scheck <redhat@linuxnetz.de> 2.7.11-1
-- Upgrade to 2.7.11 and spec file cleanup (#185234)
+* Thu Jul 30 2015 Eric Sandeen <sandeen@redhat.com> 3.2.4-1
+- New upstream release
+- Addresses CVE-2012-2150 for xfs_metadump
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.7.3-1.2.1
-- bump again for double-long bug on ppc(64)
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.7.3-1.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Mon Oct 31 2005 Robert Scheck <redhat@linuxnetz.de> 2.7.3-1
-- Upgrade to 2.7.3 and enabled termcap support (#154323)
-
-* Wed Sep 28 2005 Florian La Roche <laroche@redhat.com>
-- fixup building with current rpm
-
-* Wed Apr 20 2005 Dave Jones <davej@redhat.com>
-- Disable debug. (#151438)
-- Rebuild with gcc4
-
-* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> - 2.6.13-3
-- Rebuilt for new readline.
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed May  5 2004 Jeremy Katz <katzj@redhat.com> - 2.6.13-1
-- update to 2.6.13 per request of upstream
-- fixes mount by label of xfs on former raid partition (#122043)
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Thu Jan  8 2004 Jeremy Katz <katzj@redhat.com> 2.6.0-2
-- add defattr (reported by Matthias)
-
-* Tue Dec 23 2003 Elliot Lee <sopwith@redhat.com> 2.6.0-3
-- Fix tyops in dependencies
-
-* Mon Dec 22 2003 Jeremy Katz <katzj@redhat.com> 2.6.0-1
-- build for Fedora Core
-- switch to more explicit file lists, nuke .la files
-
-* Tue Dec 16 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.6.0
-- Update to 2.6.0.
-
-* Sat Sep 13 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de>
-- Sync with XFS 1.3.0.
-- Update to 2.5.6.
-
-* Thu Apr 10 2003 Axel Thimm <Axel.Thimm@physik.fu-berlin.de> 2.3.9-0_2.90at
-- Rebuilt for Red Hat 9.
+* Wed Jun 10 2015 Eric Sandeen <sandeen@redhat.com> 3.2.3-1
+- New upstream release