From 5faf278bd3b41e07261d9df9121b26f41c603afba21b58830cb4bb62b9d93be3 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 15 Dec 2023 09:04:44 +0000
Subject: [PATCH] - Update to release 11.1

OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=98
---
 ...e-IPPROTO_IPV6-setsockopt-calls-on-A.patch | 39 -------------------
 glusterfs-11.0.tar.gz                         |  3 --
 glusterfs-11.1.tar.gz                         |  3 ++
 glusterfs.changes                             | 11 ++++++
 glusterfs.spec                                |  4 +-
 5 files changed, 16 insertions(+), 44 deletions(-)
 delete mode 100644 0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
 delete mode 100644 glusterfs-11.0.tar.gz
 create mode 100644 glusterfs-11.1.tar.gz

diff --git a/0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch b/0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
deleted file mode 100644
index 4b92586..0000000
--- a/0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b46885bba7ce6a41aba7f4b2d4482cf4d6efe792 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Thu, 4 May 2023 15:35:03 +0200
-Subject: [PATCH] socket: only issue IPPROTO_IPV6 setsockopt calls on AF_INET6
- sockets
-
-Related-to: #2648
----
- rpc/rpc-transport/socket/src/socket.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
-index 97c9544d34..5b6870e6c4 100644
---- a/rpc/rpc-transport/socket/src/socket.c
-+++ b/rpc/rpc-transport/socket/src/socket.c
-@@ -3281,15 +3281,17 @@ socket_connect(rpc_transport_t *this, int port)
-          * net.ipv6.bindv6only to 1 so that gluster services are
-          * available over IPv4 & IPv6.
-          */
--#ifdef IPV6_DEFAULT
-         int disable_v6only = 0;
--        if (setsockopt(priv->sock, IPPROTO_IPV6, IPV6_V6ONLY,
-+        int fdsock_family = 0;
-+        socklen_t fdsock_size = sizeof(fdsock_family);
-+        if (getsockopt(priv->sock, SOL_SOCKET, SO_DOMAIN, &fdsock_family, &fdsock_size) == 0 &&
-+            fdsock_family == AF_INET6 &&
-+            setsockopt(priv->sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                        (void *)&disable_v6only, sizeof(disable_v6only)) < 0) {
-             gf_log(this->name, GF_LOG_WARNING,
-                    "Error disabling sockopt IPV6_V6ONLY: \"%s\"",
-                    strerror(errno));
-         }
--#endif
- 
-         if (sa_family != AF_UNIX) {
-             if (priv->nodelay) {
--- 
-2.40.1
-
diff --git a/glusterfs-11.0.tar.gz b/glusterfs-11.0.tar.gz
deleted file mode 100644
index 6abf866..0000000
--- a/glusterfs-11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ae8f4a90408813e45d4349e813f78b60e919e1009d29fd174c462f456142696
-size 8355706
diff --git a/glusterfs-11.1.tar.gz b/glusterfs-11.1.tar.gz
new file mode 100644
index 0000000..a6896fe
--- /dev/null
+++ b/glusterfs-11.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a31b8450d02cd12f47f4571c031e9d6b8705279a0e8970ae9a05e1c87dffb76
+size 8365581
diff --git a/glusterfs.changes b/glusterfs.changes
index 99c30bf..ebf93e7 100644
--- a/glusterfs.changes
+++ b/glusterfs.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 15 08:56:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 11.1
+  * Fix upgrade issue by reverting posix change related to
+    storage.reserve value
+  * Fix possible data loss during rebalance if there is any
+    linkfile on the system
+- Delete 0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
+  (merged),
+
 -------------------------------------------------------------------
 Wed Jul  5 09:28:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/glusterfs.spec b/glusterfs.spec
index 2cc4e23..2d46b85 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           glusterfs
-Version:        11.0
+Version:        11.1
 Release:        0
 Summary:        Aggregating distributed file system
 License:        GPL-2.0-only OR LGPL-3.0-or-later
@@ -26,8 +26,8 @@ URL:            https://www.gluster.org/
 
 #Git-Clone:	https://github.com/gluster/glusterfs
 #Git-Clone:	https://github.com/fvzwieten/lsgvt
+#Changelog:     https://docs.gluster.org/en/latest/release-notes/
 Source:         https://download.gluster.org/pub/gluster/glusterfs/11/%version/glusterfs-%version.tar.gz
-Patch1:         0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
 Patch2:         0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
 BuildRequires:  acl-devel
 BuildRequires:  autoconf