Sync from SUSE:SLFO:Main glusterfs revision 95046ae1655d39bd0ef742bbff82bf3b

0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch

@@ -0,0 +1,44 @@
+From 5d0533d0858194ed6d365f1080db7ab10d0e3d11 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Wed, 5 Jul 2023 18:15:22 +0900
+Subject: [PATCH] glusterfs: fix heap-buffer-overflow on startup
+References: https://github.com/gluster/glusterfs/issues/4192
+
+==4418==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x613000000190
+at pc 0x7f028cd2341c bp 0x7ffd9c5ba7e0 sp 0x7ffd9c5ba7d8
+WRITE of size 8 at 0x613000000190 thread T0
+    f0 in mem_get_pool_list ~/libglusterfs/src/mem-pool.c:786
+
+0x613000000190 is located 0 bytes after 336-byte region [0x613000000040,0x613000000190)
+allocated by thread T0 here:
+    f0 in malloc (/usr/lib64/libasan.so.8+0xdc04f) (BuildId: 44194dcf14c212b57346030492309d59d5379ae1)
+    f1 in __gf_default_malloc glusterfs/mem-pool.h:112
+    f2 in mem_get_pool_list ~/libglusterfs/src/mem-pool.c:778
+
+``NPOOLS-1`` is just wrong. ``per_thread_pool_list_t`` does not include one free
+``per_thread_pool_t``.
+
+Fixes: https://github.com/gluster/glusterfs/issues/4192
+Fixes: v11dev-211-g1cfff6e6ec ("Use flexible array members (#3411)")
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ libglusterfs/src/mem-pool.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
+index f053fdceae..e258758158 100644
+--- a/libglusterfs/src/mem-pool.c
++++ b/libglusterfs/src/mem-pool.c
+@@ -589,8 +589,7 @@ mem_pools_preinit(void)
+     }
+ 
+     pool_list_size = sizeof(per_thread_pool_list_t) +
+-                     sizeof(per_thread_pool_t) * (NPOOLS - 1);
+-
++                     sizeof(per_thread_pool_t) * NPOOLS;
+     init_done = GF_MEMPOOL_INIT_EARLY;
+ }
+ 
+-- 
+2.41.0
+

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1724938126
+commit: 00a808796c22b4854ddde847eb4b438e74400c9558f0f2a08bf140e5d07dd014
+url: https://src.opensuse.org/jengelh/glusterfs
+revision: master

glusterfs.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu Aug 22 18:11:49 UTC 2024 - pgajdos@suse.com
+
+- remove dependency on /usr/bin/python3 using
+  %python3_fix_shebang{,_path} macros, [bsc#1212476]
+
+-------------------------------------------------------------------
+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>
+
+- Add 0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
+
+-------------------------------------------------------------------
+Sat Jun 10 13:29:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Disable IO_uring for now [boo#1210894]
+
+-------------------------------------------------------------------
+Tue May 23 23:25:48 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Add 0001-socket-only-issue-IPPROTO_IPV6-setsockopt-calls-on-A.patch
+  [boo#1210894]
+
 -------------------------------------------------------------------
 Tue Feb 21 10:20:10 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

glusterfs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glusterfs
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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,7 +26,9 @@ 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
+Patch2:         0001-glusterfs-fix-heap-buffer-overflow-on-startup.patch
 BuildRequires:  acl-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -151,9 +153,8 @@ links.
 ./autogen.sh
 %configure \
 	--without-tcmalloc \
-%if !(0%{?suse_version} >= 1550)
 	--disable-linux-io_uring \
-%else
+%if 0%{?suse_version} >= 1550
 	--with-mountutildir="%_sbindir" \
 %endif
 	--disable-static --with-ipv6-default
@@ -170,6 +171,17 @@ chmod -v u-s "%buildroot/%_bindir/fusermount-glusterfs"
 rm -fv "%buildroot/%_sbindir/conf.py"
 rm -f "%buildroot/etc/bash_completion.d/gluster.bash"
 %fdupes %buildroot/%_prefix
+%python3_fix_shebang
+%if %{suse_version} >= 1600
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/ganesha/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/gfevents/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/glusterfind/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/python/syncdaemon/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/gfind_missing_files/*
+%python3_fix_shebang_path %{buildroot}%{_libexecdir}/glusterfs/scripts/*
+%python3_fix_shebang_path %{buildroot}%{_datadir}/glusterfs/scripts/*
+%endif
 
 %pre
 %service_add_pre glusterd.service glustereventsd.service glusterfssharedstorage.service gluster-ta-volume.service