Upgrade gfs2-utils to 3.5.1 for Mariner 3.0 (#7623)
Co-authored-by: Nan Liu <liunan@microsoft.com>
This commit is contained in:
CBL-Mariner-Bot
GitHub
Родитель
3a7ce00996
Коммит
ae4d3c7bf3
|
|
@ -1,26 +0,0 @@
|
|||
commit 222e97c23dd015a8fc4bcceb598720cc17337edf
|
||||
Author: Andrew Price <anprice@redhat.com>
|
||||
Date: Mon Feb 4 14:54:34 2019 +0000
|
||||
|
||||
Fix libuuid linking
|
||||
|
||||
Fixes a build failure in Rawhide.
|
||||
|
||||
Signed-off-by: Andrew Price <anprice@redhat.com>
|
||||
|
||||
diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
|
||||
index 749da85a..76df920e 100644
|
||||
--- a/gfs2/libgfs2/Makefile.am
|
||||
+++ b/gfs2/libgfs2/Makefile.am
|
||||
@@ -54,8 +54,9 @@ libgfs2_la_CPPFLAGS = \
|
||||
$(uuid_CFLAGS)
|
||||
|
||||
gfs2l_SOURCES = gfs2l.c
|
||||
-gfs2l_LDADD = libgfs2.la
|
||||
-gfs2l_LDFLAGS = $(uuid_LIBS)
|
||||
+gfs2l_LDADD = \
|
||||
+ libgfs2.la \
|
||||
+ $(uuid_LIBS)
|
||||
gfs2l_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gfs2/include \
|
||||
-D_FILE_OFFSET_BITS=64
|
||||
|
|
@ -1,159 +0,0 @@
|
|||
commit 1a92a964c8ba87d95b2f43b0adc3d351a7f7ba80
|
||||
Author: Andrew Price <anprice@redhat.com>
|
||||
Date: Mon Feb 4 15:31:33 2019 +0000
|
||||
|
||||
Fix more linking errors
|
||||
|
||||
Signed-off-by: Andrew Price <anprice@redhat.com>
|
||||
|
||||
diff --git a/gfs2/convert/Makefile.am b/gfs2/convert/Makefile.am
|
||||
index 4db643fb..2d61af74 100644
|
||||
--- a/gfs2/convert/Makefile.am
|
||||
+++ b/gfs2/convert/Makefile.am
|
||||
@@ -7,5 +7,6 @@ gfs2_convert_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gfs2/include \
|
||||
-I$(top_srcdir)/gfs2/libgfs2
|
||||
|
||||
-gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
-gfs2_convert_LDFLAGS = $(uuid_LIBS)
|
||||
+gfs2_convert_LDADD = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
+ $(uuid_LIBS)
|
||||
diff --git a/gfs2/edit/Makefile.am b/gfs2/edit/Makefile.am
|
||||
index a9b177e9..4a89502c 100644
|
||||
--- a/gfs2/edit/Makefile.am
|
||||
+++ b/gfs2/edit/Makefile.am
|
||||
@@ -25,9 +25,9 @@ gfs2_edit_CFLAGS = \
|
||||
$(zlib_CFLAGS) \
|
||||
$(uuid_CFLAGS)
|
||||
|
||||
-gfs2_edit_LDFLAGS = \
|
||||
+gfs2_edit_LDADD = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
$(ncurses_LIBS) \
|
||||
$(zlib_LIBS) \
|
||||
$(uuid_LIBS)
|
||||
|
||||
-gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
|
||||
index 97fcd404..1c528051 100644
|
||||
--- a/gfs2/fsck/Makefile.am
|
||||
+++ b/gfs2/fsck/Makefile.am
|
||||
@@ -36,6 +36,5 @@ fsck_gfs2_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gfs2/libgfs2
|
||||
|
||||
fsck_gfs2_LDADD = \
|
||||
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
-fsck_gfs2_LDFLAGS = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
$(uuid_LIBS)
|
||||
diff --git a/gfs2/glocktop/Makefile.am b/gfs2/glocktop/Makefile.am
|
||||
index 1102c8e2..f5076554 100644
|
||||
--- a/gfs2/glocktop/Makefile.am
|
||||
+++ b/gfs2/glocktop/Makefile.am
|
||||
@@ -9,10 +9,6 @@ glocktop_SOURCES = \
|
||||
glocktop_CFLAGS = \
|
||||
$(ncurses_CFLAGS)
|
||||
|
||||
-glocktop_LDFLAGS = \
|
||||
- $(ncurses_LIBS) \
|
||||
- $(uuid_LIBS)
|
||||
-
|
||||
glocktop_CPPFLAGS = \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
-D_LARGEFILE64_SOURCE \
|
||||
@@ -21,4 +17,6 @@ glocktop_CPPFLAGS = \
|
||||
-I$(top_srcdir)/gfs2/libgfs2
|
||||
|
||||
glocktop_LDADD = \
|
||||
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
+ $(ncurses_LIBS) \
|
||||
+ $(uuid_LIBS)
|
||||
diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am
|
||||
index f0dd961c..fd7145b8 100644
|
||||
--- a/gfs2/mkfs/Makefile.am
|
||||
+++ b/gfs2/mkfs/Makefile.am
|
||||
@@ -25,10 +25,10 @@ mkfs_gfs2_CPPFLAGS = $(COMMON_CPPFLAGS)
|
||||
mkfs_gfs2_CFLAGS = \
|
||||
$(blkid_CFLAGS) \
|
||||
$(uuid_CFLAGS)
|
||||
-mkfs_gfs2_LDFLAGS = \
|
||||
+mkfs_gfs2_LDADD = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
$(blkid_LIBS) \
|
||||
$(uuid_LIBS)
|
||||
-mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
|
||||
gfs2_grow_SOURCES = \
|
||||
main_grow.c \
|
||||
@@ -36,16 +36,17 @@ gfs2_grow_SOURCES = \
|
||||
|
||||
gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
|
||||
gfs2_grow_CFLAGS = $(blkid_CFLAGS)
|
||||
-gfs2_grow_LDFLAGS = \
|
||||
+gfs2_grow_LDADD = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
$(blkid_LIBS) \
|
||||
$(uuid_LIBS)
|
||||
-gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
|
||||
gfs2_jadd_SOURCES = \
|
||||
main_jadd.c \
|
||||
metafs.c
|
||||
|
||||
gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS)
|
||||
-gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
-gfs2_jadd_LDFLAGS = $(uuid_LIBS)
|
||||
+gfs2_jadd_LDADD = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
+ $(uuid_LIBS)
|
||||
|
||||
diff --git a/gfs2/tune/Makefile.am b/gfs2/tune/Makefile.am
|
||||
index 7628f424..171377d0 100644
|
||||
--- a/gfs2/tune/Makefile.am
|
||||
+++ b/gfs2/tune/Makefile.am
|
||||
@@ -13,5 +13,5 @@ tunegfs2_CPPFLAGS = \
|
||||
-I$(top_srcdir)/group/include
|
||||
tunegfs2_CFLAGS = \
|
||||
$(uuid_CFLAGS)
|
||||
-tunegfs2_LDFLAGS = \
|
||||
+tunegfs2_LDADD = \
|
||||
$(uuid_LIBS)
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 40fcfb47..40b486b0 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -26,8 +26,7 @@ nukerg_CFLAGS = \
|
||||
-I$(top_srcdir)/gfs2/libgfs2 \
|
||||
-I$(top_srcdir)/gfs2/include
|
||||
nukerg_LDADD = \
|
||||
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
|
||||
-nukerg_LDFLAGS = \
|
||||
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
|
||||
$(uuid_LIBS)
|
||||
|
||||
if HAVE_CHECK
|
||||
@@ -54,16 +53,18 @@ check_meta_SOURCES = \
|
||||
$(UNIT_SOURCES) \
|
||||
check_meta.c
|
||||
check_meta_CFLAGS = $(UNIT_CFLAGS)
|
||||
-check_meta_LDADD = $(UNIT_LDADD)
|
||||
-check_meta_LDFLAGS = $(uuid_LIBS)
|
||||
+check_meta_LDADD = \
|
||||
+ $(UNIT_LDADD) \
|
||||
+ $(uuid_LIBS)
|
||||
check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
|
||||
|
||||
check_rgrp_SOURCES = \
|
||||
$(UNIT_SOURCES) \
|
||||
check_rgrp.c
|
||||
check_rgrp_CFLAGS = $(UNIT_CFLAGS)
|
||||
-check_rgrp_LDADD = $(UNIT_LDADD)
|
||||
-check_rgrp_LDFLAGS = $(uuid_LIBS)
|
||||
+check_rgrp_LDADD = \
|
||||
+ $(UNIT_LDADD) \
|
||||
+ $(uuid_LIBS)
|
||||
check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
|
||||
endif
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
From 17fb470356a6d55988f05ac70f06b382ef982604 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Nov 08 2021 11:30:45 +0000
|
||||
Subject: 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 798639b..88ee3e5 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++;
|
||||
}
|
||||
|
||||
|
||||
From 9b16dfdf2b12ef89933af629d81489869d7688a6 Mon Sep 17 00:00:00 2001
|
||||
From: Olivia Crain <olivia@olivia.dev>
|
||||
Date: Fri, 17 Jun 2022 18:52:34 +0000
|
||||
Subject: [PATCH] gfs2hex.c: Fix format-security error in gfs2_inum_print2
|
||||
|
||||
---
|
||||
gfs2/edit/gfs2hex.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c
|
||||
index 62d5cab..0972469 100644
|
||||
--- a/gfs2/edit/gfs2hex.c
|
||||
+++ b/gfs2/edit/gfs2hex.c
|
||||
@@ -376,7 +376,7 @@ static void gfs2_inum_print2(const char *title,struct gfs2_inum *no)
|
||||
if (termlines) {
|
||||
check_highlight(TRUE);
|
||||
move(line,2);
|
||||
- printw(title);
|
||||
+ printw("%s", title);
|
||||
check_highlight(FALSE);
|
||||
}
|
||||
else
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"gfs2-utils-3.2.0.tar.gz": "372dc8eeb058317a90dcba4e9a7d4c69bd27e4b8e086901348c29191e9eecb0d"
|
||||
}
|
||||
}
|
||||
"Signatures": {
|
||||
"gfs2-utils-3.5.1.tar.gz": "c92f832d4e243be15d89079df913dc4b2524212a3f2447e3eb0455cc67384e84"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,19 +11,17 @@
|
|||
###############################################################################
|
||||
Summary: Utilities for managing the global file system (GFS2)
|
||||
Name: gfs2-utils
|
||||
Version: 3.2.0
|
||||
Release: 12%{?dist}
|
||||
Version: 3.5.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ AND LGPLv2+
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
URL: https://pagure.io/gfs2-utils
|
||||
Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
|
||||
Patch0: 0-Fix_libuuid_linking.patch
|
||||
Patch1: 1-Fix_more_linking_errors.patch
|
||||
Patch2: fix-format-security.patch
|
||||
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: check-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: gettext-devel
|
||||
|
|
@ -70,7 +68,7 @@ modifying, and correcting inconsistencies in GFS2 file systems.
|
|||
%{_sbindir}/gfs2_convert
|
||||
%{_sbindir}/gfs2_edit
|
||||
%{_sbindir}/tunegfs2
|
||||
%{_sbindir}/gfs2_withdraw_helper
|
||||
%{_libexecdir}/gfs2_withdraw_helper
|
||||
%{_sbindir}/glocktop
|
||||
%{_mandir}/man8/*gfs2*
|
||||
%{_mandir}/man8/glocktop*
|
||||
|
|
@ -78,6 +76,11 @@ modifying, and correcting inconsistencies in GFS2 file systems.
|
|||
%{_libdir}/udev/rules.d/82-gfs2-withdraw.rules
|
||||
|
||||
%changelog
|
||||
* Fri Feb 23 2024 Nan Liu <liunan@microsoft.com> - 3.5.1-1
|
||||
- Upgrade to 3.5.1.
|
||||
- Remove patches.
|
||||
- Add BuildRequires and update file directory.
|
||||
|
||||
* Tue Sep 26 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.2.0-12
|
||||
- Removing 'exit' calls from the '%%check' section.
|
||||
|
||||
|
|
|
|||
|
|
@ -4210,8 +4210,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "gfs2-utils",
|
||||
"version": "3.2.0",
|
||||
"downloadUrl": "https://releases.pagure.org/gfs2-utils/gfs2-utils-3.2.0.tar.gz"
|
||||
"version": "3.5.1",
|
||||
"downloadUrl": "https://releases.pagure.org/gfs2-utils/gfs2-utils-3.5.1.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче