* 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
This commit is contained in:
parent
5af69c86ff
commit
1e1999af85
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
/gfs2-utils-3.3.0.tar.gz
|
/gfs2-utils-3.3.0.tar.gz
|
||||||
/gfs2-utils-3.4.0.tar.gz
|
/gfs2-utils-3.4.0.tar.gz
|
||||||
/gfs2-utils-3.4.1.tar.gz
|
/gfs2-utils-3.4.1.tar.gz
|
||||||
|
/gfs2-utils-3.5.0.tar.gz
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
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,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
|
|
@ -1,11 +1,14 @@
|
|||||||
Name: gfs2-utils
|
Name: gfs2-utils
|
||||||
Version: 3.4.1
|
Version: 3.5.0
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
# 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)
|
Summary: Utilities for managing the global file system (GFS2)
|
||||||
%ifnarch %{arm}
|
%ifnarch %{arm}
|
||||||
%{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)}
|
%{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)}
|
||||||
%endif
|
%endif
|
||||||
|
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||||
|
ExcludeArch: %{ix86}
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: kernel-headers
|
BuildRequires: kernel-headers
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -21,8 +24,6 @@ BuildRequires: bzip2-devel
|
|||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
|
Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
|
||||||
URL: https://pagure.io/gfs2-utils
|
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
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
@ -65,6 +66,12 @@ modifying, and correcting inconsistencies in GFS2 file systems.
|
|||||||
%{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
|
%{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e
|
SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765
|
||||||
|
Loading…
Reference in New Issue
Block a user