New upstream release 1.45.6
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
This commit is contained in:
Eric Sandeen
parent
bdcc549ca9
commit
30661bb04e
|
|
@ -43,3 +43,4 @@ e2fsprogs-1.41.12.tar.gz
|
|||
/e2fsprogs-1.45.3.tar.xz
|
||||
/e2fsprogs-1.45.4.tar.xz
|
||||
/e2fsprogs-1.45.5.tar.xz
|
||||
/e2fsprogs-1.45.6.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
From 92c24f230ac7c02b5111849d94db14a24626bee4 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Czerner <lczerner@redhat.com>
|
||||
Date: Thu, 30 Jan 2020 13:24:19 +0100
|
||||
Subject: [PATCH] tst_libext2fs: Avoid multiple definition of global variables
|
||||
|
||||
gcc version 10 changed the default from -fcommon to -fno-common and as a
|
||||
result e2fsprogs unit tests fail because tst_libext2fs.c end up with a
|
||||
build error.
|
||||
|
||||
This is because it defines two global variables debug_prog_name and
|
||||
extra_cmds that are already defined in debugfs/debugfs.c. With -fcommon
|
||||
linker was able to resolve those into the same object, however with
|
||||
-fno-common it's no longer able to do it and we end up with
|
||||
multiple definition errors.
|
||||
|
||||
Fix the problem by creating an extern declaration of said variables in
|
||||
debugfs.h and just setting them in tst_libext2fs.c without additional
|
||||
declaration.
|
||||
|
||||
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
|
||||
---
|
||||
debugfs/debugfs.h | 2 ++
|
||||
lib/ext2fs/tst_libext2fs.c | 5 +++--
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h
|
||||
index 477d9bbb..956517bc 100644
|
||||
--- a/debugfs/debugfs.h
|
||||
+++ b/debugfs/debugfs.h
|
||||
@@ -123,6 +123,8 @@ extern void do_set_block_group_descriptor(int argc, char **, int sci_idx, void *
|
||||
extern void do_dump_unused(int argc, char **argv, int sci_idx, void *infop);
|
||||
|
||||
/* debugfs.c */
|
||||
+extern ss_request_table *extra_cmds;
|
||||
+extern const char *debug_prog_name;
|
||||
extern void internal_dump_inode(FILE *, const char *, ext2_ino_t,
|
||||
struct ext2_inode *, int);
|
||||
|
||||
diff --git a/lib/ext2fs/tst_libext2fs.c b/lib/ext2fs/tst_libext2fs.c
|
||||
index 3e7497cd..43f0d153 100644
|
||||
--- a/lib/ext2fs/tst_libext2fs.c
|
||||
+++ b/lib/ext2fs/tst_libext2fs.c
|
||||
@@ -28,9 +28,7 @@
|
||||
* Hook in new commands into debugfs
|
||||
* Override debugfs's prompt
|
||||
*/
|
||||
-const char *debug_prog_name = "tst_libext2fs";
|
||||
extern ss_request_table libext2fs_cmds;
|
||||
-ss_request_table *extra_cmds = &libext2fs_cmds;
|
||||
|
||||
static int print_blocks_proc(ext2_filsys fs EXT2FS_ATTR((unused)),
|
||||
blk64_t *blocknr, e2_blkcnt_t blockcnt,
|
||||
@@ -51,6 +49,9 @@ void do_block_iterate(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
|
||||
int err = 0;
|
||||
int flags = 0;
|
||||
|
||||
+ debug_prog_name = "tst_libext2fs";
|
||||
+ extra_cmds = &libext2fs_cmds;
|
||||
+
|
||||
if (common_args_process(argc, argv, 2, 3, argv[0], usage, 0))
|
||||
return;
|
||||
|
||||
--
|
||||
2.21.1
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Utilities for managing ext2, ext3, and ext4 file systems
|
||||
Name: e2fsprogs
|
||||
Version: 1.45.5
|
||||
Release: 3%{?dist}
|
||||
Version: 1.45.6
|
||||
Release: 1%{?dist}
|
||||
|
||||
# License tags based on COPYING file distinctions for various components
|
||||
License: GPLv2
|
||||
|
|
@ -27,8 +27,6 @@ BuildRequires: gettext
|
|||
BuildRequires: multilib-rpm-config
|
||||
BuildRequires: systemd
|
||||
|
||||
Patch0: 0001-tst_libext2fs-Avoid-multiple-definition-of-global-va.patch
|
||||
|
||||
%description
|
||||
The e2fsprogs package contains a number of utilities for creating,
|
||||
checking, modifying, and correcting any inconsistencies in second,
|
||||
|
|
@ -156,8 +154,6 @@ managed device with some free space available in respective volume group.
|
|||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%global _udevdir %{_prefix}/lib/udev/rules.d
|
||||
|
||||
%build
|
||||
|
|
@ -324,6 +320,9 @@ make fullcheck
|
|||
%{_udevdir}/96-e2scrub.rules
|
||||
|
||||
%changelog
|
||||
* Tue Mar 24 2020 Lukas Czerner <sandeen@redhat.com> - 1.45.6-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Jan 30 2020 Lukas Czerner <lczerner@redhat.com> - 1.45.5-3
|
||||
- Fix build errors with gcc 10
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (e2fsprogs-1.45.5.tar.xz) = d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
|
||||
SHA512 (e2fsprogs-1.45.6.tar.xz) = f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
|
||||
|
|
|
|||
Loading…
Reference in New Issue