From 1e1999af85f70a41f427c790668ed8eb34583378 Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Thu, 9 Feb 2023 16:32:20 +0000 Subject: [PATCH] * 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