Compare commits
13 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
20741961f9 | ||
|
|
97ae0c8161 | ||
|
|
f9601570de | ||
|
|
c57964a916 | ||
|
|
a60723ba10 | ||
|
|
b67103f4f6 | ||
|
13f517d933 | ||
|
|
687beb2e84 | ||
|
|
9ab7b3db72 | ||
|
|
efa2243948 | ||
|
|
46e9b63b14 | ||
|
|
83e4a9d52e | ||
|
|
8c18dfd0c3 |
9 changed files with 648 additions and 1533 deletions
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
||||
39
0001-glusterfsd-Dereferencing-the-null-pointer.patch
Normal file
39
0001-glusterfsd-Dereferencing-the-null-pointer.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
From 87bd25b64ae34cce95e87e724acfeab4c13d60a4 Mon Sep 17 00:00:00 2001
|
||||
From: Sanju Rakonde <srakonde@redhat.com>
|
||||
Date: Wed, 18 Oct 2017 08:06:24 +0530
|
||||
Subject: [PATCH] glusterfsd: Dereferencing the null pointer
|
||||
|
||||
Problem: When control reaches to out, one of (iobref, iobuf, frame) can
|
||||
be null.for iobref, iobuf iobref_unref() and iobuf_unref() functions
|
||||
are called respectively, which are using GF_VALIDATE_OR_GOTO(), so
|
||||
there won't be null pointer dereference. But for frame without null
|
||||
checking STACK_DESTROY(frame->root) is called causing null pointer
|
||||
dereference.
|
||||
|
||||
Fix: adding a line for null checking, the function
|
||||
STACK_DESTROY(frame->root) is called only when frame is not null.
|
||||
|
||||
Change-Id: I3a6684c11fb7b694b81d6ad4fec3bced5562ad88
|
||||
BUG: 1503394
|
||||
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
---
|
||||
glusterfsd/src/gf_attach.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glusterfsd/src/gf_attach.c b/glusterfsd/src/gf_attach.c
|
||||
index 05119e4f4..3f248292d 100644
|
||||
--- a/glusterfsd/src/gf_attach.c
|
||||
+++ b/glusterfsd/src/gf_attach.c
|
||||
@@ -144,7 +144,8 @@ out:
|
||||
|
||||
iobref_unref (iobref);
|
||||
iobuf_unref (iobuf);
|
||||
- STACK_DESTROY (frame->root);
|
||||
+ if (frame)
|
||||
+ STACK_DESTROY (frame->root);
|
||||
|
||||
if (rpc_status != 0) {
|
||||
fprintf (stderr, "got error %d on RPC\n", rpc_status);
|
||||
--
|
||||
2.13.5
|
||||
|
||||
|
|
@ -1,212 +0,0 @@
|
|||
--- 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])])
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
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
|
||||
21
README.md
21
README.md
|
|
@ -1,21 +0,0 @@
|
|||
# Gluster
|
||||
Gluster is a software defined distributed storage that can scale to several
|
||||
petabytes. It provides interfaces for object, block and file storage.
|
||||
|
||||
## Development
|
||||
Contributions to gluster in the form of patches and new feature additions can
|
||||
be made by following steps outlined at [Developers Guide](https://gluster.readthedocs.io/en/latest/Developer-guide/Developers-Index/#contributing-to-the-gluster-community).
|
||||
|
||||
## Documentation
|
||||
The Gluster documentation can be found at [Gluster Docs](http://gluster.readthedocs.io/en/latest).
|
||||
|
||||
## Deployment
|
||||
Quick instructions to build and install can be found in [INSTALL](INSTALL) file.
|
||||
|
||||
## Maintainers
|
||||
The list of Gluster maintainers is available in [MAINTAINERS](MAINTAINERS) file.
|
||||
|
||||
## License
|
||||
Gluster is dual licensed under [GPLV2](COPYING-GPLV2) and [LGPLV3+](COPYING-LGPLV3).
|
||||
|
||||
Please visit the [Gluster Home Page](http://www.gluster.org/) to find out more about Gluster.
|
||||
109
glusterd.init
Normal file
109
glusterd.init
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# glusterd Startup script for the glusterfs server
|
||||
#
|
||||
# chkconfig: - 20 80
|
||||
# description: Clustered file-system server
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: glusterd
|
||||
# Required-Start: $local_fs $network
|
||||
# Required-Stop: $local_fs $network
|
||||
# Should-Start:
|
||||
# Should-Stop:
|
||||
# Default-Start:
|
||||
# Default-Stop: 0 1 2 3 4 5 6
|
||||
# Short-Description: glusterfs server
|
||||
# Description: Clustered file-system server
|
||||
### END INIT INFO
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
exe="/usr/sbin/glusterd"
|
||||
prog="glusterd"
|
||||
|
||||
# Fedora File System Layout dictates /run
|
||||
[ -e /run ] && RUNDIR="/run"
|
||||
pidf="${RUNDIR:-/var/run}/$prog.pid"
|
||||
|
||||
# Set defaults, then source config for eventual overrides
|
||||
GLUSTERD_NOFILE="65536"
|
||||
|
||||
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
|
||||
|
||||
lockfile=/var/lock/subsys/$prog
|
||||
|
||||
start() {
|
||||
[ -x $exe ] || exit 5
|
||||
ulimit -n $GLUSTERD_NOFILE
|
||||
echo -n $"Starting $prog: "
|
||||
daemon $exe${GLUSTERD_LOGFILE+" -l $GLUSTERD_LOGFILE"}${GLUSTERD_LOGLEVEL+" -L $GLUSTERD_LOGLEVEL"} -p $pidf
|
||||
retval=$?
|
||||
echo
|
||||
[ $retval -eq 0 ] && touch $lockfile /var/lock/subsys/glusterfsd
|
||||
return $retval
|
||||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Stopping $prog: "
|
||||
killproc $prog
|
||||
retval=$?
|
||||
echo
|
||||
[ $retval -eq 0 ] && rm -f $lockfile
|
||||
return $retval
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
reload() {
|
||||
restart
|
||||
}
|
||||
|
||||
force_reload() {
|
||||
restart
|
||||
}
|
||||
|
||||
rh_status() {
|
||||
status $prog
|
||||
}
|
||||
|
||||
rh_status_q() {
|
||||
rh_status &>/dev/null
|
||||
}
|
||||
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
rh_status_q && exit 0
|
||||
$1
|
||||
;;
|
||||
stop)
|
||||
rh_status_q || exit 0
|
||||
$1
|
||||
;;
|
||||
restart)
|
||||
$1
|
||||
;;
|
||||
reload)
|
||||
rh_status_q || exit 7
|
||||
$1
|
||||
;;
|
||||
force-reload)
|
||||
force_reload
|
||||
;;
|
||||
status)
|
||||
rh_status
|
||||
;;
|
||||
condrestart|try-restart)
|
||||
rh_status_q || exit 0
|
||||
restart
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
||||
exit 2
|
||||
esac
|
||||
exit $?
|
||||
1654
glusterfs.spec
1654
glusterfs.spec
File diff suppressed because it is too large
Load diff
7
rhel5-load-fuse-modules
Executable file
7
rhel5-load-fuse-modules
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# fusermount-glusterfs requires the /dev/fuse character device. The fuse module
|
||||
# provides this and is loaded on demand in newer Linux distributions.
|
||||
#
|
||||
|
||||
[ -c /dev/fuse ] || /sbin/modprobe fuse
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (glusterfs-11.2.tar.gz) = 6ac463047c5b1fee1d00ca9d6c16169762ed31c7d3b8dfb341bb8a90b83c15fdd9d48ebbe6cf79eee885f764cfa5391f4107837764c0a182eff1b51bede63d48
|
||||
SHA512 (glusterfs-3.12.15.tar.gz) = f2c327c6d0e5c24603023ce21fb829f1af3f863fd103c35367947dfe221ce82ec0aa83e0bfe17411b2c7f90be50f447f63c93d047f009adf24c59c6f0087fefe
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue