From 6e67c1e1df95dac57f97d80fbd36cf9be3e2f71f Mon Sep 17 00:00:00 2001 From: Andrew Price Date: Tue, 11 Apr 2023 19:08:22 +0100 Subject: [PATCH] * Tue Apr 11 2023 Andrew Price - 3.5.1-1 - New upstream release - Drop patches - Re-enabled LTO Resolves: rhbz#2170017 --- .gitignore | 1 + ...test_failures_in_32_bit_environments.patch | 25 ------------------- gfs2-utils.spec | 11 +++++--- sources | 2 +- 4 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch 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/0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch b/0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch deleted file mode 100644 index a8c0195..0000000 --- a/0-gfs2_edit_Fix_savemeta_test_failures_in_32_bit_environments.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit a3f3aadc789f214cd24606808f5d8a6608e10219 -Author: Andrew Price -Date: Fri Feb 10 12:31:08 2023 +0000 - - gfs2_edit: Fix savemeta test failures in 32-bit environments - - size_t is the wrong type for sm_fs_bytes and it is too small in 32-bit - environments leading to savemeta test failures, as it considers the - target to be too small. Change it to uint64_t. - - Signed-off-by: Andrew Price - -diff --git a/gfs2/edit/savemeta.c b/gfs2/edit/savemeta.c -index e6ca18b1..5c864d2e 100644 ---- a/gfs2/edit/savemeta.c -+++ b/gfs2/edit/savemeta.c -@@ -43,7 +43,7 @@ struct savemeta_header { - struct savemeta { - time_t sm_time; - unsigned sm_format; -- size_t sm_fs_bytes; -+ uint64_t sm_fs_bytes; - }; - - struct saved_metablock { diff --git a/gfs2-utils.spec b/gfs2-utils.spec index f1b6356..ec1e884 100644 --- a/gfs2-utils.spec +++ b/gfs2-utils.spec @@ -1,7 +1,5 @@ -%global _lto_cflags %nil - Name: gfs2-utils -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Summary: Utilities for managing the global file system (GFS2) @@ -23,7 +21,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_Fix_savemeta_test_failures_in_32_bit_environments.patch %prep %autosetup -p1 @@ -66,6 +63,12 @@ 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 +- Drop patches +- Re-enabled LTO + Resolves: rhbz#2170017 + * Mon Feb 27 2023 Andrew Price - 3.5.0-1 - New upstream version Resolves: rhbz#2170017 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