* Mon Feb 27 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1

- New upstream version
  Resolves: rhbz#2170017
- Update tests
- Disable LTO to fix unit test breakage in el9
- gfs2_edit: Fix savemeta test failures in 32-bit environments

.gitignore

@@ -1,3 +1,4 @@
 /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

0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch

@@ -0,0 +1,25 @@
+commit a3f3aadc789f214cd24606808f5d8a6608e10219
+Author: Andrew Price <anprice@redhat.com>
+Date:   Fri Feb 10 12:31:08 2023 +0000
+
+    gfs2_edit: Fix savemeta test failures in 32-bit environments
+    
+    size_t is the wrong type for sm_fs_bytes and it is too small in 32-bit
+    environments leading to savemeta test failures, as it considers the
+    target to be too small. Change it to uint64_t.
+    
+    Signed-off-by: Andrew Price <anprice@redhat.com>
+
+diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c
+index e6ca18b1..5c864d2e 100644
+--- a/gfs2/edit/savemeta.c
++++ b/gfs2/edit/savemeta.c
+@@ -43,7 +43,7 @@ struct savemeta_header {
+ struct savemeta {
+ 	time_t sm_time;
+ 	unsigned sm_format;
+-	size_t sm_fs_bytes;
++	uint64_t sm_fs_bytes;
+ };
+ 
+ struct saved_metablock {

gfs2-utils.spec

@@ -1,6 +1,8 @@
+%global _lto_cflags %nil
+
 Name: gfs2-utils
-Version: 3.4.1
-Release: 4%{?dist}
+Version: 3.5.0
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -21,6 +23,7 @@ BuildRequires: bzip2-devel
 BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
+Patch: 0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch
 
 %prep
 %autosetup -p1
@@ -63,6 +66,13 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Mon Feb 27 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1
+- New upstream version
+  Resolves: rhbz#2170017
+- Update tests
+- Disable LTO to fix unit test breakage in el9
+- gfs2_edit: Fix savemeta test failures in 32-bit environments
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.4.1-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

sources

@@ -1 +1 @@
-SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e
+SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765

tests/atlocal

@@ -1,8 +1,17 @@
-GFS_TGT="../../testvol"
-GFS_TGT_SZ=10
+GFS_TGT="${abs_top_builddir}/tests/testvol"
+GFS_TGT_SZ=20
 GFS_MKFS="mkfs.gfs2 -O -D"
 
 gfs_max_blocks()
 {
 	printf $((GFS_TGT_SZ*1073741824/$1))
 }
+
+gfs_tgt_cleanup()
+{
+	if $1; then
+		rm -f $GFS_TGT
+	fi
+}
+
+trap 'gfs_tgt_cleanup $at_arg_always_clean_testvol' EXIT