Migrate tests to tmt

For https://fedoraproject.org/wiki/Changes/DisableSTI

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,12 +1,6 @@
-/gfs2-utils-3.1.0.tar.gz
-/gfs2-utils-3.1.1.tar.gz
-/gfs2-utils-3.1.2.tar.gz
-/gfs2-utils-3.1.3.tar.gz
-/gfs2-utils-3.1.4.tar.gz
-/gfs2-utils-3.1.5.tar.gz
-/gfs2-utils-3.1.6.tar.gz
-/gfs2-utils-3.1.7.tar.gz
-/gfs2-utils-3.1.8.tar.gz
-/gfs2-utils-3.1.9.tar.gz
-/gfs2-utils-3.1.10.tar.gz
-/gfs2-utils-3.2.0.tar.gz
+/gfs2-utils-3.3.0.tar.gz
+/gfs2-utils-3.4.0.tar.gz
+/gfs2-utils-3.4.1.tar.gz
+/gfs2-utils-3.5.0.tar.gz
+/gfs2-utils-3.5.1.tar.gz
+/gfs2-utils-3.6.1.tar.gz

0-Fix_libuuid_linking.patch

@@ -1,26 +0,0 @@
-commit 222e97c23dd015a8fc4bcceb598720cc17337edf
-Author: Andrew Price <anprice@redhat.com>
-Date:   Mon Feb 4 14:54:34 2019 +0000
-
-    Fix libuuid linking
-    
-    Fixes a build failure in Rawhide.
-    
-    Signed-off-by: Andrew Price <anprice@redhat.com>
-
-diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
-index 749da85a..76df920e 100644
---- a/gfs2/libgfs2/Makefile.am
-+++ b/gfs2/libgfs2/Makefile.am
-@@ -54,8 +54,9 @@ libgfs2_la_CPPFLAGS = \
- 	$(uuid_CFLAGS)
- 
- gfs2l_SOURCES = gfs2l.c
--gfs2l_LDADD = libgfs2.la
--gfs2l_LDFLAGS = $(uuid_LIBS)
-+gfs2l_LDADD = \
-+	libgfs2.la \
-+	$(uuid_LIBS)
- gfs2l_CPPFLAGS = \
- 	-I$(top_srcdir)/gfs2/include \
- 	-D_FILE_OFFSET_BITS=64

1-Fix_more_linking_errors.patch

@@ -1,159 +0,0 @@
-commit 1a92a964c8ba87d95b2f43b0adc3d351a7f7ba80
-Author: Andrew Price <anprice@redhat.com>
-Date:   Mon Feb 4 15:31:33 2019 +0000
-
-    Fix more linking errors
-    
-    Signed-off-by: Andrew Price <anprice@redhat.com>
-
-diff --git a/gfs2/convert/Makefile.am b/gfs2/convert/Makefile.am
-index 4db643fb..2d61af74 100644
---- a/gfs2/convert/Makefile.am
-+++ b/gfs2/convert/Makefile.am
-@@ -7,5 +7,6 @@ gfs2_convert_CPPFLAGS = \
- 	-I$(top_srcdir)/gfs2/include \
- 	-I$(top_srcdir)/gfs2/libgfs2
- 
--gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
--gfs2_convert_LDFLAGS = $(uuid_LIBS)
-+gfs2_convert_LDADD = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
-+	$(uuid_LIBS)
-diff --git a/gfs2/edit/Makefile.am b/gfs2/edit/Makefile.am
-index a9b177e9..4a89502c 100644
---- a/gfs2/edit/Makefile.am
-+++ b/gfs2/edit/Makefile.am
-@@ -25,9 +25,9 @@ gfs2_edit_CFLAGS = \
- 	$(zlib_CFLAGS) \
- 	$(uuid_CFLAGS)
- 
--gfs2_edit_LDFLAGS = \
-+gfs2_edit_LDADD = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
- 	$(ncurses_LIBS) \
- 	$(zlib_LIBS) \
- 	$(uuid_LIBS)
- 
--gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
-index 97fcd404..1c528051 100644
---- a/gfs2/fsck/Makefile.am
-+++ b/gfs2/fsck/Makefile.am
-@@ -36,6 +36,5 @@ fsck_gfs2_CPPFLAGS = \
- 	-I$(top_srcdir)/gfs2/libgfs2
- 
- fsck_gfs2_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
--fsck_gfs2_LDFLAGS = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
- 	$(uuid_LIBS)
-diff --git a/gfs2/glocktop/Makefile.am b/gfs2/glocktop/Makefile.am
-index 1102c8e2..f5076554 100644
---- a/gfs2/glocktop/Makefile.am
-+++ b/gfs2/glocktop/Makefile.am
-@@ -9,10 +9,6 @@ glocktop_SOURCES = \
- glocktop_CFLAGS = \
- 	$(ncurses_CFLAGS)
- 
--glocktop_LDFLAGS = \
--	$(ncurses_LIBS) \
--	$(uuid_LIBS)
--
- glocktop_CPPFLAGS = \
- 	-D_FILE_OFFSET_BITS=64 \
- 	-D_LARGEFILE64_SOURCE \
-@@ -21,4 +17,6 @@ glocktop_CPPFLAGS = \
- 	-I$(top_srcdir)/gfs2/libgfs2
- 
- glocktop_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
-+	$(ncurses_LIBS) \
-+	$(uuid_LIBS)
-diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am
-index f0dd961c..fd7145b8 100644
---- a/gfs2/mkfs/Makefile.am
-+++ b/gfs2/mkfs/Makefile.am
-@@ -25,10 +25,10 @@ mkfs_gfs2_CPPFLAGS = $(COMMON_CPPFLAGS)
- mkfs_gfs2_CFLAGS = \
- 	$(blkid_CFLAGS) \
- 	$(uuid_CFLAGS)
--mkfs_gfs2_LDFLAGS = \
-+mkfs_gfs2_LDADD	= \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
- 	$(blkid_LIBS) \
- 	$(uuid_LIBS)
--mkfs_gfs2_LDADD	= $(top_builddir)/gfs2/libgfs2/libgfs2.la
- 
- gfs2_grow_SOURCES = \
- 	main_grow.c \
-@@ -36,16 +36,17 @@ gfs2_grow_SOURCES = \
- 
- gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
- gfs2_grow_CFLAGS = $(blkid_CFLAGS)
--gfs2_grow_LDFLAGS = \
-+gfs2_grow_LDADD = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
- 	$(blkid_LIBS) \
- 	$(uuid_LIBS)
--gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
- 
- gfs2_jadd_SOURCES = \
- 	main_jadd.c \
- 	metafs.c
- 
- gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS)
--gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
--gfs2_jadd_LDFLAGS = $(uuid_LIBS)
-+gfs2_jadd_LDADD = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
-+	$(uuid_LIBS)
- 
-diff --git a/gfs2/tune/Makefile.am b/gfs2/tune/Makefile.am
-index 7628f424..171377d0 100644
---- a/gfs2/tune/Makefile.am
-+++ b/gfs2/tune/Makefile.am
-@@ -13,5 +13,5 @@ tunegfs2_CPPFLAGS = \
- 	-I$(top_srcdir)/group/include
- tunegfs2_CFLAGS = \
- 	$(uuid_CFLAGS)
--tunegfs2_LDFLAGS = \
-+tunegfs2_LDADD = \
- 	$(uuid_LIBS)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 40fcfb47..40b486b0 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -26,8 +26,7 @@ nukerg_CFLAGS = \
- 	-I$(top_srcdir)/gfs2/libgfs2 \
- 	-I$(top_srcdir)/gfs2/include
- nukerg_LDADD = \
--	$(top_builddir)/gfs2/libgfs2/libgfs2.la
--nukerg_LDFLAGS = \
-+	$(top_builddir)/gfs2/libgfs2/libgfs2.la \
- 	$(uuid_LIBS)
- 
- if HAVE_CHECK
-@@ -54,16 +53,18 @@ check_meta_SOURCES = \
- 	$(UNIT_SOURCES) \
- 	check_meta.c
- check_meta_CFLAGS = $(UNIT_CFLAGS)
--check_meta_LDADD = $(UNIT_LDADD)
--check_meta_LDFLAGS = $(uuid_LIBS)
-+check_meta_LDADD = \
-+	$(UNIT_LDADD) \
-+	$(uuid_LIBS)
- check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
- 
- check_rgrp_SOURCES = \
- 	$(UNIT_SOURCES) \
- 	check_rgrp.c
- check_rgrp_CFLAGS = $(UNIT_CFLAGS)
--check_rgrp_LDADD = $(UNIT_LDADD)
--check_rgrp_LDFLAGS = $(uuid_LIBS)
-+check_rgrp_LDADD = \
-+	$(UNIT_LDADD) \
-+	$(uuid_LIBS)
- check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
- endif
- 

2-tests_Don_t_use_fail_unless_in_unit_tests.patch

@@ -1,74 +0,0 @@
-diff -urN gfs2-utils-3.2.0/tests/check_meta.c gfs2-utils-3.2.0.patched/tests/check_meta.c
---- gfs2-utils-3.2.0/tests/check_meta.c	2018-05-23 21:04:16.000000000 +0100
-+++ gfs2-utils-3.2.0.patched/tests/check_meta.c	2020-07-29 13:19:28.548734314 +0100
-@@ -6,7 +6,7 @@
- 
- START_TEST(test_lgfs2_meta)
- {
--	fail_unless(lgfs2_selfcheck() == 0);
-+	ck_assert(lgfs2_selfcheck() == 0);
- }
- END_TEST
- 
-diff -urN gfs2-utils-3.2.0/tests/check_rgrp.c gfs2-utils-3.2.0.patched/tests/check_rgrp.c
---- gfs2-utils-3.2.0/tests/check_rgrp.c	2018-05-23 21:04:16.000000000 +0100
-+++ gfs2-utils-3.2.0.patched/tests/check_rgrp.c	2020-07-29 13:19:28.548734314 +0100
-@@ -16,7 +16,7 @@
- 	uint32_t rgsize = (1024 << 20) / 4096;
- 
- 	sdp = calloc(1, sizeof(*sdp));
--	fail_unless(sdp != NULL);
-+	ck_assert(sdp != NULL);
- 
- 	sdp->device.length = rgsize + 20;
- 	sdp->device_fd = -1;
-@@ -24,7 +24,7 @@
- 	compute_constants(sdp);
- 
- 	rgs = lgfs2_rgrps_init(sdp, 0, 0);
--	fail_unless(rgs != NULL);
-+	ck_assert(rgs != NULL);
- 
- 	lgfs2_rgrps_plan(rgs, sdp->device.length - 16, rgsize);
- 
-@@ -32,11 +32,11 @@
- 	ck_assert(addr != 0);
- 
- 	rg = lgfs2_rgrps_append(rgs, &ri, 0);
--	fail_unless(rg != NULL);
-+	ck_assert(rg != NULL);
- 
- 	for (i = 0; i < rg->ri.ri_length; i++) {
- 		rg->bits[i].bi_bh = bget(sdp, rg->ri.ri_addr + i);
--		fail_unless(rg->bits[i].bi_bh != NULL);
-+		ck_assert(rg->bits[i].bi_bh != NULL);
- 	}
- 	return rgs;
- }
-@@ -44,7 +44,7 @@
- START_TEST(test_mockup_rgrp)
- {
- 	lgfs2_rgrps_t rgs = mockup_rgrp();
--	fail_unless(rgs != NULL);
-+	ck_assert(rgs != NULL);
- }
- END_TEST
- 
-@@ -66,7 +66,7 @@
- 		ck_assert_int_eq(err, 0);
- 
- 		addr = lgfs2_rbm_to_block(&rbm);
--		fail_unless(addr == rbm.rgd->ri.ri_data0);
-+		ck_assert(addr == rbm.rgd->ri.ri_data0);
- 	}
- }
- END_TEST
-@@ -110,7 +110,7 @@
- 	ck_assert_int_eq(err, 0);
- 
- 	addr = lgfs2_rbm_to_block(&rbm);
--	fail_unless(addr == (rg->ri.ri_data0 + rg->ri.ri_data - 1));
-+	ck_assert(addr == (rg->ri.ri_data0 + rg->ri.ri_data - 1));
- }
- END_TEST
- 

gating.yaml

@@ -0,0 +1,15 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

gfs2-utils.spec

@@ -1,11 +1,14 @@
 Name: gfs2-utils
-Version: 3.2.0
-Release: 10%{?dist}
-License: GPLv2+ and LGPLv2+
+Version: 3.6.1
+Release: 2%{?dist}
+# Refer to doc/README.licence in the upstream tarball
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
 %{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)}
 %endif
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
 BuildRequires: ncurses-devel
 BuildRequires: kernel-headers
 BuildRequires: automake
@@ -17,11 +20,10 @@ BuildRequires: flex
 BuildRequires: libblkid-devel
 BuildRequires: libuuid-devel
 BuildRequires: check-devel
+BuildRequires: bzip2-devel
+BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
-Patch0: 0-Fix_libuuid_linking.patch
-Patch1: 1-Fix_more_linking_errors.patch
-Patch2: 2-tests_Don_t_use_fail_unless_in_unit_tests.patch
 
 %prep
 %autosetup -p1
@@ -37,8 +39,8 @@ make check || { cat tests/testsuite.log; exit 1; }
 %install
 %make_install
 # Don't ship gfs2_{trace,lockcapture} in this package
-rm -f %{buildroot}/usr/sbin/gfs2_trace
-rm -f %{buildroot}/usr/sbin/gfs2_lockcapture
+rm -f %{buildroot}%{_sbindir}/gfs2_trace
+rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture
 rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
 
@@ -53,17 +55,85 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_sbindir}/gfs2_grow
 %{_sbindir}/gfs2_jadd
 %{_sbindir}/mkfs.gfs2
-%{_sbindir}/gfs2_convert
 %{_sbindir}/gfs2_edit
 %{_sbindir}/tunegfs2
-%{_sbindir}/gfs2_withdraw_helper
 %{_sbindir}/glocktop
+%{_libexecdir}/gfs2_withdraw_helper
 %{_mandir}/man8/*gfs2*
 %{_mandir}/man8/glocktop*
 %{_mandir}/man5/*
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
+- New upstream release
+
+* Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
+- Don't hardcode /usr/sbin in the spec
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 11 2023 Andrew Price <anprice@redhat.com> - 3.5.1-1
+- New upstream release
+
+* Thu Feb 09 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1
+- New upstream release
+- Drop all patches
+- Exclude i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+- Migrate to SPDX license identifier
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jun 23 2022 Andrew Price <anprice@redhat.com> - 3.4.1-4
+- gfs2/edit: always use "%s"-style format for printf()-style functions
+- Custom patch to fix a printw() call missed by the above
+  Fixes a build failure due to format-security warnings being treated as errors
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
+- New upstream version
+
+* Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
+- New upstream version
+- Update testsuite script
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 03 2020 Andrew Price <anprice@redhat.com> - 3.3.0-2
+- Version bump to enable gating tests
+
+* Tue Sep 01 2020 Andrew Price <anprice@redhat.com> - 3.3.0-1
+- New upstream version
+- Add dependency on bzip2
+- Drop all patches
+- gfs2_withdraw_helper is now in /usr/libexec/
+
 * Wed Jul 29 2020 Andrew Price <anprice@redhat.com> - 3.2.0-10
 - tests: Don't use fail_unless in unit tests
   Fixes build failures due to a regression in check-devel

plans/testsuite.fmf

@@ -0,0 +1,5 @@
+summary: Run testsuite
+discover:
+  how: fmf
+execute:
+  how: tmt

sources

@@ -1 +1 @@
-SHA512 (gfs2-utils-3.2.0.tar.gz) = 98ddf07666a7d0b0985e65eafebec455e0926a9bda9350d413f209bfc7af9ef30e23980a516f7375db61ea1b7b55f33934d52685d163ca6cc4a151ac0db5e5fe
+SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346

tests/atlocal

@@ -0,0 +1,8 @@
+GFS_TGT="../../testvol"
+GFS_TGT_SZ=10
+GFS_MKFS="mkfs.gfs2 -O -D"
+
+gfs_max_blocks()
+{
+	printf $((GFS_TGT_SZ*1073741824/$1))
+}

tests/rgrifieldscheck.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+dev=$1
+i=0
+gfs2_edit -p rg 0 $dev | grep rg_data0 > /dev/null 2>&1
+# New fields not present in /usr/include/linux/gfs2_ondisk.h
+test $? = 0 || exit 0
+gfs2_edit -p rindex $dev | while read field rival unused
+do
+	test $field = ri_data0 -o $field = ri_data -o $field = ri_bitbytes || continue
+	rgfield=$(echo $field | sed 's/ri/rg/')
+	rgval=$(gfs2_edit -p rg $i $dev | grep " $rgfield " | awk '{print $2}')
+
+	if test "$rival" != "$rgval"
+	then
+		echo "Bad $rgfield in rg $i: $rgval (expected: $rival)" >&2
+		exit 1
+	fi
+
+	test $field = ri_bitbytes && i=$((i+1))
+done

tests/rgskipcheck.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+dev=$1
+rgcount=$(gfs2_edit -p rgcount $dev | cut -f1 -d' ')
+prevaddr=$(gfs2_edit -p rg 0 $dev | grep ^RG | awk '{print $5}')
+prevskip=0
+for i in `seq 0 $(($rgcount - 1))`; do
+	addr=$(gfs2_edit -p rg $i $dev | grep ^RG | awk '{print $5}')
+	expected=$(($addr - $prevaddr))
+
+	if test $prevskip != $expected; then
+		echo "Bad rg_skip in rg $(($i - 1)): $prevskip (expected: $expected)" >&2
+		exit 1
+	fi
+
+	prevskip=$(gfs2_edit -p rg $i $dev | grep rg_skip | awk '{print $2}')
+	prevaddr=$addr
+done
+

tests/testsuite.fmf

@@ -0,0 +1,2 @@
+summary: Upstream testsuite
+test: ./testsuite