.fmf/version

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

.gitignore

@@ -1,6 +1,3 @@
 /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-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch

@@ -0,0 +1,33 @@
+commit 17fb470356a6d55988f05ac70f06b382ef982604
+Author: Sergei Trofimovich <slyich@gmail.com>
+Date:   Sun Nov 7 09:00:31 2021 +0000
+
+    gfs2/edit: always use "%s"-style format for printf()-style functions
+    
+    `ncurses-6.3` added printf-style function attributes and now makes
+    it easier to catch cases when user input is used in place of format
+    string when built with CFLAGS=-Werror=format-security:
+    
+        hexedit.c:227:9: error: format not a string literal and no format arguments [-Werror=format-security]
+          227 |         printw(s2);
+              |         ^~~~~~
+    
+    Let's wrap all the missing places with "%s" format.
+
+diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
+index 798639b5..88ee3e5f 100644
+--- a/gfs2/edit/hexedit.c
++++ b/gfs2/edit/hexedit.c
+@@ -221,10 +221,10 @@ static void gfs2instr(const char *s1, const char *s2)
+ {
+ 	COLORS_HIGHLIGHT;
+ 	move(line,0);
+-	printw(s1);
++	printw("%s", s1);
+ 	COLORS_NORMAL;
+ 	move(line,17);
+-	printw(s2);
++	printw("%s", s2);
+ 	line++;
+ }
+ 

1-fix-missed-printw.patch

@@ -0,0 +1,12 @@
+diff -urN gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c
+--- gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c	2022-06-23 15:28:41.957428587 +0100
++++ gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c	2022-06-23 15:29:38.013944443 +0100
+@@ -374,7 +374,7 @@
+ 	if (termlines) {
+ 		check_highlight(TRUE);
+ 		move(line,2);
+-		printw(title);
++		printw("%s", title);
+ 		check_highlight(FALSE);
+ 	}
+ 	else

gfs2-utils.spec

@@ -1,14 +1,11 @@
 Name: gfs2-utils
-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
+Version: 3.4.1
+Release: 6%{?dist}
+License: GPLv2+ and LGPLv2+
 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
@@ -24,6 +21,8 @@ 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_always_use_s_style_format_for_printf_style_functions.patch
+Patch: 1-fix-missed-printw.patch
 
 %prep
 %autosetup -p1
@@ -39,8 +38,8 @@ make check || { cat tests/testsuite.log; exit 1; }
 %install
 %make_install
 # Don't ship gfs2_{trace,lockcapture} in this package
-rm -f %{buildroot}%{_sbindir}/gfs2_trace
-rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture
+rm -f %{buildroot}/usr/sbin/gfs2_trace
+rm -f %{buildroot}/usr/sbin/gfs2_lockcapture
 rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
 
@@ -55,6 +54,7 @@ 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}/glocktop
@@ -65,39 +65,6 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_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
 

plans/testsuite.fmf

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

sources

@@ -1 +1 @@
-SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346
+SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e

tests/tests.yml

@@ -0,0 +1,11 @@
+- hosts: localhost
+  roles:
+    - role: standard-test-basic
+      tags:
+        - classic
+      environment:
+        PATH: ".:{{ ansible_env.PATH }}"
+      tests:
+        - upstream_test_suite:
+            dir: .
+            run: ./testsuite

tests/testsuite.fmf

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