From 009a3940f3987324440465ec08666c4d87480629 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 04:21:55 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 43f955e..e79c924 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) %ifnarch %{arm} @@ -63,6 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 3.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 56e8974ead862577d526a9e17918d3de3957b8ec Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Thu, 23 Jun 2022 15:41:47 +0100 Subject: [PATCH 02/15] * Thu Jun 23 2022 Andrew Price - 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 --- ...le_format_for_printf_style_functions.patch | 33 +++++++++++++++++++ 1-fix-missed-printw.patch | 12 +++++++ gfs2-utils.spec | 9 ++++- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch create mode 100644 1-fix-missed-printw.patch diff --git a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch new file mode 100644 index 0000000..1c5d7d7 --- /dev/null +++ b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch @@ -0,0 +1,33 @@ +commit 17fb470356a6d55988f05ac70f06b382ef982604 +Author: Sergei Trofimovich +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++; + } + diff --git a/1-fix-missed-printw.patch b/1-fix-missed-printw.patch new file mode 100644 index 0000000..be4c2d7 --- /dev/null +++ b/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 diff --git a/gfs2-utils.spec b/gfs2-utils.spec index e79c924..d0bcb5c 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) %ifnarch %{arm} @@ -21,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 @@ -63,6 +65,11 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jun 23 2022 Andrew Price - 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 - 3.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 05ff9d3929e95a73b5d9437badaeb747b6e62999 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 04:32:13 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index d0bcb5c..d387ad7 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.4.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) %ifnarch %{arm} @@ -65,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 23 2022 Andrew Price - 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 From 5af69c86ff0a4781a669d6435f993749fe836366 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:47:19 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index d387ad7..d70129c 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.4.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) %ifnarch %{arm} @@ -65,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 3.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1e1999af85f70a41f427c790668ed8eb34583378 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Thu, 9 Feb 2023 16:32:20 +0000 Subject: [PATCH 05/15] * Thu Feb 09 2023 Andrew Price - 3.5.0-1 - New upstream release - Drop all patches - Exclude i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval - Migrate to SPDX license identifier --- .gitignore | 1 + ...le_format_for_printf_style_functions.patch | 33 ------------------- 1-fix-missed-printw.patch | 12 ------- gfs2-utils.spec | 17 +++++++--- sources | 2 +- 5 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch delete mode 100644 1-fix-missed-printw.patch diff --git a/.gitignore b/.gitignore index 2daf545..e258909 100644 --- a/.gitignore +++ b/.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 diff --git a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch deleted file mode 100644 index 1c5d7d7..0000000 --- a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 17fb470356a6d55988f05ac70f06b382ef982604 -Author: Sergei Trofimovich -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++; - } - diff --git a/1-fix-missed-printw.patch b/1-fix-missed-printw.patch deleted file mode 100644 index be4c2d7..0000000 --- a/1-fix-missed-printw.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/gfs2-utils.spec b/gfs2-utils.spec index d70129c..586bcae 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,11 +1,14 @@ Name: gfs2-utils -Version: 3.4.1 -Release: 6%{?dist} -License: GPLv2+ and LGPLv2+ +Version: 3.5.0 +Release: 1%{?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 @@ -21,8 +24,6 @@ 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 @@ -65,6 +66,12 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Feb 09 2023 Andrew Price - 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 - 3.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b779448..310735a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e +SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765 From c378aa91c68f5dd977cd17499bfa2372c9ec3e43 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Tue, 11 Apr 2023 18:37:03 +0100 Subject: [PATCH 06/15] * Tue Apr 11 2023 Andrew Price - 3.5.1-1 - New upstream release --- .gitignore | 1 + gfs2-utils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e258909..0c329f8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 586bcae..e95949b 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,5 +1,5 @@ Name: gfs2-utils -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} # Refer to doc/README.licence in the upstream tarball License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Tue Apr 11 2023 Andrew Price - 3.5.1-1 +- New upstream release + * Thu Feb 09 2023 Andrew Price - 3.5.0-1 - New upstream release - Drop all patches diff --git a/sources b/sources index 310735a..4278534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765 +SHA512 (gfs2-utils-3.5.1.tar.gz) = 08c7b1870b1fb76496f7ab4ce3c121e4e5f5a37760831536817ed880ef030d765a533c53ba9913ae080b4a98b4efaffa112fcf92acd4e939199d1dae8d0e6f9b From 8a2056d72b6047abdb5a38ddc0cafd2528231df3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 21:13:19 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index e95949b..75a2f4f 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 1%{?dist} +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) @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 11 2023 Andrew Price - 3.5.1-1 - New upstream release From 2a63457c456237db8a83f32d94d847296b9ed00c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 20:41:10 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 75a2f4f..5a3969b 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 2%{?dist} +Release: 3%{?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) @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e87fb43e6fdc0d47d8d596a0e563854008c34cb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:56:36 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 5a3969b..b64b2dc 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 3%{?dist} +Release: 4%{?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) @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5a9f1acadd7a7279e47c0b6cf9f4742bb46ccedc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 00:35:26 +0000 Subject: [PATCH 10/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index b64b2dc..a8a7f45 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 4%{?dist} +Release: 5%{?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) @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 3.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 11929a37617d1c91789c8c47764c74797f2e4997 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:57:40 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index a8a7f45..845a3ff 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 5%{?dist} +Release: 6%{?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) @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 3.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9914a4c60a73ccffb857a41715c2bc513544baf3 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Mon, 20 Jan 2025 18:06:53 +0000 Subject: [PATCH 12/15] * Mon Jan 20 2025 Andrew Price - 3.5.1-7 - Don't hardcode /usr/sbin in the spec --- gfs2-utils.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 845a3ff..778e1d5 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.5.1 -Release: 6%{?dist} +Release: 7%{?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) @@ -39,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 @@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Mon Jan 20 2025 Andrew Price - 3.5.1-7 +- Don't hardcode /usr/sbin in the spec + * Thu Jan 16 2025 Fedora Release Engineering - 3.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0d360ede59aafd48958f891bb7f5d79eb654b0d4 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Thu, 27 Feb 2025 17:13:30 +0000 Subject: [PATCH 13/15] * Thu Feb 27 2025 Andrew Price - 3.6.1-1 - New upstream release --- .gitignore | 1 + gfs2-utils.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0c329f8..3076a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 778e1d5..58beb29 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils -Version: 3.5.1 -Release: 7%{?dist} +Version: 3.6.1 +Release: 1%{?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) @@ -55,7 +55,6 @@ 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 @@ -66,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems. %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules %changelog +* Thu Feb 27 2025 Andrew Price - 3.6.1-1 +- New upstream release + * Mon Jan 20 2025 Andrew Price - 3.5.1-7 - Don't hardcode /usr/sbin in the spec diff --git a/sources b/sources index 4278534..bf0a0ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gfs2-utils-3.5.1.tar.gz) = 08c7b1870b1fb76496f7ab4ce3c121e4e5f5a37760831536817ed880ef030d765a533c53ba9913ae080b4a98b4efaffa112fcf92acd4e939199d1dae8d0e6f9b +SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346 From 940e1380316390487b89742392d76a7e43575db4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 21:20:59 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gfs2-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gfs2-utils.spec b/gfs2-utils.spec index 58beb29..3f1220a 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,6 +1,6 @@ Name: gfs2-utils Version: 3.6.1 -Release: 1%{?dist} +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) @@ -65,6 +65,9 @@ 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 - 3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 27 2025 Andrew Price - 3.6.1-1 - New upstream release From 1cd5e8054480bdecdc4a5d84de6661712e19d329 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Mon, 28 Jul 2025 11:21:17 +0100 Subject: [PATCH 15/15] Migrate tests to tmt For https://fedoraproject.org/wiki/Changes/DisableSTI --- .fmf/version | 1 + plans/testsuite.fmf | 5 +++++ tests/tests.yml | 11 ----------- tests/testsuite.fmf | 2 ++ 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/testsuite.fmf delete mode 100644 tests/tests.yml create mode 100644 tests/testsuite.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/testsuite.fmf b/plans/testsuite.fmf new file mode 100644 index 0000000..2f86880 --- /dev/null +++ b/plans/testsuite.fmf @@ -0,0 +1,5 @@ +summary: Run testsuite +discover: + how: fmf +execute: + how: tmt diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index aaaac51..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - environment: - PATH: ".:{{ ansible_env.PATH }}" - tests: - - upstream_test_suite: - dir: . - run: ./testsuite diff --git a/tests/testsuite.fmf b/tests/testsuite.fmf new file mode 100644 index 0000000..dd9714f --- /dev/null +++ b/tests/testsuite.fmf @@ -0,0 +1,2 @@ +summary: Upstream testsuite +test: ./testsuite