diff --git a/0010-extras-use-grep-E-instead-of-egrep-to-resolve-warnin.patch b/0010-extras-use-grep-E-instead-of-egrep-to-resolve-warnin.patch new file mode 100644 index 0000000000000000000000000000000000000000..034cee47ec99869fad7aafb0722e2d3787fe96bf --- /dev/null +++ b/0010-extras-use-grep-E-instead-of-egrep-to-resolve-warnin.patch @@ -0,0 +1,35 @@ +From 9e95395694203db1d0357257dd8efec72a496ccc Mon Sep 17 00:00:00 2001 +From: lv-mz <94813168+lv-mz@users.noreply.github.com> +Date: Tue, 10 Jun 2025 17:24:47 +0800 +Subject: [PATCH] extras: use "grep -E" instead of egrep to resolve warning + (#4532) + +When grep uses version 3.8 and higher, gluster command auto comletion +will print waring message in command lines. +Now, use "grep -E" instead of egrep to fix the problem. + +fixes:#4528 + +Signed-off-by: lv_mz +--- + extras/command-completion/gluster.bash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extras/command-completion/gluster.bash b/extras/command-completion/gluster.bash +index 70f8e19..a7c7531 100644 +--- a/extras/command-completion/gluster.bash ++++ b/extras/command-completion/gluster.bash +@@ -486,8 +486,8 @@ _gluster_handle_list () + _gluster_completion () + { + GLUSTER_FINAL_LIST=`echo $GLUSTER_COMMAND_TREE | \ +- egrep -ao --color=never "([A-Za-z0-9_.-]+)|[[:space:]]+|." | \ +- egrep -v --color=never "^[[:space:]]*$" | \ ++ grep -E -ao --color=never "([A-Za-z0-9_.-]+)|[[:space:]]+|." | \ ++ grep -E -v --color=never "^[[:space:]]*$" | \ + _gluster_parse` + + ARG="GLUSTER_FINAL_LIST" +-- +2.43.0 + diff --git a/glusterfs.spec b/glusterfs.spec index 0767391e5d586ddc0de9201b76a5f43543a7227c..7138937628406ae8ae7b88736c037269783099c7 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -224,7 +224,7 @@ Summary: Distributed File System Name: glusterfs Version: 11.1 -Release: 9 +Release: 10 License: GPLv3 or GPLv2+ or LGPLv3+ URL: http://docs.gluster.org/ %if ( 0%{_for_fedora_koji_builds} ) @@ -246,6 +246,7 @@ Patch6: 0006-glusterd-fix-memory-leaks-detected-by-asan.patch Patch7: 0007-fix-use-after-free-in-readdir.patch Patch8: 0008-Fix-unsigned-type-size_t.patch Patch9: 0009-fix-race-between-__afr_eager_lock_handle-and-afr_wakeup_same_fd_delayed_op.patch +Patch10: 0010-extras-use-grep-E-instead-of-egrep-to-resolve-warnin.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: rpcgen gperftools-devel libunwind-devel @@ -1508,6 +1509,9 @@ exit 0 %{_mandir}/man8/*gluster*.8* %changelog +* Mon Nov 17 2025 liuh - 11.1-10 +- extras: use "grep -E" instead of egrep to resolve warning (#4532) + * Thu Nov 06 2025 xuchenchen - 11.1-9 - afr: fix race between __afr_eager_lock_handle and afr_wakeup_same_fd_delayed_op