!27 [sync] PR-24: Cleanup spec

From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
cleanup spec
2024-10-08 03:26:35 +00:00 · 2024-10-08 10:31:17 +08:00 · 2023-01-31 02:31:44 +00:00 · 2023-01-30 17:17:06 +08:00 · 2023-01-17 06:04:19 +00:00 · 2023-01-17 11:04:19 +08:00
25 changed files with 1850 additions and 163 deletions
--- a/0001-zsh-5.9-do-not-use-egrep-in-tests.patch
+++ b/0001-zsh-5.9-do-not-use-egrep-in-tests.patch
@ -0,0 +1,178 @@
 From 6935aa4b515fe9b782507820c77ab681136470bc Mon Sep 17 00:00:00 2001
 From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 Date: Thu, 15 Sep 2022 18:56:20 +0900
 Subject: [PATCH] 50629: do not use egrep in tests
 Upstream-commit: 4fc5dc0292acd77f17281f451774ba2ca4203026
 Signed-off-by: Kamil Dudka <kdudka@redhat.com>
 ---
 Test/D07multibyte.ztst  | 16 ++--------------
 Test/E01options.ztst    |  2 +-
 Test/V07pcre.ztst       | 16 ++--------------
 Test/X02zlevi.ztst      | 11 +----------
 Test/X03zlebindkey.ztst | 11 +----------
 Test/Y01completion.ztst | 11 +----------
 Test/ztst.zsh           | 15 +++++++++++++++
 7 files changed, 23 insertions(+), 59 deletions(-)
 diff --git a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
 index e2e9a25..6909346 100644
 --- a/Test/D07multibyte.ztst
 +++ b/Test/D07multibyte.ztst
@@ -1,19 +1,7 @@
 %prep
 -# Find a UTF-8 locale.
 -  setopt multibyte
 -# Don't let LC_* override our choice of locale.
 -  unset -m LC_\*
 -  mb_ok=
 -  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 -	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
 -  for LANG in $langs; do
 -    if [[ é = ? ]]; then
 -      mb_ok=1
 -      break;
 -    fi
 -  done
 -  if [[ -z $mb_ok ]]; then
 +  LANG=$(ZTST_find_UTF8)
 +  if [[ -z $LANG ]]; then
     ZTST_unimplemented="no UTF-8 locale or multibyte mode is not implemented"
   else
     print -u $ZTST_fd Testing multibyte with locale $LANG
 diff --git a/Test/E01options.ztst b/Test/E01options.ztst
 index 2acbfd3..d38fbed 100644
 --- a/Test/E01options.ztst
 +++ b/Test/E01options.ztst
@@ -651,7 +651,7 @@
 >noktarg1
 >0 1
 -  showopt() { setopt | egrep 'localoptions|ksharrays'; }
 +  showopt() { echo ${(FM)${(@f)"$(setopt)"}:#(localoptions|ksharrays)*} }
   f1() { setopt localoptions ksharrays; showopt }
   f2() { setopt ksharrays; showopt }
   setopt kshoptionprint
 diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
 index c9c844d..ca13419 100644
 --- a/Test/V07pcre.ztst
 +++ b/Test/V07pcre.ztst
@@ -6,20 +6,8 @@
     return 0
   fi
   setopt rematch_pcre
 -# Find a UTF-8 locale.
 -  setopt multibyte
 -# Don't let LC_* override our choice of locale.
 -  unset -m LC_\*
 -  mb_ok=
 -  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 -	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
 -  for LANG in $langs; do
 -    if [[ é = ? ]]; then
 -      mb_ok=1
 -      break;
 -    fi
 -  done
 -  if [[ -z $mb_ok ]]; then
 +  LANG=$(ZTST_find_UTF8)
 +  if [[ -z $LANG ]]; then
     ZTST_unimplemented="no UTF-8 locale or multibyte mode is not implemented"
   else
     print -u $ZTST_fd Testing PCRE multibyte with locale $LANG
 diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
 index 8146d67..203c13c 100644
 --- a/Test/X02zlevi.ztst
 +++ b/Test/X02zlevi.ztst
@@ -1,16 +1,7 @@
 # Tests of the vi mode of ZLE
 %prep
 -  unset -m LC_\*
 -  ZSH_TEST_LANG=
 -  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 -	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
 -  for LANG in $langs; do
 -    if [[ é = ? ]]; then
 -      ZSH_TEST_LANG=$LANG 
 -      break;
 -    fi
 -  done
 +  ZSH_TEST_LANG=$(ZTST_find_UTF8)
   if ( zmodload zsh/zpty 2>/dev/null ); then
     . $ZTST_srcdir/comptest
     comptestinit -v -z $ZTST_testdir/../Src/zsh
 diff --git a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst
 index 43692a8..5277332 100644
 --- a/Test/X03zlebindkey.ztst
 +++ b/Test/X03zlebindkey.ztst
@@ -3,16 +3,7 @@
 # into bindings.  The latter is particularly tricky with multibyte sequences.
 %prep
 -  unset -m LC_\*
 -  ZSH_TEST_LANG=
 -  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 -	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
 -  for LANG in $langs; do
 -    if [[ é = ? ]]; then
 -      ZSH_TEST_LANG=$LANG
 -      break;
 -    fi
 -  done
 +  ZSH_TEST_LANG=$(ZTST_find_UTF8)
   if ( zmodload zsh/zpty 2>/dev/null ); then
     . $ZTST_srcdir/comptest
     comptestinit -z $ZTST_testdir/../Src/zsh
 diff --git a/Test/Y01completion.ztst b/Test/Y01completion.ztst
 index 6af0efc..f976f9f 100644
 --- a/Test/Y01completion.ztst
 +++ b/Test/Y01completion.ztst
@@ -1,16 +1,7 @@
 # Tests for completion system.
 %prep
 -  unset -m LC_\*
 -  ZSH_TEST_LANG=
 -  langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 -         $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
 -  for LANG in $langs; do
 -    if [[ é = ? ]]; then
 -      ZSH_TEST_LANG=$LANG
 -      break;
 -    fi
 -  done
 +  ZSH_TEST_LANG=$(ZTST_find_UTF8)
   if ( zmodload zsh/zpty 2>/dev/null ); then
     . $ZTST_srcdir/comptest
     mkdir comp.tmp
 diff --git a/Test/ztst.zsh b/Test/ztst.zsh
 index aca275c..d95b726 100755
 --- a/Test/ztst.zsh
 +++ b/Test/ztst.zsh
@@ -37,6 +37,21 @@ emulate -R zsh
 # LANG must be passed to child zsh.
 export LANG
 +# find UTF-8 locale
 +ZTST_find_UTF8 () {
 +  setopt multibyte
 +  # Don't let LC_* override our choice of locale.
 +  unset -m LC_\*
 +  local langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
 +               ${(M)$(locale -a 2>/dev/null):#*.(utf8|UTF-8)})
 +  for LANG in $langs; do
 +    if [[ é = ? ]]; then
 +      echo $LANG
 +      return
 +    fi
 +  done
 +}
 +
 # Don't propagate variables that are set by default in the shell.
 typeset +x WORDCHARS
 -- 
 2.39.0
--- a/0002-zsh-Use-int-main-in-test-c-codes.patch
+++ b/0002-zsh-Use-int-main-in-test-c-codes.patch
@ -0,0 +1,541 @@
 commit ab4d62eb975a4c4c51dd35822665050e2ddc6918
 Author: Nicholas Vinson <nvinson234@gmail.com>
 Date:   Wed Sep 21 09:22:11 2022 +0900
    50641: use 'int main()' in test C-codes in configure
 diff --git a/aczsh.m4 b/aczsh.m4
 index 1209ac614..b31236020 100644
 --- a/aczsh.m4
 +++ b/aczsh.m4
@@ -44,6 +44,7 @@ AC_DEFUN(zsh_64_BIT_TYPE,
 #include <sys/types.h>
 #endif
 +int
 main()
 {
   $1 foo = 0; 
@@ -118,7 +119,6 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS
 AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AS_MESSAGE_LOG_FD) &&
 AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AS_MESSAGE_LOG_FD); then
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -146,29 +146,30 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 +int
 main()
 {
     void *handle1, *handle2;
     void *(*zsh_getaddr1)(), *(*zsh_getaddr2)();
     void *sym1, *sym2;
     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle1) exit(1);
 +    if(!handle1) return(1);
     handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle2) exit(1);
 +    if(!handle2) return(1);
     zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1");
     zsh_getaddr2 = (void *(*)()) dlsym(handle2, "${us}zsh_getaddr2");
     sym1 = zsh_getaddr1();
     sym2 = zsh_getaddr2();
 -    if(!sym1 || !sym2) exit(1);
 -    if(sym1 != sym2) exit(1);
 +    if(!sym1 || !sym2) return(1);
 +    if(sym1 != sym2) return(1);
     dlclose(handle1);
     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle1) exit(1);
 +    if(!handle1) return(1);
     zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1");
     sym1 = zsh_getaddr1();
 -    if(!sym1) exit(1);
 -    if(sym1 != sym2) exit(1);
 -    exit(0);
 +    if(!sym1) return(1);
 +    if(sym1 != sym2) return(1);
 +    return(0);
 }
 ]])],[zsh_cv_shared_$1=yes],
 [zsh_cv_shared_$1=no],
@@ -200,7 +201,6 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS
 AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AS_MESSAGE_LOG_FD) &&
 AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AS_MESSAGE_LOG_FD); then
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -228,19 +228,19 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 -
 +int
 main()
 {
     void *handle1, *handle2;
     int (*fred1)(), (*fred2)();
     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle1) exit(1);
 +    if(!handle1) return(1);
     handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle2) exit(1);
 +    if(!handle2) return(1);
     fred1 = (int (*)()) dlsym(handle1, "${us}fred");
     fred2 = (int (*)()) dlsym(handle2, "${us}fred");
 -    if(!fred1 || !fred2) exit(1);
 -    exit((*fred1)() != 42 || (*fred2)() != 69);
 +    if(!fred1 || !fred2) return(1);
 +    return((*fred1)() != 42 || (*fred2)() != 69);
 }
 ]])],[zsh_cv_sys_dynamic_clash_ok=yes],
 [zsh_cv_sys_dynamic_clash_ok=no],
@@ -276,7 +276,6 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS
 AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&AS_MESSAGE_LOG_FD) &&
 AC_TRY_COMMAND($DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&AS_MESSAGE_LOG_FD); then
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -304,17 +303,18 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 +int
 main()
 {
     void *handle;
     int (*barneysym)();
     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle) exit(1);
 +    if(!handle) return(1);
     handle = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle) exit(1);
 +    if(!handle) return(1);
     barneysym = (int (*)()) dlsym(handle, "${us}barney");
 -    if(!barneysym) exit(1);
 -    exit((*barneysym)() != 69);
 +    if(!barneysym) return(1);
 +    return((*barneysym)() != 69);
 }
 ]])],[zsh_cv_sys_dynamic_rtld_global=yes],
 [zsh_cv_sys_dynamic_rtld_global=no],
@@ -346,7 +346,6 @@ AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS
     save_ldflags=$LDFLAGS
     LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -374,15 +373,16 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 +int
 main()
 {
     void *handle;
     int (*barneysym)();
     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle) exit(1);
 +    if(!handle) return(1);
     barneysym = (int (*)()) dlsym(handle, "${us}barney");
 -    if(!barneysym) exit(1);
 -    exit((*barneysym)() != 69);
 +    if(!barneysym) return(1);
 +    return((*barneysym)() != 69);
 }
 int fred () { return 42; }
@@ -420,7 +420,6 @@ elif
     save_ldflags=$LDFLAGS
     LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -s"
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -448,15 +447,16 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 +int
 main()
 {
     void *handle;
     int (*barneysym)();
     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle) exit(1);
 +    if(!handle) return(1);
     barneysym = (int (*)()) dlsym(handle, "${us}barney");
 -    if(!barneysym) exit(1);
 -    exit((*barneysym)() != 69);
 +    if(!barneysym) return(1);
 +    return((*barneysym)() != 69);
 }
 int fred () { return 42; }
@@ -488,7 +488,6 @@ echo 'int fred () { return 42; }' > conftest1.c
 if AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&AS_MESSAGE_LOG_FD) &&
 AC_TRY_COMMAND($DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS -s conftest1.o $LIBS 1>&AS_MESSAGE_LOG_FD); then
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -516,15 +515,16 @@ char *zsh_gl_sym_addr ;
 #define RTLD_GLOBAL 0
 #endif
 +int
 main()
 {
     void *handle;
     int (*fredsym)();
     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
 -    if(!handle) exit(1);
 +    if(!handle) return(1);
     fredsym = (int (*)()) dlsym(handle, "${us}fred");
 -    if(!fredsym) exit(1);
 -    exit((*fredsym)() != 42);
 +    if(!fredsym) return(1);
 +    return((*fredsym)() != 42);
 }
 ]])],[zsh_cv_sys_dynamic_strip_lib=yes],
 [zsh_cv_sys_dynamic_strip_lib=no],
 diff --git a/configure.ac b/configure.ac
 index 890ef8dd2..074141d38 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -585,7 +585,7 @@ fi
 dnl  Checking if compiler correctly cast signed to unsigned.
 AC_CACHE_CHECK(if signed to unsigned casting is broken,
 zsh_cv_c_broken_signed_to_unsigned_casting,
 -[AC_RUN_IFELSE([AC_LANG_SOURCE([[main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
 +[AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
 AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING],
 [Define to 1 if compiler incorrectly cast signed to unsigned.])
 if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
@@ -1046,7 +1046,7 @@ else
   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 -main() { return sizeof(off_t) < 8; }
 +int main() { return sizeof(off_t) < 8; }
 ]])],[zsh_cv_off_t_is_64_bit=yes],[zsh_cv_off_t_is_64_bit=no],[zsh_cv_off_t_is_64_bit=no])])
   if test x$zsh_cv_off_t_is_64_bit = xyes; then
     AC_DEFINE(OFF_T_IS_64_BIT)
@@ -1056,7 +1056,7 @@ main() { return sizeof(off_t) < 8; }
   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 -main() { return sizeof(ino_t) < 8; }
 +int main() { return sizeof(ino_t) < 8; }
 ]])],[zsh_cv_ino_t_is_64_bit=yes],[zsh_cv_ino_t_is_64_bit=no],[zsh_cv_ino_t_is_64_bit=no])])
   if test x$zsh_cv_ino_t_is_64_bit = xyes; then
     AC_DEFINE(INO_T_IS_64_BIT)
@@ -1369,7 +1369,7 @@ zsh_cv_func_realpath_accepts_null,
 #include <stdlib.h>
 #include <limits.h>
 ],[
 -exit(!realpath("/", (char*)0));
 +return(!realpath("/", (char*)0));
 ])],
 [zsh_cv_func_realpath_accepts_null=yes],
 [zsh_cv_func_realpath_accepts_null=no],
@@ -1393,10 +1393,9 @@ AC_CACHE_CHECK(if tgetent accepts NULL,
 zsh_cv_func_tgetent_accepts_null,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <fcntl.h>
 -#include <stdlib.h>
 int tgetent(char *, char *);
 char *tgetstr(char *, char **);
 -main()
 +int main()
 {
     char buf[4096];
     int r1 = tgetent(buf, "vt100");
@@ -1407,7 +1406,7 @@ main()
     	tgetstr("cl", &u);
 	creat("conftest.tgetent", 0640);
     }
 -    exit((r1 != r2) || r2 == -1);
 +    return((r1 != r2) || r2 == -1);
 }
 ]])],[if test -f conftest.tgetent; then
     zsh_cv_func_tgetent_accepts_null=yes
@@ -1421,10 +1420,9 @@ AC_CACHE_CHECK(if tgetent returns 0 on success,
 zsh_cv_func_tgetent_zero_success,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <fcntl.h>
 -#include <stdlib.h>
 int tgetent(char *, char*);
 char *tgetstr(char *, char **);
 -main()
 +int main()
 {
     char buf[4096];
     int r1 = tgetent(buf, "!@#$%^&*");
@@ -1435,7 +1433,7 @@ main()
     	tgetstr("cl", &u);
 	creat("conftest.tgetent0", 0640);
     }
 -    exit(r1 == r2);
 +    return(r1 == r2);
 }
 ]])],[if test -f conftest.tgetent0; then
     zsh_cv_func_tgetent_zero_success=yes
@@ -1869,8 +1867,7 @@ zsh_cv_rlim_t_is_longer,
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
 -#include <stdlib.h>
 -main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
 +int main(){struct rlimit r;return(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
 if test x$zsh_cv_rlim_t_is_longer = xyes; then
   AC_CACHE_CHECK(if rlim_t is a quad,
   zsh_cv_rlim_t_is_quad_t,
@@ -1880,13 +1877,12 @@ if test x$zsh_cv_rlim_t_is_longer = xyes; then
 #endif
 #include <stdio.h>
 #include <sys/resource.h>
 -#include <stdlib.h>
 -main() { 
 +int main() {
   struct rlimit r;
   char buf[20];
   r.rlim_cur = 0;
   sprintf(buf, "%qd", r.rlim_cur);
 -  exit(strcmp(buf, "0"));
 +  return(strcmp(buf, "0"));
 }]])],[zsh_cv_rlim_t_is_quad_t=yes],[zsh_cv_rlim_t_is_quad_t=no],[zsh_cv_rlim_t_is_quad_t=no])])
   if test x$zsh_cv_rlim_t_is_quad_t = xyes; then
     AC_DEFINE(RLIM_T_IS_QUAD_T)
@@ -1903,8 +1899,7 @@ else
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
 -#include <stdlib.h>
 -  main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
 +  int main(){struct rlimit r;r.rlim_cur=-1;return(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
   if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
     AC_DEFINE(RLIM_T_IS_UNSIGNED)
     DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
@@ -2187,9 +2182,8 @@ zsh_cv_sys_fifo,
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
 -#include <stdlib.h>
 #include <sys/stat.h>
 -main()
 +int main()
 {
     char c;
     int fd;
@@ -2200,18 +2194,18 @@ main()
 #else
     if(mknod("/tmp/fifo$$", 0010600, 0) < 0)
 #endif
 -	exit(1);
 +	return(1);
     pid = fork();
     if(pid < 0)
 -	exit(1);
 +	return(1);
     if(pid) {
 	fd = open("/tmp/fifo$$", O_RDONLY);
 -	exit(fd < 0 || read(fd, &c, 1) != 1 || c != 'x');
 +	return(fd < 0 || read(fd, &c, 1) != 1 || c != 'x');
     }
     fd = open("/tmp/fifo$$", O_WRONLY);
     ret = (fd < 0 || write(fd, "x", 1) < 1);
     unlink("/tmp/fifo$$");
 -    exit(ret);
 +    return(ret);
 }
 ]])],[zsh_cv_sys_fifo=yes],[zsh_cv_sys_fifo=no],[zsh_cv_sys_fifo=yes])
 ])
@@ -2289,8 +2283,7 @@ zsh_cv_sys_link,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <unistd.h>
 #include <fcntl.h>
 -#include <stdlib.h>
 -main()
 +int main()
 {
     int ret;
     char *tmpfile, *newfile;
@@ -2299,11 +2292,11 @@ main()
     unlink(tmpfile);
     unlink(newfile);
     if(creat(tmpfile, 0644) < 0)
 -	exit(1);
 +	return(1);
     ret = link(tmpfile, newfile);
     unlink(tmpfile);
     unlink(newfile);
 -    exit(ret<0);
 +    return(ret<0);
 }
 ]])],[zsh_cv_sys_link=yes],[zsh_cv_sys_link=no],[zsh_cv_sys_link=yes])])
 AH_TEMPLATE([HAVE_LINK],
@@ -2322,12 +2315,11 @@ zsh_cv_sys_killesrch,
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
 -#include <stdlib.h>
 -main()
 +int main()
 {
     int pid = (getpid() + 10000) & 0xffffff;
     while (pid && (kill(pid, 0) == 0 || errno != ESRCH)) pid >>= 1;
 -    exit(errno!=ESRCH);
 +    return(errno!=ESRCH);
 }
 ]])],[zsh_cv_sys_killesrch=yes],[zsh_cv_sys_killesrch=no],[zsh_cv_sys_killesrch=yes])])
 AH_TEMPLATE([BROKEN_KILL_ESRCH],
@@ -2348,12 +2340,11 @@ if test x$signals_style = xPOSIX_SIGNALS; then
     [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <signal.h>
 #include <unistd.h>
 -#include <stdlib.h>
 int child=0;
 void handler(sig)
     int sig;
 {if(sig==SIGCHLD) child=1;}
 -main() {
 +int main() {
     struct sigaction act;
     sigset_t set;
     int pid, ret;
@@ -2368,7 +2359,7 @@ main() {
     if(pid>0) {
     sigemptyset(&set);
         ret=sigsuspend(&set);
 -        exit(child==0);
 +        return(child==0);
     }
 }
 ]])],[zsh_cv_sys_sigsuspend=yes],[zsh_cv_sys_sigsuspend=no],[zsh_cv_sys_sigsuspend=yes])])
@@ -2400,15 +2391,14 @@ case "x$zsh_working_tcsetpgrp" in
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 -#include <stdlib.h>
 -main() {
 +int main() {
     int fd;
     int ret;
     fd=open("/dev/tty", O_RDWR);
 -    if (fd < 0) exit(2);
 +    if (fd < 0) return(2);
     ret=tcsetpgrp(fd, tcgetpgrp(fd));
 -    if (ret < 0) exit(1);
 -    exit(0);
 +    if (ret < 0) return(1);
 +    return(0);
 }
 ]])],[zsh_cv_sys_tcsetpgrp=yes],[
 case $? in
@@ -2448,7 +2438,7 @@ if test x$ac_cv_func_getpwnam = xyes; then
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 -main() {
 +int main() {
     struct passwd *pw1, *pw2;
     char buf[1024], name[1024];
     sprintf(buf, "%d:%d", getpid(), rand());
@@ -2456,7 +2446,7 @@ main() {
     if (pw1) strcpy(name, pw1->pw_name);
     sprintf(buf, "%d:%d", rand(), getpid());
     pw2=getpwnam(buf);
 -    exit(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name));
 +    return(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name));
 }
 ]])],[zsh_cv_sys_getpwnam_faked=no],[zsh_cv_sys_getpwnam_faked=yes],[zsh_cv_sys_getpwnam_faked=no])])
     if test x$zsh_cv_sys_getpwnam_faked = xyes; then
@@ -2775,20 +2765,17 @@ elif test "x$dynamic" = xyes; then
    zsh_cv_sys_elf,
    [AC_RUN_IFELSE([AC_LANG_SOURCE([[/* Test for whether ELF binaries are produced */
 #include <fcntl.h>
 -#include <stdlib.h>
 #include <unistd.h>
 -main(argc, argv)
 -int argc;
 -char *argv[];
 +int main(int argc, char *argv[])
 {
 	char b[4];
 	int i = open(argv[0],O_RDONLY);
 	if(i == -1) 
 -		exit(1); /* fail */
 +		return(1); /* fail */
 	if(read(i,b,4)==4 && b[0]==127 && b[1]=='E' && b[2]=='L' && b[3]=='F')
 -		exit(0); /* succeed (yes, it's ELF) */
 +		return(0); /* succeed (yes, it's ELF) */
 	else
 -		exit(1); /* fail */
 +		return(1); /* fail */
 }]])],[zsh_cv_sys_elf=yes],[zsh_cv_sys_elf=no],[zsh_cv_sys_elf=yes])])
   # We use [0-9]* in case statements, so need to change quoting
@@ -2924,13 +2911,12 @@ LDFLAGS="$old_LDFLAGS")
   AC_CACHE_CHECK(if your dlsym() needs a leading underscore,
    zsh_cv_func_dlsym_needs_underscore,
    [echo failed >conftestval && cat >conftest.c <<EOM
 -fred () { }
 +void fred () { }
 EOM
     AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest.c 1>&AS_MESSAGE_LOG_FD) &&
     AC_TRY_COMMAND($DLLD $LDFLAGS $DLLDFLAGS -o conftest.$DL_EXT conftest.o 1>&AS_MESSAGE_LOG_FD) &&
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 -#include <stdlib.h>
 #ifdef HPUX10DYNAMIC
 #include <dl.h>
 #define RTLD_LAZY BIND_DEFERRED
@@ -2957,16 +2943,16 @@ char *zsh_gl_sym_addr ;
 extern int fred() ;
 -main()
 +int main()
 {
     void * handle ;
     void * symbol ;
     FILE *f=fopen("conftestval", "w");
 -    if (!f) exit(1);
 +    if (!f) return(1);
     handle = dlopen("./conftest.$DL_EXT", RTLD_LAZY) ;
     if (handle == NULL) {
         fprintf (f, "dlopen failed") ;
 -            exit(1);
 +            return(1);
     }
     symbol = dlsym(handle, "fred") ;
     if (symbol == NULL) {
@@ -2974,13 +2960,13 @@ main()
         symbol = dlsym(handle, "_fred") ;
         if (symbol == NULL) {
             fprintf (f, "dlsym failed") ;
 -                exit(1);
 +                return(1);
                 }
         fprintf (f, "yes") ;
     }
     else
         fprintf (f, "no") ;
 -    exit(0);
 +    return(0);
 }]])],[zsh_cv_func_dlsym_needs_underscore=`cat conftestval`],[zsh_cv_func_dlsym_needs_underscore=failed
     dynamic=no],[zsh_cv_func_dlsym_needs_underscore=no])])
   if test "x$zsh_cv_func_dlsym_needs_underscore" = xyes; then
--- a/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
+++ b/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
@ -0,0 +1,69 @@
 From a84fdd7c8f77935ecce99ff2b0bdba738821ed79 Mon Sep 17 00:00:00 2001
 From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 Date: Mon, 26 Jun 2023 17:13:04 +0900
 Subject: [PATCH] 51889: fix module loading problem with full RELRO
 If full RELRO (relocation read-only, one of the security enhancement
 methods for ELF-based systems) is used when building zsh (as in binary
 packages of most Linuxes), loading a module (e.g. zsh/zftp) fails unless
 all the modules it depends on are already loaded. With this patch the
 necessary modules are automatically loaded.
 Upstream-commit: a84fdd7c8f77935ecce99ff2b0bdba738821ed79
 Signed-off-by: Lukáš Zaoral <lzaoral@redhat.com>
 ---
 Src/Modules/zftp.c |  2 +-
 Src/mkbltnmlst.sh  | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
 index 49b3ffa89..47a5e9de9 100644
 --- a/Src/Modules/zftp.c
 +++ b/Src/Modules/zftp.c
@@ -3172,7 +3172,7 @@ static struct features module_features = {
 int
 setup_(UNUSED(Module m))
 {
 -    return (require_module("zsh/net/tcp", NULL, 0) == 1);
 +    return 0;
 }
 /**/
 diff --git a/Src/mkbltnmlst.sh b/Src/mkbltnmlst.sh
 index c4611d8b3..067ecdaf9 100644
 --- a/Src/mkbltnmlst.sh
 +++ b/Src/mkbltnmlst.sh
@@ -76,6 +76,30 @@ for x_mod in $x_mods; do
     test "x$linked" = xno && echo "#endif"
 done
 +# if dynamic module 'mod' with load=no has moddeps in its .mdd,
 +# then output add_dep(mod, dep) for each 'dep' in moddeps.
 +dyn_mods="`grep ' link=dynamic .* load=no ' $CFMOD | \
 +          sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`"
 +
 +for mod in $dyn_mods; do
 +    modfile="`grep '^name='$mod' ' $CFMOD | \
 +              sed -e 's/^.* modfile=//' -e 's/ .*//'`"
 +    if test "x$modfile" = x; then
 +	echo >&2 "WARNING: no name for \`$mod' in $CFMOD (ignored)"
 +	continue
 +    fi
 +    unset moddeps
 +    . $srcdir/../$modfile
 +    if test -n "$moddeps"; then
 +        echo '#ifdef DYNAMIC'
 +        echo "/* non-linked-in known module \`$mod' */"
 +        for dep in $moddeps; do
 +          echo "  add_dep(\"$mod\", \"$dep\");"
 +        done
 +        echo '#endif'
 +    fi
 +done
 +
 echo
 done_mods=" "
 for bin_mod in $bin_mods; do
 -- 
 2.41.0
--- a/0004-zsh-enable-PCRE-locale-switching.patch
+++ b/0004-zsh-enable-PCRE-locale-switching.patch
@ -0,0 +1,64 @@
 From 1b421e4978440234fb73117c8505dad1ccc68d46 Mon Sep 17 00:00:00 2001
 From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 Date: Mon, 26 Sep 2022 10:52:50 +0900
 Subject: [PATCH] 50658 + test: Enable to switch between C/UTF-8 locales in
 PCRE
 ---
 Src/Modules/pcre.c | 10 ++--------
 Test/V07pcre.ztst  | 11 +++++++++++
 2 files changed, 13 insertions(+), 8 deletions(-)
 diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
 index 6289e003e..46875a59b 100644
 --- a/Src/Modules/pcre.c
 +++ b/Src/Modules/pcre.c
@@ -47,8 +47,6 @@ zpcre_utf8_enabled(void)
 #if defined(MULTIBYTE_SUPPORT) && defined(HAVE_NL_LANGINFO) && defined(CODESET)
     static int have_utf8_pcre = -1;
 -    /* value can toggle based on MULTIBYTE, so don't
 -     * be too eager with caching */
     if (have_utf8_pcre < -1)
 	return 0;
@@ -56,15 +54,11 @@ zpcre_utf8_enabled(void)
 	return 0;
     if ((have_utf8_pcre == -1) &&
 -        (!strcmp(nl_langinfo(CODESET), "UTF-8"))) {
 -
 -	if (pcre_config(PCRE_CONFIG_UTF8, &have_utf8_pcre))
 +	(pcre_config(PCRE_CONFIG_UTF8, &have_utf8_pcre))) {
 	    have_utf8_pcre = -2; /* erk, failed to ask */
     }
 -    if (have_utf8_pcre < 0)
 -	return 0;
 -    return have_utf8_pcre;
 +    return (have_utf8_pcre == 1) && (!strcmp(nl_langinfo(CODESET), "UTF-8"));
 #else
     return 0;
 diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
 index ca13419e5..22a0b64c7 100644
 --- a/Test/V07pcre.ztst
 +++ b/Test/V07pcre.ztst
@@ -162,3 +162,14 @@
     echo $match[2] )
 0:regression for segmentation fault, workers/38307
 >test
 +
 +  LANG_SAVE=$LANG
 +  [[ é =~ '^.\z' ]]; echo $?
 +  LANG=C
 +  [[ é =~ '^..\z' ]]; echo $?
 +  LANG=$LANG_SAVE
 +  [[ é =~ '^.\z' ]]; echo $?
 +0:swich between C/UTF-8 locales
 +>0
 +>0
 +>0
 -- 
 2.41.0
--- a/0005-zsh-port-to-pcre2.patch
+++ b/0005-zsh-port-to-pcre2.patch
@ -0,0 +1,641 @@
 From b62e911341c8ec7446378b477c47da4256053dc0 Mon Sep 17 00:00:00 2001
 From: Oliver Kiddle <opk@zsh.org>
 Date: Sat, 13 May 2023 00:53:32 +0200
 Subject: [PATCH] 51723: migrate pcre module to pcre2
 Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 ---
 Src/Modules/pcre.c | 223 ++++++++++++++++++---------------------------
 Test/V07pcre.ztst  |  13 ++-
 configure.ac       |  20 ++--
 3 files changed, 109 insertions(+), 149 deletions(-)
 diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
 index 46875a59b..079ecc2c5 100644
 --- a/Src/Modules/pcre.c
 +++ b/Src/Modules/pcre.c
@@ -34,11 +34,11 @@
 #define CPCRE_PLAIN 0
 /**/
 -#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
 -#include <pcre.h>
 +#if defined(HAVE_PCRE2_COMPILE_8) && defined(HAVE_PCRE2_H)
 +#define PCRE2_CODE_UNIT_WIDTH 8
 +#include <pcre2.h>
 -static pcre *pcre_pattern;
 -static pcre_extra *pcre_hints;
 +static pcre2_code *pcre_pattern;
 /**/
 static int
@@ -54,8 +54,8 @@ zpcre_utf8_enabled(void)
 	return 0;
     if ((have_utf8_pcre == -1) &&
 -	(pcre_config(PCRE_CONFIG_UTF8, &have_utf8_pcre))) {
 -	    have_utf8_pcre = -2; /* erk, failed to ask */
 +       (pcre2_config(PCRE2_CONFIG_UNICODE, &have_utf8_pcre))) {
 +           have_utf8_pcre = -2; /* erk, failed to ask */
     }
     return (have_utf8_pcre == 1) && (!strcmp(nl_langinfo(CODESET), "UTF-8"));
@@ -69,115 +69,87 @@ zpcre_utf8_enabled(void)
 static int
 bin_pcre_compile(char *nam, char **args, Options ops, UNUSED(int func))
 {
 -    int pcre_opts = 0, pcre_errptr, target_len;
 -    const char *pcre_error;
 +    uint32_t pcre_opts = 0;
 +    int target_len;
 +    int pcre_error;
 +    PCRE2_SIZE pcre_offset;
     char *target;
 -    if(OPT_ISSET(ops,'a')) pcre_opts |= PCRE_ANCHORED;
 -    if(OPT_ISSET(ops,'i')) pcre_opts |= PCRE_CASELESS;
 -    if(OPT_ISSET(ops,'m')) pcre_opts |= PCRE_MULTILINE;
 -    if(OPT_ISSET(ops,'x')) pcre_opts |= PCRE_EXTENDED;
 -    if(OPT_ISSET(ops,'s')) pcre_opts |= PCRE_DOTALL;
 +    if (OPT_ISSET(ops, 'a')) pcre_opts |= PCRE2_ANCHORED;
 +    if (OPT_ISSET(ops, 'i')) pcre_opts |= PCRE2_CASELESS;
 +    if (OPT_ISSET(ops, 'm')) pcre_opts |= PCRE2_MULTILINE;
 +    if (OPT_ISSET(ops, 'x')) pcre_opts |= PCRE2_EXTENDED;
 +    if (OPT_ISSET(ops, 's')) pcre_opts |= PCRE2_DOTALL;
     if (zpcre_utf8_enabled())
 -	pcre_opts |= PCRE_UTF8;
 -
 -#ifdef HAVE_PCRE_STUDY
 -    if (pcre_hints)
 -#ifdef PCRE_CONFIG_JIT
 -	pcre_free_study(pcre_hints);
 -#else
 -	pcre_free(pcre_hints);
 -#endif
 -    pcre_hints = NULL;
 -#endif
 +	pcre_opts |= PCRE2_UTF;
     if (pcre_pattern)
 -	pcre_free(pcre_pattern);
 +	pcre2_code_free(pcre_pattern);
     pcre_pattern = NULL;
     target = ztrdup(*args);
     unmetafy(target, &target_len);
 -    if ((int)strlen(target) != target_len) {
 -	zwarnnam(nam, "embedded NULs in PCRE pattern terminate pattern");
 -    }
 -
 -    pcre_pattern = pcre_compile(target, pcre_opts, &pcre_error, &pcre_errptr, NULL);
 +    pcre_pattern = pcre2_compile((PCRE2_SPTR) target, (PCRE2_SIZE) target_len,
 +	    pcre_opts, &pcre_error, &pcre_offset, NULL);
     free(target);
     if (pcre_pattern == NULL)
     {
 -	zwarnnam(nam, "error in regex: %s", pcre_error);
 +	PCRE2_UCHAR buffer[256];
 +	pcre2_get_error_message(pcre_error, buffer, sizeof(buffer));
 +	zwarnnam(nam, "error in regex: %s", buffer);
 	return 1;
     }
     return 0;
 }
 -/**/
 -#ifdef HAVE_PCRE_STUDY
 -
 /**/
 static int
 bin_pcre_study(char *nam, UNUSED(char **args), UNUSED(Options ops), UNUSED(int func))
 {
 -    const char *pcre_error;
 -
     if (pcre_pattern == NULL)
     {
 	zwarnnam(nam, "no pattern has been compiled for study");
 	return 1;
     }
 -    
 -    if (pcre_hints)
 -#ifdef PCRE_CONFIG_JIT
 -	pcre_free_study(pcre_hints);
 -#else
 -	pcre_free(pcre_hints);
 -#endif
 -    pcre_hints = NULL;
 -    pcre_hints = pcre_study(pcre_pattern, 0, &pcre_error);
 -    if (pcre_error != NULL)
 -    {
 -	zwarnnam(nam, "error while studying regex: %s", pcre_error);
 -	return 1;
 +    int jit = 0;
 +    if (!pcre2_config(PCRE2_CONFIG_JIT, &jit) && jit) {
 +	if (pcre2_jit_compile(pcre_pattern, PCRE2_JIT_COMPLETE) < 0) {
 +	    zwarnnam(nam, "error while studying regex");
 +	    return 1;
 +	}
     }
     return 0;
 }
 -/**/
 -#else /* !HAVE_PCRE_STUDY */
 -
 -# define bin_pcre_study bin_notavail
 -
 -/**/
 -#endif /* !HAVE_PCRE_STUDY */
 -
 -/**/
 static int
 -zpcre_get_substrings(char *arg, int *ovec, int captured_count, char *matchvar,
 -		     char *substravar, int want_offset_pair, int matchedinarr,
 -		     int want_begin_end)
 +zpcre_get_substrings(char *arg, pcre2_match_data *mdata, int captured_count,
 +	char *matchvar, char *substravar, int want_offset_pair,
 +	int matchedinarr, int want_begin_end)
 {
 -    char **captures, *match_all, **matches;
 +    PCRE2_SIZE *ovec;
 +    char *match_all, **matches;
     char offset_all[50];
     int capture_start = 1;
     if (matchedinarr) {
 -	/* bash-style captures[0] entire-matched string in the array */
 +	/* bash-style ovec[0] entire-matched string in the array */
 	capture_start = 0;
     }
 -    /* captures[0] will be entire matched string, [1] first substring */
 -    if (!pcre_get_substring_list(arg, ovec, captured_count, (const char ***)&captures)) {
 -	int nelem = arrlen(captures)-1;
 +    /* ovec[0] will be entire matched string, [1] first substring */
 +    ovec = pcre2_get_ovector_pointer(mdata);
 +    if (ovec) {
 +	int nelem = captured_count - 1;
 	/* Set to the offsets of the complete match */
 	if (want_offset_pair) {
 -	    sprintf(offset_all, "%d %d", ovec[0], ovec[1]);
 +	    sprintf(offset_all, "%ld %ld", ovec[0], ovec[1]);
 	    setsparam("ZPCRE_OP", ztrdup(offset_all));
 	}
 	/*
@@ -186,7 +158,7 @@ zpcre_get_substrings(char *arg, int *ovec, int captured_count, char *matchvar,
 	 * ovec is length 2*(1+capture_list_length)
 	 */
 	if (matchvar) {
 -	    match_all = metafy(captures[0], ovec[1] - ovec[0], META_DUP);
 +	    match_all = metafy(arg + ovec[0], ovec[1] - ovec[0], META_DUP);
 	    setsparam(matchvar, match_all);
 	}
 	/*
@@ -201,16 +173,12 @@ zpcre_get_substrings(char *arg, int *ovec, int captured_count, char *matchvar,
 	 */
 	if (substravar &&
 	    (!want_begin_end || nelem)) {
 -	    char **x, **y;
 +	    char **x;
 	    int vec_off, i;
 -	    y = &captures[capture_start];
 	    matches = x = (char **) zalloc(sizeof(char *) * (captured_count+1-capture_start));
 -	    for (i = capture_start; i < captured_count; i++, y++) {
 +	    for (i = capture_start; i < captured_count; i++) {
 		vec_off = 2*i;
 -		if (*y)
 -		    *x++ = metafy(*y, ovec[vec_off+1]-ovec[vec_off], META_DUP);
 -		else
 -		    *x++ = NULL;
 +		*x++ = metafy(arg + ovec[vec_off], ovec[vec_off+1]-ovec[vec_off], META_DUP);
 	    }
 	    *x = NULL;
 	    setaparam(substravar, matches);
@@ -247,7 +215,8 @@ zpcre_get_substrings(char *arg, int *ovec, int captured_count, char *matchvar,
 	    setiparam("MEND", offs + !isset(KSHARRAYS) - 1);
 	    if (nelem) {
 		char **mbegin, **mend, **bptr, **eptr;
 -		int i, *ipair;
 +		int i;
 +		size_t *ipair;
 		bptr = mbegin = zalloc(sizeof(char*)*(nelem+1));
 		eptr = mend = zalloc(sizeof(char*)*(nelem+1));
@@ -287,8 +256,6 @@ zpcre_get_substrings(char *arg, int *ovec, int captured_count, char *matchvar,
 		setaparam("mend", mend);
 	    }
 	}
 -
 -	pcre_free_substring_list((const char **)captures);
     }
     return 0;
@@ -314,7 +281,8 @@ getposint(char *instr, char *nam)
 static int
 bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
 {
 -    int ret, capcount, *ovec, ovecsize, c;
 +    int ret, c;
 +    pcre2_match_data *pcre_mdata = NULL;
     char *matched_portion = NULL;
     char *plaintext = NULL;
     char *receptacle = NULL;
@@ -344,36 +312,30 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
     /* For the entire match, 'Return' the offset byte positions instead of the matched string */
     if(OPT_ISSET(ops,'b')) want_offset_pair = 1;
 -    if ((ret = pcre_fullinfo(pcre_pattern, pcre_hints, PCRE_INFO_CAPTURECOUNT, &capcount)))
 -    {
 -	zwarnnam(nam, "error %d in fullinfo", ret);
 -	return 1;
 -    }
 -
 -    ovecsize = (capcount+1)*3;
 -    ovec = zalloc(ovecsize*sizeof(int));
 -
     plaintext = ztrdup(*args);
     unmetafy(plaintext, &subject_len);
     if (offset_start > 0 && offset_start >= subject_len)
 -	ret = PCRE_ERROR_NOMATCH;
 -    else
 -	ret = pcre_exec(pcre_pattern, pcre_hints, plaintext, subject_len, offset_start, 0, ovec, ovecsize);
 +	ret = PCRE2_ERROR_NOMATCH;
 +    else {
 +	pcre_mdata = pcre2_match_data_create_from_pattern(pcre_pattern, NULL);
 +	ret = pcre2_match(pcre_pattern, (PCRE2_SPTR) plaintext, subject_len,
 +		offset_start, 0, pcre_mdata, NULL);
 +    }
     if (ret==0) return_value = 0;
 -    else if (ret==PCRE_ERROR_NOMATCH) /* no match */;
 +    else if (ret == PCRE2_ERROR_NOMATCH) /* no match */;
     else if (ret>0) {
 -	zpcre_get_substrings(plaintext, ovec, ret, matched_portion, receptacle,
 +	zpcre_get_substrings(plaintext, pcre_mdata, ret, matched_portion, receptacle,
 			     want_offset_pair, 0, 0);
 	return_value = 0;
     }
     else {
 -	zwarnnam(nam, "error in pcre_exec [%d]", ret);
 +	zwarnnam(nam, "error in pcre2_match [%d]", ret);
     }
 -    if (ovec)
 -	zfree(ovec, ovecsize*sizeof(int));
 +    if (pcre_mdata)
 +	pcre2_match_data_free(pcre_mdata);
     zsfree(plaintext);
     return return_value;
@@ -383,17 +345,19 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
 static int
 cond_pcre_match(char **a, int id)
 {
 -    pcre *pcre_pat;
 -    const char *pcre_err;
 +    pcre2_code *pcre_pat = NULL;
 +    int pcre_err;
 +    PCRE2_SIZE pcre_erroff;
     char *lhstr, *rhre, *lhstr_plain, *rhre_plain, *avar, *svar;
 -    int r = 0, pcre_opts = 0, pcre_errptr, capcnt, *ov, ovsize;
 +    int r = 0, pcre_opts = 0;
 +    pcre2_match_data *pcre_mdata = NULL;
     int lhstr_plain_len, rhre_plain_len;
     int return_value = 0;
     if (zpcre_utf8_enabled())
 -	pcre_opts |= PCRE_UTF8;
 +	pcre_opts |= PCRE2_UTF;
     if (isset(REMATCHPCRE) && !isset(CASEMATCH))
 -	pcre_opts |= PCRE_CASELESS;
 +	pcre_opts |= PCRE2_CASELESS;
     lhstr = cond_str(a,0,0);
     rhre = cond_str(a,1,0);
@@ -401,9 +365,6 @@ cond_pcre_match(char **a, int id)
     rhre_plain = ztrdup(rhre);
     unmetafy(lhstr_plain, &lhstr_plain_len);
     unmetafy(rhre_plain, &rhre_plain_len);
 -    pcre_pat = NULL;
 -    ov = NULL;
 -    ovsize = 0;
     if (isset(BASHREMATCH)) {
 	svar = NULL;
@@ -415,27 +376,27 @@ cond_pcre_match(char **a, int id)
     switch(id) {
 	 case CPCRE_PLAIN:
 -		if ((int)strlen(rhre_plain) != rhre_plain_len) {
 -		    zwarn("embedded NULs in PCRE pattern terminate pattern");
 -		}
 -		pcre_pat = pcre_compile(rhre_plain, pcre_opts, &pcre_err, &pcre_errptr, NULL);
 -		if (pcre_pat == NULL) {
 -		    zwarn("failed to compile regexp /%s/: %s", rhre, pcre_err);
 +		if (!(pcre_pat = pcre2_compile((PCRE2_SPTR) rhre_plain,
 +			(PCRE2_SIZE) rhre_plain_len, pcre_opts,
 +			&pcre_err, &pcre_erroff, NULL)))
 +		{
 +		    PCRE2_UCHAR buffer[256];
 +		    pcre2_get_error_message(pcre_err, buffer, sizeof(buffer));
 +		    zwarn("failed to compile regexp /%s/: %s", rhre, buffer);
 		    break;
 		}
 -                pcre_fullinfo(pcre_pat, NULL, PCRE_INFO_CAPTURECOUNT, &capcnt);
 -    		ovsize = (capcnt+1)*3;
 -		ov = zalloc(ovsize*sizeof(int));
 -    		r = pcre_exec(pcre_pat, NULL, lhstr_plain, lhstr_plain_len, 0, 0, ov, ovsize);
 -		/* r < 0 => error; r==0 match but not enough size in ov
 +		pcre_mdata = pcre2_match_data_create_from_pattern(pcre_pat, NULL);
 +		r = pcre2_match(pcre_pat, (PCRE2_SPTR8) lhstr_plain, lhstr_plain_len,
 +			0, 0, pcre_mdata, NULL);
 +		/* r < 0 => error; r==0 match but not enough size in match data
 		 * r > 0 => (r-1) substrings found; r==1 => no substrings
 		 */
     		if (r==0) {
 -		    zwarn("reportable zsh problem: pcre_exec() returned 0");
 +		    zwarn("reportable zsh problem: pcre2_match() returned 0");
 		    return_value = 1;
 		    break;
 		}
 -	        else if (r==PCRE_ERROR_NOMATCH) {
 +		else if (r == PCRE2_ERROR_NOMATCH) {
 		    return_value = 0; /* no match */
 		    break;
 		}
@@ -444,7 +405,7 @@ cond_pcre_match(char **a, int id)
 		    break;
 		}
                 else if (r>0) {
 -		    zpcre_get_substrings(lhstr_plain, ov, r, svar, avar, 0,
 +		    zpcre_get_substrings(lhstr_plain, pcre_mdata, r, svar, avar, 0,
 					 isset(BASHREMATCH),
 					 !isset(BASHREMATCH));
 		    return_value = 1;
@@ -457,10 +418,10 @@ cond_pcre_match(char **a, int id)
 	free(lhstr_plain);
     if(rhre_plain)
 	free(rhre_plain);
 +    if (pcre_mdata)
 +	pcre2_match_data_free(pcre_mdata);
     if (pcre_pat)
 -	pcre_free(pcre_pat);
 -    if (ov)
 -	zfree(ov, ovsize*sizeof(int));
 +	pcre2_code_free(pcre_pat);
     return return_value;
 }
@@ -489,11 +450,11 @@ static struct builtin bintab[] = {
 static struct features module_features = {
     bintab, sizeof(bintab)/sizeof(*bintab),
 -#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
 +#if defined(HAVE_PCRE2_COMPILE_8) && defined(HAVE_PCRE2_H)
     cotab, sizeof(cotab)/sizeof(*cotab),
 -#else /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
 +#else /* !(HAVE_PCRE2_COMPILE_8 && HAVE_PCRE2_H) */
     NULL, 0,
 -#endif /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
 +#endif /* !(HAVE_PCRE2_COMPILE_8 && HAVE_PCRE2_H) */
     NULL, 0,
     NULL, 0,
     0
@@ -540,19 +501,9 @@ cleanup_(Module m)
 int
 finish_(UNUSED(Module m))
 {
 -#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
 -#ifdef HAVE_PCRE_STUDY
 -    if (pcre_hints)
 -#ifdef PCRE_CONFIG_JIT
 -	pcre_free_study(pcre_hints);
 -#else
 -	pcre_free(pcre_hints);
 -#endif
 -    pcre_hints = NULL;
 -#endif
 -
 +#if defined(HAVE_PCRE2_COMPILE_8) && defined(HAVE_PCRE2_H)
     if (pcre_pattern)
 -	pcre_free(pcre_pattern);
 +	pcre2_code_free(pcre_pattern);
     pcre_pattern = NULL;
 #endif
 diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
 index 22a0b64c7..6eb366964 100644
 --- a/Test/V07pcre.ztst
 +++ b/Test/V07pcre.ztst
@@ -117,12 +117,17 @@
 >78884; ZPCRE_OP: 25 30
 >90210; ZPCRE_OP: 31 36
 -# Embedded NULs allowed in plaintext, but not in RE (although \0 as two-chars allowed)
 +# Embedded NULs allowed in plaintext, in RE, pcre supports \0 as two-chars
   [[ $'a\0bc\0d' =~ '^(a\0.)(.+)$' ]]
   print "${#MATCH}; ${#match[1]}; ${#match[2]}"
 0:ensure ASCII NUL passes in and out of matched plaintext
 >6; 3; 3
 +# PCRE2 supports NULs also in the RE
 +  [[ $'a\0b\0c' =~ $'^(.\0)+' ]] && print "${#MATCH}; ${#match[1]}"
 +0:ensure ASCII NUL works also in the regex
 +>4; 2
 +
 # Ensure the long-form infix operator works
   [[ foo -pcre-match ^f..$ ]]
   print $?
@@ -169,7 +174,11 @@
   [[ é =~ '^..\z' ]]; echo $?
   LANG=$LANG_SAVE
   [[ é =~ '^.\z' ]]; echo $?
 -0:swich between C/UTF-8 locales
 +0:switch between C/UTF-8 locales
 >0
 >0
 >0
 +
 +  [[ abc =~ 'a(d*)bc' ]] && print "$#MATCH; $#match; ${#match[1]}"
 +0:empty capture
 +>3; 1; 0
 diff --git a/configure.ac b/configure.ac
 index d8a17791a..4710d1659 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -438,7 +438,7 @@ fi],
 dnl Do you want to look for pcre support?
 AC_ARG_ENABLE(pcre,
 -AS_HELP_STRING([--enable-pcre],[enable the search for the pcre library (may create run-time library dependencies)]))
 +AS_HELP_STRING([--enable-pcre],[enable the search for the pcre2 library (may create run-time library dependencies)]))
 dnl Do you want to look for capability support?
 AC_ARG_ENABLE(cap,
@@ -652,13 +652,12 @@ AC_HEADER_SYS_WAIT
 oldcflags="$CFLAGS"
 if test x$enable_pcre = xyes; then
 -AC_CHECK_PROG([PCRECONF], pcre-config, pcre-config)
 -dnl Typically (meaning on this single RedHat 9 box in front of me)
 -dnl pcre-config --cflags produces a -I output which needs to go into
 +AC_CHECK_PROG([PCRECONF], pcre2-config, pcre2-config)
 +dnl pcre2-config --cflags may produce a -I output which needs to go into
 dnl CPPFLAGS else configure's preprocessor tests don't pick it up,
 dnl producing a warning.
 -if test "x$ac_cv_prog_PCRECONF" = xpcre-config; then
 -  CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
 +if test "x$ac_cv_prog_PCRECONF" = xpcre2-config; then
 +  CPPFLAGS="$CPPFLAGS `pcre2-config --cflags`"
 fi
 fi
@@ -668,9 +667,10 @@ AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
 		 locale.h errno.h stdio.h stdarg.h varargs.h stdlib.h \
 		 unistd.h sys/capability.h \
 		 utmp.h utmpx.h sys/types.h pwd.h grp.h poll.h sys/mman.h \
 -		 netinet/in_systm.h pcre.h langinfo.h wchar.h stddef.h \
 +		 netinet/in_systm.h langinfo.h wchar.h stddef.h \
 		 sys/stropts.h iconv.h ncurses.h ncursesw/ncurses.h \
 		 ncurses/ncurses.h)
 +AC_CHECK_HEADERS([pcre2.h],,,[#define PCRE2_CODE_UNIT_WIDTH 8])
 if test x$dynamic = xyes; then
   AC_CHECK_HEADERS(dlfcn.h)
   AC_CHECK_HEADERS(dl.h)
@@ -948,9 +948,7 @@ if test "x$ac_found_iconv" = "xyes"; then
 fi
 if test x$enable_pcre = xyes; then
 -dnl pcre-config should probably be employed here
 -dnl AC_SEARCH_LIBS(pcre_compile, pcre)
 -  LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS"
 +  LIBS="`$ac_cv_prog_PCRECONF --libs8` $LIBS"
 fi
 dnl ---------------------
@@ -1313,7 +1311,7 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \
 	       pathconf sysconf \
 	       tgetent tigetflag tigetnum tigetstr setupterm initscr resize_term \
 	       getcchar setcchar waddwstr wget_wch win_wch use_default_colors \
 -	       pcre_compile pcre_study pcre_exec \
 +	       pcre2_compile_8 \
 	       nl_langinfo \
 	       erand48 open_memstream \
 	       posix_openpt \
 -- 
 2.41.0
 From 10bdbd8b5b0b43445aff23dcd412f25cf6aa328a Mon Sep 17 00:00:00 2001
 From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 Date: Tue, 20 Jun 2023 18:14:27 +0900
 Subject: [PATCH] 51877: do not build pcre module if pcre2-config is not found
 Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 ---
 Src/Modules/pcre.mdd |  2 +-
 configure.ac         | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)
 diff --git a/Src/Modules/pcre.mdd b/Src/Modules/pcre.mdd
 index 6eb3c691b..3e1579117 100644
 --- a/Src/Modules/pcre.mdd
 +++ b/Src/Modules/pcre.mdd
@@ -1,5 +1,5 @@
 name=zsh/pcre
 -link=`if test x$enable_pcre = xyes && (pcre-config --version >/dev/null 2>/dev/null); then echo dynamic; else echo no; fi`
 +link=`if test x$enable_pcre = xyes; then echo dynamic; else echo no; fi`
 load=no
 autofeatures="b:pcre_compile b:pcre_study b:pcre_match"
 diff --git a/configure.ac b/configure.ac
 index ba76f9a60..c5263035e 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -440,6 +440,17 @@ dnl Do you want to look for pcre support?
 AC_ARG_ENABLE(pcre,
 AS_HELP_STRING([--enable-pcre],[enable the search for the pcre2 library (may create run-time library dependencies)]))
 +AC_ARG_VAR(PCRE_CONFIG, [pathname of pcre2-config if it is not in PATH])
 +if test "x$enable_pcre" = xyes; then
 +  AC_CHECK_PROG([PCRE_CONFIG], pcre2-config, pcre2-config)
 +  if test "x$PCRE_CONFIG" = x; then
 +    enable_pcre=no
 +    AC_MSG_WARN([pcre2-config not found: pcre module is disabled.])
 +    AC_MSG_NOTICE(
 +      [Set PCRE_CONFIG to pathname of pcre2-config if it is not in PATH.])
 +  fi
 +fi
 +
 dnl Do you want to look for capability support?
 AC_ARG_ENABLE(cap,
 AS_HELP_STRING([--enable-cap],[enable the search for POSIX capabilities (may require additional headers to be added by hand)]))
@@ -655,15 +666,12 @@ AC_HEADER_DIRENT
 AC_HEADER_STAT
 AC_HEADER_SYS_WAIT
 -oldcflags="$CFLAGS"
 -if test x$enable_pcre = xyes; then
 -AC_CHECK_PROG([PCRECONF], pcre2-config, pcre2-config)
 dnl pcre2-config --cflags may produce a -I output which needs to go into
 dnl CPPFLAGS else configure's preprocessor tests don't pick it up,
 dnl producing a warning.
 -if test "x$ac_cv_prog_PCRECONF" = xpcre2-config; then
 -  CPPFLAGS="$CPPFLAGS `pcre2-config --cflags`"
 -fi
 +if test "x$enable_pcre" = xyes; then
 +  CPPFLAGS="`$PCRE_CONFIG --cflags` $CPPFLAGS"
 +  AC_CHECK_HEADERS([pcre2.h],,,[#define PCRE2_CODE_UNIT_WIDTH 8])
 fi
 AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
@@ -675,7 +683,6 @@ AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
 		 netinet/in_systm.h langinfo.h wchar.h stddef.h \
 		 sys/stropts.h iconv.h ncurses.h ncursesw/ncurses.h \
 		 ncurses/ncurses.h)
 -AC_CHECK_HEADERS([pcre2.h],,,[#define PCRE2_CODE_UNIT_WIDTH 8])
 if test x$dynamic = xyes; then
   AC_CHECK_HEADERS(dlfcn.h)
   AC_CHECK_HEADERS(dl.h)
@@ -952,10 +959,6 @@ if test "x$ac_found_iconv" = "xyes"; then
     [Define as const if the declaration of iconv() needs const.])
 fi
 -if test x$enable_pcre = xyes; then
 -  LIBS="`$ac_cv_prog_PCRECONF --libs8` $LIBS"
 -fi
 -
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
 dnl ---------------------
@@ -1316,7 +1319,6 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \
 	       pathconf sysconf \
 	       tgetent tigetflag tigetnum tigetstr setupterm initscr resize_term \
 	       getcchar setcchar waddwstr wget_wch win_wch use_default_colors \
 -	       pcre2_compile_8 \
 	       nl_langinfo \
 	       erand48 open_memstream \
 	       posix_openpt \
@@ -1371,6 +1373,11 @@ if test x$zsh_cv_func_realpath_accepts_null = xyes; then
   AC_DEFINE(REALPATH_ACCEPTS_NULL)
 fi
 +if test x$enable_pcre = xyes; then
 +  LIBS="`$PCRE_CONFIG --libs8` $LIBS"
 +  AC_CHECK_FUNCS(pcre2_compile_8)
 +fi
 +
 if test x$enable_cap = xyes; then
   AC_CHECK_FUNCS(cap_get_proc)
 fi
 -- 
 2.42.0
--- a/0006-zsh-support-texinfo-7.0.patch
+++ b/0006-zsh-support-texinfo-7.0.patch
@ -0,0 +1,53 @@
 From ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4 Mon Sep 17 00:00:00 2001
 From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 Date: Mon, 19 Jun 2023 11:19:25 +0900
 Subject: [PATCH] 51862: support texinfo-7.0
 Upstream-commit: ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
 Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 ---
 Doc/Makefile.in | 3 ++-
 configure.ac    | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 diff --git a/Doc/Makefile.in b/Doc/Makefile.in
 index 136b080d6..dabe11fe3 100644
 --- a/Doc/Makefile.in
 +++ b/Doc/Makefile.in
@@ -43,6 +43,7 @@ TEXI2DVI = @TEXI2DVI@
 DVIPS = dvips
 TEXI2PDF  = @TEXI2PDF@
 TEXI2HTML = @TEXI2HTML@
 +SET_TEXI2ANY_VAR = @SET_TEXI2ANY_VAR@
 PAPERSIZE = @PAPERSIZE@
 .SUFFIXES: .yo .1
@@ -266,7 +267,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk
 	d=`echo $(VERSION_DATE)`; \
 	v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \
 	case '$(TEXI2HTML)' in \
 -	  *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \
 +	  *texi2any*) echo "$(SET_TEXI2ANY_VAR)('PRE_BODY_CLOSE','$$v');" ;; \
 	  *) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \
 	esac > $@
 diff --git a/configure.ac b/configure.ac
 index 4710d1659..ba76f9a60 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -623,7 +623,12 @@ fi
 if test x"$TEXI2HTML" = xtexi2any; then
   TEXI2HTML='texi2any -c TEXI2HTML=1'
 +  case `texi2any --version 2>/dev/null | sed -e 's/^.*) *//' -e 1q` in
 +    [[1-6]].*) SET_TEXI2ANY_VAR=set_from_init_file ;;
 +    *) SET_TEXI2ANY_VAR=texinfo_set_from_init_file ;;
 +  esac
 fi
 +AC_SUBST(SET_TEXI2ANY_VAR)
 case "$LC_PAPER" in
   ??_US*) PAPERSIZE=us ;;
 -- 
 2.42.0
--- a/0007-zsh-configure-c99.patch
+++ b/0007-zsh-configure-c99.patch
@ -0,0 +1,44 @@
 Avoid incompatible pointer types in terminfo global variable checks.
 Some compilers reject these incompatible pointer types, causing the
 checks to always fail, when these variables are in fact available.
 Submitted upstream: <https://www.zsh.org/mla/workers/2023/msg01112.html>
 diff --git a/configure.ac b/configure.ac
 index a58242f453b4a8f3..5534f42df14eb28c 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -1769,27 +1769,27 @@ if test x$zsh_cv_path_term_header != xnone; then
   fi
   AC_MSG_CHECKING(if boolcodes is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
   AC_MSG_RESULT($boolcodes)
   AC_MSG_CHECKING(if numcodes is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
   AC_MSG_RESULT($numcodes)
   AC_MSG_CHECKING(if strcodes is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
   AC_MSG_RESULT($strcodes)
   AC_MSG_CHECKING(if boolnames is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
   AC_MSG_RESULT($boolnames)
   AC_MSG_CHECKING(if numnames is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
   AC_MSG_RESULT($numnames)
   AC_MSG_CHECKING(if strnames is available)
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
   AC_MSG_RESULT($strnames)
   dnl There are apparently defective terminal library headers on some
--- a/0008-zsh-deletefilelist-segfault.patch
+++ b/0008-zsh-deletefilelist-segfault.patch
@ -0,0 +1,42 @@
 From d3edf318306e37d2d96c4e4ea442d10207722e94 Mon Sep 17 00:00:00 2001
 From: Bart Schaefer <schaefer@zsh.org>
 Date: Sun, 12 Feb 2023 09:52:39 -0800
 Subject: [PATCH] 51404: Nullify filelist after deleting (fix segfault)
 Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 Upstream-commit: d3edf318306e37d2d96c4e4ea442d10207722e94
 ---
 Src/jobs.c | 8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
 diff --git a/Src/jobs.c b/Src/jobs.c
 index 4863962b9..59ddd952e 100644
 --- a/Src/jobs.c
 +++ b/Src/jobs.c
@@ -1372,8 +1372,10 @@ cleanfilelists(void)
     DPUTS(shell_exiting >= 0, "BUG: cleanfilelists() before exit");
 -    for (i = 1; i <= maxjob; i++)
 +    for (i = 1; i <= maxjob; i++) {
 	deletefilelist(jobtab[i].filelist, 0);
 +	jobtab[i].filelist = 0;
 +    }
 }
 /**/
@@ -1531,8 +1533,10 @@ havefiles(void)
     int i;
     for (i = 1; i <= maxjob; i++)
 -	if (jobtab[i].stat && jobtab[i].filelist)
 +	if (jobtab[i].stat && jobtab[i].filelist &&
 +	    peekfirst(jobtab[i].filelist)) {
 	    return 1;
 +	}
     return 0;
 }
 -- 
 2.43.0
--- a/backport-Simplify-N-cond-test.patch
+++ b/backport-Simplify-N-cond-test.patch
@ -1,67 +0,0 @@
 From 80ddc46e54f6116235e68d3fc039ef775e72d1c5 Mon Sep 17 00:00:00 2001
 From: dana <dana@dana.is>
 Date: Wed, 11 Mar 2020 21:17:12 -0500
 Subject: [PATCH] 45470: C02cond: Simplify '-N cond' test
 This fixes an (intermittent?) issue with the test on macOS+APFS, and hopefully
 makes it simpler and faster in general
 ---
 Test/C02cond.ztst | 36 ++++++++++++------------------------
 1 files changed, 12 insertions(+), 24 deletions(-)
 diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
 index 4b1ec02f0..5b105b2a0 100644
 --- a/Test/C02cond.ztst
 +++ b/Test/C02cond.ztst
@@ -146,39 +146,27 @@
 # can't be bothered with -S
 -  if [[ ${mtab::="$({mount || /sbin/mount || /usr/sbin/mount} 2>/dev/null)"} = *[(]?*[)] ]]; then
 -    print -u $ZTST_fd 'This test takes two seconds...'
 -  else
 -    unmodified_ls="$(ls -lu $unmodified)"
 -    print -u $ZTST_fd 'This test takes up to 60 seconds...'
 -  fi
 -  sleep 2
 +  print -ru $ZTST_fd 'This test may take two seconds...'
   touch $newnewnew
   if [[ $OSTYPE == "cygwin" ]]; then
     ZTST_skip="[[ -N file ]] not supported on Cygwin"
   elif (( isnfs )); then
     ZTST_skip="[[ -N file ]] not supported with NFS"
 -  elif { (( ! $+unmodified_ls )) &&
 -         cat $unmodified &&
 -         { df -k -- ${$(print -r -- "$mtab" |
 -                        awk '/noatime/ {print $1,$3}'):-""} | tr -s ' ' |
 -           fgrep -- "$(df -k . | tail -1 | tr -s ' ')" } >&/dev/null } ||
 -       { (( $+unmodified_ls )) && SECONDS=0 &&
 -         ! until (( SECONDS >= 58 )); do
 -             ZTST_hashmark; sleep 2; cat $unmodified
 -             [[ $unmodified_ls != "$(ls -lu $unmodified)" ]] && break
 -	   done }; then
 -    ZTST_skip="[[ -N file ]] not supported with noatime file system"
 +  elif ! zmodload -F zsh/stat b:zstat 2> /dev/null; then
 +    ZTST_skip='[[ -N file ]] not tested; zsh/stat not available'
 +  elif ! { sleep 2; touch -a $unmodified 2> /dev/null }; then
 +    ZTST_skip='[[ -N file ]] not tested; touch failed'
 +  elif [[ "$(zstat +atime $unmodified)" == "$(zstat +mtime $unmodified)" ]]; then
 +    ZTST_skip='[[ -N file ]] not supported on this file system'
   else
     [[ -N $newnewnew && ! -N $unmodified ]]
   fi
 0:-N cond
 -F:This test can fail on NFS-mounted filesystems as the access and
 -F:modification times are not updated separately.  The test will fail
 -F:on HFS+ (Apple Mac OS X default) filesystems because access times
 -F:are not recorded.  Also, Linux ext3 filesystems may be mounted
 -F:with the noatime option which does not update access times.
 -F:Failures in these cases do not indicate a problem in the shell.
 +F:This test relies on the file system supporting atime updates. It
 +F:should automatically detect whether this is the case, and skip
 +F:without failing if it isn't, but it's possible that some
 +F:configurations may elude this detection. Please report this
 +F:scenario if you encounter it.
   [[ $newnewnew -nt $zlnfs && ! ($unmodified -nt $zlnfs) ]]
 0:-nt cond
--- a/12
+++ b/12
@ -0,0 +1,12 @@
 # this file is installed as ~/.zprofile for newly created users
 # prepend ~/.local/bin and ~/bin to $PATH unless it is already there
 if ! [[ "$PATH" =~ "$HOME/bin" ]]
 then
    PATH="$HOME/bin:$PATH"
 fi
 if ! [[ "$PATH" =~ "$HOME/.local/bin:" ]]
 then
    PATH="$HOME/.local/bin:$PATH"
 fi
 export PATH
--- a/27
+++ b/27
@ -4,6 +4,31 @@
 # functions, options, key bindings, etc.
 #
 # Setup new style completion system.
 autoload -U compinit
 compinit
 #allow tab completion in the middle of a word
 setopt COMPLETE_IN_WORD
 ## keep background processes at full speed
 #setopt NOBGNICE
 ## restart running processes on exit
 #setopt HUP
 ## history
 #setopt APPEND_HISTORY
 ## for sharing history between zsh processes
 #setopt INC_APPEND_HISTORY
 #setopt SHARE_HISTORY
 ## never ever beep ever
 #setopt NO_BEEP
 ## automatically decide when to page a list of completions
 #LISTMAX=0
 ## disable mail checking
 #MAILCHECK=0
 # autoload -U colors
 #colors
--- a/4
+++ b/4
@ -1,4 +0,0 @@
 #
 # '.zlogin' is sourced in login shells.  It should contain
 # commands that should be executed only in login shells.
 #
--- a/zlogin.rhs
+++ b/zlogin.rhs
@ -0,0 +1,8 @@
 #
 # /etc/zlogin and .zlogin are sourced in login shells.  It should
 # contain commands that should be executed only in
 # login shells.  It should be used to set the terminal
 # type and run a series of external commands (fortune,
 # msgs, from, etc).
 #
--- a/5
+++ b/5
@ -1,5 +0,0 @@
 #
 # '.zlogout' is sourced when login shells exit
 #
 clear
--- a/zlogout.rhs
+++ b/zlogout.rhs
@ -0,0 +1,7 @@
 #
 #
 # /etc/zlogout and ~/.zlogout are run when an interactive session ends
 #
 #
 command -v clear &> /dev/null && clear
--- a/8
+++ b/8
@ -1,8 +0,0 @@
 #
 # '.zlogout' is similar to `.zlogin', except that it is sourced before `.zshrc'
 #
 PATH="$PATH:$HOME/bin"
 export PATH
 [ -f /etc/profile ] && . /etc/profile
--- a/zprofile.rhs
+++ b/zprofile.rhs
@ -0,0 +1,19 @@
 #
 # /etc/zprofile and ~/.zprofile are run for login shells
 #
 _src_etc_profile()
 {
    #  Make /etc/profile happier, and have possible ~/.zshenv options like
    # NOMATCH ignored.
    #
    emulate -L ksh
    # source profile
    if [ -f /etc/profile ]; then
 	    source /etc/profile
    fi
 }
 _src_etc_profile
 unset -f _src_etc_profile
--- a/zsh-5.8.tar.xz
+++ b/zsh-5.8.tar.xz
--- a/zsh-5.9.tar.xz
+++ b/zsh-5.9.tar.xz
--- a/zsh.spec
+++ b/zsh.spec
@ -1,33 +1,45 @@
 %define _bindir /bin
 Name:                 zsh
-Version:              5.8
+Version:              5.9
-Release:              2
+Release:              4
 Summary:              A shell designed for interactive use
 License:              MIT
-URL:                  http://zsh.sourceforge.net
+URL:                  https://zsh.sourceforge.net
 Source0:              https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 # There are five startup files that zsh will read commands from
 # http://zsh.sourceforge.net/Intro/intro_3.html
-Source1:              zlogin
+Source1:              zlogin.rhs
-Source2:              zlogout
+Source2:              zlogout.rhs
-Source3:              zprofile
+Source3:              zprofile.rhs
-Source4:              zshrc
+Source4:              zshrc.rhs
-Source5:              zshenv
+Source5:              zshenv.rhs
 Source6:              dotzshrc
 Source7:              dotzprofile
 # do not use egrep in tests to make them pass again
 Patch1: 0001-zsh-5.9-do-not-use-egrep-in-tests.patch
 # Upstream commit ab4d62eb975a4c4c51dd35822665050e2ddc6918
 Patch2: 0002-zsh-Use-int-main-in-test-c-codes.patch
 # upstream commit a84fdd7c8f77935ecce99ff2b0bdba738821ed79
 Patch3: 0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
 # upstream commit 1b421e4978440234fb73117c8505dad1ccc68d46
 Patch4: 0004-zsh-enable-PCRE-locale-switching.patch
 # upstream commit b62e911341c8ec7446378b477c47da4256053dc0 and 10bdbd8b5b0b43445aff23dcd412f25cf6aa328a
 Patch5: 0005-zsh-port-to-pcre2.patch
 # upstream commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
 Patch6: 0006-zsh-support-texinfo-7.0.patch
 # upstream commit 4c89849c98172c951a9def3690e8647dae76308f
 Patch7: 0007-zsh-configure-c99.patch
 # upstream commit d3edf318306e37d2d96c4e4ea442d10207722e94
 Patch8: 0008-zsh-deletefilelist-segfault.patch
 BuildRequires:        autoconf coreutils gawk gdbm-devel libcap-devel make
-BuildRequires:        ncurses-devel pcre-devel sed texinfo hostname gcc
+BuildRequires:        ncurses-devel pcre2-devel sed texinfo hostname gcc
-Requires(post):       info grep
+Requires(post):       grep
 Requires(preun):      info
 Requires(postun):     coreutils grep
 Provides:             /bin/zsh
 Patch0: backport-Simplify-N-cond-test.patch
 %description
 The zsh is a shell designed for interactive use, and it is also a powerful scripting language. Many of
 the useful features of bash, ksh, and tcsh were incorporated into zsh. It can match files by file extension
@ -37,8 +49,8 @@ without running an external program, share command history with any shell, and m
 Summary:              zsh shell manual in html format
 BuildArch:            noarch
-Provides:             zsh-html
+Provides:             zsh-html = %{version}-%{release}
-Obsoletes:            zsh-html
+Obsoletes:            zsh-html < %{version}-%{release}
 %description          help
 This package contains the zsh manual in html format.
@ -52,36 +64,49 @@ sed -e 's|^\.NOTPARALLEL|#.NOTPARALLEL|' -i 'Config/defs.mk.in'
 %build
 %undefine _strict_symbol_defs_build
-export LIBLDFLAGS='-z lazy -fstack-protector-strong'
+%configure \
-
+    --enable-etcdir=%{_sysconfdir} \
-%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support --enable-pcre
+    --with-tcsetpgrp \
    --enable-maildir-support \
    --enable-pcre
 make -C Src headers
 make -C Src -f Makemod zsh{path,xmod}s.h version.h
 %make_build all html
 %check
-make check
+# avoid unnecessary failure of the test-suite in case ${RPS1} is set
 unset RPS1
 %make_build check
 %install
-%make_install install.info fndir=%{_datadir}/%{name}/%{version}/functions sitefndir=%{_datadir}/%{name}/site-functions \
+%make_install install.info \
-                           scriptdir=%{_datadir}/%{name}/%{version}/scripts sitescriptdir=%{_datadir}/%{name}/scripts \
+  fndir=%{_datadir}/%{name}/%{version}/functions \
  sitefndir=%{_datadir}/%{name}/site-functions \
  scriptdir=%{_datadir}/%{name}/%{version}/scripts \
  sitescriptdir=%{_datadir}/%{name}/scripts \
  runhelpdir=%{_datadir}/%{name}/%{version}/help
-rm -f $RPM_BUILD_ROOT%{_bindir}/zsh-%{version}
+rm -f %{buildroot}%{_bindir}/zsh-%{version}
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}
+mkdir -p %{buildroot}%{_sysconfdir}
-for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
+for i in %{S:1} %{S:2} %{S:3} %{S:4} %{S:5}; do
-    install -m 644 $i $RPM_BUILD_ROOT%{_sysconfdir}/"${i##*/}"
+    install -m 644 $i %{buildroot}%{_sysconfdir}/"$(basename $i .rhs)"
 done
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel
+mkdir -p %{buildroot}%{_sysconfdir}/skel
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc
+install -m 644 %{S:6} %{buildroot}%{_sysconfdir}/skel/.zshrc
 install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/skel/.zprofile
-for i in checkmail harden run-help zcalc zkbd; do
+# This is just here to shut up rpmlint, and is very annoying.
-    sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
+# Note that we can't chmod everything as then rpmlint will complain about
-    chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
+# those without a she-bang line.
 for i in checkmail harden run-help test-repo-git-rebase-{apply,merge} zcalc zkbd; do
    sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
    %{buildroot}%{_datadir}/zsh/%{version}/functions/$i
    chmod +x %{buildroot}%{_datadir}/zsh/%{version}/functions/$i
 done
 %post
@ -95,19 +120,6 @@ if [ "$1" = 1 ]; then
  fi
 fi
 if [ -f %{_infodir}/zsh.info.gz ]; then
 /sbin/install-info %{_infodir}/zsh.info.gz %{_infodir}/dir \
  --entry="* zsh: (zsh).                        An enhanced bourne shell."
 fi
 %preun
 if [ "$1" = 0 ] ; then
    if [ -f %{_infodir}/zsh.info.gz ]; then
    /sbin/install-info --delete %{_infodir}/zsh.info.gz %{_infodir}/dir \
      --entry="* zsh: (zsh).                    An enhanced bourne shell."
    fi
 fi
 %postun
 if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then
  sed -i '\!^%{_bindir}/%{name}$!d' %{_sysconfdir}/shells
@ -115,14 +127,13 @@ if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ] ; then
 fi
 %files
-%doc README LICENCE Etc/* FEATURES MACHINES NEWS
+%license LICENCE
 %doc README Etc/* FEATURES MACHINES NEWS
 %attr(755,root,root) %{_bindir}/zsh
-
+%{_datadir}/zsh
 %{_libdir}/zsh
 %config(noreplace) %{_sysconfdir}/skel/.z*
 %config(noreplace) %{_sysconfdir}/z*
 %{_datadir}/zsh
 %files help
 %doc Doc/*.html
@ -130,6 +141,25 @@ fi
 %{_infodir}/*
 %changelog
 * Mon Oct 07 2024 Funda Wang <fundawang@yeah.net> - 5.9-4
 - cleanup spec
 - sync patches from fedora
 * Mon Jan 30 2023 Cao Jingbo <caojb@chinatelecom.cn> - 5.9-3
 - Fix when use grep 3.8 build error.
 * Tue Jan 17 2023 dillon chen < dillon.chen@gmail.com> - 5.9-2
 - /usr/local/bin/zsh => /bin/zsh
 * Sun Oct  9 2022 dillon chen < dillon.chen@gmail.com> - 5.9-1
 - update to 5.9
 * Tue Mar 1 2022 wangjie <wangjie375@h-partners.com> - 5.8-3
 - Type: CVE
 - ID: CVE-2021-45444
 - SUG: NA
 - DESC: fix CVE-2021-45444
 * Sat Mar 20 2021 shenyangyang <shenyangyang4@huawei.com> - 5.8-2
 - Type:enhancement
 - ID:NA
--- a/zsh.yaml
+++ b/zsh.yaml
@ -1,4 +1,4 @@
 version_control: git
 src_repo: "https://git.code.sf.net/p/zsh/code"
 tag_prefix: "^zsh-"
-seperator:
+separator:
--- a/7
+++ b/7
@ -1,7 +0,0 @@
 #
 # `.zshenv' is sourced on all invocations of the shell, unless 
 # the -f option is set. It should contain commands to set the 
 # command search path, plus other important environment variables.
 # `.zshenv' should not contain commands that produce output or 
 # assume the shell is attached to a tty.
 #
--- a/zshenv.rhs
+++ b/zshenv.rhs
@ -0,0 +1,14 @@
 # /etc/zsh/zshenv: system-wide .zshenv file for zsh(1).
 #
 # This file is sourced on all invocations of the shell.
 # If the -f flag is present or if the NO_RCS option is
 # set within this file, all other initialization files
 # are skipped.
 #
 # This file should contain commands to set the command
 # search path, plus other important environment variables.
 # This file should not contain commands that produce
 # output or assume the shell is attached to a tty.
 #
 # Global Order: zshenv, zprofile, zshrc, zlogin
--- a/19
+++ b/19
@ -1,19 +0,0 @@
 #
 # `.zshrc' is sourced in interactive shells. It should contain
 # commands to set up aliases, functions, options, key bindings, etc.
 #
 # Some nice key bindings
 #bindkey '^X^Z' universal-argument ' ' magic-space
 #bindkey '^X^A' vi-find-prev-char-skip
 #bindkey '^Xa' _expand_alias
 #bindkey '^Z' accept-and-hold
 #bindkey -s '\M-/' \\\\
 #bindkey -s '\M-=' \|
 # bindkey -v               # vi key bindings
 bindkey -e                 # emacs key bindings
 bindkey ' ' magic-space    # also do history expansion on space
 bindkey '^I' complete-word # complete on tab, leave expansion to _expand
--- a/zshrc.rhs
+++ b/zshrc.rhs
@ -0,0 +1,50 @@
 #
 # /etc/zshrc is sourced in interactive shells.  It
 # should contain commands to set up aliases, functions,
 # options, key bindings, etc.
 #
 ## shell functions
 #setenv() { export $1=$2 }  # csh compatibility
 # Set prompts
 [[ "$PROMPT" = "%m%# " ]] && PROMPT='[%n@%m]%~%# '    # default prompt
 #RPROMPT=' %~'     # prompt for right side of screen
 # bindkey -v             # vi key bindings
 # bindkey -e             # emacs key bindings
 bindkey ' ' magic-space  # also do history expansion on space
 # Provide pathmunge for /etc/profile.d scripts
 pathmunge()
 {
    if ! echo $PATH | /bin/grep -qE "(^|:)$1($|:)" ; then
        if [ "$2" = "after" ] ; then
            PATH=$PATH:$1
        else
            PATH=$1:$PATH
        fi
    fi
 }
 _src_etc_profile_d()
 {
    #  Make the *.sh things happier, and have possible ~/.zshenv options like
    # NOMATCH ignored.
    emulate -L ksh
    # from bashrc, with zsh fixes
    if [[ ! -o login ]]; then # We're not a login shell
        for i in /etc/profile.d/*.sh; do
 	    if [ -r "$i" ]; then
 	        . $i
 	    fi
        done
        unset i
    fi
 }
 _src_etc_profile_d
 unset -f pathmunge _src_etc_profile_d
Author	SHA1	Message	Date
openeuler-ci-bot	1784114075	!27 [sync] PR-24: Cleanup spec From: @openeuler-sync-bot Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2024-10-08 03:26:35 +00:00
Funda Wang	ac9ac58f87	cleanup spec (cherry picked from commit fa2c7ed56b824e6e005a1c12c93b575021074710)	2024-10-08 10:31:17 +08:00
openeuler-ci-bot	bacc79c480	!23 修复在grep 3.8 下测试用例失败问题 From: @caojingbo Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2023-01-31 02:31:44 +00:00
Cao Jingbo	d788b481cf	Fix build with grep-3.8 test error Signed-off-by: Cao Jingbo <caojb@chinatelecom.cn>	2023-01-30 17:17:06 +08:00
openeuler-ci-bot	a0656086b7	!22 update to 5.9-2 From: @dillon_chen Reviewed-by: @overweight Signed-off-by: @overweight	2023-01-17 06:04:19 +00:00
dillon_chen	ec900d86d2	replace /usr/local/bin/zsh to /bin/zsh	2023-01-17 11:04:19 +08:00
openeuler-ci-bot	b5f2a01093	!21 update to 5.9 From: @dillon_chen Reviewed-by: @overweight Signed-off-by: @overweight	2022-10-20 01:43:53 +00:00
dillon_chen	643319342f	update to 5.9	2022-10-09 15:39:51 +08:00
openeuler-ci-bot	275001e5fa	!14 fix CVE-2021-45444 From: @jlwwlsqc Reviewed-by: @overweight Signed-off-by: @overweight	2022-03-02 09:36:54 +00:00
jlwwlsqc	f32e936d97	fix CVE-2021-45444	2022-03-01 16:59:41 +08:00