SOURCES/0481-RHGS-3.5.3-rebuild-to-ship-with-RHEL.patch

@@ -1,33 +0,0 @@
-From 346aa7cbc34b9bbbaca45180215a4d9ffd5055df Mon Sep 17 00:00:00 2001
-From: Rinku Kothiya <rkothiya@redhat.com>
-Date: Fri, 19 Feb 2021 06:19:07 +0000
-Subject: [PATCH 481/481] RHGS-3.5.3 rebuild to ship with RHEL.
-
-Label: DOWNSTREAM ONLY
-BUG: 1930561
-
-Change-Id: I9c7f30cc6bc616344b27072bfde056c7bba1e143
-Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
-Reviewed-on: https://code.engineering.redhat.com/gerrit/228413
-Tested-by: RHGS Build Bot <nigelb@redhat.com>
-Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
----
- glusterfs.spec.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/glusterfs.spec.in b/glusterfs.spec.in
-index 30d7162..52f9b40 100644
---- a/glusterfs.spec.in
-+++ b/glusterfs.spec.in
-@@ -1983,6 +1983,8 @@ fi
- %endif
- 
- %changelog
-+* Fri Feb 19 2021 Rinku Kothiya <rkothiya@redhat.com>
-+- Build RGHS clients for RHEL (#1930561)
- 
- * Mon May 11 2020 Sunny Kumar <sunkumar@redhat.com>
- - added requires policycoreutils-python-utils on rhel8 for geo-replication
--- 
-1.8.3.1
-

SOURCES/0481-Update-rfc.sh-to-rhgs-3.5.4.patch

@@ -0,0 +1,26 @@
+From 828be8e789db3c77587c708f930d7fe8c9456e3b Mon Sep 17 00:00:00 2001
+From: Rinku Kothiya <rkothiya@redhat.com>
+Date: Fri, 4 Dec 2020 05:18:45 +0530
+Subject: [PATCH 481/511] Update rfc.sh to rhgs-3.5.4
+
+Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
+---
+ rfc.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rfc.sh b/rfc.sh
+index 1dca29f..c0559b9 100755
+--- a/rfc.sh
++++ b/rfc.sh
+@@ -18,7 +18,7 @@ done
+ shift $((OPTIND-1))
+ 
+ 
+-branch="rhgs-3.5.3";
++branch="rhgs-3.5.4";
+ 
+ set_hooks_commit_msg()
+ {
+-- 
+1.8.3.1
+

SOURCES/0544-RHGS-3.5.4-rebuild-to-ship-with-RHEL-8.5.patch

@@ -0,0 +1,47 @@
+From 840f437d232fbafac9f4448b0f8d0e9976ea1e1d Mon Sep 17 00:00:00 2001
+From: Tamar Shacked <tshacked@redhat.com>
+Date: Mon, 23 Aug 2021 20:46:13 +0300
+Subject: [PATCH 544/544] RHGS-3.5.4: rebuild to ship with RHEL-8.5
+
+Label: DOWNSTREAM ONLY
+BUG: 1996984
+
+Signed-off-by: Tamar Shacked <tshacked@redhat.com>
+Change-Id: Idafc64b8ee5da165c87428b8a5166cf319ef7660
+Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/267350
+Tested-by: RHGS Build Bot <nigelb@redhat.com>
+Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
+---
+ glusterfs.spec.in | 2 ++
+ rfc.sh            | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/glusterfs.spec.in b/glusterfs.spec.in
+index 2be7677..4511979 100644
+--- a/glusterfs.spec.in
++++ b/glusterfs.spec.in
+@@ -1982,6 +1982,8 @@ fi
+ %endif
+ 
+ %changelog
++* Tue Aug 24 2021 Tamar Shacked <tshacked@redhat.com>
++- build RGHS client for RHEL-8.5 (#1996984)
+ 
+ * Mon May 11 2020 Sunny Kumar <sunkumar@redhat.com>
+ - added requires policycoreutils-python-utils on rhel8 for geo-replication
+diff --git a/rfc.sh b/rfc.sh
+index c0559b9..b1153be 100755
+--- a/rfc.sh
++++ b/rfc.sh
+@@ -315,7 +315,7 @@ main()
+     if [ -z "${reference}" ]; then
+         $drier git push $ORIGIN HEAD:refs/for/$branch/rfc;
+     else
+-        $drier git push $ORIGIN HEAD:refs/for/$branch/ref-${reference};
++        $drier git push $ORIGIN HEAD:refs/for/$branch;
+     fi
+ }
+ 
+-- 
+1.8.3.1
+

SOURCES/0901-contrib-remove-contrib-sunrpc-xdr_sizeof.c.patch

@@ -1,250 +0,0 @@
-From 04a43bb831b98ce9942ac6daa7e14ff88ecd9bee Mon Sep 17 00:00:00 2001
-From: Tamar Shacked <tshacked@redhat.com>
-Date: Sun, 1 Aug 2021 09:30:18 +0300
-Subject: contrib: remove contrib/sunrpc/xdr_sizeof.c
-
-It's not needed, and it has a license that Fedora is not very happy with.
-Just removed that file.
-
-Backport of:
-> Upstream-patch-link: https://review.gluster.org/#/c/glusterfs/+/24761/
-> Fixes: #1383
-> Change-Id: Ia753f0058c8a7c6482aca40c3b3dc8f6aa4a266d
-> Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
-
-BUG: 1939340
-
-Signed-off-by: Tamar Shacked <tshacked@redhat.com>
-Change-Id: Ibbc3871e66f542f4cb0c5a6c3182792eb125d0f1
----
- contrib/sunrpc/xdr_sizeof.c | 204 ------------------------------------
- rpc/rpc-lib/src/Makefile.am |   2 +-
- 2 files changed, 1 insertion(+), 205 deletions(-)
- delete mode 100644 contrib/sunrpc/xdr_sizeof.c
-
-diff --git a/contrib/sunrpc/xdr_sizeof.c b/contrib/sunrpc/xdr_sizeof.c
-deleted file mode 100644
-index ca1f7bf0a..000000000
---- a/contrib/sunrpc/xdr_sizeof.c
-+++ /dev/null
-@@ -1,204 +0,0 @@
--/*
-- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
-- *
-- * @APPLE_LICENSE_HEADER_START@
-- *
-- * Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
-- * Reserved.  This file contains Original Code and/or Modifications of
-- * Original Code as defined in and that are subject to the Apple Public
-- * Source License Version 1.1 (the "License").  You may not use this file
-- * except in compliance with the License.  Please obtain a copy of the
-- * License at http://www.apple.com/publicsource and read it before using
-- * this file.
-- *
-- * The Original Code and all software distributed under the License are
-- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-- * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
-- * License for the specific language governing rights and limitations
-- * under the License.
-- *
-- * @APPLE_LICENSE_HEADER_END@
-- */
--
--/*
-- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-- * unrestricted use provided that this legend is included on all tape
-- * media and as a part of the software program in whole or part.  Users
-- * may copy or modify Sun RPC without charge, but are not authorized
-- * to license or distribute it to anyone else except as part of a product or
-- * program developed by the user.
-- *
-- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-- *
-- * Sun RPC is provided with no support and without any obligation on the
-- * part of Sun Microsystems, Inc. to assist in its use, correction,
-- * modification or enhancement.
-- *
-- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-- * OR ANY PART THEREOF.
-- *
-- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-- * or profits or other special, indirect and consequential damages, even if
-- * Sun has been advised of the possibility of such damages.
-- *
-- * Sun Microsystems, Inc.
-- * 2550 Garcia Avenue
-- * Mountain View, California  94043
-- */
--
--/*
-- * xdr_sizeof.c
-- *
-- * Copyright 1990 Sun Microsystems, Inc.
-- *
-- * General purpose routine to see how much space something will use
-- * when serialized using XDR.
-- */
--
--#ifdef GF_DARWIN_HOST_OS
--
--#include <rpc/types.h>
--#include <rpc/xdr.h>
--#include <sys/types.h>
--#include <sys/cdefs.h>
--
--#include <stdlib.h>
--
--/* ARGSUSED */
--#ifdef GF_DARWIN_HOST_OS
--static bool_t
--x_putlong (XDR *xdrs, const int *longp)
--{
--        xdrs->x_handy += BYTES_PER_XDR_UNIT;
--        return TRUE;
--}
--
--#else
--static bool_t
--x_putlong (XDR *xdrs, const long *longp)
--{
--        xdrs->x_handy += BYTES_PER_XDR_UNIT;
--        return TRUE;
--}
--#endif
--
--/* ARGSUSED */
--static bool_t
--x_putbytes (XDR *xdrs, const char *bp, u_int len)
--{
--        xdrs->x_handy += len;
--        return TRUE;
--}
--
--#ifdef GF_DARWIN_HOST_OS
--static u_int
--x_getpostn (XDR *xdrs)
--{
--        return xdrs->x_handy;
--}
--#else
--static u_int
--x_getpostn (const XDR *xdrs)
--{
--        return xdrs->x_handy;
--}
--#endif
--
--/* ARGSUSED */
--static bool_t
--x_setpostn (XDR *xdrs, u_int len)
--{
--        /* This is not allowed */
--        return FALSE;
--}
--
--static int32_t *
--x_inline (XDR *xdrs, u_int len)
--{
--        if (len == 0)
--                return NULL;
--        if (xdrs->x_op != XDR_ENCODE)
--                return NULL;
--        if (len < (u_int) (long int) xdrs->x_base)
--        {
--                /* x_private was already allocated */
--                xdrs->x_handy += len;
--                return (int32_t *) xdrs->x_private;
--        }
--        else
--        {
--                /* Free the earlier space and allocate new area */
--                free (xdrs->x_private);
--                if ((xdrs->x_private = (caddr_t) malloc (len)) == NULL)
--                {
--                        xdrs->x_base = 0;
--                        return NULL;
--                }
--                xdrs->x_base = (void *) (long) len;
--                xdrs->x_handy += len;
--                return (int32_t *) xdrs->x_private;
--        }
--}
--
--static int
--harmless (void)
--{
--        /* Always return FALSE/NULL, as the case may be */
--        return 0;
--}
--
--static void
--x_destroy (XDR *xdrs)
--{
--        xdrs->x_handy = 0;
--        xdrs->x_base = 0;
--        if (xdrs->x_private)
--        {
--                free (xdrs->x_private);
--                xdrs->x_private = NULL;
--        }
--        return;
--}
--
--unsigned long
--xdr_sizeof (xdrproc_t func, void *data)
--{
--        XDR x;
--        struct xdr_ops ops;
--        bool_t stat;
--
--#ifdef GF_DARWIN_HOST_OS
--        typedef bool_t (*dummyfunc1) (XDR *, int *);
--#else
--        typedef bool_t (*dummyfunc1) (XDR *, long *);
--#endif
--        typedef bool_t (*dummyfunc2) (XDR *, caddr_t, u_int);
--
--        ops.x_putlong = x_putlong;
--        ops.x_putbytes = x_putbytes;
--        ops.x_inline = x_inline;
--        ops.x_getpostn = x_getpostn;
--        ops.x_setpostn = x_setpostn;
--        ops.x_destroy = x_destroy;
--
--        /* the other harmless ones */
--        ops.x_getlong = (dummyfunc1) harmless;
--        ops.x_getbytes = (dummyfunc2) harmless;
--
--        x.x_op = XDR_ENCODE;
--        x.x_ops = &ops;
--        x.x_handy = 0;
--        x.x_private = (caddr_t) NULL;
--        x.x_base = (caddr_t) 0;
--
--        stat = func (&x, data, 0);
--        if (x.x_private)
--                free (x.x_private);
--        return (stat == TRUE ? (unsigned) x.x_handy : 0);
--}
--#endif /* GF_DARWIN_HOST_OS */
-diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am
-index 81a964768..35c9db07e 100644
---- a/rpc/rpc-lib/src/Makefile.am
-+++ b/rpc/rpc-lib/src/Makefile.am
-@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libgfrpc.la
- 
- libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
- 	rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
--	rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c  rpc-clnt-ping.c \
-+	rpc-drc.c rpc-clnt-ping.c \
-         autoscale-threads.c mgmt-pmap.c
- 
- EXTRA_DIST = libgfrpc.sym
--- 
-2.27.0
-

SPECS/glusterfs.spec

@@ -233,11 +233,11 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.8.0
-Release:          0.2%{?prereltag:.%{prereltag}}%{?dist}
+Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             glusterfs
 Version:          6.0
-Release:          57.4%{?dist}
+Release:          56.4%{?dist}
 ExcludeArch:      i686
 %endif
 License:          GPLv2 or LGPLv3+
@@ -795,7 +795,7 @@ Patch0477: 0477-glusterd-snapshot-Snapshot-prevalidation-failure-not.patch
 Patch0478: 0478-DHT-Fixing-rebalance-failure-on-issuing-stop-command.patch
 Patch0479: 0479-ganesha-ha-revised-regex-exprs-for-status.patch
 Patch0480: 0480-DHT-Rebalance-Ensure-Rebalance-reports-status-only-o.patch
-Patch0481: 0481-RHGS-3.5.3-rebuild-to-ship-with-RHEL.patch
+Patch0481: 0481-Update-rfc.sh-to-rhgs-3.5.4.patch
 Patch0482: 0482-logger-Always-print-errors-in-english.patch
 Patch0483: 0483-afr-more-quorum-checks-in-lookup-and-new-entry-marki.patch
 Patch0484: 0484-glusterd-rebalance-status-displays-stats-as-0-after-.patch
@@ -858,8 +858,7 @@ Patch0540: 0540-extras-Disable-write-behind-for-group-samba.patch
 Patch0541: 0541-glusterd-volgen-Add-functionality-to-accept-any-cust.patch
 Patch0542: 0542-xlaotrs-mgmt-Fixing-coverity-issue-1445996.patch
 Patch0543: 0543-glusterd-handle-custom-xlator-failure-cases.patch
-Patch0900: 0900-rhel-9.0-beta-build-fixing-gcc-10-and-LTO-errors.patch
+Patch0544: 0544-RHGS-3.5.4-rebuild-to-ship-with-RHEL-8.5.patch
-Patch0901: 0901-contrib-remove-contrib-sunrpc-xdr_sizeof.c.patch
 
 %description
 GlusterFS is a distributed file-system capable of scaling to several
@@ -2000,7 +1999,6 @@ exit 0
 %if ( 0%{!?_without_server:1} )
 %files server
 %doc extras/clear_xattrs.sh
-%{_datadir}/glusterfs/scripts/xattr_analysis.py*
 %{_datadir}/glusterfs/scripts/quota_fsck.py*
 # sysconf
 %config(noreplace) %{_sysconfdir}/glusterfs
@@ -2603,18 +2601,11 @@ fi
 %endif
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.0-57.4
+* Mon Aug 30 2021 Gluster Jenkins <dkhandel+glusterjenkins@redhat.com> - 6.0-56.4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Add gating.yaml, fixes bugs bz#1996984
-  Related: rhbz#1991688
 
-* Sun Aug 1 2021 Tamar Shacked <tshacked@redhat.com> - 6.0-56.4
+* Tue Aug 24 2021 Gluster Jenkins <dkhandel+glusterjenkins@redhat.com> - 6.0-56.3
-- remove unneeded file with ambiguous licence
+- fixes bugs bz#1996984
-- fixes bug bz#1939340
-
-* Mon Jul 26 2021 Tamar Shacked <tshacked@redhat.com> - 6.0-56.3
-- Rebase with latest RHGS-3.5.4
-- Fix changlog chronological order by removing unneeded changelogs
-- fixes bug bz#1939340
 
 * Thu May 06 2021 Gluster Jenkins <dkhandel+glusterjenkins@redhat.com> - 6.0-56.2
 - fixes bugs bz#1953901