glusterfs: uprev from v5.4 to v6.1

The release-6.1 fixes a lot of CVEs.

Modify parts of patches for v6.1.
Remove bd-xlator configure which has been dropped.

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
index e3453a2..deb9e45 100644
--- a/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
+++ b/recipes-extended/glusterfs/files/glusterfs-change-default-nfs-port-number.patch
@@ -1,6 +1,6 @@
-From b0c106e74beee36c20f73b956841007209a7f23c Mon Sep 17 00:00:00 2001
+From b8b48d3c4ab92ce167db8137426fad45e938b11b Mon Sep 17 00:00:00 2001
 From: "Hongzhi.Song" <hongzhi.song@windriver.com>
-Date: Tue, 12 Mar 2019 19:52:03 -0700
+Date: Wed, 24 Apr 2019 22:50:01 -0400
 Subject: [PATCH] glusterfs: change default nfs port number
 
 Currently both native nfs and glusterfs-nfs use NFS well
@@ -30,25 +30,25 @@ Signed-off-by: Vu Tran <vu.tran@windriver.com>
 Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
 [Yi: minor adjust to apply the patch on 3.11.1]
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-[Hongzhi: minor adjust to apply the patch on v5.4]
+[Hongzhi: modify patch for release-6.1]
 Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
 ---
- libglusterfs/src/common-utils.h | 2 +-
+ libglusterfs/src/glusterfs/common-utils.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h
-index 6a6fd8c..218e379 100644
---- a/libglusterfs/src/common-utils.h
-+++ b/libglusterfs/src/common-utils.h
+diff --git a/libglusterfs/src/glusterfs/common-utils.h b/libglusterfs/src/glusterfs/common-utils.h
+index 0e2ecc7..59237a9 100644
+--- a/libglusterfs/src/glusterfs/common-utils.h
++++ b/libglusterfs/src/glusterfs/common-utils.h
 @@ -108,7 +108,7 @@ trap(void);
  /* Defining this here as it is needed by glusterd for setting
   * nfs port in volume status.
   */
 -#define GF_NFS3_PORT 2049
-+#define GF_NFS3_PORT    38467
++#define GF_NFS3_PORT 38467
  
  #define GF_CLIENT_PORT_CEILING 1024
  #define GF_IANA_PRIV_PORTS_START 49152 /* RFC 6335 */
 -- 
-2.17.1
+2.8.1