diff --git a/1001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch b/1001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch deleted file mode 100644 index 47c63d890fd925e86ec87ca69fc26e917ea70b3f..0000000000000000000000000000000000000000 --- a/1001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 5ccd50176b4e45abf528ef6870c332ef5f05448e Mon Sep 17 00:00:00 2001 -From: "Kaleb S. KEITHLEY" -Date: Thu, 2 Jan 2020 07:46:23 -0500 -Subject: [PATCH] cli: duplicate defns of cli_default_conn_timeout and - cli_ten_minutes_timeout - -Winter is coming. So is gcc-10. - -Compiling with gcc-10-20191219 snapshot reveals dupe defns of -cli_default_conn_timeout and cli_ten_minutes_timeout in -.../cli/src/cli.[ch] due to missing extern decl. - -There are many changes coming in gcc-10 described in -https://gcc.gnu.org/gcc-10/changes.html - -compiling cli.c with gcc-9 we see: - ... - .quad .LC88 - .comm cli_ten_minutes_timeout,4,4 - .comm cli_default_conn_timeout,4,4 - .text - .Letext0: - ... - -and with gcc-10: - ... - .quad .LC88 - .globl cli_ten_minutes_timeout - .bss - .align 4 - .type cli_ten_minutes_timeout, @object - .size cli_ten_minutes_timeout, 4 - cli_ten_minutes_timeout: - .zero 4 - .globl cli_default_conn_timeout - .align 4 - .type cli_default_conn_timeout, @object - .size cli_default_conn_timeout, 4 - cli_default_conn_timeout: - .zero 4 - .text - .Letext0: - ... - -which is reflected in the .o file as (gcc-9): -... -0000000000000004 C cli_ten_minutes_timeout -0000000000000004 C cli_default_conn_timeout -... - -and (gcc-10): -... -0000000000000020 B cli_ten_minutes_timeout -0000000000000024 B cli_default_conn_timeout -... - -See nm(1) and ld(1) for a description C (common) and B (BSS) and how -they are treated by the linker. - -Note: gcc-10 will land in Fedora-32! - -Change-Id: I54ea485736a4910254eeb21222ad263721cdef3c -Fixes: bz#1793492 -Signed-off-by: Kaleb S. KEITHLEY ---- - cli/src/cli.c | 3 +++ - cli/src/cli.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/cli/src/cli.c b/cli/src/cli.c -index fac32d3e9..6ac9c7901 100644 ---- a/cli/src/cli.c -+++ b/cli/src/cli.c -@@ -84,6 +84,9 @@ rpc_clnt_prog_t *cli_rpc_prog; - - extern struct rpc_clnt_program cli_prog; - -+int cli_default_conn_timeout = 120; -+int cli_ten_minutes_timeout = 600; -+ - static int - glusterfs_ctx_defaults_init(glusterfs_ctx_t *ctx) - { -diff --git a/cli/src/cli.h b/cli/src/cli.h -index 7166991a7..09d824ed0 100644 ---- a/cli/src/cli.h -+++ b/cli/src/cli.h -@@ -39,8 +39,8 @@ enum argp_option_keys { - ARGP_PORT_KEY = 'p', - }; - --int cli_default_conn_timeout; --int cli_ten_minutes_timeout; -+extern int cli_default_conn_timeout; -+extern int cli_ten_minutes_timeout; - - typedef enum { - COLD_BRICK_COUNT, --- -2.24.1 - diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..4fa11efd8472cefe97f8bda4f1825e799bbf29a9 --- /dev/null +++ b/download @@ -0,0 +1 @@ +d4aede64fb096b1a32f5113aaafc0d78 glusterfs-6.0.tar.gz diff --git a/glusterfs-6.0.tar.gz b/glusterfs-6.0.tar.gz deleted file mode 100644 index 1a95c44791ef68c8349d7dc5f9fb114f4857c455..0000000000000000000000000000000000000000 Binary files a/glusterfs-6.0.tar.gz and /dev/null differ diff --git a/glusterfs.spec b/glusterfs.spec index 258c09520ea84a2ba92ee5662ac1dd70789c2515..a5ab1ce48e5c7026ad5ac29e5bc6b04d9d057933 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global _hardened_build 1 %global _for_fedora_koji_builds 0 @@ -234,11 +233,11 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.8.0 -Release: 0.1%{?prereltag:.%{prereltag}}%{anolis_release}%{?dist} +Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: glusterfs Version: 6.0 -Release: 61%{anolis_release}%{?dist} +Release: 61.3%{?dist} ExcludeArch: i686 %endif License: GPLv2 or LGPLv3+ @@ -928,11 +927,6 @@ Patch0609: 0609-feature-shard-wrong-dname-results-in-dentry-not-foun.patch Patch0610: 0610-glusterfs.spec.in-remove-condtionals-from-tar-depend.patch Patch0611: 0611-SELinux-Fix-boolean-management-again.patch -# Begin: Anolis customized patches -# port patch from fc33 -Patch1001: 1001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch -# End: Anolis customized patches - %description GlusterFS is a distributed file-system capable of scaling to several petabytes. It aggregates various storage bricks over Infiniband RDMA @@ -2695,8 +2689,14 @@ fi %endif %changelog -* Thu Jan 20 2022 Weitao Zhou 6.0-61.0.1 -- Fix gcc10 -fno-common compile issue for compatible with gcc10 build +* Wed Feb 23 2022 Tamar Shacked - 6.0-61.3 +- Rebuilt for rhel-8.6 target. fixes bugs bz#2056228 + +* Tue Feb 22 2022 Tamar Shacked - 6.0-61.2 +- Rebuilt with rhel-8.5.0-z-build target. fixes bugs bz#2056953 + +* Sun Feb 20 2022 Tamar Shacked - 6.0-61.1 +- Rebuilt for rhel-8.5.0.z. fixes bugs bz#2056647 * Mon Nov 29 2021 Gluster Jenkins - 6.0-61 - fixes bugs bz#1973566