upgrade version to 11.1

This commit is contained in:
wguanghao 2023-07-27 15:18:42 +00:00
parent 2e3883d94d
commit b3f331d476
4 changed files with 21 additions and 63 deletions

View File

@ -1,34 +0,0 @@
From 396f52a60bbe5eba0075b1658d84e46cbf7461ab Mon Sep 17 00:00:00 2001
From: zhanchengbin <zhanchengbin1@huawei.com>
Date: Thu, 13 Oct 2022 10:34:52 +0800
Subject: [PATCH] SC2081: [ .. ] can't match globs. Use [[ .. ]] or grep.
Shellcheck check out a problem.
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
---
.../add-brick/post/disabled-quota-root-xattr-heal.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
index ca17a90..969d6fc 100755
--- a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
+++ b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
##---------------------------------------------------------------------------
## This script updates the 'limit-set' xattr on the newly added node. Please
@@ -106,7 +106,7 @@ ENABLED_STATE_1="${GLUSTERD_WORKDIR}/hooks/${VERSION}/${VOLUME_OP}/"
ENABLED_STATE_2="post/${ENABLED_NAME_PREFIX}${VOL_NAME}-${ENABLED_NAME}"
ENABLED_STATE="${ENABLED_STATE_1}${ENABLED_STATE_2}"
-if [ "${THIS_SCRIPT}" != *"${VOL_NAME}"* ]; then
+if [[ "${THIS_SCRIPT}" != *"${VOL_NAME}"* ]]; then
exit 0
fi
--
2.37.3

View File

@ -223,8 +223,8 @@
## ##
Summary: Distributed File System Summary: Distributed File System
Name: glusterfs Name: glusterfs
Version: 10.3 Version: 11.1
Release: 2 Release: 1
License: GPLv3 or GPLv2+ or LGPLv3+ License: GPLv3 or GPLv2+ or LGPLv3+
URL: http://docs.gluster.org/ URL: http://docs.gluster.org/
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
@ -234,11 +234,10 @@ Source2: glusterfsd.sysconfig
Source7: glusterfsd.service Source7: glusterfsd.service
Source8: glusterfsd.init Source8: glusterfsd.init
%else %else
Source0: https://download.gluster.org/pub/gluster/glusterfs/10/%{version}/%{name}-%{version}.tar.gz Source0: https://download.gluster.org/pub/gluster/glusterfs/11/%{version}/%{name}-%{version}.tar.gz
%endif %endif
Patch1: 0001-SC2081-can-t-match-globs-Use-or-grep.patch Patch1: 0001-fuse-Resolve-asan-bug-in-during-receive-event-notifi.patch
Patch2: 0002-fuse-Resolve-asan-bug-in-during-receive-event-notifi.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: rpcgen gperftools-devel libunwind-devel BuildRequires: rpcgen gperftools-devel libunwind-devel
@ -326,7 +325,6 @@ and client framework.
%package cli %package cli
Summary: GlusterFS CLI Summary: GlusterFS CLI
Requires: libglusterfs0%{?_isa} = %{version}-%{release} Requires: libglusterfs0%{?_isa} = %{version}-%{release}
Requires: libglusterd0%{?_isa} = %{version}-%{release}
%description cli %description cli
GlusterFS is a distributed file-system capable of scaling to several GlusterFS is a distributed file-system capable of scaling to several
@ -450,6 +448,8 @@ Requires: libgfrpc0%{?_isa} = %{version}-%{release}
Requires: libgfxdr0%{?_isa} = %{version}-%{release} Requires: libgfxdr0%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-libs <= %{version}-%{release} Obsoletes: %{name}-libs <= %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release} Provides: %{name}-libs = %{version}-%{release}
Obsoletes: libglusterd0 = %{version}-%{release}
Provides: libglusterd0 = %{version}-%{release}
%description -n libglusterfs0 %description -n libglusterfs0
GlusterFS is a distributed file-system capable of scaling to several GlusterFS is a distributed file-system capable of scaling to several
@ -602,21 +602,6 @@ Much of the code in GlusterFS is in user space and easily manageable.
This package provides libgfxdr.so. This package provides libgfxdr.so.
%package -n libglusterd0
Summary: GlusterFS libglusterd library
Requires: libglusterfs0%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-libs <= %{version}-%{release}
%description -n libglusterd0
GlusterFS is a distributed file-system capable of scaling to several
petabytes. It aggregates various storage bricks over TCP/IP interconnect
into one large parallel network filesystem. GlusterFS is one of the
most sophisticated file systems in terms of features and extensibility.
It borrows a powerful concept called Translators from GNU Hurd kernel.
Much of the code in GlusterFS is in user space and easily manageable.
This package provides the libglusterd library
%package -n python%{_pythonver}-gluster %package -n python%{_pythonver}-gluster
Summary: GlusterFS python library Summary: GlusterFS python library
Requires: python%{_pythonver} Requires: python%{_pythonver}
@ -962,9 +947,6 @@ exit 0
%post -n libgfxdr0 %post -n libgfxdr0
/sbin/ldconfig /sbin/ldconfig
%post -n libglusterd0
/sbin/ldconfig
%if ( 0%{!?_without_server:1} ) %if ( 0%{!?_without_server:1} )
%post server %post server
# Legacy server # Legacy server
@ -1185,7 +1167,7 @@ exit 0
%files cli %files cli
%{_sbindir}/gluster %{_sbindir}/gluster
%{_mandir}/man8/gluster.8* %{_mandir}/man8/gluster.8*
%{_sysconfdir}/bash_completion.d/gluster %{_sysconfdir}/bash_completion.d/gluster*
%files cloudsync-plugins %files cloudsync-plugins
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins
@ -1322,10 +1304,6 @@ exit 0
%files -n libgfxdr0 %files -n libgfxdr0
%{_libdir}/libgfxdr.so.* %{_libdir}/libgfxdr.so.*
%files -n libglusterd0
%{_libdir}/libglusterd.so.*
%exclude %{_libdir}/libglusterd.so
%files -n python%{_pythonver}-gluster %files -n python%{_pythonver}-gluster
# introducing glusterfs module in site packages. # introducing glusterfs module in site packages.
# so that all other gluster submodules can reside in the same namespace. # so that all other gluster submodules can reside in the same namespace.
@ -1396,6 +1374,7 @@ exit 0
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/simple-quota.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
@ -1519,6 +1498,19 @@ exit 0
%endif %endif
%changelog %changelog
* Sat Jan 27 2024 wuguanghao <wuguanghao3@huawei.com> - 11.1-1
- upgrade to 11.1
- add simple-quota xattr to afr and ec ignore list
- fix asan use-after-free bug
- fix error not supported for ipv6
- support OpenSSL 3.0
- drop libglusterd
- O_PATH support over protocol
- Enable AES cipher for SSL by default
- glusterd: add stripe_count in volume info
- snapshots: Support for ZFS Snapshots
- gfapi: Add support for 'AT_EMPTY_PATH' and 'AT_REMOVEDIR' flag
* Thu Mar 9 2023 wuguanghao <wuguanghao3@huawei.com> - 10.3-2 * Thu Mar 9 2023 wuguanghao <wuguanghao3@huawei.com> - 10.3-2
- fix CVE-2023-26253 - fix CVE-2023-26253