- updated to 11.2

diff --git a/glusterfs-atomic32.patch b/glusterfs-atomic32.patch
index 5a34e230e66c4cc2366dcfe0c9dd18da92ee48d4..a9f45e1d7ad4b6a6480f3102477e313617f26c3b 100644 (file)
--- a/glusterfs-atomic32.patch
+++ b/glusterfs-atomic32.patch
@@ -1,6 +1,6 @@
-diff -ur glusterfs-10.5.orig/libglusterfs/src/gf-io-legacy.c glusterfs-10.5/libglusterfs/src/gf-io-legacy.c
---- glusterfs-10.5.orig/libglusterfs/src/gf-io-legacy.c        2023-11-14 15:03:34.000000000 +0000
-+++ glusterfs-10.5/libglusterfs/src/gf-io-legacy.c     2025-04-20 13:16:07.787544191 +0000
+diff -ur glusterfs-11.2.orig/libglusterfs/src/gf-io-legacy.c glusterfs-11.2/libglusterfs/src/gf-io-legacy.c
+--- glusterfs-11.2.orig/libglusterfs/src/gf-io-legacy.c        2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/libglusterfs/src/gf-io-legacy.c     2025-08-13 16:32:36.737990754 +0200
 @@ -45,7 +45,11 @@
  {
      uint64_t seq;
@@ -13,24 +13,24 @@ diff -ur glusterfs-10.5.orig/libglusterfs/src/gf-io-legacy.c glusterfs-10.5/libg
  
      gf_io_cbk(NULL, seq, id, res);
  }
-diff -ur glusterfs-10.5.orig/libglusterfs/src/gf-io-uring.c glusterfs-10.5/libglusterfs/src/gf-io-uring.c
---- glusterfs-10.5.orig/libglusterfs/src/gf-io-uring.c 2023-11-14 15:03:34.000000000 +0000
-+++ glusterfs-10.5/libglusterfs/src/gf-io-uring.c      2025-04-20 13:17:10.011727047 +0000
-@@ -668,7 +668,11 @@
+diff -ur glusterfs-11.2.orig/libglusterfs/src/gf-io-uring.c glusterfs-11.2/libglusterfs/src/gf-io-uring.c
+--- glusterfs-11.2.orig/libglusterfs/src/gf-io-uring.c 2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/libglusterfs/src/gf-io-uring.c      2025-08-13 16:32:36.737990754 +0200
+@@ -665,7 +665,11 @@
      idx = tail & gf_io_uring.sq.mask;
      nr = gf_io_uring_sq_length(idx);
      if (nr != 0) {
 +#ifdef __LP64__
-         nr = (uint32_t)uatomic_xchg(&gf_io_uring.sq.sqes[idx].__pad2[2], 0);
+         nr = (uint32_t)uatomic_xchg(&GF_IO_URING_SQE_COUNT(idx), 0);
 +#else
-+        nr = (uint32_t)__atomic_exchange_n(&gf_io_uring.sq.sqes[idx].__pad2[2], 0, __ATOMIC_SEQ_CST);
++        nr = (uint32_t)__atomic_exchange_n(&GF_IO_URING_SQE_COUNT(idx), 0, __ATOMIC_SEQ_CST);
 +#endif
      }
  
      return nr;
-diff -ur glusterfs-10.5.orig/libglusterfs/src/glusterfs/gf-io.h glusterfs-10.5/libglusterfs/src/glusterfs/gf-io.h
---- glusterfs-10.5.orig/libglusterfs/src/glusterfs/gf-io.h     2023-11-14 15:03:34.000000000 +0000
-+++ glusterfs-10.5/libglusterfs/src/glusterfs/gf-io.h  2025-04-20 13:16:07.787544191 +0000
+diff -ur glusterfs-11.2.orig/libglusterfs/src/glusterfs/gf-io.h glusterfs-11.2/libglusterfs/src/glusterfs/gf-io.h
+--- glusterfs-11.2.orig/libglusterfs/src/glusterfs/gf-io.h     2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/libglusterfs/src/glusterfs/gf-io.h  2025-08-13 16:32:36.737990754 +0200
 @@ -358,7 +358,11 @@
  static inline uint64_t
  gf_io_reserve(uint32_t nr)

diff --git a/glusterfs-glibc.patch b/glusterfs-glibc.patch
index 3d120d716883acc01b394cb7e2c7e25c4c69d7ac..fc57c677b053cb841eecbe940edfa8e4a5c2794c 100644 (file)
--- a/glusterfs-glibc.patch
+++ b/glusterfs-glibc.patch
@@ -1,5 +1,6 @@
---- glusterfs-10.3/libglusterfs/src/glusterfs/compat-io_uring.h.orig   2022-09-20 12:24:29.627820825 +0200
-+++ glusterfs-10.3/libglusterfs/src/glusterfs/compat-io_uring.h        2023-03-17 21:47:37.793704259 +0100
+diff -ur glusterfs-11.2.orig/libglusterfs/src/glusterfs/compat-io_uring.h glusterfs-11.2/libglusterfs/src/glusterfs/compat-io_uring.h
+--- glusterfs-11.2.orig/libglusterfs/src/glusterfs/compat-io_uring.h   2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/libglusterfs/src/glusterfs/compat-io_uring.h        2025-08-13 16:31:59.685829650 +0200
 @@ -11,6 +11,8 @@
  #ifndef __COMPAT_IO_URING_H__
  #define __COMPAT_IO_URING_H__

diff --git a/glusterfs.spec b/glusterfs.spec
index efecb9f5bfdba6717ad0f757d3d231a340cf6e1b..945632620f0114cfef77b6e6146ff89000ab46a4 100644 (file)
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -13,12 +13,12 @@
 Summary:       Clustered File Storage that can scale to peta bytes
 Summary(pl.UTF-8):     Klastrowy system przechowywania plików skalujący się do petabajtów
 Name:          glusterfs
-Version:       10.5
-Release:       2
+Version:       11.2
+Release:       1
 License:       LGPL v3+ or GPL v2 (libraries), GPL v3+ (programs)
 Group:         Applications/System
-Source0:       https://download.gluster.org/pub/gluster/glusterfs/10/%{version}/glusterfs-%{version}.tar.gz
-# Source0-md5: 8ac48f7b7f9afa0e5dfa9ad42589ee27
+Source0:       https://github.com/gluster/glusterfs/archive/refs/tags/v%{version}.tar.gz
+# Source0-md5: 774b78c834e6160f86e01d97a95e7eb2
 Source1:       glusterfsd.init
 Patch0:                ssl_paths.patch
 Patch1:                ksh_getopts.patch
@@ -28,6 +28,7 @@ URL:          https://www.gluster.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: bash-completion-devel >= 1:2.0
 BuildRequires: bison
 #BuildRequires:        cmocka-devel >= 1.0.1 for unittest
 BuildRequires: curl-devel
@@ -38,18 +39,18 @@ BuildRequires:      libaio-devel
 BuildRequires: libselinux-devel
 BuildRequires: libtcmalloc-devel
 BuildRequires: libtirpc-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: liburing-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel >= 1:2.6.19
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 1.1
 BuildRequires: pkgconfig
 BuildRequires: python3 >= 1:3.2
 BuildRequires: python3-devel >= 1:3.2
 BuildRequires: readline-devel
 BuildRequires: rpcsvc-proto
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: sed >= 4.0
 BuildRequires: sqlite3-devel >= 3
 BuildRequires: userspace-rcu-devel >= 0.8
@@ -431,8 +432,6 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libgfrpc.so.0
 %attr(755,root,root) %{_libdir}/libgfxdr.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgfxdr.so.0
-%attr(755,root,root) %{_libdir}/libglusterd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglusterd.so.0
 %attr(755,root,root) %{_libdir}/libglusterfs.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libglusterfs.so.0
 
@@ -442,13 +441,11 @@ fi
 %attr(755,root,root) %{_libdir}/libgfchangelog.so
 %attr(755,root,root) %{_libdir}/libgfrpc.so
 %attr(755,root,root) %{_libdir}/libgfxdr.so
-%attr(755,root,root) %{_libdir}/libglusterd.so
 %attr(755,root,root) %{_libdir}/libglusterfs.so
 %{_libdir}/libgfapi.la
 %{_libdir}/libgfchangelog.la
 %{_libdir}/libgfrpc.la
 %{_libdir}/libgfxdr.la
-%{_libdir}/libglusterd.la
 %{_libdir}/libglusterfs.la
 %dir %{_includedir}/glusterfs
 %{_includedir}/glusterfs/api
@@ -532,6 +529,7 @@ fi
 %{!?with_system_fuse:%attr(755,root,root) %{_bindir}/fusermount-glusterfs}
 %attr(755,root,root) /sbin/mount.glusterfs
 %attr(755,root,root) %{_sbindir}/gluster
+%{bash_compdir}/gluster.bash
 %{_mandir}/man8/gluster.8*
 %{_mandir}/man8/mount.glusterfs.8*
 

diff --git a/ksh_getopts.patch b/ksh_getopts.patch
index bfe2930ea1ff119651aac9a0dedcc0b751d200ab..3d1be7088bdbaa0ac8fd2523898a4279768d7889 100644 (file)
--- a/ksh_getopts.patch
+++ b/ksh_getopts.patch
@@ -1,7 +1,7 @@
-diff -ur glusterfs-10.3.orig/xlators/mount/fuse/utils/mount.glusterfs.in glusterfs-10.3/xlators/mount/fuse/utils/mount.glusterfs.in
---- glusterfs-10.3.orig/xlators/mount/fuse/utils/mount.glusterfs.in    2022-09-20 12:24:29.933821865 +0200
-+++ glusterfs-10.3/xlators/mount/fuse/utils/mount.glusterfs.in 2023-02-15 23:52:58.118725982 +0100
-@@ -772,7 +772,7 @@
+diff -ur glusterfs-11.2.orig/xlators/mount/fuse/utils/mount.glusterfs.in glusterfs-11.2/xlators/mount/fuse/utils/mount.glusterfs.in
+--- glusterfs-11.2.orig/xlators/mount/fuse/utils/mount.glusterfs.in    2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/xlators/mount/fuse/utils/mount.glusterfs.in 2025-08-13 16:30:53.953543843 +0200
+@@ -777,7 +777,7 @@
          ## `mount` specifies options as a last argument
          shift 2;
      fi

diff --git a/ssl_paths.patch b/ssl_paths.patch
index e66870b371a93e09afc337ef59f64e3dc12baf3a..e49f2014151b9968b6643daf117ca9f28dd3a773 100644 (file)
--- a/ssl_paths.patch
+++ b/ssl_paths.patch
@@ -1,7 +1,7 @@
-diff -ur glusterfs-10.3.orig/rpc/rpc-transport/socket/src/socket.c glusterfs-10.3/rpc/rpc-transport/socket/src/socket.c
---- glusterfs-10.3.orig/rpc/rpc-transport/socket/src/socket.c  2022-09-20 12:24:29.656820924 +0200
-+++ glusterfs-10.3/rpc/rpc-transport/socket/src/socket.c       2023-02-15 16:02:26.665973455 +0100
-@@ -46,20 +46,12 @@
+diff -ur glusterfs-11.2.orig/rpc/rpc-transport/socket/src/socket.c glusterfs-11.2/rpc/rpc-transport/socket/src/socket.c
+--- glusterfs-11.2.orig/rpc/rpc-transport/socket/src/socket.c  2025-07-02 15:34:01.000000000 +0200
++++ glusterfs-11.2/rpc/rpc-transport/socket/src/socket.c       2025-08-13 16:30:04.433328554 +0200
+@@ -44,20 +44,12 @@
  #define SSL_CRL_PATH_OPT "transport.socket.ssl-crl-path"
  #define OWN_THREAD_OPT "transport.socket.own-thread"
  
@@ -20,7 +20,7 @@ diff -ur glusterfs-10.3.orig/rpc/rpc-transport/socket/src/socket.c glusterfs-10.
 +#define DEFAULT_CA_PATH "/etc/glusterfs/glusterfs.ca"
  #define DEFAULT_VERIFY_DEPTH 1
 -#endif
- #define DEFAULT_CIPHER_LIST "EECDH:EDH:HIGH:!3DES:!RC4:!DES:!MD5:!aNULL:!eNULL"
+ #define DEFAULT_CIPHER_LIST "AES128:EECDH:EDH:HIGH:!3DES:!RC4:!DES:!MD5:!aNULL:!eNULL"
 -#define DEFAULT_DH_PARAM SSL_CERT_PATH "/dhparam.pem"
 +#define DEFAULT_DH_PARAM "/etc/glusterfs/dhparam.pem"
  #define DEFAULT_EC_CURVE "prime256v1"