gluster · bkmgit · Jul 2, 2025
diff --git a/.packit.yml b/.packit.yml
@@ -0,0 +1,17 @@
+# https://packit.dev/docs/configuration/
+
+specfile_path: packaging/fedora/glusterfs.spec
+
+notifications:
+  failure_comment:
+    message: "One of the tests failed for {commit_sha}. @admin check logs {logs_url}, packit dashboard {packit_dashboard_url} and external service dashboard {external_dashboard_url}"
+
+jobs:
+- job: copr_build
+  trigger: pull_request
+  targets:
+  - fedora-rawhide-aarch64
+  - fedora-rawhide-i386
+  - fedora-rawhide-ppc64le
+  - fedora-rawhide-s390x
+  - fedora-rawhide-x86_64
diff --git a/packaging/fedora/0001-configure.ac.patch b/packaging/fedora/0001-configure.ac.patch
@@ -0,0 +1,11 @@
+--- glusterfs-11.0/configure.ac.orig	2023-02-07 08:27:06.663310072 -0500
++++ glusterfs-11.0/configure.ac	2023-02-07 08:27:56.012452316 -0500
+@@ -1319,7 +1319,7 @@
+ fi
+
+ GF_HOST_OS=""
+-GF_LDFLAGS="${GF_LDFLAGS} -rdynamic"
++GF_LDFLAGS="${GF_LDFLAGS} -rdynamic -fuse-ld=mold"
+
+ dnl see --with-libtirpc option check above, libtirpc(-devel) is required for
+ dnl ipv6-default
diff --git a/packaging/fedora/0002-contrib-aclocal-python.m4.patch b/packaging/fedora/0002-contrib-aclocal-python.m4.patch
@@ -0,0 +1,212 @@
+--- glusterfs-11.0/contrib/aclocal/python.m4.orig	2023-06-16 11:18:03.550994174 -0400
++++ glusterfs-11.0/contrib/aclocal/python.m4	2023-06-16 11:18:47.875238947 -0400
+@@ -1,209 +1 @@
+-## ------------------------                                 -*- Autoconf -*-
+-## Python file handling
+-## From Andrew Dalke
+-## Updated by James Henstridge
+ ## ------------------------
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-# ---------------------------------------------------------------------------
+-# Adds support for distributing Python modules and packages.  To
+-# install modules, copy them to $(pythondir), using the python_PYTHON
+-# automake variable.  To install a package with the same name as the
+-# automake package, install to $(pkgpythondir), or use the
+-# pkgpython_PYTHON automake variable.
+-#
+-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
+-# locations to install python extension modules (shared libraries).
+-# Another macro is required to find the appropriate flags to compile
+-# extension modules.
+-#
+-# If your package is configured with a different prefix to python,
+-# users will have to add the install directory to the PYTHONPATH
+-# environment variable, or create a .pth file (see the python
+-# documentation for details).
+-#
+-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
+-# cause an error if the version of python installed on the system
+-# doesn't meet the requirement.  MINIMUM-VERSION should consist of
+-# numbers and dots only.
+-AC_DEFUN([AM_PATH_PYTHON],
+- [
+-  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
+-  dnl supported. (2.0 was released on October 16, 2000).
+-  m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-                    [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
+-python2.1 python2.0])
+-
+-  m4_if([$1],[],[
+-    dnl No version check is needed.
+-    # Find any Python interpreter.
+-    if test -z "$PYTHON"; then
+-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
+-    fi
+-    am_display_PYTHON=python
+-  ], [
+-    dnl A version check is needed.
+-    if test -n "$PYTHON"; then
+-      # If the user set $PYTHON, use it and don't search something else.
+-      AC_MSG_CHECKING([whether $PYTHON version >= $1])
+-      AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
+-			      [AC_MSG_RESULT(yes)],
+-			      [AC_MSG_ERROR(too old)])
+-      am_display_PYTHON=$PYTHON
+-    else
+-      # Otherwise, try each interpreter until we find one that satisfies
+-      # VERSION.
+-      AC_CACHE_CHECK([for a Python interpreter with version >= $1],
+-	[am_cv_pathless_PYTHON],[
+-	for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
+-	  test "$am_cv_pathless_PYTHON" = none && break
+-	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
+-	done])
+-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+-      if test "$am_cv_pathless_PYTHON" = none; then
+-	PYTHON=:
+-      else
+-        AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
+-      fi
+-      am_display_PYTHON=$am_cv_pathless_PYTHON
+-    fi
+-  ])
+-
+-  if test "$PYTHON" = :; then
+-  dnl Run any user-specified action, or abort.
+-    m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+-  else
+-
+-  dnl Query Python for its version number.  Getting [:3] seems to be
+-  dnl the best way to do this; it's what "site.py" does in the standard
+-  dnl library.
+-
+-  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+-    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+-  AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+-
+-  dnl Use the values of $prefix and $exec_prefix for the corresponding
+-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
+-  dnl distinct variables so they can be overridden if need be.  However,
+-  dnl general consensus is that you shouldn't need this ability.
+-
+-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+-
+-  dnl At times (like when building shared libraries) you may want
+-  dnl to know which OS platform Python thinks this is.
+-
+-  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
+-    [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
+-  AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+-
+-
+-  dnl Set up 4 directories:
+-
+-  dnl pythondir -- where to install python scripts.  This is the
+-  dnl   site-packages directory, not the python standard library
+-  dnl   directory like in previous automake betas.  This behavior
+-  dnl   is more consistent with lispdir.m4 for example.
+-  dnl Query distutils for this directory.  distutils does not exist in
+-  dnl Python 1.5, so we fall back to the hardcoded directory if it
+-  dnl doesn't work.
+-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+-    [am_cv_python_pythondir],
+-    [if test "x$prefix" = xNONE
+-     then
+-       am_py_prefix=$ac_default_prefix
+-     else
+-       am_py_prefix=$prefix
+-     fi
+-     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+-     case $am_cv_python_pythondir in
+-     $am_py_prefix*)
+-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+-       ;;
+-     *)
+-       case $am_py_prefix in
+-         /usr|/System*) ;;
+-         *)
+-	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+-	  ;;
+-       esac
+-       ;;
+-     esac
+-    ])
+-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
+-
+-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+-  dnl   more consistent with the rest of automake.
+-
+-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+-
+-  dnl pyexecdir -- directory for installing python extension modules
+-  dnl   (shared libraries)
+-  dnl Query distutils for this directory.  distutils does not exist in
+-  dnl Python 1.5, so we fall back to the hardcoded directory if it
+-  dnl doesn't work.
+-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+-    [am_cv_python_pyexecdir],
+-    [if test "x$exec_prefix" = xNONE
+-     then
+-       am_py_exec_prefix=$am_py_prefix
+-     else
+-       am_py_exec_prefix=$exec_prefix
+-     fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+-     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+-     case $am_cv_python_pyexecdir in
+-     $am_py_exec_prefix*)
+-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+-       ;;
+-     *)
+-       case $am_py_exec_prefix in
+-         /usr|/System*) ;;
+-         *)
+-	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+-	   ;;
+-       esac
+-       ;;
+-     esac
+-    ])
+-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+-
+-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+-
+-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+-
+-  dnl Run any user-specified action.
+-  $2
+-  fi
+-
+-])
+-
+-
+-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+-# ---------------------------------------------------------------------------
+-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
+-# Run ACTION-IF-FALSE otherwise.
+-# This test uses sys.hexversion instead of the string equivalent (first
+-# word of sys.version), in order to cope with versions such as 2.2c1.
+-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
+-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
+- [prog="import sys
+-# split strings by '.' and convert to numeric.  Append some zeros
+-# because we need at least 4 digits for the hex conversion.
+-# map returns an iterator in Python 3.0 and a list in 2.x
+-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
+-minverhex = 0
+-# xrange is not present in Python 3.0 and range returns an iterator
+-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
+-sys.exit(sys.hexversion < minverhex)"
+-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
diff --git a/packaging/fedora/0003-makefile-am-subdirs.patch b/packaging/fedora/0003-makefile-am-subdirs.patch
@@ -0,0 +1,126 @@
+diff -ruN glusterfs-11.2/api/examples/Makefile.am glusterfs-11.2-mod/api/examples/Makefile.am
+--- glusterfs-11.2/api/examples/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/api/examples/Makefile.am	2025-07-02 12:31:15.002167956 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ # The bits needed for glfsxmp
+ EXTRA_PROGRAMS = glfsxmp
+ glfsxmp_SOURCES = glfsxmp.c
+diff -ruN glusterfs-11.2/contrib/fuse-util/Makefile.am glusterfs-11.2-mod/contrib/fuse-util/Makefile.am
+--- glusterfs-11.2/contrib/fuse-util/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/contrib/fuse-util/Makefile.am	2025-07-02 12:31:32.290546271 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ bin_PROGRAMS = fusermount-glusterfs
+
+ fusermount_glusterfs_SOURCES = fusermount.c mount_util.c $(CONTRIBDIR)/fuse-lib/mount-common.c
+diff -ruN glusterfs-11.2/libglusterfs/src/Makefile.am glusterfs-11.2-mod/libglusterfs/src/Makefile.am
+--- glusterfs-11.2/libglusterfs/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/libglusterfs/src/Makefile.am	2025-07-02 12:26:47.776161392 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ noinst_PYTHON = generator.py gen-defaults.py $(top_srcdir)/events/eventskeygen.py
+
+ libglusterfs_la_CFLAGS = $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
+diff -ruN glusterfs-11.2/xlators/cluster/afr/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/afr/src/Makefile.am
+--- glusterfs-11.2/xlators/cluster/afr/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/cluster/afr/src/Makefile.am	2025-07-02 12:26:21.567940962 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ xlator_LTLIBRARIES = afr.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+
+diff -ruN glusterfs-11.2/xlators/cluster/dht/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/dht/src/Makefile.am
+--- glusterfs-11.2/xlators/cluster/dht/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/cluster/dht/src/Makefile.am	2025-07-02 12:26:07.943843179 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ xlator_LTLIBRARIES = dht.la nufa.la switch.la
+
+ AM_CFLAGS = -Wall $(GF_CFLAGS)
+diff -ruN glusterfs-11.2/xlators/cluster/ec/src/Makefile.am glusterfs-11.2-mod/xlators/cluster/ec/src/Makefile.am
+--- glusterfs-11.2/xlators/cluster/ec/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/cluster/ec/src/Makefile.am	2025-07-02 12:25:45.287655225 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ xlator_LTLIBRARIES = ec.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
+
+diff -ruN glusterfs-11.2/xlators/features/changelog/lib/src/Makefile.am glusterfs-11.2-mod/xlators/features/changelog/lib/src/Makefile.am
+--- glusterfs-11.2/xlators/features/changelog/lib/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/changelog/lib/src/Makefile.am	2025-07-02 12:25:15.015401482 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ libgfchangelog_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \
+ 	-DDATADIR=\"$(localstatedir)\"
+
+diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am
+--- glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/Makefile.am	2025-07-02 12:24:16.783001896 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ csp_LTLIBRARIES = cloudsyncs3.la
+ cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
+
+diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am
+--- glusterfs-11.2/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/cloudsync/src/cloudsync-plugins/src/cvlt/src/Makefile.am	2025-07-02 12:24:00.726984102 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ csp_LTLIBRARIES = cloudsynccvlt.la
+ cspdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/cloudsync-plugins
+
+diff -ruN glusterfs-11.2/xlators/features/cloudsync/src/Makefile.am glusterfs-11.2-mod/xlators/features/cloudsync/src/Makefile.am
+--- glusterfs-11.2/xlators/features/cloudsync/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/cloudsync/src/Makefile.am	2025-07-02 12:24:45.054966491 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ SUBDIRS = cloudsync-plugins
+
+ xlator_LTLIBRARIES = cloudsync.la
+diff -ruN glusterfs-11.2/xlators/features/thin-arbiter/src/Makefile.am glusterfs-11.2-mod/xlators/features/thin-arbiter/src/Makefile.am
+--- glusterfs-11.2/xlators/features/thin-arbiter/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/thin-arbiter/src/Makefile.am	2025-07-02 12:22:10.366019070 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ xlator_LTLIBRARIES = thin-arbiter.la
+
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+diff -ruN glusterfs-11.2/xlators/features/utime/src/Makefile.am glusterfs-11.2-mod/xlators/features/utime/src/Makefile.am
+--- glusterfs-11.2/xlators/features/utime/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/features/utime/src/Makefile.am	2025-07-02 12:21:54.421923762 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ xlator_LTLIBRARIES = utime.la
+ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
+
+diff -ruN glusterfs-11.2/xlators/mgmt/glusterd/src/Makefile.am glusterfs-11.2-mod/xlators/mgmt/glusterd/src/Makefile.am
+--- glusterfs-11.2/xlators/mgmt/glusterd/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/mgmt/glusterd/src/Makefile.am	2025-07-02 12:20:49.141466838 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ if WITH_SERVER
+ xlator_LTLIBRARIES = glusterd.la
+ endif
+diff -ruN glusterfs-11.2/xlators/mount/fuse/src/Makefile.am glusterfs-11.2-mod/xlators/mount/fuse/src/Makefile.am
+--- glusterfs-11.2/xlators/mount/fuse/src/Makefile.am	2025-06-10 16:27:14.000000000 +0300
++++ glusterfs-11.2-mod/xlators/mount/fuse/src/Makefile.am	2025-07-02 12:19:50.029047303 +0300
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ noinst_HEADERS_linux = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\
+ 	$(CONTRIBDIR)/fuse-include/mount_util.h\
+ 	$(CONTRIBDIR)/fuse-lib/mount-gluster-compat.h
diff --git a/packaging/fedora/glusterd.sysconfig b/packaging/fedora/glusterd.sysconfig
@@ -0,0 +1,6 @@
+# Change the glusterd service defaults here.
+# See "glusterd --help" outpout for defaults and possible values.
+
+#GLUSTERD_LOGFILE="/var/log/gluster/gluster.log"
+#GLUSTERD_LOGLEVEL="NORMAL"
+