1
0
forked from pool/glusterfs

Accepting request 1134601 from filesystems

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1134601
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=38
This commit is contained in:
Ana Guerrero 2023-12-22 21:41:01 +00:00 committed by Git OBS Bridge
commit 0d191fc9cc
5 changed files with 16 additions and 44 deletions

View File

@ -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

BIN
glusterfs-11.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
glusterfs-11.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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> Wed Jul 5 09:28:08 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -17,7 +17,7 @@
Name: glusterfs Name: glusterfs
Version: 11.0 Version: 11.1
Release: 0 Release: 0
Summary: Aggregating distributed file system Summary: Aggregating distributed file system
License: GPL-2.0-only OR LGPL-3.0-or-later 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/gluster/glusterfs
#Git-Clone: https://github.com/fvzwieten/lsgvt #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 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 Patch2: 0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
BuildRequires: acl-devel BuildRequires: acl-devel
BuildRequires: autoconf BuildRequires: autoconf