From 3eea62750be80c9934d9680acc10748b12cff4c7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 05:23:40 +0000
Subject: [PATCH 01/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 0d77f70..e52f259 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -157,6 +157,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Kamil Dudka <kdudka@redhat.com> - 5.7.1-4
 - make failed searches of history in Zle robust (#1722703)
 

From 8dbf2fe7bfed3bc8bbf44982e76d5f0680e7bc46 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Feb 2020 13:31:18 +0100
Subject: [PATCH 02/45] update to latest upstream release: 5.8.0

---
 0001-zsh-5.7.1-zle-history-avoid-crash.patch | 92 --------------------
 sources                                      |  2 +-
 zsh-5.7.1.tar.xz.asc                         | 11 ---
 zsh-5.8.tar.xz.asc                           | 11 +++
 zsh.spec                                     | 10 +--
 5 files changed, 17 insertions(+), 109 deletions(-)
 delete mode 100644 0001-zsh-5.7.1-zle-history-avoid-crash.patch
 delete mode 100644 zsh-5.7.1.tar.xz.asc
 create mode 100644 zsh-5.8.tar.xz.asc

diff --git a/0001-zsh-5.7.1-zle-history-avoid-crash.patch b/0001-zsh-5.7.1-zle-history-avoid-crash.patch
deleted file mode 100644
index 23932c3..0000000
--- a/0001-zsh-5.7.1-zle-history-avoid-crash.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 15c190164c375cfe1772ebec92b544ca26a60e28 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Tue, 23 Jul 2019 14:45:48 +0200
-Subject: [PATCH 1/2] 44566: make sure Zle doesn't crash if history entry not
- found
-
-Upstream-commit: f9cd2187875b6f2ebdb9b9a787fac20b2aaf745b
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- Src/Zle/zle_utils.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
-index c6df3d8..633f593 100644
---- a/Src/Zle/zle_utils.c
-+++ b/Src/Zle/zle_utils.c
-@@ -1607,7 +1607,12 @@ static int
- unapplychange(struct change *ch)
- {
-     if(ch->hist != histline) {
--	zle_setline(quietgethist(ch->hist));
-+	Histent he = quietgethist(ch->hist);
-+	if(!he) {
-+	    dputs(ERRMSG("quietgethist(ch->hist) returned NULL"));
-+	    return 1;
-+	}
-+	zle_setline(he);
- 	zlecs = ch->new_cs;
- 	return 0;
-     }
-@@ -1647,7 +1652,12 @@ static int
- applychange(struct change *ch)
- {
-     if(ch->hist != histline) {
--	zle_setline(quietgethist(ch->hist));
-+	Histent he = quietgethist(ch->hist);
-+	if(!he) {
-+	    dputs(ERRMSG("quietgethist(ch->hist) returned NULL"));
-+	    return 1;
-+	}
-+	zle_setline(he);
- 	zlecs = ch->old_cs;
- 	return 0;
-     }
--- 
-2.20.1
-
-
-From 10dedc96ce0de43372add239f8256e259ca1e04a Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 26 Jul 2019 17:24:59 +0200
-Subject: [PATCH 2/2] 44582: Fix foregoing commit to use DPUTS() better
-
-Upstream-commit: d6a9e222ec6b006c09d6f84beae6ef488a19b214
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- Src/Zle/zle_utils.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c
-index 633f593..29dba08 100644
---- a/Src/Zle/zle_utils.c
-+++ b/Src/Zle/zle_utils.c
-@@ -1608,10 +1608,9 @@ unapplychange(struct change *ch)
- {
-     if(ch->hist != histline) {
- 	Histent he = quietgethist(ch->hist);
--	if(!he) {
--	    dputs(ERRMSG("quietgethist(ch->hist) returned NULL"));
-+	DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL");
-+	if(he == NULL)
- 	    return 1;
--	}
- 	zle_setline(he);
- 	zlecs = ch->new_cs;
- 	return 0;
-@@ -1653,10 +1652,9 @@ applychange(struct change *ch)
- {
-     if(ch->hist != histline) {
- 	Histent he = quietgethist(ch->hist);
--	if(!he) {
--	    dputs(ERRMSG("quietgethist(ch->hist) returned NULL"));
-+	DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL");
-+	if(he == NULL)
- 	    return 1;
--	}
- 	zle_setline(he);
- 	zlecs = ch->old_cs;
- 	return 0;
--- 
-2.20.1
-
diff --git a/sources b/sources
index 14a66e3..0ede01c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zsh-5.7.1.tar.xz) = a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
+SHA512 (zsh-5.8.tar.xz) = 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
diff --git a/zsh-5.7.1.tar.xz.asc b/zsh-5.7.1.tar.xz.asc
deleted file mode 100644
index bfb4510..0000000
--- a/zsh-5.7.1.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAlxXSocACgkQrPgUbK6M
-u8SXPgf/Vw+pYfQXAlGy59MsmArJvU+72zP/Q8Cu9gSuLbNZetwR8Zkubibi1rpO
-zCFn0Ps9lR565k9ue+wPUtBhZjEPJVjNALdJK5YaKvh6Dir3/nhoVoS4kobJCHad
-k8X6ThID8zOwZ3E49n+2AiNxwKkSej6cUKzZ2CSGaZ077GgnY4M8y6ACSdwEp7w8
-f5W9gUMqxawx0PCfsxkoJNdNrWq0V2WAgVql3qqVqSvLzAijFXUqtDEauwHecDkw
-5NqWZVHLqJHWHyYImjo/RQnVcGHLCYLSOiHH9duo1VnLsXUNPC9+8yjTRkEte8UA
-38bf8N8gmpaI/sG1Z2v12VXqCV3eqA==
-=g3Uh
------END PGP SIGNATURE-----
diff --git a/zsh-5.8.tar.xz.asc b/zsh-5.8.tar.xz.asc
new file mode 100644
index 0000000..8eb13ec
--- /dev/null
+++ b/zsh-5.8.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl5HHTEACgkQrPgUbK6M
+u8Ttmwf/U1HoG30yYZ4m3yxFZ8QGI0WwnV7/IAQ4rMBWo+31yijLrwnl8+WILVfi
+gRzskwTrVmLjklT4hnv3aSyO1KtQMDImCYw01JbK801JCnCRRRTKVTC69S1TQ9FI
+mp+GB+QemYAdDRZwIlZcuVmhL7MJS0IWZiwqzlvqyKGG4MCrzqPqKO3s/JgMisUG
+KLHZJWoUWidYfmuwkPRKXN+dcnZUF4B/jJbNwLRGhvySzpT6pAwI2SBWak+vUbs/
+UKal6pOHYv1zalMrh5as2/hAo4Rjpsgn0zRGiFsn5Ys9srB6XKhXifUP6d1g3cRj
+lH9B3QGrd1oh7u8IOjU29F8+DeeU+g==
+=+BhZ
+-----END PGP SIGNATURE-----
diff --git a/zsh.spec b/zsh.spec
index e52f259..6897f66 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.7.1
-Release: 5%{?dist}
+Version: 5.8
+Release: 1%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -12,9 +12,6 @@ Source4: zshrc.rhs
 Source5: zshenv.rhs
 Source6: dotzshrc
 
-# make failed searches of history in Zle robust (#1722703)
-Patch1:  0001-zsh-5.7.1-zle-history-avoid-crash.patch
-
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -157,6 +154,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Feb 24 2020 Kamil Dudka <kdudka@redhat.com> - 5.8-1
+- update to latest upstream release
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 84fbd7d6713ce921376d0140b699945c7178daa3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Feb 2020 14:53:26 +0100
Subject: [PATCH 03/45] Resolves: CVE-2019-20044 - drop privileges securely
 when unsetting PRIVILEGED option

---
 0002-zsh-5.7.1-CVE-2019-20044.patch | 1330 +++++++++++++++++++++++++++
 zsh.spec                            |    8 +-
 2 files changed, 1337 insertions(+), 1 deletion(-)
 create mode 100644 0002-zsh-5.7.1-CVE-2019-20044.patch

diff --git a/0002-zsh-5.7.1-CVE-2019-20044.patch b/0002-zsh-5.7.1-CVE-2019-20044.patch
new file mode 100644
index 0000000..f959a20
--- /dev/null
+++ b/0002-zsh-5.7.1-CVE-2019-20044.patch
@@ -0,0 +1,1330 @@
+From 97e74e7038234359bd64b45a635720792824530e Mon Sep 17 00:00:00 2001
+From: Sam Foxman <samfoxman320@gmail.com>
+Date: Sun, 22 Dec 2019 17:30:28 -0500
+Subject: [PATCH 1/5] Drop privileges securely
+
+Upstream-commit: 24e993db62cf146fb76ebcf677a4a7aa3766fc74
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/options.c | 161 +++++++++++++++++++++++++++++++++++++-------------
+ configure.ac  |   4 +-
+ 2 files changed, 124 insertions(+), 41 deletions(-)
+
+diff --git a/Src/options.c b/Src/options.c
+index 600b649..c9608af 100644
+--- a/Src/options.c
++++ b/Src/options.c
+@@ -576,6 +576,7 @@ int
+ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ {
+     int action, optno, match = 0;
++    int retval = 0;
+ 
+     /* With no arguments or options, display options. */
+     if (!*args) {
+@@ -603,18 +604,28 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 		    inittyptab();
+ 		    return 1;
+ 		}
+-		if(!(optno = optlookup(*args)))
++		if(!(optno = optlookup(*args))) {
+ 		    zwarnnam(nam, "no such option: %s", *args);
+-		else if(dosetopt(optno, action, 0, opts))
+-		    zwarnnam(nam, "can't change option: %s", *args);
++		    retval = 1;
++		} else {
++		    retval = !!dosetopt(optno, action, 0, opts);
++		    if (retval) {
++			zwarnnam(nam, "can't change option: %s", *args);
++		    }
++		}
+ 		break;
+ 	    } else if(**args == 'm') {
+ 		match = 1;
+ 	    } else {
+-	    	if (!(optno = optlookupc(**args)))
++	    	if (!(optno = optlookupc(**args))) {
+ 		    zwarnnam(nam, "bad option: -%c", **args);
+-		else if(dosetopt(optno, action, 0, opts))
+-		    zwarnnam(nam, "can't change option: -%c", **args);
++		    retval = 1;
++		} else {
++		    retval = !!dosetopt(optno, action, 0, opts);
++		    if (retval) {
++			zwarnnam(nam, "can't change option: -%c", **args);
++		    }
++		}
+ 	    }
+ 	}
+ 	args++;
+@@ -624,10 +635,15 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+     if (!match) {
+ 	/* Not globbing the arguments -- arguments are simply option names. */
+ 	while (*args) {
+-	    if(!(optno = optlookup(*args++)))
++	    if(!(optno = optlookup(*args++))) {
+ 		zwarnnam(nam, "no such option: %s", args[-1]);
+-	    else if(dosetopt(optno, !isun, 0, opts))
+-		zwarnnam(nam, "can't change option: %s", args[-1]);
++		retval = 1;
++	    } else {
++		retval = !!dosetopt(optno, !isun, 0, opts);
++		if (retval) {
++		    zwarnnam(nam, "can't change option: %s", args[-1]);
++		}
++	    }
+ 	}
+     } else {
+ 	/* Globbing option (-m) set. */
+@@ -650,7 +666,8 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 	    tokenize(s);
+ 	    if (!(pprog = patcompile(s, PAT_HEAPDUP, NULL))) {
+ 		zwarnnam(nam, "bad pattern: %s", *args);
+-		continue;
++		retval = 1;
++		break;
+ 	    }
+ 	    /* Loop over expansions. */
+ 	    scanmatchtable(optiontab, pprog, 0, 0, OPT_ALIAS,
+@@ -659,7 +676,7 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 	}
+     }
+     inittyptab();
+-    return 0;
++    return retval;
+ }
+ 
+ /* Identify an option name */
+@@ -768,37 +785,101 @@ dosetopt(int optno, int value, int force, char *new_opts)
+ 	    return -1;
+     } else if(optno == PRIVILEGED && !value) {
+ 	/* unsetting PRIVILEGED causes the shell to make itself unprivileged */
+-#ifdef HAVE_SETUID
+-	int ignore_err;
+-	errno = 0;
+-	/*
+-	 * Set the GID first as if we set the UID to non-privileged it
+-	 * might be impossible to restore the GID.
+-	 *
+-	 * Some OSes (possibly no longer around) have been known to
+-	 * fail silently the first time, so we attempt the change twice.
+-	 * If it fails we are guaranteed to pick this up the second
+-	 * time, so ignore the first time.
+-	 *
+-	 * Some versions of gcc make it hard to ignore the results the
+-	 * first time, hence the following.  (These are probably not
+-	 * systems that require the doubled calls.)
+-	 */
+-	ignore_err = setgid(getgid());
+-	(void)ignore_err;
+-	ignore_err = setuid(getuid());
+-	(void)ignore_err;
+-	if (setgid(getgid())) {
+-            zwarn("failed to change group ID: %e", errno);
+-            return -1;
+-        } else if (setuid(getuid())) {
+-            zwarn("failed to change user ID: %e", errno);
+-            return -1;
++
++	int skip_setuid = 0;
++	int skip_setgid = 0;
++
++#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
++	int orig_egid = getegid();
++#endif
++
++#if defined(HAVE_GETEUID) && defined(HAVE_GETUID)
++	if (geteuid() == getuid()) {
++	    skip_setuid = 1;
++	}
++#endif
++
++#if defined(HAVE_GETEGID) && defined(HAVE_GETGID)
++	if (getegid() == getgid()) {
++	    skip_setgid = 1;
+ 	}
++#endif
++
++	if (!skip_setgid) {
++	    int setgid_err;
++#ifdef HAVE_SETRESGID
++	    setgid_err = setresgid(getgid(), getgid(), getgid());
++#elif defined(HAVE_SETREGID)
++#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
++	    setgid_err = setregid(getgid(), getgid());
+ #else
+-        zwarn("setuid not available");
+-        return -1;
+-#endif /* not HAVE_SETUID */
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; setregid available, but cannot check if saved gid changed");
++	    return -1;
++#endif
++#else
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid and setregid not available");
++	    return -1;
++#endif
++	    if (setgid_err) {
++		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change group ID: %e", errno);
++		return -1;
++	    }
++	}
++
++	if (!skip_setuid) {
++#if defined(HAVE_GETEUID) && defined(HAVE_SETUID)
++	    int orig_euid = geteuid();
++#endif
++	    int setuid_err;
++#if defined(HAVE_GETEUID) && defined(HAVE_INITGROUPS) && defined(HAVE_GETPWUID)
++	    if (geteuid() == 0) {
++		struct passwd *pw = getpwuid(getuid());
++		if (pw == NULL) {
++		    zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %d: %e",
++			    getuid(), errno);
++		    return -1;
++		}
++		if (initgroups(pw->pw_name, pw->pw_gid)) {
++		    zwarnnam("unsetopt", "can't drop privileges; failed to set supplementary group list: %e", errno);
++		    return -1;
++		}
++	    }
++#endif
++
++#ifdef HAVE_SETRESUID
++	    setuid_err = setresuid(getuid(), getuid(), getuid());
++#elif defined(HAVE_SETREUID)
++#if defined(HAVE_GETEUID) && defined(HAVE_SETUID) && defined(HAVE_GETUID)
++	    setuid_err = setreuid(getuid(), getuid());
++#else
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; setreuid available, but cannot check if saved uid changed");
++	    return -1;
++#endif
++#else
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid and setreuid not available");
++	    return -1;
++#endif
++	    if (setuid_err) {
++		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change user ID: %e", errno);
++		return -1;
++	    }
++#if defined(HAVE_GETEUID) && defined(HAVE_SETUID) && defined(HAVE_GETUID)
++	    if (getuid() != 0 && !setuid(orig_euid)) {
++		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the euid");
++		return -1;
++	    }
++#endif
++	}
++
++#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
++	if (getuid() != 0 && !skip_setgid && !setgid(orig_egid)) {
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the egid");
++	    return -1;
++	}
++#endif
++
+ #ifdef JOB_CONTROL
+     } else if (!force && optno == MONITOR && value) {
+ 	if (new_opts[optno] == value)
+diff --git a/configure.ac b/configure.ac
+index 5513e25..1e654a7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1259,7 +1259,9 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \
+ 	       inet_aton inet_pton inet_ntop \
+ 	       getlogin getpwent getpwnam getpwuid getgrgid getgrnam \
+ 	       initgroups nis_list \
+-	       setuid seteuid setreuid setresuid setsid \
++	       getuid setuid seteuid setreuid setresuid setsid \
++	       getgid setgid setegid setregid setresgid \
++	       geteuid getegid \
+ 	       memcpy memmove strstr strerror strtoul \
+ 	       getrlimit getrusage \
+ 	       setlocale \
+-- 
+2.21.1
+
+
+From 540c79cb6a2c39b35c7bc28966936cd5a8e45713 Mon Sep 17 00:00:00 2001
+From: Daniel Shahaf <danielsh@apache.org>
+Date: Thu, 26 Dec 2019 09:16:19 +0000
+Subject: [PATCH 2/5] Improve PRIVILEGED fixes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- Fix retval handling in bin_setopt()
+
+- Don't skip_setuid / skip_setgid.  It's not our place to optimize away noops
+  (that might not even _be_ noops; they might change the saved uid…).
+
+- Remove HAVE_* guard checks around functions that are used unguarded elsewhere.
+
+- Use bsd-setres_id.c from OpenSSH to provide setresuid() / setresgid()
+  everywhere, and thus simplify the ifdef soup.  Fix some preëxisting
+  bugs in the macro definitions of setuid() (do we still need that one?).
+
+- Fix zwarning() format codes for variadic arguments type safety
+
+- Restored a comment from HEAD
+
+- Fix failure modes around initgroups()
+
+- Compared privilege restoration code with OpenSSH's permanently_drop_uid() and
+  updated as needed
+
+- Add E01 PRIVILEGED sanity checks
+
+Upstream-commit: 8250c5c168f07549ed646e6848e6dda118271e23
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/openssh_bsd_setres_id.c | 129 +++++++++++++++++++++++++++++++
+ Src/options.c               | 148 ++++++++++++++++--------------------
+ Src/zsh.mdd                 |   3 +-
+ Src/zsh_system.h            |  94 ++++++++++++++++++-----
+ Test/E01options.ztst        |  15 ++++
+ configure.ac                |   5 +-
+ 6 files changed, 292 insertions(+), 102 deletions(-)
+ create mode 100644 Src/openssh_bsd_setres_id.c
+
+diff --git a/Src/openssh_bsd_setres_id.c b/Src/openssh_bsd_setres_id.c
+new file mode 100644
+index 0000000..65e91a4
+--- /dev/null
++++ b/Src/openssh_bsd_setres_id.c
+@@ -0,0 +1,129 @@
++/*
++ * Copyright (c) 2012 Darren Tucker (dtucker at zip com au).
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++/*
++ * openssh_bsd_setres_id.c - setresuid() and setresgid() wrappers
++ *
++ * This file is part of zsh, the Z shell.
++ *
++ * It is based on the file openbsd-compat/bsd-setres_id.c in OpenSSH 7.9p1,
++ * which is subject to the copyright notice above.  The zsh modifications are
++ * licensed as follows:
++ *
++ * Copyright (c) 2019 Daniel Shahaf
++ * All rights reserved.
++ *
++ * Permission is hereby granted, without written agreement and without
++ * license or royalty fees, to use, copy, modify, and distribute this
++ * software and to distribute modified versions of this software for any
++ * purpose, provided that the above copyright notice and the following
++ * two paragraphs appear in all copies of this software.
++ *
++ * In no event shall Daniel Shahaf or the Zsh Development Group be liable
++ * to any party for direct, indirect, special, incidental, or consequential
++ * damages arising out of the use of this software and its documentation,
++ * even if Daniel Shahaf and the Zsh Development Group have been advised of
++ * the possibility of such damage.
++ *
++ * Daniel Shahaf and the Zsh Development Group specifically disclaim any
++ * warranties, including, but not limited to, the implied warranties of
++ * merchantability and fitness for a particular purpose.  The software
++ * provided hereunder is on an "as is" basis, and Daniel Shahaf and the
++ * Zsh Development Group have no obligation to provide maintenance,
++ * support, updates, enhancements, or modifications.
++ *
++ */
++
++
++#include <sys/types.h>
++
++#include <stdarg.h>
++#include <unistd.h>
++#include <string.h>
++
++#include "zsh.mdh"
++
++#if defined(ZSH_IMPLEMENT_SETRESGID) || defined(BROKEN_SETRESGID)
++int
++setresgid(gid_t rgid, gid_t egid, gid_t sgid)
++{
++	int ret = 0, saved_errno;
++
++	if (rgid != sgid) {
++		errno = ENOSYS;
++		return -1;
++	}
++#if defined(ZSH_HAVE_NATIVE_SETREGID) && !defined(BROKEN_SETREGID)
++	if (setregid(rgid, egid) < 0) {
++		saved_errno = errno;
++		zwarnnam("setregid", "to gid %L: %e", (long)rgid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++#else
++	if (setegid(egid) < 0) {
++		saved_errno = errno;
++		zwarnnam("setegid", "to gid %L: %e", (long)(unsigned int)egid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++	if (setgid(rgid) < 0) {
++		saved_errno = errno;
++		zwarnnam("setgid", "to gid %L: %e", (long)rgid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++#endif
++	return ret;
++}
++#endif
++
++#if defined(ZSH_IMPLEMENT_SETRESUID) || defined(BROKEN_SETRESUID)
++int
++setresuid(uid_t ruid, uid_t euid, uid_t suid)
++{
++	int ret = 0, saved_errno;
++
++	if (ruid != suid) {
++		errno = ENOSYS;
++		return -1;
++	}
++#if defined(ZSH_HAVE_NATIVE_SETREUID) && !defined(BROKEN_SETREUID)
++	if (setreuid(ruid, euid) < 0) {
++		saved_errno = errno;
++		zwarnnam("setreuid", "to uid %L: %e", (long)ruid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++#else
++
++# ifndef SETEUID_BREAKS_SETUID
++	if (seteuid(euid) < 0) {
++		saved_errno = errno;
++		zwarnnam("seteuid", "to uid %L: %e", (long)euid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++# endif
++	if (setuid(ruid) < 0) {
++		saved_errno = errno;
++		zwarnnam("setuid", "to uid %L: %e", (long)ruid, errno);
++		errno = saved_errno;
++		ret = -1;
++	}
++#endif
++	return ret;
++}
++#endif
+diff --git a/Src/options.c b/Src/options.c
+index c9608af..deec560 100644
+--- a/Src/options.c
++++ b/Src/options.c
+@@ -606,25 +606,21 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 		}
+ 		if(!(optno = optlookup(*args))) {
+ 		    zwarnnam(nam, "no such option: %s", *args);
+-		    retval = 1;
+-		} else {
+-		    retval = !!dosetopt(optno, action, 0, opts);
+-		    if (retval) {
+-			zwarnnam(nam, "can't change option: %s", *args);
+-		    }
++		    retval |= 1;
++		} else if (dosetopt(optno, action, 0, opts)) {
++		    zwarnnam(nam, "can't change option: %s", *args);
++		    retval |= 1;
+ 		}
+ 		break;
+ 	    } else if(**args == 'm') {
+ 		match = 1;
+ 	    } else {
+-	    	if (!(optno = optlookupc(**args))) {
++		if (!(optno = optlookupc(**args))) {
+ 		    zwarnnam(nam, "bad option: -%c", **args);
+-		    retval = 1;
+-		} else {
+-		    retval = !!dosetopt(optno, action, 0, opts);
+-		    if (retval) {
+-			zwarnnam(nam, "can't change option: -%c", **args);
+-		    }
++		    retval |= 1;
++		} else if (dosetopt(optno, action, 0, opts)) {
++		    zwarnnam(nam, "can't change option: -%c", **args);
++		    retval |= 1;
+ 		}
+ 	    }
+ 	}
+@@ -637,12 +633,10 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 	while (*args) {
+ 	    if(!(optno = optlookup(*args++))) {
+ 		zwarnnam(nam, "no such option: %s", args[-1]);
+-		retval = 1;
+-	    } else {
+-		retval = !!dosetopt(optno, !isun, 0, opts);
+-		if (retval) {
+-		    zwarnnam(nam, "can't change option: %s", args[-1]);
+-		}
++		retval |= 1;
++	    } else if (dosetopt(optno, !isun, 0, opts)) {
++		zwarnnam(nam, "can't change option: %s", args[-1]);
++		retval |= 1;
+ 	    }
+ 	}
+     } else {
+@@ -666,7 +660,7 @@ bin_setopt(char *nam, char **args, UNUSED(Options ops), int isun)
+ 	    tokenize(s);
+ 	    if (!(pprog = patcompile(s, PAT_HEAPDUP, NULL))) {
+ 		zwarnnam(nam, "bad pattern: %s", *args);
+-		retval = 1;
++		retval |= 1;
+ 		break;
+ 	    }
+ 	    /* Loop over expansions. */
+@@ -786,100 +780,92 @@ dosetopt(int optno, int value, int force, char *new_opts)
+     } else if(optno == PRIVILEGED && !value) {
+ 	/* unsetting PRIVILEGED causes the shell to make itself unprivileged */
+ 
+-	int skip_setuid = 0;
+-	int skip_setgid = 0;
+-
+-#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
+-	int orig_egid = getegid();
+-#endif
++	/* If set, return -1 so lastval will be non-zero. */
++	int failed = 0;
+ 
+-#if defined(HAVE_GETEUID) && defined(HAVE_GETUID)
+-	if (geteuid() == getuid()) {
+-	    skip_setuid = 1;
+-	}
++#ifdef HAVE_SETUID
++	const int orig_euid = geteuid();
+ #endif
++	const int orig_egid = getegid();
+ 
+-#if defined(HAVE_GETEGID) && defined(HAVE_GETGID)
+-	if (getegid() == getgid()) {
+-	    skip_setgid = 1;
+-	}
+-#endif
+-
+-	if (!skip_setgid) {
+-	    int setgid_err;
+-#ifdef HAVE_SETRESGID
+-	    setgid_err = setresgid(getgid(), getgid(), getgid());
+-#elif defined(HAVE_SETREGID)
+-#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
+-	    setgid_err = setregid(getgid(), getgid());
+-#else
+-	    zwarnnam("unsetopt",
+-		"PRIVILEGED: can't drop privileges; setregid available, but cannot check if saved gid changed");
++	/*
++	 * Set the GID first as if we set the UID to non-privileged it
++	 * might be impossible to restore the GID.
++	 */
++	{
++#ifndef HAVE_SETRESGID
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid() and friends not available");
+ 	    return -1;
+-#endif
+ #else
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid and setregid not available");
+-	    return -1;
+-#endif
++	    int setgid_err;
++	    setgid_err = setresgid(getgid(), getgid(), getgid());
+ 	    if (setgid_err) {
+ 		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change group ID: %e", errno);
+ 		return -1;
+ 	    }
++#endif
+ 	}
+ 
+-	if (!skip_setuid) {
+-#if defined(HAVE_GETEUID) && defined(HAVE_SETUID)
+-	    int orig_euid = geteuid();
+-#endif
++	/* Set the UID second. */
++	{
++#ifndef HAVE_SETRESUID
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid() and friends not available");
++	    return -1;
++#else
+ 	    int setuid_err;
+-#if defined(HAVE_GETEUID) && defined(HAVE_INITGROUPS) && defined(HAVE_GETPWUID)
++
++# ifdef HAVE_INITGROUPS
++	    /* Set the supplementary groups list. */
+ 	    if (geteuid() == 0) {
+ 		struct passwd *pw = getpwuid(getuid());
+ 		if (pw == NULL) {
+-		    zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %d: %e",
+-			    getuid(), errno);
+-		    return -1;
+-		}
+-		if (initgroups(pw->pw_name, pw->pw_gid)) {
++		    zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %L: %e",
++			    (long)getuid(), errno);
++		    failed = 1;
++		} else if (initgroups(pw->pw_name, pw->pw_gid)) {
+ 		    zwarnnam("unsetopt", "can't drop privileges; failed to set supplementary group list: %e", errno);
+ 		    return -1;
+ 		}
++	    } else if (getuid() != 0 &&
++		    (geteuid() != getuid() || orig_egid != getegid())) {
++		zwarnnam("unsetopt", "PRIVILEGED: supplementary group list not changed due to lack of permissions: EUID=%L",
++			(long)geteuid());
++		failed = 1;
+ 	    }
+-#endif
++# else
++	    /* initgroups() isn't in POSIX.  If it's not available on the system,
++	     * we silently skip it. */
++# endif
+ 
+-#ifdef HAVE_SETRESUID
+ 	    setuid_err = setresuid(getuid(), getuid(), getuid());
+-#elif defined(HAVE_SETREUID)
+-#if defined(HAVE_GETEUID) && defined(HAVE_SETUID) && defined(HAVE_GETUID)
+-	    setuid_err = setreuid(getuid(), getuid());
+-#else
+-	    zwarnnam("unsetopt",
+-		"PRIVILEGED: can't drop privileges; setreuid available, but cannot check if saved uid changed");
+-	    return -1;
+-#endif
+-#else
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid and setreuid not available");
+-	    return -1;
+-#endif
+ 	    if (setuid_err) {
+ 		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change user ID: %e", errno);
+ 		return -1;
+ 	    }
+-#if defined(HAVE_GETEUID) && defined(HAVE_SETUID) && defined(HAVE_GETUID)
+-	    if (getuid() != 0 && !setuid(orig_euid)) {
+-		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the euid");
+-		return -1;
+-	    }
+ #endif
+ 	}
+ 
+-#if defined(HAVE_GETEGID) && defined(HAVE_SETGID) && defined(HAVE_GETUID)
+-	if (getuid() != 0 && !skip_setgid && !setgid(orig_egid)) {
++#ifdef HAVE_SETGID
++	if (getuid() != 0 && orig_egid != getegid() &&
++		(setgid(orig_egid) != -1 || setegid(orig_egid) != -1)) {
+ 	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the egid");
+ 	    return -1;
+ 	}
+ #endif
+ 
++#ifdef HAVE_SETUID
++	if (getuid() != 0 && orig_euid != geteuid() &&
++		(setuid(orig_euid) != -1 || seteuid(orig_euid) != -1)) {
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the euid");
++	    return -1;
++	}
++#endif
++
++	if (failed) {
++	    /* A warning message has been printed. */
++	    return -1;
++	}
++
+ #ifdef JOB_CONTROL
+     } else if (!force && optno == MONITOR && value) {
+ 	if (new_opts[optno] == value)
+diff --git a/Src/zsh.mdd b/Src/zsh.mdd
+index 3e5788a..9bcacca 100644
+--- a/Src/zsh.mdd
++++ b/Src/zsh.mdd
+@@ -13,7 +13,8 @@ objects="builtin.o compat.o cond.o context.o \
+ exec.o glob.o hashtable.o hashnameddir.o \
+ hist.o init.o input.o jobs.o lex.o linklist.o loop.o math.o \
+ mem.o module.o options.o params.o parse.o pattern.o prompt.o signals.o \
+-signames.o sort.o string.o subst.o text.o utils.o watch.o"
++signames.o sort.o string.o subst.o text.o utils.o watch.o \
++openssh_bsd_setres_id.o"
+ 
+ headers="../config.h zsh_system.h zsh.h sigcount.h signals.h \
+ prototypes.h hashtable.h ztype.h"
+diff --git a/Src/zsh_system.h b/Src/zsh_system.h
+index e7d529b..6eb114b 100644
+--- a/Src/zsh_system.h
++++ b/Src/zsh_system.h
+@@ -468,30 +468,90 @@ struct timespec {
+ # define setpgrp setpgid
+ #endif
+ 
+-/* can we set the user/group id of a process */
++/* compatibility wrappers */
+ 
+-#ifndef HAVE_SETUID
++/* Our strategy is as follows:
++ *
++ * - Ensure that either setre[ug]id() or set{e,}[ug]id() is available.
++ * - If setres[ug]id() are missing, provide them in terms of either
++ *   setre[ug]id() or set{e,}[ug]id(), whichever is available.
++ * - Provide replacement setre[ug]id() or set{e,}[ug]id() if they are not
++ *   available natively.
++ *
++ * There isn't a circular dependency because, right off the bat, we check that
++ * there's an end condition, and #error out otherwise.
++ */
++#if !defined(HAVE_SETREUID) && !(defined(HAVE_SETEUID) && defined(HAVE_SETUID))
++  /*
++   * If you run into this error, you have two options:
++   * - Teach zsh how to do the equivalent of setreuid() on your system
++   * - Remove support for PRIVILEGED option, and then remove the #error.
++   */
++# error "Don't know how to change UID"
++#endif
++#if !defined(HAVE_SETREGID) && !(defined(HAVE_SETEGID) && defined(HAVE_SETGID))
++  /* See above comment. */
++# error "Don't know how to change GID"
++#endif
++
++/* Provide setresuid(). */
++#ifndef HAVE_SETRESUID
++int	setresuid(uid_t, uid_t, uid_t);
++# define HAVE_SETRESUID
++# define ZSH_IMPLEMENT_SETRESUID
+ # ifdef HAVE_SETREUID
+-#  define setuid(X) setreuid(X,X)
+-#  define setgid(X) setregid(X,X)
+-#  define HAVE_SETUID
++#  define ZSH_HAVE_NATIVE_SETREUID
+ # endif
+ #endif
+ 
+-/* can we set the effective user/group id of a process */
++/* Provide setresgid(). */
++#ifndef HAVE_SETRESGID
++int	setresgid(gid_t, gid_t, gid_t);
++# define HAVE_SETRESGID
++# define ZSH_IMPLEMENT_SETRESGID
++# ifdef HAVE_SETREGID
++#  define ZSH_HAVE_NATIVE_SETREGID
++# endif
++#endif
+ 
++/* Provide setreuid(). */
++#ifndef HAVE_SETREUID
++# define setreuid(X, Y) setresuid((X), (Y), -1)
++# define HAVE_SETREUID
++#endif
++
++/* Provide setregid(). */
++#ifndef HAVE_SETREGID
++# define setregid(X, Y) setresgid((X), (Y), -1)
++# define HAVE_SETREGID
++#endif
++
++/* Provide setuid(). */
++/* ### TODO: Either remove this (this function has been standard since 1985),
++ * ###       or rewrite this without multiply-evaluating the argument */
++#ifndef HAVE_SETUID
++# define setuid(X) setreuid((X), (X))
++# define HAVE_SETUID
++#endif
++
++/* Provide setgid(). */
++#ifndef HAVE_SETGID
++/* ### TODO: Either remove this (this function has been standard since 1985),
++ * ###       or rewrite this without multiply-evaluating the argument */
++#  define setgid(X) setregid((X), (X))
++#  define HAVE_SETGID
++#endif
++
++/* Provide seteuid(). */
+ #ifndef HAVE_SETEUID
+-# ifdef HAVE_SETREUID
+-#  define seteuid(X) setreuid(-1,X)
+-#  define setegid(X) setregid(-1,X)
+-#  define HAVE_SETEUID
+-# else
+-#  ifdef HAVE_SETRESUID
+-#   define seteuid(X) setresuid(-1,X,-1)
+-#   define setegid(X) setresgid(-1,X,-1)
+-#   define HAVE_SETEUID
+-#  endif
+-# endif
++# define seteuid(X) setreuid(-1, (X))
++# define HAVE_SETEUID
++#endif
++
++/* Provide setegid(). */
++#ifndef HAVE_SETEGID
++# define setegid(X) setregid(-1, (X))
++# define HAVE_SETEGID
+ #endif
+ 
+ #ifdef HAVE_SYS_RESOURCE_H
+diff --git a/Test/E01options.ztst b/Test/E01options.ztst
+index 0f6bb34..c4c3d67 100644
+--- a/Test/E01options.ztst
++++ b/Test/E01options.ztst
+@@ -1391,3 +1391,18 @@ F:Regression test for workers/41811
+ ?(anon):4: `break' active at end of function scope
+ ?(anon):4: `break' active at end of function scope
+ ?(anon):4: `break' active at end of function scope
++
++# There are further tests for PRIVILEGED in P01privileged.ztst.
++ if [[ -o privileged ]]; then
++   unsetopt privileged
++ fi
++ unsetopt privileged
++0:PRIVILEGED sanity check: unsetting is idempotent
++F:If this test fails at the first unsetopt, refer to P01privileged.ztst.
++
++  if [[ -o privileged ]]; then
++    (( UID != EUID ))
++  else
++    (( UID == EUID ))
++  fi
++0:PRIVILEGED sanity check: default value is correct
+diff --git a/configure.ac b/configure.ac
+index 1e654a7..ffd65c0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1259,9 +1259,8 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \
+ 	       inet_aton inet_pton inet_ntop \
+ 	       getlogin getpwent getpwnam getpwuid getgrgid getgrnam \
+ 	       initgroups nis_list \
+-	       getuid setuid seteuid setreuid setresuid setsid \
+-	       getgid setgid setegid setregid setresgid \
+-	       geteuid getegid \
++	       setuid seteuid setreuid setresuid setsid \
++	       setgid setegid setregid setresgid \
+ 	       memcpy memmove strstr strerror strtoul \
+ 	       getrlimit getrusage \
+ 	       setlocale \
+-- 
+2.21.1
+
+
+From c1855ecb424f8f9547a43a2583bd22eed2748c89 Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Sun, 29 Dec 2019 02:41:11 +0000
+Subject: [PATCH 3/5] Improve PRIVILEGED fixes (again)
+
+* Pass RGID instead of passwd GID to initgroups()
+
+* Clean up #ifdefs, avoid unnecessary checks
+
+* Flatten conditions
+
+Upstream-commit: 26d02efa7a9b0a6b32e1a8bbc6aca6c544b94211
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/options.c | 92 ++++++++++++++++++++++++---------------------------
+ 1 file changed, 43 insertions(+), 49 deletions(-)
+
+diff --git a/Src/options.c b/Src/options.c
+index deec560..8599ed3 100644
+--- a/Src/options.c
++++ b/Src/options.c
+@@ -780,91 +780,85 @@ dosetopt(int optno, int value, int force, char *new_opts)
+     } else if(optno == PRIVILEGED && !value) {
+ 	/* unsetting PRIVILEGED causes the shell to make itself unprivileged */
+ 
++/* For simplicity's sake, require both setresgid() and setresuid() up-front. */
++#if !defined(HAVE_SETRESGID)
++	zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid() and friends not available");
++	return -1;
++#elif !defined(HAVE_SETRESUID)
++	zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid() and friends not available");
++	return -1;
++#else
+ 	/* If set, return -1 so lastval will be non-zero. */
+ 	int failed = 0;
+-
+-#ifdef HAVE_SETUID
+ 	const int orig_euid = geteuid();
+-#endif
+ 	const int orig_egid = getegid();
+ 
+ 	/*
+ 	 * Set the GID first as if we set the UID to non-privileged it
+ 	 * might be impossible to restore the GID.
+ 	 */
+-	{
+-#ifndef HAVE_SETRESGID
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid() and friends not available");
++	if (setresgid(getgid(), getgid(), getgid())) {
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change group ID: %e", errno);
+ 	    return -1;
+-#else
+-	    int setgid_err;
+-	    setgid_err = setresgid(getgid(), getgid(), getgid());
+-	    if (setgid_err) {
+-		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change group ID: %e", errno);
+-		return -1;
+-	    }
+-#endif
+ 	}
+ 
+-	/* Set the UID second. */
+-	{
+-#ifndef HAVE_SETRESUID
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid() and friends not available");
+-	    return -1;
+-#else
+-	    int setuid_err;
+-
+ # ifdef HAVE_INITGROUPS
+-	    /* Set the supplementary groups list. */
+-	    if (geteuid() == 0) {
+-		struct passwd *pw = getpwuid(getuid());
+-		if (pw == NULL) {
+-		    zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %L: %e",
+-			    (long)getuid(), errno);
+-		    failed = 1;
+-		} else if (initgroups(pw->pw_name, pw->pw_gid)) {
+-		    zwarnnam("unsetopt", "can't drop privileges; failed to set supplementary group list: %e", errno);
+-		    return -1;
+-		}
+-	    } else if (getuid() != 0 &&
+-		    (geteuid() != getuid() || orig_egid != getegid())) {
+-		zwarnnam("unsetopt", "PRIVILEGED: supplementary group list not changed due to lack of permissions: EUID=%L",
+-			(long)geteuid());
++	/* Set the supplementary groups list.
++	 *
++	 * Note that on macOS, FreeBSD, and possibly some other platforms,
++	 * initgroups() resets the EGID to its second argument (see setgroups(2) for
++	 * details). This has the potential to leave the EGID in an unexpected
++	 * state. However, it seems common in other projects that do this dance to
++	 * simply re-use the same GID that's going to become the EGID anyway, in
++	 * which case it doesn't matter. That's what we do here. It's therefore
++	 * possible, in some probably uncommon cases, that the shell ends up not
++	 * having the privileges of the RUID user's primary/passwd group. */
++	if (geteuid() == 0) {
++	    struct passwd *pw = getpwuid(getuid());
++	    if (pw == NULL) {
++		zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %L: %e",
++		    (long)getuid(), errno);
+ 		failed = 1;
++	    /* This may behave strangely in the unlikely event that the same user
++	     * name appears with multiple UIDs in the passwd database */
++	    } else if (initgroups(pw->pw_name, getgid())) {
++		zwarnnam("unsetopt", "can't drop privileges; failed to set supplementary group list: %e", errno);
++		return -1;
+ 	    }
++	} else if (getuid() != 0 &&
++	    (geteuid() != getuid() || orig_egid != getegid())) {
++	    zwarnnam("unsetopt", "PRIVILEGED: supplementary group list not changed due to lack of permissions: EUID=%L",
++		(long)geteuid());
++	    failed = 1;
++	}
+ # else
+-	    /* initgroups() isn't in POSIX.  If it's not available on the system,
+-	     * we silently skip it. */
++	/* initgroups() isn't in POSIX.  If it's not available on the system,
++	 * we silently skip it. */
+ # endif
+ 
+-	    setuid_err = setresuid(getuid(), getuid(), getuid());
+-	    if (setuid_err) {
+-		zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change user ID: %e", errno);
+-		return -1;
+-	    }
+-#endif
++	/* Set the UID second. */
++	if (setresuid(getuid(), getuid(), getuid())) {
++	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change user ID: %e", errno);
++	    return -1;
+ 	}
+ 
+-#ifdef HAVE_SETGID
+ 	if (getuid() != 0 && orig_egid != getegid() &&
+ 		(setgid(orig_egid) != -1 || setegid(orig_egid) != -1)) {
+ 	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the egid");
+ 	    return -1;
+ 	}
+-#endif
+ 
+-#ifdef HAVE_SETUID
+ 	if (getuid() != 0 && orig_euid != geteuid() &&
+ 		(setuid(orig_euid) != -1 || seteuid(orig_euid) != -1)) {
+ 	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the euid");
+ 	    return -1;
+ 	}
+-#endif
+ 
+ 	if (failed) {
+ 	    /* A warning message has been printed. */
+ 	    return -1;
+ 	}
++#endif /* HAVE_SETRESGID && HAVE_SETRESUID */
+ 
+ #ifdef JOB_CONTROL
+     } else if (!force && optno == MONITOR && value) {
+-- 
+2.21.1
+
+
+From 419c71136403c294d8d4cc4b1d6292a96455aa88 Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Sun, 29 Dec 2019 02:43:14 +0000
+Subject: [PATCH 4/5] Clean up error-message white space
+
+Upstream-commit: 4ce66857b71b40a0661df3780ff557f2b0f4cb13
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/options.c | 30 +++++++++++++++++++++---------
+ 1 file changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/Src/options.c b/Src/options.c
+index 8599ed3..5b972d4 100644
+--- a/Src/options.c
++++ b/Src/options.c
+@@ -782,10 +782,12 @@ dosetopt(int optno, int value, int force, char *new_opts)
+ 
+ /* For simplicity's sake, require both setresgid() and setresuid() up-front. */
+ #if !defined(HAVE_SETRESGID)
+-	zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresgid() and friends not available");
++	zwarnnam("unsetopt",
++	    "PRIVILEGED: can't drop privileges; setresgid() and friends not available");
+ 	return -1;
+ #elif !defined(HAVE_SETRESUID)
+-	zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; setresuid() and friends not available");
++	zwarnnam("unsetopt",
++	    "PRIVILEGED: can't drop privileges; setresuid() and friends not available");
+ 	return -1;
+ #else
+ 	/* If set, return -1 so lastval will be non-zero. */
+@@ -798,7 +800,9 @@ dosetopt(int optno, int value, int force, char *new_opts)
+ 	 * might be impossible to restore the GID.
+ 	 */
+ 	if (setresgid(getgid(), getgid(), getgid())) {
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change group ID: %e", errno);
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; failed to change group ID: %e",
++		errno);
+ 	    return -1;
+ 	}
+ 
+@@ -816,18 +820,22 @@ dosetopt(int optno, int value, int force, char *new_opts)
+ 	if (geteuid() == 0) {
+ 	    struct passwd *pw = getpwuid(getuid());
+ 	    if (pw == NULL) {
+-		zwarnnam("unsetopt", "can't drop privileges; failed to get user information for uid %L: %e",
++		zwarnnam("unsetopt",
++		    "can't drop privileges; failed to get user information for uid %L: %e",
+ 		    (long)getuid(), errno);
+ 		failed = 1;
+ 	    /* This may behave strangely in the unlikely event that the same user
+ 	     * name appears with multiple UIDs in the passwd database */
+ 	    } else if (initgroups(pw->pw_name, getgid())) {
+-		zwarnnam("unsetopt", "can't drop privileges; failed to set supplementary group list: %e", errno);
++		zwarnnam("unsetopt",
++		    "can't drop privileges; failed to set supplementary group list: %e",
++		    errno);
+ 		return -1;
+ 	    }
+ 	} else if (getuid() != 0 &&
+ 	    (geteuid() != getuid() || orig_egid != getegid())) {
+-	    zwarnnam("unsetopt", "PRIVILEGED: supplementary group list not changed due to lack of permissions: EUID=%L",
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: supplementary group list not changed due to lack of permissions: EUID=%L",
+ 		(long)geteuid());
+ 	    failed = 1;
+ 	}
+@@ -838,19 +846,23 @@ dosetopt(int optno, int value, int force, char *new_opts)
+ 
+ 	/* Set the UID second. */
+ 	if (setresuid(getuid(), getuid(), getuid())) {
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; failed to change user ID: %e", errno);
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; failed to change user ID: %e",
++		errno);
+ 	    return -1;
+ 	}
+ 
+ 	if (getuid() != 0 && orig_egid != getegid() &&
+ 		(setgid(orig_egid) != -1 || setegid(orig_egid) != -1)) {
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the egid");
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; was able to restore the egid");
+ 	    return -1;
+ 	}
+ 
+ 	if (getuid() != 0 && orig_euid != geteuid() &&
+ 		(setuid(orig_euid) != -1 || seteuid(orig_euid) != -1)) {
+-	    zwarnnam("unsetopt", "PRIVILEGED: can't drop privileges; was able to restore the euid");
++	    zwarnnam("unsetopt",
++		"PRIVILEGED: can't drop privileges; was able to restore the euid");
+ 	    return -1;
+ 	}
+ 
+-- 
+2.21.1
+
+
+From 10177eaeee71efcfe13242d37a4e0ea0b0a8e430 Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Sat, 28 Dec 2019 20:45:55 -0600
+Subject: [PATCH 5/5] Add unsetopt/PRIVILEGED tests
+
+Upstream-commit: b15bd4aa590db8087d1e8f2eb1af2874f5db814d
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Test/E01options.ztst    |  10 +-
+ Test/P01privileged.ztst | 197 ++++++++++++++++++++++++++++++++++++++++
+ Test/README             |   1 +
+ 3 files changed, 207 insertions(+), 1 deletion(-)
+ create mode 100644 Test/P01privileged.ztst
+
+diff --git a/Test/E01options.ztst b/Test/E01options.ztst
+index c4c3d67..767879a 100644
+--- a/Test/E01options.ztst
++++ b/Test/E01options.ztst
+@@ -74,7 +74,6 @@
+ #    HASH_LIST_ALL )
+ #    PRINT_EXIT_STATUS   haven't worked out what this does yet, although
+ #                        Bart suggested a fix.
+-#    PRIVILEGED (similar to GLOBAL_RCS)
+ #    RCS        (  "      "    "    " )
+ #    SH_OPTION_LETTERS   even I found this too dull to set up a test for
+ #    SINGLE_COMMAND      kills shell
+@@ -95,6 +94,15 @@
+ 
+ %test
+ 
++  # setopt should move on to the next operation in the face of an error, but
++  # preserve the >0 return code
++  unsetopt aliases
++  setopt not_a_real_option aliases && return 2
++  print -r - $options[aliases]
++0:setopt error handling
++?(eval):setopt:4: no such option: not_a_real_option
++>on
++
+   alias echo='print foo'
+   unsetopt aliases
+   # use eval else aliases are all parsed at start
+diff --git a/Test/P01privileged.ztst b/Test/P01privileged.ztst
+new file mode 100644
+index 0000000..c54112b
+--- /dev/null
++++ b/Test/P01privileged.ztst
+@@ -0,0 +1,197 @@
++# This file contains tests related to the PRIVILEGED option. In order to run,
++# it requires that the test process itself have super-user privileges (or that
++# one of the environment variables described below be set). This can be achieved
++# via, e.g., `sudo make check TESTNUM=P`.
++#
++# Optionally, the environment variables ZSH_TEST_UNPRIVILEGED_UID and/or
++# ZSH_TEST_UNPRIVILEGED_GID may be set to UID:EUID or GID:EGID pairs, where the
++# two IDs in each pair are different, non-0 IDs valid on the system being used
++# to run the tests. (The UIDs must both be non-0 to effectively test downgrading
++# of privileges, and they must be non-matching to test auto-enabling of
++# PRIVILEGED and to ensure that disabling PRIVILEGED correctly resets the saved
++# UID. Technically GID 0 is not special, but for simplicity's sake we apply the
++# same requirements here.)
++#
++# If either of the aforementioned environment variables is not set, the test
++# script will try to pick the first two >0 IDs from the passwd/group databases
++# on the current system.
++#
++# If either variable is set, the tests will run, but they will likely fail
++# without super-user privileges.
++
++%prep
++
++  # Mind your empty lines here. The logic in this %prep section is somewhat
++  # complex compared to most others; to avoid lots of nested/duplicated
++  # conditions we need to make sure that this all gets executed as a single
++  # function from which we can return early
++  [[ $EUID == 0 || -n $ZSH_TEST_UNPRIVILEGED_UID$ZSH_TEST_UNPRIVILEGED_GID ]] || {
++    ZTST_unimplemented='PRIVILEGED tests require super-user privileges (or env var)'
++    return 1
++  }
++  (( $+commands[perl] )) || { # @todo Eliminate this dependency with a C wrapper?
++    ZTST_unimplemented='PRIVILEGED tests require Perl'
++    return 1
++  }
++  grep -qE '#define HAVE_SETRES?UID' $ZTST_testdir/../config.h || {
++    ZTST_unimplemented='PRIVILEGED tests require setreuid()/setresuid()'
++    return 1
++  }
++  #
++  ruid= euid= rgid= egid=
++  #
++  if [[ -n $ZSH_TEST_UNPRIVILEGED_UID ]]; then
++    ruid=${ZSH_TEST_UNPRIVILEGED_UID%%:*}
++    euid=${ZSH_TEST_UNPRIVILEGED_UID##*:}
++  else
++    print -ru$ZTST_fd 'Selecting unprivileged UID:EUID pair automatically'
++    local tmp=$( getent passwd 2> /dev/null || < /etc/passwd )
++    # Note: Some awks require -v and its argument to be separate
++    ruid=$( awk -F:            '$3 > 0 { print $3; exit; }' <<< $tmp )
++    euid=$( awk -F: -v u=$ruid '$3 > u { print $3; exit; }' <<< $tmp )
++  fi
++  #
++  if [[ -n $ZSH_TEST_UNPRIVILEGED_GID ]]; then
++    rgid=${ZSH_TEST_UNPRIVILEGED_GID%%:*}
++    egid=${ZSH_TEST_UNPRIVILEGED_GID##*:}
++  else
++    print -ru$ZTST_fd 'Selecting unprivileged GID:EGID pair automatically'
++    local tmp=$( getent group 2> /dev/null || < /etc/group )
++    # Note: Some awks require -v and its argument to be separate
++    rgid=$( awk -F:            '$3 > 0 { print $3; exit; }' <<< $tmp )
++    egid=$( awk -F: -v g=$rgid '$3 > g { print $3; exit; }' <<< $tmp )
++  fi
++  #
++  [[ $ruid/$euid == <1->/<1-> && $ruid != $euid ]] || ruid= euid=
++  [[ $rgid/$egid == <1->/<1-> && $rgid != $egid ]] || rgid= egid=
++  #
++  [[ -n $ruid && -n $euid ]] || {
++    ZTST_unimplemented='PRIVILEGED tests require unprivileged UID:EUID'
++    return 1
++  }
++  [[ -n $rgid || -n $egid ]] || {
++    ZTST_unimplemented='PRIVILEGED tests require unprivileged GID:EGID'
++    return 1
++  }
++  #
++  print -ru$ZTST_fd \
++    "Using unprivileged UID $ruid, EUID $euid, GID $rgid, EGID $egid"
++  #
++  # Execute process with specified UID and EUID
++  # $1     => Real UID
++  # $2     => Effective UID
++  # $3     => Real GID
++  # $4     => Effective GID
++  # $5 ... => Command + args to execute (must NOT be a shell command string)
++  re_exec() {
++    perl -e '
++      die("re_exec: not enough arguments") unless (@ARGV >= 5);
++      my ($ruid, $euid, $rgid, $egid, @cmd) = @ARGV;
++      foreach my $id ($ruid, $euid, $rgid, $egid) {
++        die("re_exec: invalid ID: $id") unless ($id =~ /^(-1|\d+)$/a);
++      }
++      $< = 0 + $ruid if ($ruid >= 0);
++      $> = 0 + $euid if ($euid >= 0);
++      $( = 0 + $rgid if ($rgid >= 0);
++      $) = 0 + $egid if ($egid >= 0);
++      exec(@cmd);
++      die("re_exec: exec failed: $!");
++    ' -- "$@"
++  }
++  #
++  # Convenience wrapper for re_exec to call `zsh -c`
++  # -* ... => (optional) Command-line options to zsh
++  # $1     => Real UID
++  # $2     => Effective UID
++  # $3     => Real GID
++  # $4     => Effective GID
++  # $5 ... => zsh command string; multiple strings are joined by \n
++  re_zsh() {
++    local -a opts
++    while [[ $1 == -[A-Za-z-]* ]]; do
++      opts+=( $1 )
++      shift
++    done
++    re_exec "$1" "$2" "$3" "$4" $ZTST_exe $opts -fc \
++      "MODULE_PATH=${(q)MODULE_PATH}; ${(F)@[5,-1]}"
++  }
++  #
++  # Return one or more random unused UIDs
++  # $1 ... => Names of parameters to store UIDs in
++  get_unused_uid() {
++    while (( $# )); do
++      local i_=0 uid_=
++      until [[ -n $uid_ ]]; do
++        (( ++i_ > 99 )) && return 1
++        uid_=$RANDOM
++        id $uid_ &> /dev/null || break
++        uid_=
++      done
++      : ${(P)1::=$uid_}
++      shift
++    done
++  }
++
++%test
++
++  re_zsh $ruid $ruid -1 -1 'echo $UID/$EUID $options[privileged]'
++  re_zsh $euid $euid -1 -1 'echo $UID/$EUID $options[privileged]'
++  re_zsh $ruid $euid -1 -1 'echo $UID/$EUID $options[privileged]'
++0q:PRIVILEGED automatically enabled when RUID != EUID
++>$ruid/$ruid off
++>$euid/$euid off
++>$ruid/$euid on
++
++  re_zsh -1 -1 $rgid $rgid 'echo $GID/$EGID $options[privileged]'
++  re_zsh -1 -1 $egid $egid 'echo $GID/$EGID $options[privileged]'
++  re_zsh -1 -1 $rgid $egid 'echo $GID/$EGID $options[privileged]'
++0q:PRIVILEGED automatically enabled when RGID != EGID
++>$rgid/$rgid off
++>$egid/$egid off
++>$rgid/$egid on
++
++  re_zsh $ruid $euid -1 -1 'unsetopt privileged; echo $UID/$EUID'
++0q:EUID set to RUID after disabling PRIVILEGED
++*?zsh:unsetopt:1: PRIVILEGED: supplementary group list not changed *
++*?zsh:unsetopt:1: can't change option: privileged
++>$ruid/$ruid
++
++  re_zsh 0 $euid -1 -1 'unsetopt privileged && echo $UID/$EUID'
++0:RUID/EUID set to 0/0 when privileged after disabling PRIVILEGED
++>0/0
++
++  re_zsh $ruid $euid -1 -1 "unsetopt privileged; UID=$euid" ||
++  re_zsh $ruid $euid -1 -1 "unsetopt privileged; EUID=$euid"
++1:not possible to regain EUID when unprivileged after disabling PRIVILEGED
++*?zsh:unsetopt:1: PRIVILEGED: supplementary group list not changed *
++*?zsh:unsetopt:1: can't change option: privileged
++*?zsh:1: failed to change user ID: *
++*?zsh:unsetopt:1: PRIVILEGED: supplementary group list not changed *
++*?zsh:unsetopt:1: can't change option: privileged
++*?zsh:1: failed to change effective user ID: *
++
++  re_zsh -1 -1 $rgid $egid 'unsetopt privileged && echo $GID/$EGID'
++0q:EGID set to RGID after disabling PRIVILEGED
++>$rgid/$rgid
++
++# This test also confirms that we can't revert to the original EUID's primary
++# GID, which initgroups() may reset the EGID to on some systems
++  re_zsh $ruid 0 $rgid 0 'unsetopt privileged; GID=0' ||
++  re_zsh $ruid 0 $rgid 0 'unsetopt privileged; EGID=0'
++1:not possible to regain EGID when unprivileged after disabling PRIVILEGED
++*?zsh:1: failed to change group ID: *
++*?zsh:1: failed to change effective group ID: *
++
++  local rruid
++  grep -qF '#define HAVE_INITGROUPS' $ZTST_testdir/../config.h || {
++    ZTST_skip='initgroups() not available'
++    return 1
++  }
++  get_unused_uid rruid || {
++    ZTST_skip="Can't get unused UID"
++    return 1
++  }
++  re_zsh $rruid 0 -1 -1 'unsetopt privileged'
++1:getpwuid() fails with non-existent RUID and 0 EUID
++*?zsh:unsetopt:1: can't drop privileges; failed to get user information *
++*?zsh:unsetopt:1: can't change option: privileged
+diff --git a/Test/README b/Test/README
+index d012277..726d68e 100644
+--- a/Test/README
++++ b/Test/README
+@@ -6,6 +6,7 @@ scripts names:
+  C: shell commands with special syntax
+  D: substititution
+  E: options
++ P: privileged (needs super-user privileges)
+  V: modules
+  W: builtin interactive commands and constructs
+  X: line editing
+-- 
+2.21.1
+
diff --git a/zsh.spec b/zsh.spec
index 0d77f70..b89f695 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -15,6 +15,9 @@ Source6: dotzshrc
 # make failed searches of history in Zle robust (#1722703)
 Patch1:  0001-zsh-5.7.1-zle-history-avoid-crash.patch
 
+# drop privileges securely when unsetting PRIVILEGED option (CVE-2019-20044)
+Patch2:  0002-zsh-5.7.1-CVE-2019-20044.patch
+
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -157,6 +160,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Feb 24 2020 Kamil Dudka <kdudka@redhat.com> - 5.7.1-5
+- drop privileges securely when unsetting PRIVILEGED option (CVE-2019-20044)
+
 * Fri Jul 26 2019 Kamil Dudka <kdudka@redhat.com> - 5.7.1-4
 - make failed searches of history in Zle robust (#1722703)
 

From 66db9a948a1c0d509ebd37fc5374570f5daa721d Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 3 Mar 2020 12:32:19 +0100
Subject: [PATCH 04/45] Related: CVE-2019-20044 - improve printing of error
 messages

---
 0002-zsh-5.7.1-CVE-2019-20044.patch | 74 +++++++++++++++++++++++++++--
 zsh.spec                            |  5 +-
 2 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/0002-zsh-5.7.1-CVE-2019-20044.patch b/0002-zsh-5.7.1-CVE-2019-20044.patch
index f959a20..5533920 100644
--- a/0002-zsh-5.7.1-CVE-2019-20044.patch
+++ b/0002-zsh-5.7.1-CVE-2019-20044.patch
@@ -1,7 +1,71 @@
+From e6dea148252c9d8cb3de0965f2e558ac13e12f06 Mon Sep 17 00:00:00 2001
+From: Daniel Shahaf <danielsh@apache.org>
+Date: Thu, 26 Dec 2019 11:49:45 +0000
+Subject: [PATCH 1/7] internal: Allow %L in zerrmsg() in non-debug builds, too.
+
+This will let error messages include long integers.
+
+Upstream-commit: 81185f4c6106d7ea2f7beaabbec7360c08e400d2
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/utils.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Src/utils.c b/Src/utils.c
+index 32f6008..2ddc596 100644
+--- a/Src/utils.c
++++ b/Src/utils.c
+@@ -325,12 +325,10 @@ zerrmsg(FILE *file, const char *fmt, va_list ap)
+ 		nicezputs(s, file);
+ 		break;
+ 	    }
+-#ifdef DEBUG
+ 	    case 'L':
+ 		lnum = va_arg(ap, long);
+ 		fprintf(file, "%ld", lnum);
+ 		break;
+-#endif
+ 	    case 'd':
+ 		num = va_arg(ap, int);
+ 		fprintf(file, "%d", num);
+-- 
+2.21.1
+
+
+From 4907caaf15e5a054088e05534c5500679c15b105 Mon Sep 17 00:00:00 2001
+From: dana <dana@dana.is>
+Date: Thu, 26 Dec 2019 14:57:07 -0600
+Subject: [PATCH 2/7] unposted: zerrmsg(): Fix macro guard missed in previous
+ commit
+
+Upstream-commit: ed21a7b70068b4250a25dcdc5b7213a789b0d0ca
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Src/utils.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Src/utils.c b/Src/utils.c
+index 2ddc596..4a1dcc4 100644
+--- a/Src/utils.c
++++ b/Src/utils.c
+@@ -287,9 +287,7 @@ zerrmsg(FILE *file, const char *fmt, va_list ap)
+ {
+     const char *str;
+     int num;
+-#ifdef DEBUG
+     long lnum;
+-#endif
+ #ifdef HAVE_STRERROR_R
+ #define ERRBUFSIZE (80)
+     int olderrno;
+-- 
+2.21.1
+
+
 From 97e74e7038234359bd64b45a635720792824530e Mon Sep 17 00:00:00 2001
 From: Sam Foxman <samfoxman320@gmail.com>
 Date: Sun, 22 Dec 2019 17:30:28 -0500
-Subject: [PATCH 1/5] Drop privileges securely
+Subject: [PATCH 3/7] Drop privileges securely
 
 Upstream-commit: 24e993db62cf146fb76ebcf677a4a7aa3766fc74
 Signed-off-by: Kamil Dudka <kdudka@redhat.com>
@@ -248,7 +312,7 @@ index 5513e25..1e654a7 100644
 From 540c79cb6a2c39b35c7bc28966936cd5a8e45713 Mon Sep 17 00:00:00 2001
 From: Daniel Shahaf <danielsh@apache.org>
 Date: Thu, 26 Dec 2019 09:16:19 +0000
-Subject: [PATCH 2/5] Improve PRIVILEGED fixes
+Subject: [PATCH 4/7] Improve PRIVILEGED fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -813,7 +877,7 @@ index 1e654a7..ffd65c0 100644
 From c1855ecb424f8f9547a43a2583bd22eed2748c89 Mon Sep 17 00:00:00 2001
 From: dana <dana@dana.is>
 Date: Sun, 29 Dec 2019 02:41:11 +0000
-Subject: [PATCH 3/5] Improve PRIVILEGED fixes (again)
+Subject: [PATCH 5/7] Improve PRIVILEGED fixes (again)
 
 * Pass RGID instead of passwd GID to initgroups()
 
@@ -973,7 +1037,7 @@ index deec560..8599ed3 100644
 From 419c71136403c294d8d4cc4b1d6292a96455aa88 Mon Sep 17 00:00:00 2001
 From: dana <dana@dana.is>
 Date: Sun, 29 Dec 2019 02:43:14 +0000
-Subject: [PATCH 4/5] Clean up error-message white space
+Subject: [PATCH 6/7] Clean up error-message white space
 
 Upstream-commit: 4ce66857b71b40a0661df3780ff557f2b0f4cb13
 Signed-off-by: Kamil Dudka <kdudka@redhat.com>
@@ -1071,7 +1135,7 @@ index 8599ed3..5b972d4 100644
 From 10177eaeee71efcfe13242d37a4e0ea0b0a8e430 Mon Sep 17 00:00:00 2001
 From: dana <dana@dana.is>
 Date: Sat, 28 Dec 2019 20:45:55 -0600
-Subject: [PATCH 5/5] Add unsetopt/PRIVILEGED tests
+Subject: [PATCH 7/7] Add unsetopt/PRIVILEGED tests
 
 Upstream-commit: b15bd4aa590db8087d1e8f2eb1af2874f5db814d
 Signed-off-by: Kamil Dudka <kdudka@redhat.com>
diff --git a/zsh.spec b/zsh.spec
index b89f695..22c7ade 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -160,6 +160,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Tue Mar 03 2020 Kamil Dudka <kdudka@redhat.com> - 5.7.1-6
+- improve printing of error messages introduced by the fix of CVE-2019-20044
+
 * Mon Feb 24 2020 Kamil Dudka <kdudka@redhat.com> - 5.7.1-5
 - drop privileges securely when unsetting PRIVILEGED option (CVE-2019-20044)
 

From f8371def5f920cf095fe49026c2b93c5c24f42e4 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 14 Jul 2020 15:12:58 +0000
Subject: [PATCH 05/45] Use make macros

https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
---
 zsh.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zsh.spec b/zsh.spec
index 6897f66..f9256db 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -86,7 +86,7 @@ export zsh_cv_sys_nis='no'
 make -C Src headers
 make -C Src -f Makemod zsh{path,xmod}s.h version.h
 
-make %{?_smp_mflags} all html
+%make_build all html
 
 %check
 # Run the testsuite
@@ -154,6 +154,10 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 5.8-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
 * Mon Feb 24 2020 Kamil Dudka <kdudka@redhat.com> - 5.8-1
 - update to latest upstream release
 

From a734556f332d344616d8d48c25ea56ae6e197376 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 15:27:18 +0000
Subject: [PATCH 06/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index f9256db..1c04649 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -154,6 +154,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 5.8-2
 - Use make macros
 - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

From 2510705678572b7cf9e631bf04da4dd554e0d06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= <psplicha@redhat.com>
Date: Mon, 26 Oct 2020 13:27:32 +0100
Subject: [PATCH 07/45] Enable relevant tests from the shared shell repo

This pull request enables tests in the Fedora CI using `tmt` which
also allows to easily execute and debug tests from your laptop:

Run tests directly on your localhost:

    sudo dnf install -y tmt
    tmt run --all provision --how local

Run tests in a virtual machine:

    sudo dnf install -y tmt-provision-virtual
    tmt run

Check the documentation to learn more about the tool:
https://docs.fedoraproject.org/en-US/ci/tmt/
---
 .fmf/version    |  1 +
 plans/shell.fmf | 14 ++++++++++++++
 tests/tests.yml | 17 -----------------
 3 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/shell.fmf
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/plans/shell.fmf b/plans/shell.fmf
new file mode 100644
index 0000000..bcc3572
--- /dev/null
+++ b/plans/shell.fmf
@@ -0,0 +1,14 @@
+summary:
+    Run relevant tests from the shell tests repository
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/shell
+    filter: component:zsh
+prepare:
+    how: install
+    package: zsh
+execute:
+    how: tmt
+environment:
+    PACKAGES: zsh
+    SH_BIN: zsh
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 3d505a4..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2"
-    environment:
-      PACKAGES: zsh
-      SH_BIN: zsh
-    required_packages:
-    - expect            # login requires expect
-    - which             # smoke requires which

From b6b9c6607bc32d4dac0d4d1a398e3b6a8d5fd0a2 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Sat, 9 Jan 2021 01:56:03 +0000
Subject: [PATCH 08/45] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 zsh.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zsh.spec b/zsh.spec
index 1c04649..3463ca2 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -12,6 +12,7 @@ Source4: zshrc.rhs
 Source5: zshenv.rhs
 Source6: dotzshrc
 
+BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk

From 157285ba33652d8950418eb70c4acb21aa1f946b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sat, 9 Jan 2021 14:04:49 +0100
Subject: [PATCH 09/45] zsh.spec: keep BR list alphabetically sorted

---
 zsh.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 3463ca2..348ea3f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -12,7 +12,6 @@ Source4: zshrc.rhs
 Source5: zshenv.rhs
 Source6: dotzshrc
 
-BuildRequires: make
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -20,6 +19,7 @@ BuildRequires: gcc
 BuildRequires: gdbm-devel
 BuildRequires: glibc-langpack-ja
 BuildRequires: libcap-devel
+BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: sed

From 8d4d20225079cb93ca7686bec86e8cbb0793c8c1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 28 Jan 2021 00:45:53 +0000
Subject: [PATCH 10/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 348ea3f..3dc6f89 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -155,6 +155,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 9f49b18e48f82ad39c4b0dd82c32ea9963d0ab6a Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 25 Mar 2021 16:51:00 +0100
Subject: [PATCH 11/45] complete file arguments after rpmbuild -r/-b/-t

---
 0001-zsh-5.8-comp-rpm.patch | 27 +++++++++++++++++++++++++++
 zsh.spec                    |  8 +++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0001-zsh-5.8-comp-rpm.patch

diff --git a/0001-zsh-5.8-comp-rpm.patch b/0001-zsh-5.8-comp-rpm.patch
new file mode 100644
index 0000000..3a91f0b
--- /dev/null
+++ b/0001-zsh-5.8-comp-rpm.patch
@@ -0,0 +1,27 @@
+From d8ec07a4779f4675139c650979eb87dd6d7a5d92 Mon Sep 17 00:00:00 2001
+From: Daniel Shahaf <d.s@daniel.shahaf.name>
+Date: Tue, 18 Aug 2020 13:30:04 +0000
+Subject: [PATCH] 47323: _rpmbuild: Complete file arguments after -r/-b/-t.
+
+Upstream-commit: e14e899ab96c4171544a244ddc39991512ec41c8
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Completion/Redhat/Command/_rpm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm
+index e346924..db7c114 100644
+--- a/Completion/Redhat/Command/_rpm
++++ b/Completion/Redhat/Command/_rpm
+@@ -282,7 +282,7 @@ _rpm () {
+     build_r) tmp=( '*:source package:_files -g "*.(#i)src.rpm(-.)"' ) ;|
+     build_t) tmp=( '*:tar file:_files -g "*.(#i)tar(.*|)(-.)"' ) ;|
+     build_?)
+-      _arguments -s -C $buildopts $commonopts $pathopts \
++      _arguments -s -C $buildopts $commonopts $pathopts "${tmp[@]}" \
+       ;;
+     checksig)
+       _arguments -s -C \!-K \
+-- 
+2.26.3
+
diff --git a/zsh.spec b/zsh.spec
index 3dc6f89..4be225d 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -12,6 +12,9 @@ Source4: zshrc.rhs
 Source5: zshenv.rhs
 Source6: dotzshrc
 
+# complete file arguments after rpmbuild -r/-b/-t
+Patch1:  0001-zsh-5.8-comp-rpm.patch
+
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -155,6 +158,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Mar 25 2021 Kamil Dudka <kdudka@redhat.com> - 5.8-5
+- complete file arguments after rpmbuild -r/-b/-t
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 210b8657cd8c145bc90b45503cf9e8560bc6fa21 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 22:22:40 +0000
Subject: [PATCH 12/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 4be225d..ba8dd75 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -158,6 +158,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Mar 25 2021 Kamil Dudka <kdudka@redhat.com> - 5.8-5
 - complete file arguments after rpmbuild -r/-b/-t
 

From 20551698318de1610f5763425b63713204281ebd Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 25 Nov 2021 19:09:23 +0100
Subject: [PATCH 13/45] Overwrite PROMPT only if it's set to the built-in
 default

https://bugzilla.redhat.com/show_bug.cgi?id=2026749
---
 zsh.spec  | 5 ++++-
 zshrc.rhs | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zsh.spec b/zsh.spec
index ba8dd75..c03537f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -158,6 +158,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Nov 25 2021 Debarshi Ray <rishi@fedoraproject.org> - 5.8-7
+- Overwrite PROMPT only if it's set to the built-in default (#2026749)
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/zshrc.rhs b/zshrc.rhs
index 5b3b92a..82dc213 100644
--- a/zshrc.rhs
+++ b/zshrc.rhs
@@ -8,7 +8,7 @@
 #setenv() { export $1=$2 }  # csh compatibility
 
 # Set prompts
-PROMPT='[%n@%m]%~%# '    # default prompt
+[[ "$PROMPT" = "%m%# " ]] && PROMPT='[%n@%m]%~%# '    # default prompt
 #RPROMPT=' %~'     # prompt for right side of screen
 
 # bindkey -v             # vi key bindings

From 717b27b08b1e4d40d203120bc14cf27572b922da Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 4 Jan 2022 08:45:46 +0100
Subject: [PATCH 14/45] avoid unnecessary failure of the test-suite

... in case ${RPS1} is set
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index c03537f..61f7942 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -93,7 +93,10 @@ make -C Src -f Makemod zsh{path,xmod}s.h version.h
 %make_build all html
 
 %check
-# Run the testsuite
+# avoid unnecessary failure of the test-suite in case ${RPS1} is set
+unset RPS1
+
+# run the test-suite
 make check
 
 %install

From 5ac50934d36b1b4e11aa2c1fa183f4e975c79760 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 4 Jan 2022 08:31:45 +0100
Subject: [PATCH 15/45] Resolves: #1900809 - prepend ~/.local/bin and ~/bin to
 $PATH

... for newly created users
---
 dotzprofile  | 12 ++++++++++++
 zprofile.rhs |  3 ---
 zsh.spec     |  7 ++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 dotzprofile

diff --git a/dotzprofile b/dotzprofile
new file mode 100644
index 0000000..9203f7e
--- /dev/null
+++ b/dotzprofile
@@ -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
diff --git a/zprofile.rhs b/zprofile.rhs
index 03d316f..5e21475 100644
--- a/zprofile.rhs
+++ b/zprofile.rhs
@@ -2,9 +2,6 @@
 # /etc/zprofile and ~/.zprofile are run for login shells
 #
 
-PATH="$PATH:$HOME/bin"
-export PATH
-
 _src_etc_profile()
 {
     #  Make /etc/profile happier, and have possible ~/.zshenv options like
diff --git a/zsh.spec b/zsh.spec
index 61f7942..f2abe5b 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -11,6 +11,7 @@ Source3: zprofile.rhs
 Source4: zshrc.rhs
 Source5: zshenv.rhs
 Source6: dotzshrc
+Source7: dotzprofile
 
 # complete file arguments after rpmbuild -r/-b/-t
 Patch1:  0001-zsh-5.8-comp-rpm.patch
@@ -117,6 +118,7 @@ done
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile
 
 # This is just here to shut up rpmlint, and is very annoying.
 # Note that we can't chmod everything as then rpmlint will complain about
@@ -161,6 +163,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Tue Jan 04 2022 Kamil Dudka <kdudka@redhat.com> - 5.8-8
+- prepend ~/.local/bin and ~/bin to $PATH for newly created users (#1900809)
+
 * Thu Nov 25 2021 Debarshi Ray <rishi@fedoraproject.org> - 5.8-7
 - Overwrite PROMPT only if it's set to the built-in default (#2026749)
 

From e583fe831509d0b7541fa8228ad3c66e85ff2a0a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 05:56:26 +0000
Subject: [PATCH 16/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index f2abe5b..8b37277 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -163,6 +163,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Jan 04 2022 Kamil Dudka <kdudka@redhat.com> - 5.8-8
 - prepend ~/.local/bin and ~/bin to $PATH for newly created users (#1900809)
 

From 528a6dccc976a2747bf8eebfc613cbfb7ca94515 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sun, 13 Feb 2022 12:58:53 +0100
Subject: [PATCH 17/45] Resolves: CVE-2021-45444 - update to latest upstream
 release: 5.8.1

---
 sources              |  2 +-
 zsh-5.8.1.tar.xz.asc | 11 +++++++++++
 zsh-5.8.tar.xz.asc   | 11 -----------
 zsh.spec             |  7 +++++--
 4 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 zsh-5.8.1.tar.xz.asc
 delete mode 100644 zsh-5.8.tar.xz.asc

diff --git a/sources b/sources
index 0ede01c..3a2f734 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zsh-5.8.tar.xz) = 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
+SHA512 (zsh-5.8.1.tar.xz) = f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d
diff --git a/zsh-5.8.1.tar.xz.asc b/zsh-5.8.1.tar.xz.asc
new file mode 100644
index 0000000..ef4fd0c
--- /dev/null
+++ b/zsh-5.8.1.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAmIHy2YACgkQrPgUbK6M
+u8RlaAgAxhHK9+kn+yzsS2/eED+VjLjCNcyPqdVdBl+bS4xeN5v2Ga0D36TfYJ4J
+3n6INHTeR8gpocFyY5RRxZcDeGPtsPV4JQlmAJMa43piLP1LZvbgKAVeooWWeIKk
+JMzXXAKWhZQ2+IG+OXlLNaHSLy6YBJ//Kj3lUkI7NHLSjOhce9ER1QwrHyeHmsKV
+RmjeKlu4gwCPtXGgRmRihnIYJNI38db9Hc2vjunasGaM30l+8ymeVBjH395EDXL7
+bfn8Vb0rN6TQY5q+4kVkG9J6m7kfgozcbCuiygsDG7zPdbI6Iwgzx+WmMoKWFfX6
+y5MZIeVwkWUscDcghU8uUhQ2mu3pmw==
+=2cR1
+-----END PGP SIGNATURE-----
diff --git a/zsh-5.8.tar.xz.asc b/zsh-5.8.tar.xz.asc
deleted file mode 100644
index 8eb13ec..0000000
--- a/zsh-5.8.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl5HHTEACgkQrPgUbK6M
-u8Ttmwf/U1HoG30yYZ4m3yxFZ8QGI0WwnV7/IAQ4rMBWo+31yijLrwnl8+WILVfi
-gRzskwTrVmLjklT4hnv3aSyO1KtQMDImCYw01JbK801JCnCRRRTKVTC69S1TQ9FI
-mp+GB+QemYAdDRZwIlZcuVmhL7MJS0IWZiwqzlvqyKGG4MCrzqPqKO3s/JgMisUG
-KLHZJWoUWidYfmuwkPRKXN+dcnZUF4B/jJbNwLRGhvySzpT6pAwI2SBWak+vUbs/
-UKal6pOHYv1zalMrh5as2/hAo4Rjpsgn0zRGiFsn5Ys9srB6XKhXifUP6d1g3cRj
-lH9B3QGrd1oh7u8IOjU29F8+DeeU+g==
-=+BhZ
------END PGP SIGNATURE-----
diff --git a/zsh.spec b/zsh.spec
index 8b37277..c25318e 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.8
-Release: 9%{?dist}
+Version: 5.8.1
+Release: 1%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -163,6 +163,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sun Feb 13 2022 Kamil Dudka <kdudka@redhat.com> - 5.8.1-1
+- update to latest upstream release
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 9fde3e3713f1a5cd994b13accc4b6cfa6922d388 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sun, 13 Feb 2022 13:06:43 +0100
Subject: [PATCH 18/45] mention CVE-2021-45444 in the last change log entry

---
 zsh.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index c25318e..2eccf07 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -164,7 +164,7 @@ fi
 
 %changelog
 * Sun Feb 13 2022 Kamil Dudka <kdudka@redhat.com> - 5.8.1-1
-- update to latest upstream release
+- update to latest upstream release (fixes CVE-2021-45444)
 
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

From 18fc23fb63d70c2e3be79f4358dc84b70803842c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sun, 15 May 2022 09:15:57 +0200
Subject: [PATCH 19/45] update to latest upstream release: 5.9

---
 .gitignore                  |  5 +----
 0001-zsh-5.8-comp-rpm.patch | 27 ---------------------------
 sources                     |  3 ++-
 zsh-5.8.1.tar.xz.asc        | 11 -----------
 zsh.spec                    | 10 +++++-----
 5 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 0001-zsh-5.8-comp-rpm.patch
 delete mode 100644 zsh-5.8.1.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index 0a91fd3..55ad85c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/zsh-5.*.*.tar.bz2
 /zsh-5.*.tar.xz
-/zsh-5.4.2.tar.gz
-/*.src.rpm
-results_*/
+/zsh-5.*.tar.xz.asc
diff --git a/0001-zsh-5.8-comp-rpm.patch b/0001-zsh-5.8-comp-rpm.patch
deleted file mode 100644
index 3a91f0b..0000000
--- a/0001-zsh-5.8-comp-rpm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d8ec07a4779f4675139c650979eb87dd6d7a5d92 Mon Sep 17 00:00:00 2001
-From: Daniel Shahaf <d.s@daniel.shahaf.name>
-Date: Tue, 18 Aug 2020 13:30:04 +0000
-Subject: [PATCH] 47323: _rpmbuild: Complete file arguments after -r/-b/-t.
-
-Upstream-commit: e14e899ab96c4171544a244ddc39991512ec41c8
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- Completion/Redhat/Command/_rpm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm
-index e346924..db7c114 100644
---- a/Completion/Redhat/Command/_rpm
-+++ b/Completion/Redhat/Command/_rpm
-@@ -282,7 +282,7 @@ _rpm () {
-     build_r) tmp=( '*:source package:_files -g "*.(#i)src.rpm(-.)"' ) ;|
-     build_t) tmp=( '*:tar file:_files -g "*.(#i)tar(.*|)(-.)"' ) ;|
-     build_?)
--      _arguments -s -C $buildopts $commonopts $pathopts \
-+      _arguments -s -C $buildopts $commonopts $pathopts "${tmp[@]}" \
-       ;;
-     checksig)
-       _arguments -s -C \!-K \
--- 
-2.26.3
-
diff --git a/sources b/sources
index 3a2f734..747480c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (zsh-5.8.1.tar.xz) = f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d
+SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
+SHA512 (zsh-5.9.tar.xz.asc) = b6a72f8dfd2ed9c25e4afa5b3d13b23c1bf0bceacfce3ad0fadf24a9df91382914f7322ef4ed8bfb4b68818fb18fe3973d22154a6cc638b46f02e30bafd93fcb
diff --git a/zsh-5.8.1.tar.xz.asc b/zsh-5.8.1.tar.xz.asc
deleted file mode 100644
index ef4fd0c..0000000
--- a/zsh-5.8.1.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAmIHy2YACgkQrPgUbK6M
-u8RlaAgAxhHK9+kn+yzsS2/eED+VjLjCNcyPqdVdBl+bS4xeN5v2Ga0D36TfYJ4J
-3n6INHTeR8gpocFyY5RRxZcDeGPtsPV4JQlmAJMa43piLP1LZvbgKAVeooWWeIKk
-JMzXXAKWhZQ2+IG+OXlLNaHSLy6YBJ//Kj3lUkI7NHLSjOhce9ER1QwrHyeHmsKV
-RmjeKlu4gwCPtXGgRmRihnIYJNI38db9Hc2vjunasGaM30l+8ymeVBjH395EDXL7
-bfn8Vb0rN6TQY5q+4kVkG9J6m7kfgozcbCuiygsDG7zPdbI6Iwgzx+WmMoKWFfX6
-y5MZIeVwkWUscDcghU8uUhQ2mu3pmw==
-=2cR1
------END PGP SIGNATURE-----
diff --git a/zsh.spec b/zsh.spec
index 2eccf07..d0594d8 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,6 +1,6 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.8.1
+Version: 5.9
 Release: 1%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
@@ -13,9 +13,6 @@ Source5: zshenv.rhs
 Source6: dotzshrc
 Source7: dotzprofile
 
-# complete file arguments after rpmbuild -r/-b/-t
-Patch1:  0001-zsh-5.8-comp-rpm.patch
-
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -123,7 +120,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile
 # This is just here to shut up rpmlint, and is very annoying.
 # Note that we can't chmod everything as then rpmlint will complain about
 # those without a she-bang line.
-for i in checkmail harden run-help zcalc zkbd; do
+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!' \
     $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
     chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
@@ -163,6 +160,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sun May 15 2022 Kamil Dudka <kdudka@redhat.com> - 5.9-1
+- update to latest upstream release
+
 * Sun Feb 13 2022 Kamil Dudka <kdudka@redhat.com> - 5.8.1-1
 - update to latest upstream release (fixes CVE-2021-45444)
 

From 8e68c402488650536cff12fa6d22eee347a32032 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 14:00:26 +0000
Subject: [PATCH 20/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index d0594d8..c677f46 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -160,6 +160,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sun May 15 2022 Kamil Dudka <kdudka@redhat.com> - 5.9-1
 - update to latest upstream release
 

From 4b91eb160f82a0a1eb3f4955e4ce7ef0e79eeb82 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 9 Jan 2023 10:35:10 +0100
Subject: [PATCH 21/45] do not use egrep in tests to make them pass again

---
 0001-zsh-5.9-do-not-use-egrep-in-tests.patch | 178 +++++++++++++++++++
 zsh.spec                                     |   8 +-
 2 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 0001-zsh-5.9-do-not-use-egrep-in-tests.patch

diff --git a/0001-zsh-5.9-do-not-use-egrep-in-tests.patch b/0001-zsh-5.9-do-not-use-egrep-in-tests.patch
new file mode 100644
index 0000000..4d5a1cf
--- /dev/null
+++ 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
+
diff --git a/zsh.spec b/zsh.spec
index c677f46..e6d591b 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -13,6 +13,9 @@ 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
+
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -160,6 +163,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Jan 09 2023 Kamil Dudka <kdudka@redhat.com> - 5.9-3
+- do not use egrep in tests to make them pass again
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 527f2cfb8126226100f39bf68b70ff15c1a4007e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
Date: Fri, 13 Jan 2023 09:37:42 +0100
Subject: [PATCH 22/45] use 'int main()' in test C-codes in configure

This is based on upstream commit
ab4d62eb975a4c4c51dd35822665050e2ddc6918 with the changed to the
ChangeLog file removed.
---
 0002-zsh-Use-int-main-in-test-c-codes.patch | 541 ++++++++++++++++++++
 zsh.spec                                    |   7 +-
 2 files changed, 547 insertions(+), 1 deletion(-)
 create mode 100644 0002-zsh-Use-int-main-in-test-c-codes.patch

diff --git a/0002-zsh-Use-int-main-in-test-c-codes.patch b/0002-zsh-Use-int-main-in-test-c-codes.patch
new file mode 100644
index 0000000..3585cc4
--- /dev/null
+++ 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
diff --git a/zsh.spec b/zsh.spec
index e6d591b..0b64e77 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -15,6 +15,8 @@ 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
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -163,6 +165,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Jan 13 2023 Timm Bäder <tbaeder@redhat.com> - 5.9-4
+- use 'int main()' in test C-codes in configure
+
 * Mon Jan 09 2023 Kamil Dudka <kdudka@redhat.com> - 5.9-3
 - do not use egrep in tests to make them pass again
 

From 1ca491a90109918759bb3c91fa6b0bb597568862 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 08:21:08 +0000
Subject: [PATCH 23/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 0b64e77..79c3b09 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -165,6 +165,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jan 13 2023 Timm Bäder <tbaeder@redhat.com> - 5.9-4
 - use 'int main()' in test C-codes in configure
 

From 51522ac8aa78c4d54a3707b1ce7f7ad3a798f145 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Wed, 17 May 2023 11:23:20 -0400
Subject: [PATCH 24/45] Update the License tag to use SPDX license expressions

Examine the zsh source and construct a new License tag using SPDX
identifiers.  Most of the zsh source is licensed under what SPDX calls
the MIT-Modern-Variant license.  One source file
(openssh_bsd_setres_id.c) carries an ISC license as well.  Three shell
extensions are licensed under GPL-2.0-only.

Signed-off-by: David Cantrell <dcantrell@redhat.com>
---
 zsh.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zsh.spec b/zsh.spec
index 79c3b09..464b2af 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,8 +1,8 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 5%{?dist}
-License: MIT
+Release: 6%{?dist}
+License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 Source1: zlogin.rhs
@@ -165,6 +165,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 5.9-6
+- Update the License tag to use SPDX identifiers
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From fa2ea2fc3629211809bee13ffc6c14eaced8b4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Thu, 13 Jul 2023 10:06:02 +0200
Subject: [PATCH 25/45] Make zsh/{tcp,zftp} compatible with full RELRO

Resolves: rhbz#2212160
---
 ...dule-loading-problem-with-full-RELRO.patch | 69 +++++++++++++++++++
 zsh.spec                                      | 10 +--
 2 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 0003-zsh-fix-module-loading-problem-with-full-RELRO.patch

diff --git a/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch b/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
new file mode 100644
index 0000000..2ca953b
--- /dev/null
+++ 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
+
diff --git a/zsh.spec b/zsh.spec
index 464b2af..24e66ba 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -17,6 +17,8 @@ Source7: dotzprofile
 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
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -77,9 +79,6 @@ sed -e 's|^\.NOTPARALLEL|#.NOTPARALLEL|' -i 'Config/defs.mk.in'
 # make build of run-time loadable modules work again (#1535422)
 %undefine _strict_symbol_defs_build
 
-# make loading of module's dependencies work again (#1277996)
-export LIBLDFLAGS='-z lazy'
-
 # avoid build failure in case we have working ypcat (#1687574)
 export zsh_cv_sys_nis='no'
 
@@ -165,6 +164,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Jul 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-7
+- Make zsh/{tcp,zftp} compatible with full RELRO (rhbz#2212160)
+
 * Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 5.9-6
 - Update the License tag to use SPDX identifiers
 

From 261d24400710eefc26c92d6485599eda33e49943 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 19:47:20 +0000
Subject: [PATCH 26/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 24e66ba..1e031c0 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -164,6 +164,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jul 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-7
 - Make zsh/{tcp,zftp} compatible with full RELRO (rhbz#2212160)
 

From 584e38d1fda565187f2df0997e7ac9f25f583ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Mon, 21 Aug 2023 08:54:34 +0200
Subject: [PATCH 27/45] port to PCRE 2

Resolves: rhbz#1938979
---
 0004-zsh-enable-PCRE-locale-switching.patch |  64 ++
 0005-zsh-port-to-pcre2.patch                | 863 ++++++++++++++++++++
 zsh.spec                                    |  11 +-
 3 files changed, 936 insertions(+), 2 deletions(-)
 create mode 100644 0004-zsh-enable-PCRE-locale-switching.patch
 create mode 100644 0005-zsh-port-to-pcre2.patch

diff --git a/0004-zsh-enable-PCRE-locale-switching.patch b/0004-zsh-enable-PCRE-locale-switching.patch
new file mode 100644
index 0000000..a6f03bf
--- /dev/null
+++ 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
+
diff --git a/0005-zsh-port-to-pcre2.patch b/0005-zsh-port-to-pcre2.patch
new file mode 100644
index 0000000..6c1a2c0
--- /dev/null
+++ b/0005-zsh-port-to-pcre2.patch
@@ -0,0 +1,863 @@
+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 1/3] 51723: migrate pcre module to pcre2
+
+---
+ 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 f3f371deb376478176866fd770fbcf9bc0d0609f Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk@zsh.org>
+Date: Sat, 13 May 2023 00:56:48 +0200
+Subject: [PATCH 2/3] 51728: assign pcre named capture groups to a hash
+
+---
+ Doc/Zsh/mod_pcre.yo | 10 ++++++----
+ Src/Modules/pcre.c  | 43 +++++++++++++++++++++++++++++++++----------
+ Test/V07pcre.ztst   | 14 ++++++++++++++
+ 3 files changed, 53 insertions(+), 14 deletions(-)
+
+diff --git a/Doc/Zsh/mod_pcre.yo b/Doc/Zsh/mod_pcre.yo
+index c2817f519..6d073985d 100644
+--- a/Doc/Zsh/mod_pcre.yo
++++ b/Doc/Zsh/mod_pcre.yo
+@@ -20,12 +20,12 @@ including those that indicate newline.
+ )
+ findex(pcre_study)
+ item(tt(pcre_study))(
+-Studies the previously-compiled PCRE which may result in faster
+-matching.
++Requests JIT compilation for the previously-compiled PCRE which
++may result in faster matching.
+ )
+ findex(pcre_match)
+ item(tt(pcre_match) [ tt(-v) var(var) ] [ tt(-a) var(arr) ] \
+-[ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
++[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
+ Returns successfully if tt(string) matches the previously-compiled
+ PCRE.
+ 
+@@ -36,7 +36,9 @@ substrings, unless the tt(-a) option is given, in which
+ case it will set the array var(arr).  Similarly, the variable
+ tt(MATCH) will be set to the entire matched portion of the
+ string, unless the tt(-v) option is given, in which case the variable
+-var(var) will be set.
++var(var) will be set. Furthermore, any named captures will
++be stored in the associative array tt(.pcre.match) unless an
++alternative is given with tt(-A).
+ No variables are altered if there is no successful match.
+ A tt(-n) option starts searching for a match from the
+ byte var(offset) position in var(string).  If the tt(-b) option is given,
+diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
+index 079ecc2c5..6be1f76e2 100644
+--- a/Src/Modules/pcre.c
++++ b/Src/Modules/pcre.c
+@@ -129,14 +129,17 @@ bin_pcre_study(char *nam, UNUSED(char **args), UNUSED(Options ops), UNUSED(int f
+ }
+ 
+ static int
+-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)
++zpcre_get_substrings(pcre2_code *pat, char *arg, pcre2_match_data *mdata,
++	int captured_count, char *matchvar, char *substravar, char *namedassoc,
++	int want_offset_pair, int matchedinarr, int want_begin_end)
+ {
+     PCRE2_SIZE *ovec;
+     char *match_all, **matches;
+     char offset_all[50];
+     int capture_start = 1;
++    int vec_off;
++    PCRE2_SPTR ntable; /* table of named captures */
++    uint32_t ncount, nsize;
+ 
+     if (matchedinarr) {
+ 	/* bash-style ovec[0] entire-matched string in the array */
+@@ -174,7 +177,7 @@ zpcre_get_substrings(char *arg, pcre2_match_data *mdata, int captured_count,
+ 	if (substravar &&
+ 	    (!want_begin_end || nelem)) {
+ 	    char **x;
+-	    int vec_off, i;
++	    int i;
+ 	    matches = x = (char **) zalloc(sizeof(char *) * (captured_count+1-capture_start));
+ 	    for (i = capture_start; i < captured_count; i++) {
+ 		vec_off = 2*i;
+@@ -184,6 +187,23 @@ zpcre_get_substrings(char *arg, pcre2_match_data *mdata, int captured_count,
+ 	    setaparam(substravar, matches);
+ 	}
+ 
++	if (!pcre2_pattern_info(pat, PCRE2_INFO_NAMECOUNT, &ncount) && ncount
++		&& !pcre2_pattern_info(pat, PCRE2_INFO_NAMEENTRYSIZE, &nsize)
++		&& !pcre2_pattern_info(pat, PCRE2_INFO_NAMETABLE, &ntable))
++	{
++	    char **hash, **hashptr;
++	    uint32_t nidx;
++	    hashptr = hash = (char **)zshcalloc((ncount+1)*2*sizeof(char *));
++	    for (nidx = 0; nidx < ncount; nidx++) {
++		vec_off = (ntable[nsize * nidx] << 9) + 2 * ntable[nsize * nidx + 1];
++		/* would metafy the key but pcre limits characters in the name */
++		*hashptr++ = ztrdup((char *) ntable + nsize * nidx + 2);
++		*hashptr++ = metafy(arg + ovec[vec_off],
++			ovec[vec_off+1]-ovec[vec_off], META_DUP);
++	    }
++	    sethparam(namedassoc, hash);
++	}
++
+ 	if (want_begin_end) {
+ 	    /*
+ 	     * cond-infix rather than builtin; also not bash; so we set a bunch
+@@ -286,6 +306,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+     char *matched_portion = NULL;
+     char *plaintext = NULL;
+     char *receptacle = NULL;
++    char *named = ".pcre.match";
+     int return_value = 1;
+     /* The subject length and offset start are both int values in pcre_exec */
+     int subject_len;
+@@ -305,6 +326,9 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+     if(OPT_HASARG(ops,c='v')) {
+ 	matched_portion = OPT_ARG(ops,c);
+     }
++    if (OPT_HASARG(ops, c='A')) {
++	named = OPT_ARG(ops, c);
++    }
+     if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
+ 	if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
+ 	    return 1;
+@@ -326,8 +350,8 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+     if (ret==0) return_value = 0;
+     else if (ret == PCRE2_ERROR_NOMATCH) /* no match */;
+     else if (ret>0) {
+-	zpcre_get_substrings(plaintext, pcre_mdata, ret, matched_portion, receptacle,
+-			     want_offset_pair, 0, 0);
++	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret, matched_portion,
++		receptacle, named, want_offset_pair, 0, 0);
+ 	return_value = 0;
+     }
+     else {
+@@ -405,9 +429,8 @@ cond_pcre_match(char **a, int id)
+ 		    break;
+ 		}
+                 else if (r>0) {
+-		    zpcre_get_substrings(lhstr_plain, pcre_mdata, r, svar, avar, 0,
+-					 isset(BASHREMATCH),
+-					 !isset(BASHREMATCH));
++		    zpcre_get_substrings(pcre_pat, lhstr_plain, pcre_mdata, r, svar, avar,
++			    ".pcre.match", 0, isset(BASHREMATCH), !isset(BASHREMATCH));
+ 		    return_value = 1;
+ 		    break;
+ 		}
+@@ -443,7 +466,7 @@ static struct conddef cotab[] = {
+ 
+ static struct builtin bintab[] = {
+     BUILTIN("pcre_compile", 0, bin_pcre_compile, 1, 1, 0, "aimxs",  NULL),
+-    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "a:v:n:b",    NULL),
++    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:b",    NULL),
+     BUILTIN("pcre_study",   0, bin_pcre_study,   0, 0, 0, NULL,    NULL)
+ };
+ 
+diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
+index 6eb366964..027fea3aa 100644
+--- a/Test/V07pcre.ztst
++++ b/Test/V07pcre.ztst
+@@ -182,3 +182,17 @@
+   [[ abc =~ 'a(d*)bc' ]] && print "$#MATCH; $#match; ${#match[1]}"
+ 0:empty capture
+ >3; 1; 0
++
++  [[ category/name-12345 =~ '(?x)^
++    (?<category> [^/]* ) /
++    (?<package>
++      (?<name> \w+ ) -
++      (?<version> \d+ ))$' ]]
++  typeset -p1 .pcre.match
++0:named captures
++>typeset -g -A .pcre.match=(
++>  [category]=category
++>  [name]=name
++>  [package]=name-12345
++>  [version]=12345
++>)
+-- 
+2.41.0
+
+
+From b4d1c756f50909b4a13e5c8fe5f26f71e9d54f63 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk@zsh.org>
+Date: Sat, 13 May 2023 00:59:00 +0200
+Subject: [PATCH 3/3] 51738: support pcre's alternative DFA matching algorithm
+
+---
+ Doc/Zsh/mod_pcre.yo |  6 ++++-
+ Src/Modules/pcre.c  | 53 ++++++++++++++++++++++++++++++---------------
+ Test/V07pcre.ztst   |  5 +++++
+ 3 files changed, 46 insertions(+), 18 deletions(-)
+
+diff --git a/Doc/Zsh/mod_pcre.yo b/Doc/Zsh/mod_pcre.yo
+index 6d073985d..da73ac85a 100644
+--- a/Doc/Zsh/mod_pcre.yo
++++ b/Doc/Zsh/mod_pcre.yo
+@@ -25,7 +25,7 @@ may result in faster matching.
+ )
+ findex(pcre_match)
+ item(tt(pcre_match) [ tt(-v) var(var) ] [ tt(-a) var(arr) ] \
+-[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
++[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-bd) ] var(string))(
+ Returns successfully if tt(string) matches the previously-compiled
+ PCRE.
+ 
+@@ -69,6 +69,10 @@ print -l $accum)
+ )
+ enditem()
+ 
++The option tt(-d) uses the alternative breadth-first DFA search algorithm of
++pcre. This sets tt(match), or the array given with tt(-a), to all the matches
++found from the same start point in the subject.
++
+ The tt(zsh/pcre) module makes available the following test condition:
+ 
+ startitem()
+diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
+index 6be1f76e2..96f3c6e65 100644
+--- a/Src/Modules/pcre.c
++++ b/Src/Modules/pcre.c
+@@ -305,30 +305,29 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+     pcre2_match_data *pcre_mdata = NULL;
+     char *matched_portion = NULL;
+     char *plaintext = NULL;
+-    char *receptacle = NULL;
+-    char *named = ".pcre.match";
++    char *receptacle;
++    char *named = NULL;
+     int return_value = 1;
+     /* The subject length and offset start are both int values in pcre_exec */
+     int subject_len;
+     int offset_start = 0;
+     int want_offset_pair = 0;
++    int use_dfa = 0;
+ 
+     if (pcre_pattern == NULL) {
+ 	zwarnnam(nam, "no pattern has been compiled");
+ 	return 1;
+     }
+ 
+-    matched_portion = "MATCH";
+-    receptacle = "match";
+-    if(OPT_HASARG(ops,c='a')) {
+-	receptacle = OPT_ARG(ops,c);
+-    }
+-    if(OPT_HASARG(ops,c='v')) {
+-	matched_portion = OPT_ARG(ops,c);
+-    }
+-    if (OPT_HASARG(ops, c='A')) {
+-	named = OPT_ARG(ops, c);
++    if (!(use_dfa = OPT_ISSET(ops, 'd'))) {
++	matched_portion = OPT_HASARG(ops, c='v') ? OPT_ARG(ops, c) : "MATCH";
++	named = OPT_HASARG(ops, c='A') ? OPT_ARG(ops, c) : ".pcre.match";
++    } else if (OPT_HASARG(ops, c='v') || OPT_HASARG(ops, c='A')) {
++	zwarnnam(nam, "-d cannot be combined with -%c", c);
++	return 1;
+     }
++    receptacle = OPT_HASARG(ops, 'a') ? OPT_ARG(ops, 'a') : "match";
++
+     if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
+ 	if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
+ 	    return 1;
+@@ -341,7 +340,25 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+ 
+     if (offset_start > 0 && offset_start >= subject_len)
+ 	ret = PCRE2_ERROR_NOMATCH;
+-    else {
++    else if (use_dfa) {
++	PCRE2_SIZE old, wscount = 128, capcount = 128;
++	void *workspace = zhalloc(sizeof(int) * wscount);
++	pcre_mdata = pcre2_match_data_create(capcount, NULL);
++	do {
++	    ret = pcre2_dfa_match(pcre_pattern, (PCRE2_SPTR) plaintext, subject_len,
++		offset_start, 0, pcre_mdata, NULL, (int *) workspace, wscount);
++	    if (ret == PCRE2_ERROR_DFA_WSSIZE) {
++		old = wscount;
++		wscount += wscount / 2;
++		workspace = hrealloc(workspace, sizeof(int) * old, sizeof(int) * wscount);
++	    } else if (ret == 0) {
++		capcount += capcount / 2;
++		pcre2_match_data_free(pcre_mdata);
++		pcre_mdata = pcre2_match_data_create(capcount, NULL);
++	    } else
++		break;
++	} while(1);
++    } 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);
+@@ -350,12 +367,14 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
+     if (ret==0) return_value = 0;
+     else if (ret == PCRE2_ERROR_NOMATCH) /* no match */;
+     else if (ret>0) {
+-	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret, matched_portion,
+-		receptacle, named, want_offset_pair, 0, 0);
++	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret,
++		matched_portion, receptacle, named, want_offset_pair, use_dfa, 0);
+ 	return_value = 0;
+     }
+     else {
+-	zwarnnam(nam, "error in pcre2_match [%d]", ret);
++	PCRE2_UCHAR buffer[256];
++	pcre2_get_error_message(ret, buffer, sizeof(buffer));
++	zwarnnam(nam, "error in pcre matching for /%s/: %s", plaintext, buffer);
+     }
+     
+     if (pcre_mdata)
+@@ -466,7 +485,7 @@ static struct conddef cotab[] = {
+ 
+ static struct builtin bintab[] = {
+     BUILTIN("pcre_compile", 0, bin_pcre_compile, 1, 1, 0, "aimxs",  NULL),
+-    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:b",    NULL),
++    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:bd",    NULL),
+     BUILTIN("pcre_study",   0, bin_pcre_study,   0, 0, 0, NULL,    NULL)
+ };
+ 
+diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
+index 027fea3aa..585698d05 100644
+--- a/Test/V07pcre.ztst
++++ b/Test/V07pcre.ztst
+@@ -196,3 +196,8 @@
+ >  [package]=name-12345
+ >  [version]=12345
+ >)
++
++  pcre_compile 'cat(er(pillar)?)?'
++  pcre_match -d 'the caterpillar catchment' && print $match
++0:pcre_match -d
++>caterpillar cater cat
+-- 
+2.41.0
+
diff --git a/zsh.spec b/zsh.spec
index 1e031c0..ebb19d9 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -19,6 +19,10 @@ Patch1: 0001-zsh-5.9-do-not-use-egrep-in-tests.patch
 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 commits b62e911341c8ec7446378b477c47da4256053dc0...b4d1c756f50909b4a13e5c8fe5f26f71e9d54f63
+Patch5: 0005-zsh-port-to-pcre2.patch
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -29,7 +33,7 @@ BuildRequires: glibc-langpack-ja
 BuildRequires: libcap-devel
 BuildRequires: make
 BuildRequires: ncurses-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
 BuildRequires: sed
 BuildRequires: texi2html
 BuildRequires: texinfo
@@ -164,6 +168,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Aug 21 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-9
+- port to PCRE 2 (rhbz#1938979)
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 47d6eba90a8aaaaa4af3a89d98a488171f0efc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 21 Nov 2023 18:40:21 +0100
Subject: [PATCH 28/45] fix FTBFS caused by texinfo 7.1

- fix build of the PCRE module
---
 0005-zsh-port-to-pcre2.patch       | 414 +++++++----------------------
 0006-zsh-support-texinfo-7.0.patch |  53 ++++
 zsh.spec                           |  12 +-
 3 files changed, 158 insertions(+), 321 deletions(-)
 create mode 100644 0006-zsh-support-texinfo-7.0.patch

diff --git a/0005-zsh-port-to-pcre2.patch b/0005-zsh-port-to-pcre2.patch
index 6c1a2c0..fd8ea0e 100644
--- a/0005-zsh-port-to-pcre2.patch
+++ b/0005-zsh-port-to-pcre2.patch
@@ -1,8 +1,9 @@
 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 1/3] 51723: migrate pcre module to pcre2
+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 ++-
@@ -533,331 +534,108 @@ index d8a17791a..4710d1659 100644
 -- 
 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
 
-From f3f371deb376478176866fd770fbcf9bc0d0609f Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <opk@zsh.org>
-Date: Sat, 13 May 2023 00:56:48 +0200
-Subject: [PATCH 2/3] 51728: assign pcre named capture groups to a hash
-
+ Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 ---
- Doc/Zsh/mod_pcre.yo | 10 ++++++----
- Src/Modules/pcre.c  | 43 +++++++++++++++++++++++++++++++++----------
- Test/V07pcre.ztst   | 14 ++++++++++++++
- 3 files changed, 53 insertions(+), 14 deletions(-)
+ Src/Modules/pcre.mdd |  2 +-
+ configure.ac         | 31 +++++++++++++++++++------------
+ 2 files changed, 20 insertions(+), 13 deletions(-)
 
-diff --git a/Doc/Zsh/mod_pcre.yo b/Doc/Zsh/mod_pcre.yo
-index c2817f519..6d073985d 100644
---- a/Doc/Zsh/mod_pcre.yo
-+++ b/Doc/Zsh/mod_pcre.yo
-@@ -20,12 +20,12 @@ including those that indicate newline.
- )
- findex(pcre_study)
- item(tt(pcre_study))(
--Studies the previously-compiled PCRE which may result in faster
--matching.
-+Requests JIT compilation for the previously-compiled PCRE which
-+may result in faster matching.
- )
- findex(pcre_match)
- item(tt(pcre_match) [ tt(-v) var(var) ] [ tt(-a) var(arr) ] \
--[ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
-+[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
- Returns successfully if tt(string) matches the previously-compiled
- PCRE.
+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
  
-@@ -36,7 +36,9 @@ substrings, unless the tt(-a) option is given, in which
- case it will set the array var(arr).  Similarly, the variable
- tt(MATCH) will be set to the entire matched portion of the
- string, unless the tt(-v) option is given, in which case the variable
--var(var) will be set.
-+var(var) will be set. Furthermore, any named captures will
-+be stored in the associative array tt(.pcre.match) unless an
-+alternative is given with tt(-A).
- No variables are altered if there is no successful match.
- A tt(-n) option starts searching for a match from the
- byte var(offset) position in var(string).  If the tt(-b) option is given,
-diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
-index 079ecc2c5..6be1f76e2 100644
---- a/Src/Modules/pcre.c
-+++ b/Src/Modules/pcre.c
-@@ -129,14 +129,17 @@ bin_pcre_study(char *nam, UNUSED(char **args), UNUSED(Options ops), UNUSED(int f
- }
+ 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)]))
  
- static int
--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)
-+zpcre_get_substrings(pcre2_code *pat, char *arg, pcre2_match_data *mdata,
-+	int captured_count, char *matchvar, char *substravar, char *namedassoc,
-+	int want_offset_pair, int matchedinarr, int want_begin_end)
- {
-     PCRE2_SIZE *ovec;
-     char *match_all, **matches;
-     char offset_all[50];
-     int capture_start = 1;
-+    int vec_off;
-+    PCRE2_SPTR ntable; /* table of named captures */
-+    uint32_t ncount, nsize;
- 
-     if (matchedinarr) {
- 	/* bash-style ovec[0] entire-matched string in the array */
-@@ -174,7 +177,7 @@ zpcre_get_substrings(char *arg, pcre2_match_data *mdata, int captured_count,
- 	if (substravar &&
- 	    (!want_begin_end || nelem)) {
- 	    char **x;
--	    int vec_off, i;
-+	    int i;
- 	    matches = x = (char **) zalloc(sizeof(char *) * (captured_count+1-capture_start));
- 	    for (i = capture_start; i < captured_count; i++) {
- 		vec_off = 2*i;
-@@ -184,6 +187,23 @@ zpcre_get_substrings(char *arg, pcre2_match_data *mdata, int captured_count,
- 	    setaparam(substravar, matches);
- 	}
- 
-+	if (!pcre2_pattern_info(pat, PCRE2_INFO_NAMECOUNT, &ncount) && ncount
-+		&& !pcre2_pattern_info(pat, PCRE2_INFO_NAMEENTRYSIZE, &nsize)
-+		&& !pcre2_pattern_info(pat, PCRE2_INFO_NAMETABLE, &ntable))
-+	{
-+	    char **hash, **hashptr;
-+	    uint32_t nidx;
-+	    hashptr = hash = (char **)zshcalloc((ncount+1)*2*sizeof(char *));
-+	    for (nidx = 0; nidx < ncount; nidx++) {
-+		vec_off = (ntable[nsize * nidx] << 9) + 2 * ntable[nsize * nidx + 1];
-+		/* would metafy the key but pcre limits characters in the name */
-+		*hashptr++ = ztrdup((char *) ntable + nsize * nidx + 2);
-+		*hashptr++ = metafy(arg + ovec[vec_off],
-+			ovec[vec_off+1]-ovec[vec_off], META_DUP);
-+	    }
-+	    sethparam(namedassoc, hash);
-+	}
++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
 +
- 	if (want_begin_end) {
- 	    /*
- 	     * cond-infix rather than builtin; also not bash; so we set a bunch
-@@ -286,6 +306,7 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
-     char *matched_portion = NULL;
-     char *plaintext = NULL;
-     char *receptacle = NULL;
-+    char *named = ".pcre.match";
-     int return_value = 1;
-     /* The subject length and offset start are both int values in pcre_exec */
-     int subject_len;
-@@ -305,6 +326,9 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
-     if(OPT_HASARG(ops,c='v')) {
- 	matched_portion = OPT_ARG(ops,c);
-     }
-+    if (OPT_HASARG(ops, c='A')) {
-+	named = OPT_ARG(ops, c);
-+    }
-     if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
- 	if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
- 	    return 1;
-@@ -326,8 +350,8 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
-     if (ret==0) return_value = 0;
-     else if (ret == PCRE2_ERROR_NOMATCH) /* no match */;
-     else if (ret>0) {
--	zpcre_get_substrings(plaintext, pcre_mdata, ret, matched_portion, receptacle,
--			     want_offset_pair, 0, 0);
-+	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret, matched_portion,
-+		receptacle, named, want_offset_pair, 0, 0);
- 	return_value = 0;
-     }
-     else {
-@@ -405,9 +429,8 @@ cond_pcre_match(char **a, int id)
- 		    break;
- 		}
-                 else if (r>0) {
--		    zpcre_get_substrings(lhstr_plain, pcre_mdata, r, svar, avar, 0,
--					 isset(BASHREMATCH),
--					 !isset(BASHREMATCH));
-+		    zpcre_get_substrings(pcre_pat, lhstr_plain, pcre_mdata, r, svar, avar,
-+			    ".pcre.match", 0, isset(BASHREMATCH), !isset(BASHREMATCH));
- 		    return_value = 1;
- 		    break;
- 		}
-@@ -443,7 +466,7 @@ static struct conddef cotab[] = {
+ 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
  
- static struct builtin bintab[] = {
-     BUILTIN("pcre_compile", 0, bin_pcre_compile, 1, 1, 0, "aimxs",  NULL),
--    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "a:v:n:b",    NULL),
-+    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:b",    NULL),
-     BUILTIN("pcre_study",   0, bin_pcre_study,   0, 0, 0, NULL,    NULL)
- };
+-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
  
-diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
-index 6eb366964..027fea3aa 100644
---- a/Test/V07pcre.ztst
-+++ b/Test/V07pcre.ztst
-@@ -182,3 +182,17 @@
-   [[ abc =~ 'a(d*)bc' ]] && print "$#MATCH; $#match; ${#match[1]}"
- 0:empty capture
- >3; 1; 0
+ 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
 +
-+  [[ category/name-12345 =~ '(?x)^
-+    (?<category> [^/]* ) /
-+    (?<package>
-+      (?<name> \w+ ) -
-+      (?<version> \d+ ))$' ]]
-+  typeset -p1 .pcre.match
-+0:named captures
-+>typeset -g -A .pcre.match=(
-+>  [category]=category
-+>  [name]=name
-+>  [package]=name-12345
-+>  [version]=12345
-+>)
+ if test x$enable_cap = xyes; then
+   AC_CHECK_FUNCS(cap_get_proc)
+ fi
 -- 
-2.41.0
-
-
-From b4d1c756f50909b4a13e5c8fe5f26f71e9d54f63 Mon Sep 17 00:00:00 2001
-From: Oliver Kiddle <opk@zsh.org>
-Date: Sat, 13 May 2023 00:59:00 +0200
-Subject: [PATCH 3/3] 51738: support pcre's alternative DFA matching algorithm
-
----
- Doc/Zsh/mod_pcre.yo |  6 ++++-
- Src/Modules/pcre.c  | 53 ++++++++++++++++++++++++++++++---------------
- Test/V07pcre.ztst   |  5 +++++
- 3 files changed, 46 insertions(+), 18 deletions(-)
-
-diff --git a/Doc/Zsh/mod_pcre.yo b/Doc/Zsh/mod_pcre.yo
-index 6d073985d..da73ac85a 100644
---- a/Doc/Zsh/mod_pcre.yo
-+++ b/Doc/Zsh/mod_pcre.yo
-@@ -25,7 +25,7 @@ may result in faster matching.
- )
- findex(pcre_match)
- item(tt(pcre_match) [ tt(-v) var(var) ] [ tt(-a) var(arr) ] \
--[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-b) ] var(string))(
-+[ tt(-A) var(assoc) ] [ tt(-n) var(offset) ] [ tt(-bd) ] var(string))(
- Returns successfully if tt(string) matches the previously-compiled
- PCRE.
- 
-@@ -69,6 +69,10 @@ print -l $accum)
- )
- enditem()
- 
-+The option tt(-d) uses the alternative breadth-first DFA search algorithm of
-+pcre. This sets tt(match), or the array given with tt(-a), to all the matches
-+found from the same start point in the subject.
-+
- The tt(zsh/pcre) module makes available the following test condition:
- 
- startitem()
-diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
-index 6be1f76e2..96f3c6e65 100644
---- a/Src/Modules/pcre.c
-+++ b/Src/Modules/pcre.c
-@@ -305,30 +305,29 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
-     pcre2_match_data *pcre_mdata = NULL;
-     char *matched_portion = NULL;
-     char *plaintext = NULL;
--    char *receptacle = NULL;
--    char *named = ".pcre.match";
-+    char *receptacle;
-+    char *named = NULL;
-     int return_value = 1;
-     /* The subject length and offset start are both int values in pcre_exec */
-     int subject_len;
-     int offset_start = 0;
-     int want_offset_pair = 0;
-+    int use_dfa = 0;
- 
-     if (pcre_pattern == NULL) {
- 	zwarnnam(nam, "no pattern has been compiled");
- 	return 1;
-     }
- 
--    matched_portion = "MATCH";
--    receptacle = "match";
--    if(OPT_HASARG(ops,c='a')) {
--	receptacle = OPT_ARG(ops,c);
--    }
--    if(OPT_HASARG(ops,c='v')) {
--	matched_portion = OPT_ARG(ops,c);
--    }
--    if (OPT_HASARG(ops, c='A')) {
--	named = OPT_ARG(ops, c);
-+    if (!(use_dfa = OPT_ISSET(ops, 'd'))) {
-+	matched_portion = OPT_HASARG(ops, c='v') ? OPT_ARG(ops, c) : "MATCH";
-+	named = OPT_HASARG(ops, c='A') ? OPT_ARG(ops, c) : ".pcre.match";
-+    } else if (OPT_HASARG(ops, c='v') || OPT_HASARG(ops, c='A')) {
-+	zwarnnam(nam, "-d cannot be combined with -%c", c);
-+	return 1;
-     }
-+    receptacle = OPT_HASARG(ops, 'a') ? OPT_ARG(ops, 'a') : "match";
-+
-     if(OPT_HASARG(ops,c='n')) { /* The offset position to start the search, in bytes. */
- 	if ((offset_start = getposint(OPT_ARG(ops,c), nam)) < 0)
- 	    return 1;
-@@ -341,7 +340,25 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
- 
-     if (offset_start > 0 && offset_start >= subject_len)
- 	ret = PCRE2_ERROR_NOMATCH;
--    else {
-+    else if (use_dfa) {
-+	PCRE2_SIZE old, wscount = 128, capcount = 128;
-+	void *workspace = zhalloc(sizeof(int) * wscount);
-+	pcre_mdata = pcre2_match_data_create(capcount, NULL);
-+	do {
-+	    ret = pcre2_dfa_match(pcre_pattern, (PCRE2_SPTR) plaintext, subject_len,
-+		offset_start, 0, pcre_mdata, NULL, (int *) workspace, wscount);
-+	    if (ret == PCRE2_ERROR_DFA_WSSIZE) {
-+		old = wscount;
-+		wscount += wscount / 2;
-+		workspace = hrealloc(workspace, sizeof(int) * old, sizeof(int) * wscount);
-+	    } else if (ret == 0) {
-+		capcount += capcount / 2;
-+		pcre2_match_data_free(pcre_mdata);
-+		pcre_mdata = pcre2_match_data_create(capcount, NULL);
-+	    } else
-+		break;
-+	} while(1);
-+    } 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);
-@@ -350,12 +367,14 @@ bin_pcre_match(char *nam, char **args, Options ops, UNUSED(int func))
-     if (ret==0) return_value = 0;
-     else if (ret == PCRE2_ERROR_NOMATCH) /* no match */;
-     else if (ret>0) {
--	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret, matched_portion,
--		receptacle, named, want_offset_pair, 0, 0);
-+	zpcre_get_substrings(pcre_pattern, plaintext, pcre_mdata, ret,
-+		matched_portion, receptacle, named, want_offset_pair, use_dfa, 0);
- 	return_value = 0;
-     }
-     else {
--	zwarnnam(nam, "error in pcre2_match [%d]", ret);
-+	PCRE2_UCHAR buffer[256];
-+	pcre2_get_error_message(ret, buffer, sizeof(buffer));
-+	zwarnnam(nam, "error in pcre matching for /%s/: %s", plaintext, buffer);
-     }
-     
-     if (pcre_mdata)
-@@ -466,7 +485,7 @@ static struct conddef cotab[] = {
- 
- static struct builtin bintab[] = {
-     BUILTIN("pcre_compile", 0, bin_pcre_compile, 1, 1, 0, "aimxs",  NULL),
--    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:b",    NULL),
-+    BUILTIN("pcre_match",   0, bin_pcre_match,   1, 1, 0, "A:a:v:n:bd",    NULL),
-     BUILTIN("pcre_study",   0, bin_pcre_study,   0, 0, 0, NULL,    NULL)
- };
- 
-diff --git a/Test/V07pcre.ztst b/Test/V07pcre.ztst
-index 027fea3aa..585698d05 100644
---- a/Test/V07pcre.ztst
-+++ b/Test/V07pcre.ztst
-@@ -196,3 +196,8 @@
- >  [package]=name-12345
- >  [version]=12345
- >)
-+
-+  pcre_compile 'cat(er(pillar)?)?'
-+  pcre_match -d 'the caterpillar catchment' && print $match
-+0:pcre_match -d
-+>caterpillar cater cat
--- 
-2.41.0
+2.42.0
 
diff --git a/0006-zsh-support-texinfo-7.0.patch b/0006-zsh-support-texinfo-7.0.patch
new file mode 100644
index 0000000..c68bd26
--- /dev/null
+++ 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
+
diff --git a/zsh.spec b/zsh.spec
index ebb19d9..6bd9360 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -19,10 +19,12 @@ Patch1: 0001-zsh-5.9-do-not-use-egrep-in-tests.patch
 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
+# upstream commit 1b421e4978440234fb73117c8505dad1ccc68d46
 Patch4: 0004-zsh-enable-PCRE-locale-switching.patch
-# upstream commits b62e911341c8ec7446378b477c47da4256053dc0...b4d1c756f50909b4a13e5c8fe5f26f71e9d54f63
+# upstream commit b62e911341c8ec7446378b477c47da4256053dc0 and 10bdbd8b5b0b43445aff23dcd412f25cf6aa328a
 Patch5: 0005-zsh-port-to-pcre2.patch
+# upstream commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
+Patch6: 0006-zsh-support-texinfo-7.0.patch
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -168,6 +170,10 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Tue Nov 21 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-10
+- fix FTBFS caused by texinfo 7.1
+- fix build of the PCRE module
+
 * Mon Aug 21 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-9
 - port to PCRE 2 (rhbz#1938979)
 

From 82b6281e8c2c5e61a9db8fc6510fc740e50c6be8 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 8 Dec 2023 21:54:47 +0100
Subject: [PATCH 29/45] Fix C compatibility issue in the configure script

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 zsh-configure-c99.patch | 44 +++++++++++++++++++++++++++++++++++++++++
 zsh.spec                |  6 +++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 zsh-configure-c99.patch

diff --git a/zsh-configure-c99.patch b/zsh-configure-c99.patch
new file mode 100644
index 0000000..c4b3623
--- /dev/null
+++ b/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
diff --git a/zsh.spec b/zsh.spec
index 6bd9360..87d0a7f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -25,6 +25,7 @@ Patch4: 0004-zsh-enable-PCRE-locale-switching.patch
 Patch5: 0005-zsh-port-to-pcre2.patch
 # upstream commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
 Patch6: 0006-zsh-support-texinfo-7.0.patch
+Patch7: zsh-configure-c99.patch
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -170,6 +171,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Dec  8 2023 Florian Weimer <fweimer@redhat.com> - 5.9-11
+- Fix C compatibility issue in the configure script
+
 * Tue Nov 21 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-10
 - fix FTBFS caused by texinfo 7.1
 - fix build of the PCRE module

From 44214321eec6a906288820cc8e2b1be4b588df23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Wed, 17 Jan 2024 14:05:37 +0100
Subject: [PATCH 30/45] fix segfault in delerefilelist

Resolves: rhbz#2245462
---
 ...-c99.patch => 0007-zsh-configure-c99.patch |  0
 0008-zsh-deletefilelist-segfault.patch        | 42 +++++++++++++++++++
 zsh.spec                                      | 10 ++++-
 3 files changed, 50 insertions(+), 2 deletions(-)
 rename zsh-configure-c99.patch => 0007-zsh-configure-c99.patch (100%)
 create mode 100644 0008-zsh-deletefilelist-segfault.patch

diff --git a/zsh-configure-c99.patch b/0007-zsh-configure-c99.patch
similarity index 100%
rename from zsh-configure-c99.patch
rename to 0007-zsh-configure-c99.patch
diff --git a/0008-zsh-deletefilelist-segfault.patch b/0008-zsh-deletefilelist-segfault.patch
new file mode 100644
index 0000000..8abaab1
--- /dev/null
+++ 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
+
diff --git a/zsh.spec b/zsh.spec
index 87d0a7f..56074a0 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -25,7 +25,10 @@ Patch4: 0004-zsh-enable-PCRE-locale-switching.patch
 Patch5: 0005-zsh-port-to-pcre2.patch
 # upstream commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
 Patch6: 0006-zsh-support-texinfo-7.0.patch
-Patch7: zsh-configure-c99.patch
+# upstream commit 4c89849c98172c951a9def3690e8647dae76308f
+Patch7: 0007-zsh-configure-c99.patch
+# upstream commit d3edf318306e37d2d96c4e4ea442d10207722e94
+Patch8: 0008-zsh-deletefilelist-segfault.patch
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -171,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Wed Jan 17 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-12
+- fix segfault in delerefilelist (rhbz#2245462)
+
 * Fri Dec  8 2023 Florian Weimer <fweimer@redhat.com> - 5.9-11
 - Fix C compatibility issue in the configure script
 

From aeaca3cd3607cbdd5cbfac2bcc762a2d94dbc060 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 11:17:42 +0000
Subject: [PATCH 31/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 56074a0..9d119b9 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -174,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jan 17 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-12
 - fix segfault in delerefilelist (rhbz#2245462)
 

From d2bb79226e2a0933a2f49360ecef4a4e6d0c5dcb Mon Sep 17 00:00:00 2001
From: Nate Leong <natthan@alumni.ubc.ca>
Date: Mon, 1 Apr 2024 01:30:04 +0000
Subject: [PATCH 32/45] Skip 'clear' if missing for zlogout.rhs

In the fedora:39 Docker image, the following occurs:

# logout
/etc/zlogout:7: command not found: clear
---
 zlogout.rhs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zlogout.rhs b/zlogout.rhs
index 3e78094..0d292de 100644
--- a/zlogout.rhs
+++ b/zlogout.rhs
@@ -4,4 +4,6 @@
 #
 #
 
-clear
+if command -v clear > /dev/null; then
+    clear
+fi
\ No newline at end of file

From ba0ada335bbfb3194a527228d013c89d1f0af174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Mon, 13 May 2024 10:57:14 +0200
Subject: [PATCH 33/45] Fix zlogout when ncurses is not installed

Resolves: rhbz#2279741
Fixes: d2bb79226e2a0933a2f49360ecef4a4e6d0c5dcb (Skip 'clear' if missing for zlogout.rhs)
---
 zlogout.rhs | 4 +---
 zsh.spec    | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zlogout.rhs b/zlogout.rhs
index 0d292de..600702c 100644
--- a/zlogout.rhs
+++ b/zlogout.rhs
@@ -4,6 +4,4 @@
 #
 #
 
-if command -v clear > /dev/null; then
-    clear
-fi
\ No newline at end of file
+command -v clear &> /dev/null && clear
diff --git a/zsh.spec b/zsh.spec
index 9d119b9..9a8fba3 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -174,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon May 13 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-14
+- fix zlogout when ncurses is not installed (rhbz#2279741)
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 10d8a438469aaa9a8b655f0d5dcd4b92b9270fd7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 10:57:13 +0000
Subject: [PATCH 34/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 9a8fba3..dc67b2e 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -174,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon May 13 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-14
 - fix zlogout when ncurses is not installed (rhbz#2279741)
 

From 1c5480cb7f074d86292e37ea71ad4f1324ca0bed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 16:52:32 +0000
Subject: [PATCH 35/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index dc67b2e..75665dc 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -174,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 631ad08bf20eecd23ab16a15d6e644f81a52b7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Fri, 11 Apr 2025 17:03:05 +0200
Subject: [PATCH 36/45] tests: remove dependency on Fedora shell tests

---
 .fmf/version    |  1 -
 plans/shell.fmf | 14 --------------
 2 files changed, 15 deletions(-)
 delete mode 100644 .fmf/version
 delete mode 100644 plans/shell.fmf

diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/plans/shell.fmf b/plans/shell.fmf
deleted file mode 100644
index bcc3572..0000000
--- a/plans/shell.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-summary:
-    Run relevant tests from the shell tests repository
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/shell
-    filter: component:zsh
-prepare:
-    how: install
-    package: zsh
-execute:
-    how: tmt
-environment:
-    PACKAGES: zsh
-    SH_BIN: zsh

From 62445c1b7d138d72109d0855677a4a5c7862a3e3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 21:20:56 +0000
Subject: [PATCH 37/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 75665dc..e55d65e 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -174,6 +174,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 43ef6c97ad83eb07df56def53a4b7e577d2e7bd8 Mon Sep 17 00:00:00 2001
From: Christoph Erhardt <fedora@sicherha.de>
Date: Mon, 29 Sep 2025 23:47:41 +0200
Subject: [PATCH 38/45] Add completion support for dnf5

---
 0009-zsh-support-dnf5.patch                   | 846 ++++++++++++++++++
 ...h-fix-dnf5-completion-with-rpm-files.patch |  19 +
 zsh.spec                                      |   9 +-
 3 files changed, 873 insertions(+), 1 deletion(-)
 create mode 100644 0009-zsh-support-dnf5.patch
 create mode 100644 0010-zsh-fix-dnf5-completion-with-rpm-files.patch

diff --git a/0009-zsh-support-dnf5.patch b/0009-zsh-support-dnf5.patch
new file mode 100644
index 0000000..8e55aa0
--- /dev/null
+++ b/0009-zsh-support-dnf5.patch
@@ -0,0 +1,846 @@
+commit b70b241cc5ca88cc129ff9ba14f8af2e889b90e6
+Author: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+Date:   Thu Nov 21 12:26:51 2024 +0900
+
+    53238 (+53239 Mikael): support dnf5
+    
+    some options etc for dnf4 are also updated
+
+diff --git a/Completion/Redhat/Command/_dnf b/Completion/Redhat/Command/_dnf
+index a5edf8564..c41795adf 100644
+--- a/Completion/Redhat/Command/_dnf
++++ b/Completion/Redhat/Command/_dnf
+@@ -1,7 +1,11 @@
+-#compdef dnf dnf-2 dnf-3
+-#
+-# based on dnf-4.2.18
+-#
++#compdef dnf dnf-2 dnf-3 dnf4
++# based on dnf-4.21.1
++
++# avoid 'dnf --version' since it's rather slow for dnf4
++if [[ $service = dnf && $commands[dnf]:P = */dnf5 ]]; then
++  _dnf5 "$@" && return 0
++  return 1
++fi
+ 
+ _dnf_helper() {
+   # Get the pathname of the python executable from the 1st line of dnf-2/dnf-3.
+@@ -68,25 +72,23 @@ _dnf_packages_or_rpms() {
+   fi
+ }
+ 
+-_dnf_groups_caching_policy() {
+-  # TODO: Are there any reliable ways to validate the cache?
+-  local -a newer=( "$1"(Nmw-1) )    # rebuild if more than a week old
+-  return $#newer
+-}
+-
+ _dnf_groups() {
+-  local package_groups update_policy expl
+-  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+-  if [[ -z "$update_policy" ]]; then
+-    zstyle ":completion:${curcontext}:" cache-policy _dnf_groups_caching_policy
+-  fi
+-  if _cache_invalid dnf-groups || ! _retrieve_cache dnf-groups; then
+-    # this can be very slow
+-    package_groups=( ${${${(M)${(f)"$(_call_program package-groups \
+-                     $service group list -v 2>/dev/null)"}:# *}#*\(}%\)*} )
+-    _store_cache dnf-groups package_groups
+-  fi
+-  _wanted package-groups expl 'package group' compadd "$@" -a package_groups
++  # optional option: -T (available|installed)
++  local selected line groups section=none
++  zparseopts -D -E - T:=selected
++  selected=$selected[2]
++  [[ -z $selected ]] && selected=all
++  # XXX hidden groups are not included.
++  # --installed and --available can't be specified with --hidden
++  for line in ${(f)"$(_call_program package-groups
++                      $service group list --$selected -qCv 2>/dev/null)"}; do
++    # a line for each group is of the following form:
++    # '  description of the group (group-id)'
++    if [[ $line = \ ##(#b)(*)\(([-_[:alnum:]]#)\) ]]; then
++      groups+=( "${match[2]}:${match[1]}" )
++    fi
++  done
++  _describe -t groups "$selected group" groups
+ }
+ 
+ _dnf_repoquery() {
+@@ -194,7 +196,7 @@ _dnf_repository_packages() {
+   fi
+ }
+ 
+-_dnf() {
++_dnf4() {
+   local cache_file="/var/cache/dnf/packages.db"
+   local -a opts=(
+     '(-6)-4[resolve to IPv4 addresses only]'
+@@ -226,7 +228,7 @@ _dnf() {
+     '*'{-x+,--exclude=}'[exclude specified packages]: : _sequence _dnf_packages -T all'
+     '--forcearch=[force the use of the specified arch]:arch: '
+     '(-)'{-h,--help}'[show the help message]'
+-    '--installroot=[set install root]:directory:_files -/'
++    '--installroot=[set install root]:directory:_files -/ -g "/*"'
+     '--newpackage[include newpackage relevant packages]'
+     '--noautoremove[disable removal of dependencies that are no longer used]'
+     '--nobest[do not limit transactions to best candidates]'
+@@ -289,18 +291,21 @@ _dnf_command() {
+   if (( CURRENT == 1 )); then
+     _describe -t dnf-commands 'dnf command' dnf_cmds
+   else
+-    local curcontext=$curcontext cur=$words[CURRENT] cmd tmp expl ret=1
++    local cur=$words[CURRENT] cmd=$words[1] tmp expl ret=1
+     # Deal with aliases (not comprehensive)
+-    case $words[1] in
++    case $cmd in
+       check-updgrade) cmd=check-update;;
+       distrosync|dsync) cmd=distro-sync;;
+       dg) cmd=downgrade;;
++      dsync) cmd=distro-sync;;
+       erase|rm) cmd=remove;;
+       groups|grp) cmd=group;;
+       hist) cmd=history;;
+       in) cmd=install;;
++      if) cmd=info;;
++      ls) cmd=list;;
+       mc) cmd=makecache;;
+-      prov|whatprovides) cmd=provides;;
++      prov|whatprovides|wp) cmd=provides;;
+       rei) cmd=reinstall;;
+       repoinfo) cmd=repolist;;
+       rq) cmd=repoquery;;
+@@ -308,9 +313,9 @@ _dnf_command() {
+       sh) cmd=shell;;
+       update|up) cmd=upgrade;;
+       update-minimal|up-min) cmd=upgrade-minimal;;
+-      *) cmd="${${dnf_cmds[(r)$words[1]:*]%%:*}}";;
++      upif) cmd=updateinfo;;
+     esac
+-    (( $#cmd )) && curcontext="${curcontext%:*:*}:dnf-${cmd}:"
++    local curcontext="${curcontext%:*:*}:dnf-${cmd}:"
+ 
+     case $cmd in
+       alias)
+@@ -337,11 +342,9 @@ _dnf_command() {
+         _describe -t options 'option' tmp && ret=0
+         ;;
+       check-update)
+-        if [[ $cur = -* ]]; then
+-          _wanted options expl 'option' compadd - --changelogs && ret=0
+-        else
+-          _dnf_packages -T installed && ret=0
+-        fi
++        _arguments : \
++          '--changelogs[also print changelog delta of packages]' \
++          '*: :_dnf_packages -T installed' && ret=0
+         ;;
+       clean)
+         tmp=(
+@@ -368,23 +371,38 @@ _dnf_command() {
+             "mark:mark a group for installation or removal"
+           )
+           _describe -t subcommands 'subcommand' tmp && ret=0
+-        elif (( CURRENT == 3 )) && [[ $cur = -* ]]; then
+-          if [[ $words[2] == install ]]; then
+-            _wanted options expl 'option' compadd - --with-optional && ret=0
+-          elif [[ $words[2] == list ]]; then
+-            tmp=(
+-              '--available:show only available groups'
+-              '--installed:show only installed groups'
+-              '--hidden:show also hidden groups'
+-              '--ids:show also ID of groups'
+-            )
+-            _describe -t options 'option' tmp && ret=0
+-          fi
+-        elif (( CURRENT == 3 )) && [[ $words[2] == mark ]]; then
+-          _wanted subcommands expl 'subcommand' \
+-                  compadd - install remove && ret=0
+         else
+-          _dnf_groups && ret=0
++          case $words[2] in
++            summary)
++              _arguments : '--hidden' '2: :_dnf_groups' && ret=0
++              ;;
++            info)
++              _dnf_groups && ret=0
++              ;;
++            install)
++              _arguments : '--with-optional[also include optional packages]' \
++                            '*: :_dnf_groups -T available' && ret=0
++              ;;
++            list)
++              _arguments : \
++                '(--installed)--available[show only available groups]' \
++                '(--available)--installed[show only installed groups]' \
++                '--hidden[show also hidden groups]' \
++                {--ids,-v}'[show also ID of groups]' \
++                '*: :_dnf_groups' && ret=0
++              ;;
++            remove|upgrade)
++              _dnf_groups -T installed && ret=0
++              ;;
++            mark)
++              if (( CURRENT == 3 )); then
++                _wanted subcommands expl 'subcommand' \
++                        compadd - install remove && ret=0
++              else
++                _dnf_groups && ret=0
++              fi
++              ;;
++          esac
+         fi
+         ;;
+       help)
+@@ -399,13 +417,32 @@ _dnf_command() {
+             "list:list transactions"
+             "info:describe the given transactions"
+             "redo:repeat the specified transaction"
++            "replay:replay transaction stored in the specified file"
+             "rollback:undo all since the given transaction"
++            "store:store the specified transaction in file"
+             "undo:undo transactions"
+             "userinstalled:list all packages installed by users"
+           )
+           _describe -t subcommands 'subcommand' tmp && ret=0
+-        elif [[ $words[2] != userinstalled ]]; then
+-          _message 'transaction' && ret=0
++        else
++          case $words[2] in
++            list)
++              _arguments : '--reverse[output history in reverse order]' \
++                '*:transaction ID or ID..ID: ' && ret=0 ;;
++            info)
++              _message 'transaction ID or ID..ID' && ret=0 ;;
++            redo|rollback|undo)
++              _message 'transaction or package' && ret=0 ;;
++            replay)
++              _arguments : \
++                "--ignore-installed[don't check for installed packages being in the same state as recorded in transaction]" \
++                "--ignore-extras[don't check for extra packages pulled into the transaction on the target system]" \
++                '--skip-unavailable[skip packages that are in transaction but not in target system]' \
++                '2:transaction file:_files' && ret=0 ;;
++            store)
++              _arguments : {-o+,--output=}'[store in specified file]: :_files' \
++                          '2:transaction: ' && ret=0 ;;
++          esac
+         fi
+         ;;
+       info|list)
+@@ -413,7 +450,7 @@ _dnf_command() {
+           if [[ $cur = -* ]]; then
+             tmp=( --all --available --installed --extras
+                   --obsoletes --upgrades --autoremove --recent )
+-            _wanted options expl 'option' compadd -a tmp
++            _wanted options expl 'option' compadd -a tmp && ret=0
+           else
+             _dnf_packages -T all && ret=0
+           fi
+@@ -449,6 +486,7 @@ _dnf_command() {
+           tmp=(
+             'install:install a module profile including its packages'
+             'update:update packages associated with an active module stream'
++            'switch-to:switch to a module stream and change versions of installed packages'
+             'remove:remove installed module profiles and their packages'
+             'enable:enable a module stream'
+             'disable:disable a module with all its streams'
+@@ -502,7 +540,7 @@ _dnf_command() {
+         _dnf_repoquery && ret=0
+         ;;
+       repository-packages)
+-        _dnf_repository_packages
++        _dnf_repository_packages && ret=0
+         ;;
+       search)
+         if [[ $cur = -* ]]; then
+@@ -531,6 +569,7 @@ _dnf_command() {
+           '--list[display list of advisories]'
+           '--info[display detailed information of advisories]'
+           + '(availability)'
++          '-all[include advisories about any versions of installed packages]'
+           '--available[limit to advisories about newer versions of installed packages]'
+           '--installed[limit to advisories about equal or older versions of installed packages]'
+           '--updates[limit to advisories about newer and available versions of installed packages]'
+@@ -548,4 +587,4 @@ _dnf_command() {
+   fi
+ }
+ 
+-_dnf "$@"
++_dnf4 "$@"
+diff --git a/Completion/Redhat/Command/_dnf5 b/Completion/Redhat/Command/_dnf5
+new file mode 100644
+index 000000000..e194dd5a7
+--- /dev/null
++++ b/Completion/Redhat/Command/_dnf5
+@@ -0,0 +1,570 @@
++#compdef dnf5
++# based on dnf-5.2.6.2
++
++# utility functions
++
++_dnf5_helper() {
++  _call_program specs $service "${(q-)@}" "${(q-)PREFIX}\*" \
++        -qC --assumeno --nogpgcheck 2>/dev/null </dev/null
++}
++
++_dnf5_repositories() {
++  # required option: -T (all|disabled|enabled)
++  local selected expl
++  zparseopts -D -E - T:=selected
++  selected=$selected[2]
++  _wanted $selected-repositories expl "$selected repository" \
++    compadd "$@" - "${(@)${(f)$(_dnf5_helper repo list --$selected)}[2,-1]%% *}"
++}
++
++_dnf5_packages() {
++  # required option: -T (all|available|installed|upgradable)
++  local selected opt expl
++  zparseopts -D -E - T:=selected
++  selected=$selected[2]
++  case $selected in
++    all)        opt='' ;;   # option --all does not exist
++    upgradable) opt='--upgrades' ;;
++    *)          opt="--$selected" ;;
++  esac
++  _wanted $selected-packages expl "$selected package" \
++    compadd "$@" - $(_dnf5_helper repoquery $opt --qf='%{name} ')
++}
++
++_dnf5_rpm_files() {
++  local expl
++  _wanted rpm-files expl 'rpm file' _files -g '(#i)*.rpm(-.)'
++}
++
++_dnf5_packages_or_rpms() {
++  if [[ "$words[CURRENT]" = (*/*|\~*) ]]; then # if looks like a path name
++    _dnf_rpm_files
++  else
++    _dnf5_packages "$@"
++  fi
++}
++
++_dnf5_groups() {
++  # optional option: -T (available|installed)
++  local update_policy selected line pat groups
++  zparseopts -D -E - T:=selected
++  selected=$selected[2]
++  if [[ -z $selected ]]; then
++    selected=all
++    opt=  # option --all does not exist
++  else
++    opt=--$selected
++  fi
++  # XXX hidden groups are not included
++  for line in ${${(f)"$(_dnf5_helper group list $opt)"}[2,-1]}; do
++    line=( ${(z)line} )
++    groups+=( "$line[1]:$line[2,-2]" )
++  done
++  _describe -t $selected-groups "$selected group" groups
++}
++
++_dnf5_environments() {
++  local line envs
++  for line in ${${(f)"$(_dnf5_helper environment list)"}[2,-1]}; do
++    line=( ${(z)line} )
++    envs+=( "$line[1]:$line[2,-2]" )
++  done
++  _describe -t environments 'environment' envs
++}
++
++# completers for (several) dnf commands
++
++_dnf5-advisory () {
++  _arguments : \
++    $advisory_opts \
++    '--contains-pkgs=[only show advisories containing specified packages]: : _sequence _dnf5_packages -T installed' \
++    + '(with)' \
++    '--with-cve[show only advisories referencing CVE ticket]' \
++    '--with-bz[show only advisories referencing Bugzilla ticket]' \
++    + '(type)' \
++    '--all[show all advisories]' \
++    '--available[show advisories containing newer versions of installed packages (default)]' \
++    '--installed[show advisories containing equal and older version of installed packages]' \
++    '--updates[show advisories containing upgradable packages]' \
++    + args \
++    ':subcommand:(list info summary)' '*:advisory spec:'
++}
++
++_dnf5-group() {
++  local -a tmp
++  if (( CURRENT == 2 )); then
++    tmp=(
++      'list:list all matching groups'
++      'info:print detailed information about groups'
++      'install:install packages from specified groups'
++      'remove:remove removable packages in specified groups'
++      'upgrade:upgrade specified groups and packages in them'
++    )
++    _describe -t subcommands 'subcommand' tmp
++  else
++    case $words[2] in
++      list|info)
++        tmp=(
++          '(--installed)--available[show only available groups]'
++          '(--available)--installed[show only installed groups]'
++          '--hidden[show also hidden groups]'
++          '--contains-pkgs=[show only groups containing specified packages]: : _sequence _dnf5_packages -T all'
++          '*: : _dnf5_groups'
++        )
++        ;;
++      install)
++        tmp=( $common_opts
++              '--with-optional[include optional packages from the groups]'
++              '*: : _dnf5_groups -T available' )
++        ;|
++      upgrade)
++        tmp=( ${common_opts:#--skip-broken*}
++              '*: : _dnf5_groups -T installed' )
++        ;|
++      remove)
++        tmp=( $offline_opts
++              '*: : _dnf5_groups -T installed' )
++        ;|
++      install|remove)
++        tmp+=( '--no-packages[operate on groups only, not manipulate any packages]' )
++        ;|
++      install|upgrade)
++        tmp+=( $downgrade_opts )
++        ;;
++    esac
++    _arguments : $tmp
++  fi
++}
++
++_dnf5-history() {
++  local -a tmp
++  if (( CURRENT == 2 )); then
++    tmp=(
++      'list:list info about recorded transactions'
++      'info:print detailed about specific transactions'
++      'undo:revert all actions from the specified transaction'
++      'redo:repeat the specified transaction'
++      'rollback:undo all transactions performed after the specified transaction'
++      'store:store the transaction into a directory'
++    )
++    _describe -t subcommands 'subcommand' tmp
++  else
++    case $words[2] in
++      list|info)
++        tmp=( '--reverse[reverse the order of transactions in output]' )
++        ;;
++      undo|rollback|redo)
++        tmp=( '--skip-unavailable[allow skipping impossible actions]' )
++        ;|
++      undo|rollback)
++        tmp+=( $replay_opts )
++        ;;
++      store)
++        tmp=( {-o,--output=}'[directory for storing the transaction (default ./transaction)]: : _directories')
++    esac
++    _arguments : $tmp '2:transaction:( )'
++  fi
++}
++
++_dnf5-mark() {
++  local -a tmp
++  if (( CURRENT == 2 )); then
++    tmp=(
++      'user:mark the package as user-installed'
++      'dependency:mark the package as a dependency'
++      'weak:mark the package as a weak dependency'
++      'group:mark the package as installed by the specified group'
++    )
++    _describe -t subcommands 'subcommand' tmp
++  else
++    tmp=(
++      '--skip-unavailable[skip packages not installed on the system]'
++      '--store=[store the transaction in specified directory]: : _directories'
++    )
++    if [[ $words[2] = group ]]; then
++        tmp+=( '2:group-id: _dnf5_groups -T installed' )
++    fi
++    _arguments : $tmp '*: : _dnf5_packages -T installed'
++  fi
++}
++
++_dnf5-module() {
++  local -a tmp
++  if (( CURRENT == 2 )); then
++    tmp=(
++      'list:list module streams'
++      'info:print details about module streams'
++      'enable:enable module streams'
++      'disable:disable modules including all their streams'
++      "reset:reset module state so it's no longer enabled or disabled"
++    )
++    _describe -t subcommands 'subcommand' tmp
++  elif (( CURRENT == 3 )) && [[ $cur = -* ]]; then
++    case $words[2] in
++      list|info) tmp=( --enabled --disabled ) ;;
++      enable)    tmp=( --skip-broken --skip-unavailable ) ;;
++      *)         tmp=( --skip-unavailable ) ;;
++    esac
++    _wanted options expl 'option' compadd -a tmp
++  else
++    _message 'module spec'
++  fi
++}
++
++_dnf5-offline() {  # also used by the 'system-upgrade' command
++  local -a tmp
++  if (( CURRENT == 2 )); then
++    tmp=(
++      'clean:remove any stored offline transactions and cached packages'
++      'log:list boots during which offline transaction was attempted'
++      'reboot:prepare the system for offline transaction and reboot'
++    )
++    if [[ $cmd = offline ]]; then
++      tmp+=( 'status:show status of the current offline transaction' )
++    else
++      tmp+=( 'download:download all packages needed for upgrade' )
++    fi
++    _describe -t subcommands 'subcommand' tmp && ret=0
++  else
++    case $words[2] in
++      download)
++        _arguments : \
++          '--releasever=[the version to upgrade to]:version number:' \
++          '--no-downgrade:do not install packages older than currently installed' '*: :' && ret=0
++        ;;
++      log)
++        _arguments : \
++          '--number=[show log of transaction specified by number]:transaction number:' '*: :' && ret=0
++        ;;
++      reboot)
++        _wanted options expl 'option' compadd -- --poweroff && ret=0
++        ;;
++    esac
++  fi
++}
++
++_dnf5-repoquery() {
++  local v
++  local -a opts=(
++    $advisory_opts
++    '--arch=[limit results to specified architectures]:list of archs: '
++    '--available[limit results to available packages]'
++    '--disable-modular-filtering[include packages of inactive module streams]'
++    '--duplicates[limit to installed duplicate packages]'
++    '--exactdeps[limit to packages that require capability specified by ==what{requires,depends}]'
++    '--extras[limit to installed packages that are not present in any available repository]'
++    '--file=[limit results to packages which own specified file]:list of files: _sequence _files'
++    '--installed[query installed packages]'
++    '--installonly[limit to installed installonly packages]'
++    '--latest-limit=[limit to latest packages of specified number]:number:'
++    '--leaves[limit to groups of installed packages not required by other installed packages]'
++    '--providers-of=[select packages that provide specified attribute]:attribute:(conflicts depends enhances obsoletes provides recommends requires requires_pre suggests supplement)'
++    '--recent[limit to only recently changed packages]'
++    '--recursive[make --whatrequires/--providers-of work recursively]'
++    '--security[limit to packages in security advisories]'
++    '--srpm[use the corresponding source RPM]'
++    '--unneeded[limit to unneeded installed packages]'
++    '--upgrades[limit to available packages that provide upgrade for installed packages]'
++    '--userinstalled[limit to packages that are not installed as dependencies]'
++    '--whatdepends=[limit to packages that require, enhance, recommend, suggest of supplement specified capability]:list of capability:'
++    '--whatconflicts=[limit to packages that conflicts with specified capabilities]:list of capability: '
++  )
++  for v in enhance obsolete provide recommend require suggest supplement; do
++    opts+=( "--what${v}s=[limit to packages that $v specified capabilities]:list of capability: ")
++  done
++  # mutually exclusive formating options
++  opts+=(
++    + '(format)'
++    '--conflicts[display capabilities that the package conflicts with]'
++    '--depends[display capabilities that the package depends on, enables, recommends, suggests or supplements]'
++    '--files[show files in the package]'
++    '--requires-pre[display capabilities required to run pre/post scripts of the package]'
++    '--sourcerpm[display source RPM of the package]'
++    '--location[display location of the package]'
++    '--info[show detailed information about the package]'
++    '--changelogs[print the package changelogs]'
++    '(- *)--querytags[list tags recognized by --queryformat]'
++    '--queryformat=[specify output format]:format:'
++  )
++  for v in enhance obsolete provide recommend require suggest supplement; do
++    opts+=( "--${v}s[display capabilities ${v}ed by the package]" )
++  done
++
++  _arguments : '*: : _dnf5_packages -T all' $opts
++}
++
++# dnf commands
++
++_dnf5_commands() {
++  local -a dnf_cmds=(
++    'advisory:manage advisories'
++    'autoremove:remove unneeded packages'
++    'check:check for problems in package database'
++    'check-upgrade:check for available package upgrades'
++    'clean:remove or invalidate cached data'
++    'distro-sync:up/downgrade installed packages to the latest available'
++    'downgrade:downgrade packages'
++    'download:download packages'
++    'environment:manage comps environments'
++    'group:manage comps groups'
++    'history:manage transaction history'
++    'info:provide detailed information about packages'
++    'install:install packages'
++    'leaves:list groups of leaf packages'
++    'list:list installed or available packages'
++    'makecache:generate the metadata cache'
++    'mark:change the reason of an installed package'
++    'module:manage modules'
++    'offline:manage offline transactions'
++    'provides:find what package provides the given value'
++    'reinstall:reinstall packages'
++    'remove:remove packages'
++    'replay:replay stored transactions'
++    'repo:manage repositories'
++    'repoquery:search for packages in repositories'
++    'search:search for packages using keywords'
++    'swap:remove software and install another in the single transaction'
++    'system-upgrade:upgrade the system to a new major release'
++    'upgrade:upgrade packages'
++    'versionlock:protect packages from updates to newer versions'
++  )
++  _describe -t dnf-commands 'dnf command' dnf_cmds
++}
++
++# subcommands and options
++
++_dnf5_subcmds_opts() {
++  local cur=$words[CURRENT] cmd=$words[1] expl ret=1
++  local -a tmp
++  # common options
++  local -a offline_opts=(
++    '(--store)--offline[store the transaction to be performed offline]'
++    '(--offline)--store=[store the transaction in specified directory]: : _directories'
++  )
++  local -a common_opts=(
++    $offline_opts
++    '--allowerasing[allow erasing of installed packages]'
++    '--skip-broken[resolve dependency problems by skipping problematic packages]'
++    "--skip-unavailable[skip packages that can't be synchronized]"
++    '--downloadonly[download packages without executing transaction]'
++  )
++  local -a advisory_opts=(
++    '--advisories=[consider only specified advisories]:list of advisories:'
++    '--advisory-severities=[limit to advisories with specified severity]:severity:_sequence compadd - critical important moderate low none'
++    '--bzs=[limit to advisories that fix specified Bugzilla ID]:list of Bugzilla ID:'
++    '--cves=[limit to advisories that fix specified CVE ID]:list of CVD ID]:'
++    '--security[limit to security advisories]'
++    '--bugfix[limit to bugfix advisories]'
++    '--enhancement[limit to enhancement advisories]'
++    '--newpackage[limit to newpackage advisories]'
++  )
++  local -a downgrade_opts=(
++    '(--no-allow-downgrade)--allow-downgrade[enable downgrade of dependencies]'
++    '(--allow-downgrade)--no-allow-downgrade[disable downgrade of dependencies]'
++  )
++  local -a replay_opts=(
++    '--ignore-extras[not consider extra packages]'
++    '--ignore-installed[mismatches between installed and stored transaction are not errors]'
++  )
++  # Deal with some aliases (not comprehensive)
++  case $cmd in
++    check-updgrade) cmd=check-update;;
++    dg) cmd=downgrade;;
++    dsync) cmd=distro-sync;;
++    grp) cmd=group;;
++    if) cmd=info;;
++    in) cmd=install;;
++    ls) cmd=list;;
++    mc) cmd=makecache;;
++    rei) cmd=reinstall;;
++    rm) cmd=remove ;;
++    rq) cmd=repoquery;;
++    se) cmd=search;;
++    update|up) cmd=upgrade;;
++  esac
++  local curcontext="${curcontext%:*:*}:dnf-${cmd}:"
++
++  case $cmd in
++    advisory|group|history|mark|module|offline|repoquery)
++      _dnf5-$cmd && ret=0
++      ;;
++    system-upgrade)
++      _dnf5-offline && ret=0
++      ;;
++    autoremove)
++      _arguments : $offline_opts && ret=0
++      ;;
++    check)
++      _arguments : \
++        '--dependencies[show missing dependencies and conflicts]' \
++        '--duplicates[show duplicated packages]' \
++        '--obsoleted[show obsoleted packages]' && ret=0
++      ;;
++    check-upgrade)
++      _arguments : \
++        $advisory_opts \
++        '--changelogs[print package changelogs]' \
++        '--minimal[reports the lowest versions of packages that fix advisories]' \
++        '*: : _dnf5_packages -T installed' && ret=0
++      ;;
++    clean)
++      tmp=(
++        'dbcache:remove cache files generated from the repository metadata'
++        'expire-cache:mark the repository metadata expired'
++        'metadata:remove the repository metadata'
++        'packages:remove any cached packages'
++        'all:clean all'
++      )
++      _describe -t cache-types 'cache type' tmp && ret=0
++      ;;
++    distro-sync)
++      _arguments : $common_opts '*: : _dnf5_packages -T installed' && ret=0
++      ;;
++    downgrade)
++      _arguments : \
++        $common_opts $downgrade_opts \
++        '*: : _dnf5_packages -T installed' && ret=0
++      ;;
++    download)
++      _arguments : \
++        '--arch=[limit to packages of specified architecture]:list of architectures:' \
++        '--resolve[resolve and download needed dependencies]' \
++        '--alldeps[with --resolve, also download already installed dependencies]' \
++        '--destdir=[download to the specified directory]: : _directories' \
++        '--srpm[download the source rpm]' \
++        '--url[print the list of URLs where the rpms can be downloaded]' \
++        '*--urlprotocol=[with --url, limit to specified protocols]:protocol:_sequence compadd - http https ftp file' \
++        '*: : _dnf5_packages -T all' && ret=0
++      ;;
++    environment)
++      _arguments : \
++        '--available[show only available environments]' \
++        '--installed[show only installed environments]' \
++        ':subcommand:(list info)' \
++        '*: : _dnf5_environments' && ret=0
++      ;;
++    info|list)
++      _arguments : \
++        '--showduplicates[show all versions of the packages]' \
++        '*: : _dnf5_packages -T all' \
++        + '(type)' \
++        '--installed[list only installed packages]:*: : _dnf5_packages -T installed' \
++        '--available[list only available packages]:*: : _dnf5_packages -T available' \
++        '--extras[list only extras]' \
++        '--obsoletes[list only installed but obsoleted packages]:*: : _dnf5_packages -T installed' \
++        '--recent[list only recently added packages]' \
++        '--upgrades[list only available upgrades of installed packages]:*: : _dnf5_packages -T upgradable' \
++        '--autoremove[list only packages that will be autoremoved]:*: : _dnf5_packages -T installed' &&ret=0
++      ;;
++    install)
++      _arguments : \
++        $common_opts $downgrade_opts $advisory_opts \
++        '*: : _dnf5_packages_or_rpms -T available' && ret=0
++      ;;
++    leaves|makecache)
++      # nothing to complete
++      ;;
++    provides)
++      _files && ret=0
++      ;;
++    reinstall)
++      _arguments : \
++        $common_opts $downgrade_opts \
++        '*: : _dnf5_packages_or_rpms -T installed' && ret=0
++      ;;
++    remove)
++      _arguments : \
++        $offline_opts \
++        '--no-autoremove[not remove dependencies that are no longer used]' \
++        '*: : _dnf5_packages -T installed' && ret=0
++      ;;
++    replay)
++      _arguments : \
++        $replay_opts \
++        ':transaction path:_directories' && ret=0
++      ;;
++    repo)
++      _arguments : \
++        '--all[show info about all repositories]' \
++        '--enabled[show info only about enabled repositories]' \
++        '--disabled[show info only about disabled repositories]' \
++        ':subcommand:(list info)' && ret=0
++      ;;
++    search)
++      _arguments : \
++        '--all[search patterns also inside description and URL fields]' \
++        '--showduplicates[show all versions of packages, not only the latest ones]' \
++        '*:search pattern:' && ret=0
++      ;;
++    swap)
++      _arguments : \
++        $offline_opts \
++        '--allowerasing[allow erasing of installed packages]' \
++        ': : _dnf5_packages -T installed' \
++        ': : _dnf5_packages -T available' && ret=0
++      ;;
++    upgrade)
++      _arguments : \
++        ${common_opts:#--skip-broken*} $downgrade_opts $advisory_opts \
++        '--minimal[upgrade only to the lowest available versions that fix advisories]' \
++        '--destdir=[specify directory into which downloading packages]: : _directories' \
++      '*: : _dnf5_packages_or_rpms -T upgradable' && ret=0
++      ;;
++    versionlock)
++      _arguments : \
++        ':subcommand:(add exclude clear delete list)' \
++        '*: : _dnf5_packages -T all' && ret=0
++      ;;
++  esac
++  return ret
++}
++
++# main completer
++
++_dnf5() {
++  local curcontext="$curcontext" state state_descr line ret=1
++  typeset -A opt_args
++  local -a opts=(
++    '(-y --assumeyes)--assumeno[answer no for all questions]'
++    '--best[try the best available package version]'
++    '(-C --cacheonly)'{-C,--cacheonly}"[run entirely from system cache, don't update cache]"
++    '--comment=[add comment to transaction history]:comment:'
++    '(-c --config)'{-c+,--config=}'[specify configuration file]:config file:_files'
++    '--debugsolver[dump detailed solving results in file ./debugdata]'
++    '*--disable-plugin=[disable specified plugins]:list of plugin names:'
++    '(--repo)*--disable-repo=[disable specified repos]: : _sequence _dnf5_repositories -T enabled'
++    '--dump-main-config[print main configuration values to stdout]'
++    '*--dump-repo-config=[print repository configuration values to stdout]:repi id'
++    '--dump-variables[print variable values to stdout]'
++    '*--enable-plugin=[enable specified plugins]:list of plugin names:'
++    '*--enable-repo=[enable additional repos]: : _sequence _dnf5_repositories -T disabled'
++    '--forcearch=[force the use of the specified arch]:arch:'
++    '(-)'{-h,--help}'[show the help message]'
++    '--installroot=[set install root]: : _directories'
++    '--no-best[do not limit transactions to best candidates]'
++    '--no-docs[do not install documentation]'
++    '--no-gpgcheck[skip checking GPG signatures on packages]'
++    '--no-plugins[disable all plugins]'
++    '(-q --quiet)'{-q,--quiet}'[show just the relevant content]'
++    '--refresh[force refreshing metadata before running the command]'
++    '--releasever=[override distribution release in config files]:release ver:'
++    '(--disablerepo)*--repo=[enable just the specified repo]: : _sequence _dnf5_repositories -T all'
++    '*--repofrompath=[specify additional repos]:repository_label,path_or_url: '
++    '*--setopt=[override option in config file]:repoid.option=value:'
++    '*--setvar=[override DNF5 variable value]'
++    '--show-new-leaves[show newly installed leaf packages]'
++    '--use-host-config[use config files and variables from host system]'
++    '(- *)--version[show dnf version]'
++    '(-y --assumeyes --assumeno)'{-y,--assumeyes}'[answer yes for all questions]'
++    '*'{-x+,--exclude=}'[exclude specified packages from transaction]: : _sequence _dnf5_packages -T all'
++  )
++  _arguments -C -s : $opts ': :->command' '*:: :->cmd_args' && ret=0
++
++  case $state in
++    command) _dnf5_commands && ret=0 ;;
++    cmd_args) _dnf5_subcmds_opts && ret=0 ;;
++  esac
++  return ret
++}
++
++_dnf5 "$@"
diff --git a/0010-zsh-fix-dnf5-completion-with-rpm-files.patch b/0010-zsh-fix-dnf5-completion-with-rpm-files.patch
new file mode 100644
index 0000000..eacb810
--- /dev/null
+++ b/0010-zsh-fix-dnf5-completion-with-rpm-files.patch
@@ -0,0 +1,19 @@
+commit 071e325c826a89b792056c3faf0c400b8c0c5738
+Author: Christoph Erhardt <christoph.erhardt@sicherha.de>
+Date:   Tue Sep 30 08:47:15 2025 +0900
+
+    53981: _dnf5: fix completion of local rpm files
+
+diff --git a/Completion/Redhat/Command/_dnf5 b/Completion/Redhat/Command/_dnf5
+index e194dd5a7..9cbf451a8 100644
+--- a/Completion/Redhat/Command/_dnf5
++++ b/Completion/Redhat/Command/_dnf5
+@@ -38,7 +38,7 @@ _dnf5_rpm_files() {
+ 
+ _dnf5_packages_or_rpms() {
+   if [[ "$words[CURRENT]" = (*/*|\~*) ]]; then # if looks like a path name
+-    _dnf_rpm_files
++    _dnf5_rpm_files
+   else
+     _dnf5_packages "$@"
+   fi
diff --git a/zsh.spec b/zsh.spec
index e55d65e..bb25350 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -29,6 +29,10 @@ Patch6: 0006-zsh-support-texinfo-7.0.patch
 Patch7: 0007-zsh-configure-c99.patch
 # upstream commit d3edf318306e37d2d96c4e4ea442d10207722e94
 Patch8: 0008-zsh-deletefilelist-segfault.patch
+# upstream commit b70b241cc5ca88cc129ff9ba14f8af2e889b90e6
+Patch9: 0009-zsh-support-dnf5.patch
+# upstream commit 071e325c826a89b792056c3faf0c400b8c0c5738
+Patch10: 0010-zsh-fix-dnf5-completion-with-rpm-files.patch
 
 BuildRequires: autoconf
 BuildRequires: coreutils
@@ -174,6 +178,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Sep 29 2025 Christoph Erhardt <fedora@sicherha.de> - 5.9-18
+- Add completion support for dnf5
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 43281b3111b29c042423348dc8cc3d9ccdb79dfc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 21:11:08 +0000
Subject: [PATCH 39/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index bb25350..7effffd 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -178,6 +178,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Mon Sep 29 2025 Christoph Erhardt <fedora@sicherha.de> - 5.9-18
 - Add completion support for dnf5
 

From fed92fd5ffc7b4dee6c43da259e7d8414948582a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 24 Mar 2026 10:31:08 +0100
Subject: [PATCH 40/45] fix segfault in _IO_putc

Resolves: rhbz#2449939
---
 0100-zsh-_IO_putc-SIGSEGV.patch | 25 +++++++++++++++++++++++++
 zsh.spec                        |  9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 0100-zsh-_IO_putc-SIGSEGV.patch

diff --git a/0100-zsh-_IO_putc-SIGSEGV.patch b/0100-zsh-_IO_putc-SIGSEGV.patch
new file mode 100644
index 0000000..3adf849
--- /dev/null
+++ b/0100-zsh-_IO_putc-SIGSEGV.patch
@@ -0,0 +1,25 @@
+diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
+index 8f32c68e3..bd4a67cee 100644
+--- a/Src/Zle/zle_tricky.c
++++ b/Src/Zle/zle_tricky.c
+@@ -2490,15 +2490,17 @@ printfmt(char *fmt, int n, int dopr, int doesc)
+ 			    p--;
+ 		    } else
+ 			atr = match_colour(NULL, is_fg, arg);
+-		    if (atr != TXT_ERROR)
++		    if (atr != TXT_ERROR && dopr)
+ 			set_colour_attribute(atr, is_fg ? COL_SEQ_FG :
+ 					     COL_SEQ_BG, 0);
+ 		    break;
+ 		case 'f':
+-		    set_colour_attribute(TXTNOFGCOLOUR, COL_SEQ_FG, 0);
++		    if (dopr)
++			set_colour_attribute(TXTNOFGCOLOUR, COL_SEQ_FG, 0);
+ 		    break;
+ 		case 'k':
+-		    set_colour_attribute(TXTNOBGCOLOUR, COL_SEQ_BG, 0);
++		    if (dopr)
++			set_colour_attribute(TXTNOBGCOLOUR, COL_SEQ_BG, 0);
+ 		    break;
+ 		case '{':
+ 		    if (arg)
diff --git a/zsh.spec b/zsh.spec
index 7effffd..3598f05 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -34,6 +34,10 @@ Patch9: 0009-zsh-support-dnf5.patch
 # upstream commit 071e325c826a89b792056c3faf0c400b8c0c5738
 Patch10: 0010-zsh-fix-dnf5-completion-with-rpm-files.patch
 
+# downstream patch for rhbz#2449939
+# already fixed upstream in a major refactor of term color attribute handling
+Patch100: 0100-zsh-_IO_putc-SIGSEGV.patch
+
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -178,6 +182,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Tue Mar 24 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-20
+- fix segfault in _IO_putc (rhbz#2449939)
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.9-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

From ea51b5077a648a0831e45417590ca44eb1727444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Tue, 24 Mar 2026 10:31:31 +0100
Subject: [PATCH 41/45] Fix typo in changelog

---
 zsh.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index 3598f05..82a14a3 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -207,7 +207,7 @@ fi
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
 * Wed Jan 17 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-12
-- fix segfault in delerefilelist (rhbz#2245462)
+- fix segfault in deletefilelist (rhbz#2245462)
 
 * Fri Dec  8 2023 Florian Weimer <fweimer@redhat.com> - 5.9-11
 - Fix C compatibility issue in the configure script

From 95be2e37b5c0d1282c249ef938f11ab5dc470d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Thu, 4 Jun 2026 11:03:21 +0200
Subject: [PATCH 42/45] rebase to the latest upstream release

Resolves: rhbz#2483668
---
 0001-zsh-5.9-do-not-use-egrep-in-tests.patch  | 178 ----
 0002-zsh-Use-int-main-in-test-c-codes.patch   | 541 -----------
 0004-zsh-enable-PCRE-locale-switching.patch   |  64 --
 0005-zsh-port-to-pcre2.patch                  | 641 -------------
 0006-zsh-support-texinfo-7.0.patch            |  53 --
 0007-zsh-configure-c99.patch                  |  44 -
 0008-zsh-deletefilelist-segfault.patch        |  42 -
 0009-zsh-support-dnf5.patch                   | 846 ------------------
 ...h-fix-dnf5-completion-with-rpm-files.patch |  19 -
 sources                                       |   4 +-
 zsh-keyring.asc                               | 269 ++++++
 zsh.spec                                      |  68 +-
 12 files changed, 296 insertions(+), 2473 deletions(-)
 delete mode 100644 0001-zsh-5.9-do-not-use-egrep-in-tests.patch
 delete mode 100644 0002-zsh-Use-int-main-in-test-c-codes.patch
 delete mode 100644 0004-zsh-enable-PCRE-locale-switching.patch
 delete mode 100644 0005-zsh-port-to-pcre2.patch
 delete mode 100644 0006-zsh-support-texinfo-7.0.patch
 delete mode 100644 0007-zsh-configure-c99.patch
 delete mode 100644 0008-zsh-deletefilelist-segfault.patch
 delete mode 100644 0009-zsh-support-dnf5.patch
 delete mode 100644 0010-zsh-fix-dnf5-completion-with-rpm-files.patch
 create mode 100644 zsh-keyring.asc

diff --git a/0001-zsh-5.9-do-not-use-egrep-in-tests.patch b/0001-zsh-5.9-do-not-use-egrep-in-tests.patch
deleted file mode 100644
index 4d5a1cf..0000000
--- a/0001-zsh-5.9-do-not-use-egrep-in-tests.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-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
-
diff --git a/0002-zsh-Use-int-main-in-test-c-codes.patch b/0002-zsh-Use-int-main-in-test-c-codes.patch
deleted file mode 100644
index 3585cc4..0000000
--- a/0002-zsh-Use-int-main-in-test-c-codes.patch
+++ /dev/null
@@ -1,541 +0,0 @@
-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
diff --git a/0004-zsh-enable-PCRE-locale-switching.patch b/0004-zsh-enable-PCRE-locale-switching.patch
deleted file mode 100644
index a6f03bf..0000000
--- a/0004-zsh-enable-PCRE-locale-switching.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
-
diff --git a/0005-zsh-port-to-pcre2.patch b/0005-zsh-port-to-pcre2.patch
deleted file mode 100644
index fd8ea0e..0000000
--- a/0005-zsh-port-to-pcre2.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-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
-
diff --git a/0006-zsh-support-texinfo-7.0.patch b/0006-zsh-support-texinfo-7.0.patch
deleted file mode 100644
index c68bd26..0000000
--- a/0006-zsh-support-texinfo-7.0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
-
diff --git a/0007-zsh-configure-c99.patch b/0007-zsh-configure-c99.patch
deleted file mode 100644
index c4b3623..0000000
--- a/0007-zsh-configure-c99.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
diff --git a/0008-zsh-deletefilelist-segfault.patch b/0008-zsh-deletefilelist-segfault.patch
deleted file mode 100644
index 8abaab1..0000000
--- a/0008-zsh-deletefilelist-segfault.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
-
diff --git a/0009-zsh-support-dnf5.patch b/0009-zsh-support-dnf5.patch
deleted file mode 100644
index 8e55aa0..0000000
--- a/0009-zsh-support-dnf5.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-commit b70b241cc5ca88cc129ff9ba14f8af2e889b90e6
-Author: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
-Date:   Thu Nov 21 12:26:51 2024 +0900
-
-    53238 (+53239 Mikael): support dnf5
-    
-    some options etc for dnf4 are also updated
-
-diff --git a/Completion/Redhat/Command/_dnf b/Completion/Redhat/Command/_dnf
-index a5edf8564..c41795adf 100644
---- a/Completion/Redhat/Command/_dnf
-+++ b/Completion/Redhat/Command/_dnf
-@@ -1,7 +1,11 @@
--#compdef dnf dnf-2 dnf-3
--#
--# based on dnf-4.2.18
--#
-+#compdef dnf dnf-2 dnf-3 dnf4
-+# based on dnf-4.21.1
-+
-+# avoid 'dnf --version' since it's rather slow for dnf4
-+if [[ $service = dnf && $commands[dnf]:P = */dnf5 ]]; then
-+  _dnf5 "$@" && return 0
-+  return 1
-+fi
- 
- _dnf_helper() {
-   # Get the pathname of the python executable from the 1st line of dnf-2/dnf-3.
-@@ -68,25 +72,23 @@ _dnf_packages_or_rpms() {
-   fi
- }
- 
--_dnf_groups_caching_policy() {
--  # TODO: Are there any reliable ways to validate the cache?
--  local -a newer=( "$1"(Nmw-1) )    # rebuild if more than a week old
--  return $#newer
--}
--
- _dnf_groups() {
--  local package_groups update_policy expl
--  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
--  if [[ -z "$update_policy" ]]; then
--    zstyle ":completion:${curcontext}:" cache-policy _dnf_groups_caching_policy
--  fi
--  if _cache_invalid dnf-groups || ! _retrieve_cache dnf-groups; then
--    # this can be very slow
--    package_groups=( ${${${(M)${(f)"$(_call_program package-groups \
--                     $service group list -v 2>/dev/null)"}:# *}#*\(}%\)*} )
--    _store_cache dnf-groups package_groups
--  fi
--  _wanted package-groups expl 'package group' compadd "$@" -a package_groups
-+  # optional option: -T (available|installed)
-+  local selected line groups section=none
-+  zparseopts -D -E - T:=selected
-+  selected=$selected[2]
-+  [[ -z $selected ]] && selected=all
-+  # XXX hidden groups are not included.
-+  # --installed and --available can't be specified with --hidden
-+  for line in ${(f)"$(_call_program package-groups
-+                      $service group list --$selected -qCv 2>/dev/null)"}; do
-+    # a line for each group is of the following form:
-+    # '  description of the group (group-id)'
-+    if [[ $line = \ ##(#b)(*)\(([-_[:alnum:]]#)\) ]]; then
-+      groups+=( "${match[2]}:${match[1]}" )
-+    fi
-+  done
-+  _describe -t groups "$selected group" groups
- }
- 
- _dnf_repoquery() {
-@@ -194,7 +196,7 @@ _dnf_repository_packages() {
-   fi
- }
- 
--_dnf() {
-+_dnf4() {
-   local cache_file="/var/cache/dnf/packages.db"
-   local -a opts=(
-     '(-6)-4[resolve to IPv4 addresses only]'
-@@ -226,7 +228,7 @@ _dnf() {
-     '*'{-x+,--exclude=}'[exclude specified packages]: : _sequence _dnf_packages -T all'
-     '--forcearch=[force the use of the specified arch]:arch: '
-     '(-)'{-h,--help}'[show the help message]'
--    '--installroot=[set install root]:directory:_files -/'
-+    '--installroot=[set install root]:directory:_files -/ -g "/*"'
-     '--newpackage[include newpackage relevant packages]'
-     '--noautoremove[disable removal of dependencies that are no longer used]'
-     '--nobest[do not limit transactions to best candidates]'
-@@ -289,18 +291,21 @@ _dnf_command() {
-   if (( CURRENT == 1 )); then
-     _describe -t dnf-commands 'dnf command' dnf_cmds
-   else
--    local curcontext=$curcontext cur=$words[CURRENT] cmd tmp expl ret=1
-+    local cur=$words[CURRENT] cmd=$words[1] tmp expl ret=1
-     # Deal with aliases (not comprehensive)
--    case $words[1] in
-+    case $cmd in
-       check-updgrade) cmd=check-update;;
-       distrosync|dsync) cmd=distro-sync;;
-       dg) cmd=downgrade;;
-+      dsync) cmd=distro-sync;;
-       erase|rm) cmd=remove;;
-       groups|grp) cmd=group;;
-       hist) cmd=history;;
-       in) cmd=install;;
-+      if) cmd=info;;
-+      ls) cmd=list;;
-       mc) cmd=makecache;;
--      prov|whatprovides) cmd=provides;;
-+      prov|whatprovides|wp) cmd=provides;;
-       rei) cmd=reinstall;;
-       repoinfo) cmd=repolist;;
-       rq) cmd=repoquery;;
-@@ -308,9 +313,9 @@ _dnf_command() {
-       sh) cmd=shell;;
-       update|up) cmd=upgrade;;
-       update-minimal|up-min) cmd=upgrade-minimal;;
--      *) cmd="${${dnf_cmds[(r)$words[1]:*]%%:*}}";;
-+      upif) cmd=updateinfo;;
-     esac
--    (( $#cmd )) && curcontext="${curcontext%:*:*}:dnf-${cmd}:"
-+    local curcontext="${curcontext%:*:*}:dnf-${cmd}:"
- 
-     case $cmd in
-       alias)
-@@ -337,11 +342,9 @@ _dnf_command() {
-         _describe -t options 'option' tmp && ret=0
-         ;;
-       check-update)
--        if [[ $cur = -* ]]; then
--          _wanted options expl 'option' compadd - --changelogs && ret=0
--        else
--          _dnf_packages -T installed && ret=0
--        fi
-+        _arguments : \
-+          '--changelogs[also print changelog delta of packages]' \
-+          '*: :_dnf_packages -T installed' && ret=0
-         ;;
-       clean)
-         tmp=(
-@@ -368,23 +371,38 @@ _dnf_command() {
-             "mark:mark a group for installation or removal"
-           )
-           _describe -t subcommands 'subcommand' tmp && ret=0
--        elif (( CURRENT == 3 )) && [[ $cur = -* ]]; then
--          if [[ $words[2] == install ]]; then
--            _wanted options expl 'option' compadd - --with-optional && ret=0
--          elif [[ $words[2] == list ]]; then
--            tmp=(
--              '--available:show only available groups'
--              '--installed:show only installed groups'
--              '--hidden:show also hidden groups'
--              '--ids:show also ID of groups'
--            )
--            _describe -t options 'option' tmp && ret=0
--          fi
--        elif (( CURRENT == 3 )) && [[ $words[2] == mark ]]; then
--          _wanted subcommands expl 'subcommand' \
--                  compadd - install remove && ret=0
-         else
--          _dnf_groups && ret=0
-+          case $words[2] in
-+            summary)
-+              _arguments : '--hidden' '2: :_dnf_groups' && ret=0
-+              ;;
-+            info)
-+              _dnf_groups && ret=0
-+              ;;
-+            install)
-+              _arguments : '--with-optional[also include optional packages]' \
-+                            '*: :_dnf_groups -T available' && ret=0
-+              ;;
-+            list)
-+              _arguments : \
-+                '(--installed)--available[show only available groups]' \
-+                '(--available)--installed[show only installed groups]' \
-+                '--hidden[show also hidden groups]' \
-+                {--ids,-v}'[show also ID of groups]' \
-+                '*: :_dnf_groups' && ret=0
-+              ;;
-+            remove|upgrade)
-+              _dnf_groups -T installed && ret=0
-+              ;;
-+            mark)
-+              if (( CURRENT == 3 )); then
-+                _wanted subcommands expl 'subcommand' \
-+                        compadd - install remove && ret=0
-+              else
-+                _dnf_groups && ret=0
-+              fi
-+              ;;
-+          esac
-         fi
-         ;;
-       help)
-@@ -399,13 +417,32 @@ _dnf_command() {
-             "list:list transactions"
-             "info:describe the given transactions"
-             "redo:repeat the specified transaction"
-+            "replay:replay transaction stored in the specified file"
-             "rollback:undo all since the given transaction"
-+            "store:store the specified transaction in file"
-             "undo:undo transactions"
-             "userinstalled:list all packages installed by users"
-           )
-           _describe -t subcommands 'subcommand' tmp && ret=0
--        elif [[ $words[2] != userinstalled ]]; then
--          _message 'transaction' && ret=0
-+        else
-+          case $words[2] in
-+            list)
-+              _arguments : '--reverse[output history in reverse order]' \
-+                '*:transaction ID or ID..ID: ' && ret=0 ;;
-+            info)
-+              _message 'transaction ID or ID..ID' && ret=0 ;;
-+            redo|rollback|undo)
-+              _message 'transaction or package' && ret=0 ;;
-+            replay)
-+              _arguments : \
-+                "--ignore-installed[don't check for installed packages being in the same state as recorded in transaction]" \
-+                "--ignore-extras[don't check for extra packages pulled into the transaction on the target system]" \
-+                '--skip-unavailable[skip packages that are in transaction but not in target system]' \
-+                '2:transaction file:_files' && ret=0 ;;
-+            store)
-+              _arguments : {-o+,--output=}'[store in specified file]: :_files' \
-+                          '2:transaction: ' && ret=0 ;;
-+          esac
-         fi
-         ;;
-       info|list)
-@@ -413,7 +450,7 @@ _dnf_command() {
-           if [[ $cur = -* ]]; then
-             tmp=( --all --available --installed --extras
-                   --obsoletes --upgrades --autoremove --recent )
--            _wanted options expl 'option' compadd -a tmp
-+            _wanted options expl 'option' compadd -a tmp && ret=0
-           else
-             _dnf_packages -T all && ret=0
-           fi
-@@ -449,6 +486,7 @@ _dnf_command() {
-           tmp=(
-             'install:install a module profile including its packages'
-             'update:update packages associated with an active module stream'
-+            'switch-to:switch to a module stream and change versions of installed packages'
-             'remove:remove installed module profiles and their packages'
-             'enable:enable a module stream'
-             'disable:disable a module with all its streams'
-@@ -502,7 +540,7 @@ _dnf_command() {
-         _dnf_repoquery && ret=0
-         ;;
-       repository-packages)
--        _dnf_repository_packages
-+        _dnf_repository_packages && ret=0
-         ;;
-       search)
-         if [[ $cur = -* ]]; then
-@@ -531,6 +569,7 @@ _dnf_command() {
-           '--list[display list of advisories]'
-           '--info[display detailed information of advisories]'
-           + '(availability)'
-+          '-all[include advisories about any versions of installed packages]'
-           '--available[limit to advisories about newer versions of installed packages]'
-           '--installed[limit to advisories about equal or older versions of installed packages]'
-           '--updates[limit to advisories about newer and available versions of installed packages]'
-@@ -548,4 +587,4 @@ _dnf_command() {
-   fi
- }
- 
--_dnf "$@"
-+_dnf4 "$@"
-diff --git a/Completion/Redhat/Command/_dnf5 b/Completion/Redhat/Command/_dnf5
-new file mode 100644
-index 000000000..e194dd5a7
---- /dev/null
-+++ b/Completion/Redhat/Command/_dnf5
-@@ -0,0 +1,570 @@
-+#compdef dnf5
-+# based on dnf-5.2.6.2
-+
-+# utility functions
-+
-+_dnf5_helper() {
-+  _call_program specs $service "${(q-)@}" "${(q-)PREFIX}\*" \
-+        -qC --assumeno --nogpgcheck 2>/dev/null </dev/null
-+}
-+
-+_dnf5_repositories() {
-+  # required option: -T (all|disabled|enabled)
-+  local selected expl
-+  zparseopts -D -E - T:=selected
-+  selected=$selected[2]
-+  _wanted $selected-repositories expl "$selected repository" \
-+    compadd "$@" - "${(@)${(f)$(_dnf5_helper repo list --$selected)}[2,-1]%% *}"
-+}
-+
-+_dnf5_packages() {
-+  # required option: -T (all|available|installed|upgradable)
-+  local selected opt expl
-+  zparseopts -D -E - T:=selected
-+  selected=$selected[2]
-+  case $selected in
-+    all)        opt='' ;;   # option --all does not exist
-+    upgradable) opt='--upgrades' ;;
-+    *)          opt="--$selected" ;;
-+  esac
-+  _wanted $selected-packages expl "$selected package" \
-+    compadd "$@" - $(_dnf5_helper repoquery $opt --qf='%{name} ')
-+}
-+
-+_dnf5_rpm_files() {
-+  local expl
-+  _wanted rpm-files expl 'rpm file' _files -g '(#i)*.rpm(-.)'
-+}
-+
-+_dnf5_packages_or_rpms() {
-+  if [[ "$words[CURRENT]" = (*/*|\~*) ]]; then # if looks like a path name
-+    _dnf_rpm_files
-+  else
-+    _dnf5_packages "$@"
-+  fi
-+}
-+
-+_dnf5_groups() {
-+  # optional option: -T (available|installed)
-+  local update_policy selected line pat groups
-+  zparseopts -D -E - T:=selected
-+  selected=$selected[2]
-+  if [[ -z $selected ]]; then
-+    selected=all
-+    opt=  # option --all does not exist
-+  else
-+    opt=--$selected
-+  fi
-+  # XXX hidden groups are not included
-+  for line in ${${(f)"$(_dnf5_helper group list $opt)"}[2,-1]}; do
-+    line=( ${(z)line} )
-+    groups+=( "$line[1]:$line[2,-2]" )
-+  done
-+  _describe -t $selected-groups "$selected group" groups
-+}
-+
-+_dnf5_environments() {
-+  local line envs
-+  for line in ${${(f)"$(_dnf5_helper environment list)"}[2,-1]}; do
-+    line=( ${(z)line} )
-+    envs+=( "$line[1]:$line[2,-2]" )
-+  done
-+  _describe -t environments 'environment' envs
-+}
-+
-+# completers for (several) dnf commands
-+
-+_dnf5-advisory () {
-+  _arguments : \
-+    $advisory_opts \
-+    '--contains-pkgs=[only show advisories containing specified packages]: : _sequence _dnf5_packages -T installed' \
-+    + '(with)' \
-+    '--with-cve[show only advisories referencing CVE ticket]' \
-+    '--with-bz[show only advisories referencing Bugzilla ticket]' \
-+    + '(type)' \
-+    '--all[show all advisories]' \
-+    '--available[show advisories containing newer versions of installed packages (default)]' \
-+    '--installed[show advisories containing equal and older version of installed packages]' \
-+    '--updates[show advisories containing upgradable packages]' \
-+    + args \
-+    ':subcommand:(list info summary)' '*:advisory spec:'
-+}
-+
-+_dnf5-group() {
-+  local -a tmp
-+  if (( CURRENT == 2 )); then
-+    tmp=(
-+      'list:list all matching groups'
-+      'info:print detailed information about groups'
-+      'install:install packages from specified groups'
-+      'remove:remove removable packages in specified groups'
-+      'upgrade:upgrade specified groups and packages in them'
-+    )
-+    _describe -t subcommands 'subcommand' tmp
-+  else
-+    case $words[2] in
-+      list|info)
-+        tmp=(
-+          '(--installed)--available[show only available groups]'
-+          '(--available)--installed[show only installed groups]'
-+          '--hidden[show also hidden groups]'
-+          '--contains-pkgs=[show only groups containing specified packages]: : _sequence _dnf5_packages -T all'
-+          '*: : _dnf5_groups'
-+        )
-+        ;;
-+      install)
-+        tmp=( $common_opts
-+              '--with-optional[include optional packages from the groups]'
-+              '*: : _dnf5_groups -T available' )
-+        ;|
-+      upgrade)
-+        tmp=( ${common_opts:#--skip-broken*}
-+              '*: : _dnf5_groups -T installed' )
-+        ;|
-+      remove)
-+        tmp=( $offline_opts
-+              '*: : _dnf5_groups -T installed' )
-+        ;|
-+      install|remove)
-+        tmp+=( '--no-packages[operate on groups only, not manipulate any packages]' )
-+        ;|
-+      install|upgrade)
-+        tmp+=( $downgrade_opts )
-+        ;;
-+    esac
-+    _arguments : $tmp
-+  fi
-+}
-+
-+_dnf5-history() {
-+  local -a tmp
-+  if (( CURRENT == 2 )); then
-+    tmp=(
-+      'list:list info about recorded transactions'
-+      'info:print detailed about specific transactions'
-+      'undo:revert all actions from the specified transaction'
-+      'redo:repeat the specified transaction'
-+      'rollback:undo all transactions performed after the specified transaction'
-+      'store:store the transaction into a directory'
-+    )
-+    _describe -t subcommands 'subcommand' tmp
-+  else
-+    case $words[2] in
-+      list|info)
-+        tmp=( '--reverse[reverse the order of transactions in output]' )
-+        ;;
-+      undo|rollback|redo)
-+        tmp=( '--skip-unavailable[allow skipping impossible actions]' )
-+        ;|
-+      undo|rollback)
-+        tmp+=( $replay_opts )
-+        ;;
-+      store)
-+        tmp=( {-o,--output=}'[directory for storing the transaction (default ./transaction)]: : _directories')
-+    esac
-+    _arguments : $tmp '2:transaction:( )'
-+  fi
-+}
-+
-+_dnf5-mark() {
-+  local -a tmp
-+  if (( CURRENT == 2 )); then
-+    tmp=(
-+      'user:mark the package as user-installed'
-+      'dependency:mark the package as a dependency'
-+      'weak:mark the package as a weak dependency'
-+      'group:mark the package as installed by the specified group'
-+    )
-+    _describe -t subcommands 'subcommand' tmp
-+  else
-+    tmp=(
-+      '--skip-unavailable[skip packages not installed on the system]'
-+      '--store=[store the transaction in specified directory]: : _directories'
-+    )
-+    if [[ $words[2] = group ]]; then
-+        tmp+=( '2:group-id: _dnf5_groups -T installed' )
-+    fi
-+    _arguments : $tmp '*: : _dnf5_packages -T installed'
-+  fi
-+}
-+
-+_dnf5-module() {
-+  local -a tmp
-+  if (( CURRENT == 2 )); then
-+    tmp=(
-+      'list:list module streams'
-+      'info:print details about module streams'
-+      'enable:enable module streams'
-+      'disable:disable modules including all their streams'
-+      "reset:reset module state so it's no longer enabled or disabled"
-+    )
-+    _describe -t subcommands 'subcommand' tmp
-+  elif (( CURRENT == 3 )) && [[ $cur = -* ]]; then
-+    case $words[2] in
-+      list|info) tmp=( --enabled --disabled ) ;;
-+      enable)    tmp=( --skip-broken --skip-unavailable ) ;;
-+      *)         tmp=( --skip-unavailable ) ;;
-+    esac
-+    _wanted options expl 'option' compadd -a tmp
-+  else
-+    _message 'module spec'
-+  fi
-+}
-+
-+_dnf5-offline() {  # also used by the 'system-upgrade' command
-+  local -a tmp
-+  if (( CURRENT == 2 )); then
-+    tmp=(
-+      'clean:remove any stored offline transactions and cached packages'
-+      'log:list boots during which offline transaction was attempted'
-+      'reboot:prepare the system for offline transaction and reboot'
-+    )
-+    if [[ $cmd = offline ]]; then
-+      tmp+=( 'status:show status of the current offline transaction' )
-+    else
-+      tmp+=( 'download:download all packages needed for upgrade' )
-+    fi
-+    _describe -t subcommands 'subcommand' tmp && ret=0
-+  else
-+    case $words[2] in
-+      download)
-+        _arguments : \
-+          '--releasever=[the version to upgrade to]:version number:' \
-+          '--no-downgrade:do not install packages older than currently installed' '*: :' && ret=0
-+        ;;
-+      log)
-+        _arguments : \
-+          '--number=[show log of transaction specified by number]:transaction number:' '*: :' && ret=0
-+        ;;
-+      reboot)
-+        _wanted options expl 'option' compadd -- --poweroff && ret=0
-+        ;;
-+    esac
-+  fi
-+}
-+
-+_dnf5-repoquery() {
-+  local v
-+  local -a opts=(
-+    $advisory_opts
-+    '--arch=[limit results to specified architectures]:list of archs: '
-+    '--available[limit results to available packages]'
-+    '--disable-modular-filtering[include packages of inactive module streams]'
-+    '--duplicates[limit to installed duplicate packages]'
-+    '--exactdeps[limit to packages that require capability specified by ==what{requires,depends}]'
-+    '--extras[limit to installed packages that are not present in any available repository]'
-+    '--file=[limit results to packages which own specified file]:list of files: _sequence _files'
-+    '--installed[query installed packages]'
-+    '--installonly[limit to installed installonly packages]'
-+    '--latest-limit=[limit to latest packages of specified number]:number:'
-+    '--leaves[limit to groups of installed packages not required by other installed packages]'
-+    '--providers-of=[select packages that provide specified attribute]:attribute:(conflicts depends enhances obsoletes provides recommends requires requires_pre suggests supplement)'
-+    '--recent[limit to only recently changed packages]'
-+    '--recursive[make --whatrequires/--providers-of work recursively]'
-+    '--security[limit to packages in security advisories]'
-+    '--srpm[use the corresponding source RPM]'
-+    '--unneeded[limit to unneeded installed packages]'
-+    '--upgrades[limit to available packages that provide upgrade for installed packages]'
-+    '--userinstalled[limit to packages that are not installed as dependencies]'
-+    '--whatdepends=[limit to packages that require, enhance, recommend, suggest of supplement specified capability]:list of capability:'
-+    '--whatconflicts=[limit to packages that conflicts with specified capabilities]:list of capability: '
-+  )
-+  for v in enhance obsolete provide recommend require suggest supplement; do
-+    opts+=( "--what${v}s=[limit to packages that $v specified capabilities]:list of capability: ")
-+  done
-+  # mutually exclusive formating options
-+  opts+=(
-+    + '(format)'
-+    '--conflicts[display capabilities that the package conflicts with]'
-+    '--depends[display capabilities that the package depends on, enables, recommends, suggests or supplements]'
-+    '--files[show files in the package]'
-+    '--requires-pre[display capabilities required to run pre/post scripts of the package]'
-+    '--sourcerpm[display source RPM of the package]'
-+    '--location[display location of the package]'
-+    '--info[show detailed information about the package]'
-+    '--changelogs[print the package changelogs]'
-+    '(- *)--querytags[list tags recognized by --queryformat]'
-+    '--queryformat=[specify output format]:format:'
-+  )
-+  for v in enhance obsolete provide recommend require suggest supplement; do
-+    opts+=( "--${v}s[display capabilities ${v}ed by the package]" )
-+  done
-+
-+  _arguments : '*: : _dnf5_packages -T all' $opts
-+}
-+
-+# dnf commands
-+
-+_dnf5_commands() {
-+  local -a dnf_cmds=(
-+    'advisory:manage advisories'
-+    'autoremove:remove unneeded packages'
-+    'check:check for problems in package database'
-+    'check-upgrade:check for available package upgrades'
-+    'clean:remove or invalidate cached data'
-+    'distro-sync:up/downgrade installed packages to the latest available'
-+    'downgrade:downgrade packages'
-+    'download:download packages'
-+    'environment:manage comps environments'
-+    'group:manage comps groups'
-+    'history:manage transaction history'
-+    'info:provide detailed information about packages'
-+    'install:install packages'
-+    'leaves:list groups of leaf packages'
-+    'list:list installed or available packages'
-+    'makecache:generate the metadata cache'
-+    'mark:change the reason of an installed package'
-+    'module:manage modules'
-+    'offline:manage offline transactions'
-+    'provides:find what package provides the given value'
-+    'reinstall:reinstall packages'
-+    'remove:remove packages'
-+    'replay:replay stored transactions'
-+    'repo:manage repositories'
-+    'repoquery:search for packages in repositories'
-+    'search:search for packages using keywords'
-+    'swap:remove software and install another in the single transaction'
-+    'system-upgrade:upgrade the system to a new major release'
-+    'upgrade:upgrade packages'
-+    'versionlock:protect packages from updates to newer versions'
-+  )
-+  _describe -t dnf-commands 'dnf command' dnf_cmds
-+}
-+
-+# subcommands and options
-+
-+_dnf5_subcmds_opts() {
-+  local cur=$words[CURRENT] cmd=$words[1] expl ret=1
-+  local -a tmp
-+  # common options
-+  local -a offline_opts=(
-+    '(--store)--offline[store the transaction to be performed offline]'
-+    '(--offline)--store=[store the transaction in specified directory]: : _directories'
-+  )
-+  local -a common_opts=(
-+    $offline_opts
-+    '--allowerasing[allow erasing of installed packages]'
-+    '--skip-broken[resolve dependency problems by skipping problematic packages]'
-+    "--skip-unavailable[skip packages that can't be synchronized]"
-+    '--downloadonly[download packages without executing transaction]'
-+  )
-+  local -a advisory_opts=(
-+    '--advisories=[consider only specified advisories]:list of advisories:'
-+    '--advisory-severities=[limit to advisories with specified severity]:severity:_sequence compadd - critical important moderate low none'
-+    '--bzs=[limit to advisories that fix specified Bugzilla ID]:list of Bugzilla ID:'
-+    '--cves=[limit to advisories that fix specified CVE ID]:list of CVD ID]:'
-+    '--security[limit to security advisories]'
-+    '--bugfix[limit to bugfix advisories]'
-+    '--enhancement[limit to enhancement advisories]'
-+    '--newpackage[limit to newpackage advisories]'
-+  )
-+  local -a downgrade_opts=(
-+    '(--no-allow-downgrade)--allow-downgrade[enable downgrade of dependencies]'
-+    '(--allow-downgrade)--no-allow-downgrade[disable downgrade of dependencies]'
-+  )
-+  local -a replay_opts=(
-+    '--ignore-extras[not consider extra packages]'
-+    '--ignore-installed[mismatches between installed and stored transaction are not errors]'
-+  )
-+  # Deal with some aliases (not comprehensive)
-+  case $cmd in
-+    check-updgrade) cmd=check-update;;
-+    dg) cmd=downgrade;;
-+    dsync) cmd=distro-sync;;
-+    grp) cmd=group;;
-+    if) cmd=info;;
-+    in) cmd=install;;
-+    ls) cmd=list;;
-+    mc) cmd=makecache;;
-+    rei) cmd=reinstall;;
-+    rm) cmd=remove ;;
-+    rq) cmd=repoquery;;
-+    se) cmd=search;;
-+    update|up) cmd=upgrade;;
-+  esac
-+  local curcontext="${curcontext%:*:*}:dnf-${cmd}:"
-+
-+  case $cmd in
-+    advisory|group|history|mark|module|offline|repoquery)
-+      _dnf5-$cmd && ret=0
-+      ;;
-+    system-upgrade)
-+      _dnf5-offline && ret=0
-+      ;;
-+    autoremove)
-+      _arguments : $offline_opts && ret=0
-+      ;;
-+    check)
-+      _arguments : \
-+        '--dependencies[show missing dependencies and conflicts]' \
-+        '--duplicates[show duplicated packages]' \
-+        '--obsoleted[show obsoleted packages]' && ret=0
-+      ;;
-+    check-upgrade)
-+      _arguments : \
-+        $advisory_opts \
-+        '--changelogs[print package changelogs]' \
-+        '--minimal[reports the lowest versions of packages that fix advisories]' \
-+        '*: : _dnf5_packages -T installed' && ret=0
-+      ;;
-+    clean)
-+      tmp=(
-+        'dbcache:remove cache files generated from the repository metadata'
-+        'expire-cache:mark the repository metadata expired'
-+        'metadata:remove the repository metadata'
-+        'packages:remove any cached packages'
-+        'all:clean all'
-+      )
-+      _describe -t cache-types 'cache type' tmp && ret=0
-+      ;;
-+    distro-sync)
-+      _arguments : $common_opts '*: : _dnf5_packages -T installed' && ret=0
-+      ;;
-+    downgrade)
-+      _arguments : \
-+        $common_opts $downgrade_opts \
-+        '*: : _dnf5_packages -T installed' && ret=0
-+      ;;
-+    download)
-+      _arguments : \
-+        '--arch=[limit to packages of specified architecture]:list of architectures:' \
-+        '--resolve[resolve and download needed dependencies]' \
-+        '--alldeps[with --resolve, also download already installed dependencies]' \
-+        '--destdir=[download to the specified directory]: : _directories' \
-+        '--srpm[download the source rpm]' \
-+        '--url[print the list of URLs where the rpms can be downloaded]' \
-+        '*--urlprotocol=[with --url, limit to specified protocols]:protocol:_sequence compadd - http https ftp file' \
-+        '*: : _dnf5_packages -T all' && ret=0
-+      ;;
-+    environment)
-+      _arguments : \
-+        '--available[show only available environments]' \
-+        '--installed[show only installed environments]' \
-+        ':subcommand:(list info)' \
-+        '*: : _dnf5_environments' && ret=0
-+      ;;
-+    info|list)
-+      _arguments : \
-+        '--showduplicates[show all versions of the packages]' \
-+        '*: : _dnf5_packages -T all' \
-+        + '(type)' \
-+        '--installed[list only installed packages]:*: : _dnf5_packages -T installed' \
-+        '--available[list only available packages]:*: : _dnf5_packages -T available' \
-+        '--extras[list only extras]' \
-+        '--obsoletes[list only installed but obsoleted packages]:*: : _dnf5_packages -T installed' \
-+        '--recent[list only recently added packages]' \
-+        '--upgrades[list only available upgrades of installed packages]:*: : _dnf5_packages -T upgradable' \
-+        '--autoremove[list only packages that will be autoremoved]:*: : _dnf5_packages -T installed' &&ret=0
-+      ;;
-+    install)
-+      _arguments : \
-+        $common_opts $downgrade_opts $advisory_opts \
-+        '*: : _dnf5_packages_or_rpms -T available' && ret=0
-+      ;;
-+    leaves|makecache)
-+      # nothing to complete
-+      ;;
-+    provides)
-+      _files && ret=0
-+      ;;
-+    reinstall)
-+      _arguments : \
-+        $common_opts $downgrade_opts \
-+        '*: : _dnf5_packages_or_rpms -T installed' && ret=0
-+      ;;
-+    remove)
-+      _arguments : \
-+        $offline_opts \
-+        '--no-autoremove[not remove dependencies that are no longer used]' \
-+        '*: : _dnf5_packages -T installed' && ret=0
-+      ;;
-+    replay)
-+      _arguments : \
-+        $replay_opts \
-+        ':transaction path:_directories' && ret=0
-+      ;;
-+    repo)
-+      _arguments : \
-+        '--all[show info about all repositories]' \
-+        '--enabled[show info only about enabled repositories]' \
-+        '--disabled[show info only about disabled repositories]' \
-+        ':subcommand:(list info)' && ret=0
-+      ;;
-+    search)
-+      _arguments : \
-+        '--all[search patterns also inside description and URL fields]' \
-+        '--showduplicates[show all versions of packages, not only the latest ones]' \
-+        '*:search pattern:' && ret=0
-+      ;;
-+    swap)
-+      _arguments : \
-+        $offline_opts \
-+        '--allowerasing[allow erasing of installed packages]' \
-+        ': : _dnf5_packages -T installed' \
-+        ': : _dnf5_packages -T available' && ret=0
-+      ;;
-+    upgrade)
-+      _arguments : \
-+        ${common_opts:#--skip-broken*} $downgrade_opts $advisory_opts \
-+        '--minimal[upgrade only to the lowest available versions that fix advisories]' \
-+        '--destdir=[specify directory into which downloading packages]: : _directories' \
-+      '*: : _dnf5_packages_or_rpms -T upgradable' && ret=0
-+      ;;
-+    versionlock)
-+      _arguments : \
-+        ':subcommand:(add exclude clear delete list)' \
-+        '*: : _dnf5_packages -T all' && ret=0
-+      ;;
-+  esac
-+  return ret
-+}
-+
-+# main completer
-+
-+_dnf5() {
-+  local curcontext="$curcontext" state state_descr line ret=1
-+  typeset -A opt_args
-+  local -a opts=(
-+    '(-y --assumeyes)--assumeno[answer no for all questions]'
-+    '--best[try the best available package version]'
-+    '(-C --cacheonly)'{-C,--cacheonly}"[run entirely from system cache, don't update cache]"
-+    '--comment=[add comment to transaction history]:comment:'
-+    '(-c --config)'{-c+,--config=}'[specify configuration file]:config file:_files'
-+    '--debugsolver[dump detailed solving results in file ./debugdata]'
-+    '*--disable-plugin=[disable specified plugins]:list of plugin names:'
-+    '(--repo)*--disable-repo=[disable specified repos]: : _sequence _dnf5_repositories -T enabled'
-+    '--dump-main-config[print main configuration values to stdout]'
-+    '*--dump-repo-config=[print repository configuration values to stdout]:repi id'
-+    '--dump-variables[print variable values to stdout]'
-+    '*--enable-plugin=[enable specified plugins]:list of plugin names:'
-+    '*--enable-repo=[enable additional repos]: : _sequence _dnf5_repositories -T disabled'
-+    '--forcearch=[force the use of the specified arch]:arch:'
-+    '(-)'{-h,--help}'[show the help message]'
-+    '--installroot=[set install root]: : _directories'
-+    '--no-best[do not limit transactions to best candidates]'
-+    '--no-docs[do not install documentation]'
-+    '--no-gpgcheck[skip checking GPG signatures on packages]'
-+    '--no-plugins[disable all plugins]'
-+    '(-q --quiet)'{-q,--quiet}'[show just the relevant content]'
-+    '--refresh[force refreshing metadata before running the command]'
-+    '--releasever=[override distribution release in config files]:release ver:'
-+    '(--disablerepo)*--repo=[enable just the specified repo]: : _sequence _dnf5_repositories -T all'
-+    '*--repofrompath=[specify additional repos]:repository_label,path_or_url: '
-+    '*--setopt=[override option in config file]:repoid.option=value:'
-+    '*--setvar=[override DNF5 variable value]'
-+    '--show-new-leaves[show newly installed leaf packages]'
-+    '--use-host-config[use config files and variables from host system]'
-+    '(- *)--version[show dnf version]'
-+    '(-y --assumeyes --assumeno)'{-y,--assumeyes}'[answer yes for all questions]'
-+    '*'{-x+,--exclude=}'[exclude specified packages from transaction]: : _sequence _dnf5_packages -T all'
-+  )
-+  _arguments -C -s : $opts ': :->command' '*:: :->cmd_args' && ret=0
-+
-+  case $state in
-+    command) _dnf5_commands && ret=0 ;;
-+    cmd_args) _dnf5_subcmds_opts && ret=0 ;;
-+  esac
-+  return ret
-+}
-+
-+_dnf5 "$@"
diff --git a/0010-zsh-fix-dnf5-completion-with-rpm-files.patch b/0010-zsh-fix-dnf5-completion-with-rpm-files.patch
deleted file mode 100644
index eacb810..0000000
--- a/0010-zsh-fix-dnf5-completion-with-rpm-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 071e325c826a89b792056c3faf0c400b8c0c5738
-Author: Christoph Erhardt <christoph.erhardt@sicherha.de>
-Date:   Tue Sep 30 08:47:15 2025 +0900
-
-    53981: _dnf5: fix completion of local rpm files
-
-diff --git a/Completion/Redhat/Command/_dnf5 b/Completion/Redhat/Command/_dnf5
-index e194dd5a7..9cbf451a8 100644
---- a/Completion/Redhat/Command/_dnf5
-+++ b/Completion/Redhat/Command/_dnf5
-@@ -38,7 +38,7 @@ _dnf5_rpm_files() {
- 
- _dnf5_packages_or_rpms() {
-   if [[ "$words[CURRENT]" = (*/*|\~*) ]]; then # if looks like a path name
--    _dnf_rpm_files
-+    _dnf5_rpm_files
-   else
-     _dnf5_packages "$@"
-   fi
diff --git a/sources b/sources
index 747480c..bd494a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
-SHA512 (zsh-5.9.tar.xz.asc) = b6a72f8dfd2ed9c25e4afa5b3d13b23c1bf0bceacfce3ad0fadf24a9df91382914f7322ef4ed8bfb4b68818fb18fe3973d22154a6cc638b46f02e30bafd93fcb
+SHA512 (zsh-5.9.1.tar.xz) = e16c13559262577e725b290c35ce6598d58c2acdd204eac619e8ed9b6a918bce39bfbf9d3ef4c5eb877af7d3279c8a4b15439eba6a38c4e4d47d5555d5f79872
+SHA512 (zsh-5.9.1.tar.xz.asc) = 8c9fb393de9b9ff84353ed35f812c8e05e6131c238fd233a2f6e3aa02b0644c7afd597a8b4e7a737152e4478d0d4dae7a5e42559047f100eb536049c4490ceeb
diff --git a/zsh-keyring.asc b/zsh-keyring.asc
new file mode 100644
index 0000000..da4b17f
--- /dev/null
+++ b/zsh-keyring.asc
@@ -0,0 +1,269 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFwswugBCADdkzua9HwC8Ip5zh7Z0/nJGKbMyq+cobXArhHos40taeidn0+v
+HRES5y6PHR+h56c9TpmJEp/bLCHP5pLvcSz/ETz7+Kk82pld63pOHejSxAQCu7Wv
+1NwrTu6TyKlZsNG1oZBxx2LkEN6k8Wy+88DlQqZoXOXafmhF+Sms6gv9DXa029sv
+B07EehAx02T+b02QwVVG/Pq9austmsTd9EcNcVNRDneD2LcdxCllbS5IamjVa+NW
+oeKZVqbsO71uUolwBvshFSBLPsSY8EZdGApjazQcY0lgkaRA/QlMOisyq2mjV6FY
+JXHrlI3WWWK2vROjb35AHiHEE/EVgb5RVpxxABEBAAG0E2RhbmEgPGRhbmFAZGFu
+YS5pcz6JAU4EEwEIADgWIQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbAwUL
+CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCs+BRsroy7xA5XB/93EQqzs0as07U+
+gmPDpvE7JwIY4TrcvAS7RHgJ4sE+arR5uTziHixiHBQQMedbfV51Jxgws6WL0Ko8
+7K8h9sN2UGnXIc1lWuQ2FDshrcpSHZvLxL4Z7WC3Rj/Dq3/nuZZyljWQNHxg4BlO
+EJqe67F5kT2OI591oxB6L1E6F8sVsgxD7gBCPVl/8CsyZ7wkyW/gMRqrlYolJhpS
+B5C1zKJzvULQJKXDCh9DUyi7cKFtPyYfYtRWfWhKGz5Dhtt9qvBlxJzZufZ9QNQt
+oPhNGF34QaLWTCLRbtoVbNq2NlxalZ5Byhg/0pBcQc2w4C70jSxF3c+2oMEGQIbc
+5GJFgLpZuQENBFwswugBCAD5rIYdlLWHOMw+stWTRNquu3SZr+v7RRzreV9fOKN+
+lUiqwicU2uCX39s/q+2wtF536r+IS/53DrMAW8sxf8eroK+MBnJYtP3U8BnB3mag
+bTJXMjng2ZqZXvxzetXLyXR+38f+6WbJtV0ByDeFQQJYsFxOag3r6etxrzpwRFm0
+PL440fc0nxOxhxWWJcR0RKTMX87ymipi9mETYeZi7h9B3cDw8aIUz2O3s45TtNlA
+NI1MNMU4sAsc5i+w0zJON9gT+rWDYFj6BiEqnRoSK2XDm+WaJa3FwgW1WnHPTe+E
+RJFGT58DICU3ta6cCQPavZz/KALyj8GBJ+PydelIAv2rABEBAAGJATYEGAEIACAW
+IQR8p+yq8GIWuQ+JQUas+BRsroy7xAUCXCzC6AIbDAAKCRCs+BRsroy7xOgxB/40
+sp9xFq8L/59yRTeXSskOsGk3aUlSnACofcRCGgDSXV5GwWJ/G0O8krhHOISJKuxc
+vA0wLFq0WB/EafrKAPTSkrnxmq8noT3c8MpnFRSXHq3sOXkB4nqVEmUu/AAA0TbC
+HcwhFQExvK7O+funxIGU5vqHFeQGJ0VcgC/KZUEMNtVV8aZGvn7JzSxEIwHVXGLu
+5H7TnNWzLzkzIDVY9IJpTutsc6RMvv6BV8ooWBHSgzmh0MTqEjwNarHAMuffrAjE
+zIO3qi0YCaxSDVf2jrWyYpB2QntplmUoubB9s/ngCqVb4A3B7JxPmJuL/0XMUThn
+WZLWFpbLimyoUCfHoehZ
+=dR/Y
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBFG3TRkBDADMoFASLIMP9faxKf/R/rOrZKbBT7ExMXQT9cVjlQLBcjOtb3uv
+63NNTbj/fBDoHbgAal4jOrKYQVPa0LDyT7K9mgj+WBhNZObPeDbmbUwCsrwC6y46
+CJokUc0JwtL0Qm1d8dvMgZ6TzO2J/ZRBAB+Bv+W5pVkV+3BifS8mhHLrwWaJD6s3
+Axxl9PPACG1NB5mlItUci7BK+JTI2Bw7whe+gtyuCn/aat4ny6NYgc74PtLz0uS/
+hG+4hFMKvZrPsflEY/H14GK1AutW8DFSjW6A+etnV9OBUemGz+0WoFOjE+AGHbuY
+FQZYUcj/WZSVcxyK0GJbTa3/KbcOwqLd+xdIWLBybSboP0TAUelyok+1PLORlZnd
+dwvE9cp1hEcEJj/hlmugR7aseG0Fb0txU9x3OnwYaiWbsjk7oLVynlcQGzGe58ID
+SfdsA2ywhkuQO6q397QzNDPRnP92g++HZRm+bGl3U0ffk8Asqef5TLMZvURRMy//
+8OQFjeMWaYCXlf0AEQEAAbQjRGFuaWVsIFNoYWhhZiA8ZGFuaWVsc2hAYXBhY2hl
+Lm9yZz6JAhwEEAEKAAYFAlfjTwAACgkQ3+aRrjMbo9tB/A/6A9EjezO5C8mS5WJa
+lz+dZWEeJF/75npCpRsuCO5wuTMY4ac5VlDR0HqBD7JJnR+vfz4Z26ErtyyMZmuu
+xxj72efT2y4XiVAWXMrQfSR3pIxyTlnrR65QoOIUXU81+1jDgn/UvKZFDa5uipw7
+fNiNqgQ6OXL1O4kLsbLP9Pr8hreD1Pw0N+FC93La537qDP1bFLPC8Ygie55+YyAE
+kWoPg0+6eSm+PI97qqA4roPPHC/srGjDZ9DG4xTwmBu9l3jZWnh9vwzKl15Ai1T4
+rJ5ipH6giR7/uhglBWl0CoqlGuHdyb4eQ6s3lpjHkxTT21vlvji2p0m1C0FB9JLd
+lghqqLSCBLm40adJWyBes6bXv45UQK3sYubETCCXnM/c2AtshK+yZRv01Bung53X
+aKdqAaPTZyE/HyLemwRCZHOb6WKfXIQdX8bTyoKk9MGllbxKBxs2x5oJG8JHocTN
+zBVyUv+BJbgmSn64s+NuCf7XwRRMORmS79oLoykuCHe4D4CD7ZiqBz1ymqyWRUPG
+lc8C5T5L/0YNa+5UacFwzphWwt6v2nVkl/wb2UVAt0WIu1Xqzq1ahc2FAnj9qAiS
+PEfyGi5oSHzLAP1kQv5tq5MDyi02ZpWgAJGepxSMlj6NREiTf1r50FLk2hJLov+6
+mIYPm8KYy8vLDLOuwEEWJi77PHSJAb0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJ
+CAsFFgIDAQAFAls530kFCQ1E+SsACgkQpf7uOseTdESZwgv/U5ErAMH2LPM9z8QQ
+WaUk4ZNQ3Ll3m+pwQ5/llXraws/9lDlX4Q21MR0e6JEZOUPxBsCQ2/qaAEN3jbWd
+pyQX7xuCY+PmTUOOx3c0XTNAB64monM1ZxKYa5sEP6JPqURPEW5tyhoAYUKASuBd
+j+ocK6t0IXGCGuF+gNt74qUi6R6L3gyiexMZAtMCpNFd5Nq8zn5E+oEpLIdUnzoi
+zCemknlrqZfbSafEjhwp0ye6ci4M5FO+IGQBwuyhfybCNlrUWga19DTaPOFIbs/D
+/8pyg3Boc5AhRISqWY0X3xfN/XX45B9iaAzp9gVW3v/NV5pQ7elwEXixChCWbWlG
+p7cw3BGisocdpykOpeKuSGurdMfRolfV4QaFJhj+JVsqlduFjJEBnhrqQ3rliGy3
+Jw0igAKYuZWth8acYMpJab18oHNLPQGLvZHziw+0+R5MZbq37GYQ8IpdzcbNMUXY
+YrRPRsUmEtFpZ5QjhfTworVo9NHGEHhf3li0nUNMlGfuIzQXiQG9BBMBCgAnAhsD
+Ah4BAheABQsJCAcDBRUKCQgLBRYCAwEABQJeNT7NBQkQF3o0AAoJEKX+7jrHk3RE
+TZcL/RcoE737pkUWzU+Bv4qvGcwK+EQ3WPWEb9cmCsmBqZ4LRaLP1UZJ7kzuba54
+3QDMuwIm7xy4Gy5Jty3zOEXKzPjKyXIGUTbfADs65QtkOyJOOygbq2i9k0TydCES
+v6mMP3HNyUPr9Kxna0dFbHZ69iZGmIBzw3/2NzyNOhh7DLnaVdmRf7QqzpZYsNGC
+ADDjyhmPUm46VmsE2EqE/hF26U6A5V6VHIqe2XLGZPrr4FWbE9rc/i1n8pVRoe5e
+KYlcAUxjlQ4BxRVsEZwuwznjLprxOUjyM68cJOE8BrpnIAcEU/88HZYsO8DALigy
+NxOHkTWO7m5JI+fX9h4+6qAKVKWpa7qWZ85IEaGoWmiTgXdf2P9N8/9cTzEzB53V
+ASSZl5z+xQsTx6kn3LKja7OtUDKLGBvfjsDSw1XTmAcFhj1ELQRRXfq38FgBB+Rq
+e/qOGW46+c+bSMid02HNCkNipW/klo77LB5qnPKj/yElH49I/P1x4vUYxpUMPgGY
++crstLQmRGFuaWVsIFNoYWhhZiA8ZC5zQGRhbmllbC5zaGFoYWYubmFtZT6JAhwE
+EAEKAAYFAlfjTvgACgkQ3+aRrjMbo9tpghAAuik/KT+YThdyNrVq2mz2c9rkzgNJ
+bwkt6XQ42AumalTa1WdpvPqisEC88F6xpR/k9uA4nh/C/PLuwDtlSc9ZhBrrlJE5
+uPrkpBKcKiGWYdRFTGtyqxzLBt2MqWb1eWOtBBRjiQkDBoP1h+tHIJHvkr64uoJE
+biSlM3CUjK/00bO7oiiZCKyd45tk1FEIZUnyGW2/JdwN9G0XWt7sdcfBxrccCTor
+36hrYH0bNKSgwbSlraYdB00lnMRqQIFI6J+rGIHqWPgJn9ZdW8heD7BeYDP3TFPg
+ADhvpP5BI7ATi2EBoAHDWyIiFjSXsllmIBq075O23jyfLaLiIY+sGzSs29d2HACA
+NyobCqCx9iTufKgayXMO6bk//ic37ACs0cubEVLqHeGUy9PeFxjJPD4iXVbqEuNo
+wAmyHtXplNLKGZuAfBcYfhlxcG+yTXQzxb711LI7iA8Ox41GBVToQCgpi8XNlgzZ
+Y4e6sP/3uFRNLUm5zbH8KaQFy/HgNfYHWb7i8y8eSu3QGaPv4jiG9eLo2j/iDF26
+3JJeOw777CWNFvcMXwTP4novzVcF9gYnjOcxDojjn3Dxk3kRMEjG5u64t+SiGsTP
+j/1fIbK+EX9PdwUH0FWFrq1K0F/4lPYIIUPuxAgN/nEdpURLDQzZ9XjICAZz50A5
+amSZ1f43AbciEVSJAb0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJCAsFFgIDAQAF
+Als530QFCQ1E+SsACgkQpf7uOseTdETg7wv+MnjKLG+J6mls4SV7dMFakHj4juqv
+41tLZj/N6n5dO8Kev9rTU5WCP4vnAPIhL5254qL+tch8md/ztwc5ixj5jIVTVC7N
+jZB8lYQx2y+g71Y2JqclzzfeA2rZ7G1CQJMU9DU4gtW9T5rRukk1FfQGXXAs4Ru8
+3aXRYOfEk6lNWtS5bnAbOSP++3tz8y35TxWgVnwqkpu8S9lmSciY/k2NgRtjATmR
+9xHFJleHQK8tmJnbUIroN5Hd4wM541m4zl0lQG3fMw8m434IUVLA4v797/Sn1av5
+m23eyXArvTneNGHqkBG0WGuVffEk07KzujV986saCB01nJv+gHQ1OeLSGMRa5zwJ
+Q7qkEw8BslfPDR6rkhC5i6B8i/vQENxnDSWeBMQ1gIdi/GpPyHqSssEJSZkT62Kg
+94oljDMNEDPjrlSc0bBaHgiArdSdFh5fwLV3zlh/m2yWIqg52ZA2t7AezUpTJH5B
+sywDpha2WtDs1BMcM6TdVEpRU/ZKn/MR+jgRiQG9BBMBCgAnAhsDAh4BAheABQsJ
+CAcDBRUKCQgLBRYCAwEABQJeNT7TBQkQF3o0AAoJEKX+7jrHk3REBH0L/i+3ZwpV
+5Ncju0iV36qCzhqgRyFu/PseNFDD19qc5/JfW3Ts+NriFNGfdR82ocTi3d8RM2XS
+crT+lYQXOd72p5OGjmg1LlUb3gqGh3sIw16kJIli/5gs/HwhXrvums7rbJO0eg2q
+7uDhGItMlE0DmWOyn+HHWX2WWArlDgQPbncgGXEg92ooLKmy5n/Xr7rK/pvQMlh0
+KEjCxrVtCxntfwdrWjNOIHc9O4NEc2+IZ1DApKlj4FUmHPdSIpAUpqWZt18pTemx
+FzU3vO1aArqa7VKnuC6IsqX1fuI3Pn1ofyQclUSi3XjGd/5SEdE61ustCN7vw9gQ
+48XFc5Odeefte0Ff0KtOt69w37OxpsUZliZfg1BD27RAGm7lJ1x1nFzXsFl/NHjT
+F+t6lwMvtbiyCQNJYiIkHeTYe5npIG73qO5NNdNK8FdwRvJ3yyBqTYtY19xugOtG
+iOqKA6fvm4Qdyei3qm/ecmcs319NpoYsLv/6BKlmUvmnMZ3tjXGG7n4EwbkBjQRR
+t00ZAQwAt+YcRrbLSY4cZO+T1Z78kb+wtUptyYdsUTjMNa+RqFEginvGWXJi3t9x
+HZD2IdwjFWUmnjeTdx8bdikpUedTlG3JrFurPX0xMgkgbC/BELF+4Suj3qHYTBr+
+iMMcZZEaGFMJ4IAHml11Ryka+p9rMVG8bHsCoTRPYyPctNS0b1YG13ZN6qdug+1x
+WrgTBBJntQEsnuCw51HZOFAOQTPkLSTpVHTvcbkEbjotXFWx30ysvVHoZpo1gxt5
+XQtPJASDgkofUdHXgcrjCTDTx7AoOSnNArgJUpdKYzaX62PA+jwWKhfQ1+PY+wUC
+7iGpmj40FMndzVbtaVKRdlEboTAOGOtDb7o4f02RBK53vJY5ZGtKq6chBE3CzBaW
+JcuSd7z6yazx0W5oLptmgGHl1xI5mw1qYE58bK6NoXgLlzki0abyUpng17mMyWnR
+kWUi2bAirAaHUkhEG4SeOcd5dvZB4KQWkmGjTGu4513NxAw/uNpXRCu/GUPeS/4d
+3ugLUbvJABEBAAGJAaUEGAECAA8CGwwFAl41PtsFCRAXekIACgkQpf7uOseTdER8
+Xgv/SsCCMdABAfNzW9ig+IqaYDej/f1vWkDmJ7segJ+TNOKV7a6tva5/Ao+5M9Dn
+U0DIVkOL4jp2h2F+sTS83zgoObb6NJ19NAH2pRiobIdlpbj0rIvQOgp6YpgDlP3d
+RQKwqnPSKqpzwDKUXApCUyAQw3xAp2avnVayJHIbm5IiVg8FoS/0YWZwKup+p7qE
+CwsAXftRUhYolejz65ZDMz/rxljFPvpBxBZsPZDqFaZzLr+PS7uvcdC8QFMAA9Cv
+fLzzhHPmX4Ogu8iKkSmyV+pbxdLxcg13zGz7GTOx4+VXgaA3WNDlU8oj51GX5bXI
+ny1jf8GFELDo/b/fog6HrcsGihE5MZzuJZ+ZBXjR2nbWTQoj85jnxqeUlJ0WuXu+
+mdIoCHvEB3Vu+r2Bn2np9w7askduYgk+6afOK06itGUNabLLtAa5M/gK/WOGop6x
+O9nQmdz6VoZ5NdA89MlHTV/A+qahGqC23m6Jeto0jPePZkP9RLZLrevm8PtDey3c
+eRf9uQIFBFlTfpsBD8C1vBhjCGSYTVxTiRWTENGUgmqDWbUqU2TXkvq3331w90Fr
+/S4Jt+v0UQ5p9L0WA9PadKlWF3MjpedttbBYPfXl68B/0hiNnX8PkgP3/I4peX6/
+23AkSJ8mXBTsv+YnzCc0GFqm1Qaf6ZsxQWHpSoNYILTH+Q+7p4dJblpzf51w+UfQ
+60iA1yO4Wov3FHZsWrkr2T1akn7dVMvVrrvSHCWG90VHXGB2WQkBkhCN3BhaSMUV
+l9K8+XSx4I4rOC1FezItMHgBfW4QyD1HVsF+dZ0sVipqzwbAbJ0jFoX1a3AVEtAW
+74dB2KSEd5UsAJ/ZUJV5K3vmfaudWobf8s6/YEdRIow4zphpif/UrxL+I9+RAGF2
+PpY3m3GpJP3sEnL9yXlqp0Kbr+xVuz/ewPWWJR6XJJhMCo8o3lXPFh+sVmc0fdb3
+lceiOJ0Au6lySP4/aZ5HkuRZAaJaLAlep2n5eLwPlNEWzWs+C9StdWNv0phuRumf
+DNrqZwPeatydfrCwPCxxe62PzpbTfnvvQ9bVDA6rsW4VyTNVNGskuG5WAlw0GREm
+eVtIW5bX864wQruAehyh9JFuM1JrS4FlBitHjN9Wx80eVIqRyqIzVqmYVclUhGHA
+lKxGkbsh564FzSxKTaq8wzZNaWiLK3mdJnrXGl5LRbsBrSTCaZsAEQEAAYkDvAQY
+AQIADwIbAgUCXjU+4QUJCHtIxgIhwVUgBBkBAgAGBQJZU36bAAoJENsn6ZdCmvIM
+cdgPviW9GD4+Ta3+0nSOyYyFmFYET+MjKVShL3xOvpHsa1p9OpiuKKkoAx9o8CqW
+dPPFMZJ95QRHeTLQrgt2ytQ3L0e54Qx4goiYKGmDlcq701qUwvPys8/jA3IwS9el
+2GBBcpIExrIG+I9h6qDf7IXAkmRAjxI/KgGgEOUDcs5HFRblK+/bEaHjU6BnPvK+
+gB7y0vx1ZCCloW0zPGb9AmsHU9x3NfdrJgrVWchjFA4tGllQbXMzm3aOOgFDZ0qD
+K9Hx0a8lrGPksBW7foJrifhTzMcLO14BSPTv/inAl8NpSW6LRpouX66nJhy5KXlK
+C/n55LiiKU9+6lV3ba8KcDSzgt/my3tD7myJBh5HOv8fvXhSfmxcFLIZa22eQfGJ
+eInu86E9Y0MHzYJ+te9qCaNC0Vay4VdmsC0MoOALacEz3GBvLIyD06cWQjb4ARXs
+j6YPW/cp8pzakxerAA+gFDmu7J+RgH+BDVDRu0Uk53gCsnCxaAIWVU5lLAy8/aRp
+G3zUPnEwZFT3gCkLkV/2nKlakPupaM2wb9ItIvA4nwYiqk6SAJPKwh5pdqNu3cRD
+00RLfFS8OpEzMCi3qWdrTXXvtcutZnyBJeYaS5ORhyR/PNzNkLjNQrO4QxpQGRvK
+TFLP8d23YMoXjogCZrW1yHq7ShjdQAZyALRmMQkQpf7uOseTdETSTAv+Jcyg59uI
+4b+GjxYhokVfCZN0aBNBd/OrWAk0GOfJsNg20AUm7BTnb76p2pj6MwLvbeBZfQ0j
+IMb1NbpJZ9B8faJzbRfBBhs45z9ff2UvyLxfjOjU7rRN3m63yBxMZJLRPgJw1k9n
+0AspkkoWqQJwTOC/2VL9xxJZcfG747xBW04k4QeY7Va0HFB8T3nrYf2wWR/KhYSG
+JLF8+2HxBGULa6L4rwyUZB3vROgzej3i6zYj5vpDsbDXv87AO6DeiQfn33EEQN3x
+TIQxZX7J2ICwD4lZm5xK+IvmIjnQdoByNTO8JQ6Eykg4z5mEwsBjtu5n2QkCOf9S
+Q9UodOHwQWZj/N5kEdY/KoygApWbctXrue2VOeFf5MsSWCpnWHsIXOELe8QvSwlD
+WPTmUZs0gN/VQjzifiVOQZBYXAInpKak6xIwltBF1gfh/a8byPD84X7BDLxUnFKY
+Ew4Gue8eao0HmXpIUm9vWdnFAU0NqLbvVfbqkrzyTRNzNopC44CUfwzR
+=KiyE
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBGBzXzkBDACjRXUOZGdF/dFBPYxbdX17touhN3T1d00HH73LEpYNny5mY97h
+NTE5lQWFQ+eNn7Tx79PZMDepv26mRHMQR6ezI2ahd2TxDCngNGlPcuhsTKgcNRiu
+i0nbgB8ssqm/q8YoW+FWJLWfGwTfH38VMP3s3022wUXAMA/gz2FVx1uEFTavC92i
+Mhrlg/+4Y9uzq4w4OMIA8QJ5cWIqBH0SzaGEZtthnZRnLRoKh9oXpgMZ4Bv+ofxT
+a1qsZ6tNb4n8Wbscv/vYZqn1yOj5XI8ut27ocKuxnoATXOuK3ac54gZYSyI9YFyh
+mjLHIMs4qpeDyhMZZRWAp6gfQP4gSAvDGZ/77o7qwV+r3kUbZFlxwz0C96Ul4CGU
+SwRJT+PGFy44PAsvUudqLAhr6ndchMN4HM3vBAtngJIEz4YKngtq5OyAZEVEFMDr
+H1WJ3/9NEq7jcqmlhEKd5t13FPIE4hfYX2cwLV4BAgcqB4uOKCP/0Ihg14Kd1FoX
+I+jgqByM92IQeQ0AEQEAAbQYbGx1YSBsbHVhIDxsbHVhQGdteC5jb20+iQHUBBMB
+CAA+FiEEKQALqIepMZD3K20A+1LjaLcLJVkFAmBzXzkCGwMFCQPCZwAFCwkIBwIG
+FQoJCAsCBBYCAwECHgECF4AACgkQ+1LjaLcLJVkrZgv+OglxzCYf9dNu3gHlZ0AC
+VzwJIrCZoS3IG36iiLsx+d2jYgdTfR3y4jH294mCVsGfoAoava6lun27Q94sMCaH
+Ng0fcZfW5uwrn8jW+H+F7mCShpQNUDHDlZx/bkC4JX2jhEZCrqQRRZUYTlteVQpu
+44ToiFq78iLs9fz9HFczDzmMmTvKp4r84+6AiFwQy2OGAVbON4EnxIZjEJdVKMqR
+8XH3tWuGeqDnBBqXrrS6g7SAh9idlA8JfifkBNFSDM4SiNXJXk1/TumR3w008Dj3
+6gq3W1P0b91gY2VwYAUBeOciSJ02hcT0Sywa1NAkytQA0djECe+wl4Y8Z2nwO4u3
+ZCCNCKVWjtjoo1QUwCyUcQl2vEt7cJdEAfbzr0VH9oaL0trjXz7V7Y0oqkI/XOSI
+wa/aTTrvybSKTEIvMIfC9IVjTwn6KMh9x66eiN1CmF6abfnwr7cTn3mbrJ2z0nMV
+1OiuU6KahncXixo2XkrUOyZ6OxsVNVGmd/ttn1IVqpvMuQGNBGBzXzkBDAC7puuc
+xUyEuxWhwYGuYCQXNeh7mHnYRhd5nFuM8hosaZx+w65RSzJ5UWKIPr6vt1vC8JK3
+r7emy1rPIeuwWCVVpzIcW6kTS+Jd/ZDDYKUdko9rm/rbmHScJF1LsiS1yvVP3l9P
+0OE2db+IDqDItDvGcHSWgygR1G1hgPl5cKz14352R+cRYQDacCMlYhg8dFL08eoQ
+96ZlLpiRLox0X3HFWih8ZyhQF/uO5cKjzEaeRnrL9vVne3BNVTaNTsUoHPvVQUJf
+H/X8CR/L8B6E1sDa2KWcRhObhTaTeUUFsjqmWkiOIDRdd29JELDCD0O+tR28w+WK
+8XwV+/2bV/49g9DVCWCHD6KxscTzOgspUKaNM2y5I5FZQVT3UYpu6GCJL46QVsJZ
+j342tGuSzEKH8MHNikJC0vg2r7MnH8ogkcJ7MVEvF5aVy+WC4f0Ciz1Tjl+RShit
+e71PeswQ6r5lFtWvanDQgB/UBfvKTwwA3qHQXe6sr0nvJO28QdD2Bo5NaIkAEQEA
+AYkBvAQYAQgAJhYhBCkAC6iHqTGQ9yttAPtS42i3CyVZBQJgc185AhsMBQkDwmcA
+AAoJEPtS42i3CyVZ6qQL/AqvaxPKKPfUQynDlWt313rqzCAls3MD1L8B9Ya/L/4Q
+JgaEsJAwW9SkSkUneB4HT6H4zqZC7NF7iXGt3akm+tGMsgQ1t41X7Ac8p9nEtNfW
+SX2SvtGgyFhi3qCJI1v2eEEI06e4m0K/O1l+w6UCwDFgMkxUsP6yRYJ5o6N0MalA
+OElJQkND6rni4rBDUo4Q7RDfgNVRMAXEcKXV08I4veykfmk5sAD+Trb2bYSfp+uA
+Dve7V9AzwlV7cSfaA4otJKk3uIt/M8xTc3cgh48Jg3ppywntiBWmzIL2JPS/0kBZ
+id3Mu8a7Yz3cjv5sY7OksjsjuIxTCHycxFZbi0QxT/QtW6CItGDrKuCKr674Q9wO
+cwnwDI6nW1zHsTjDFzaBYcFu7PHIqXd2aZkNWnc9iOQOHxLatTYKyDvzRyXuOAQa
+APc+Fy/7VI7pJk64rkoRqzAhp0Bh/8DXmKXmA7CuWTY8wiFA0YlCLQnVebgZ/ALm
+0mWkrhYxYrQKM6kywpFS6JkBjQRn++XUAQwAvRy/Pg/FrWnzF2Ch024gwdP9bcdt
+FMc7KaTTgSHI+11axQ6IcgCaL7fNYQAk/f3zzhVcVWha72K+4/vDcl/jSDrBAiMD
+V0ylwvz6iwowpXX6A427SSSl1FpeR/sV0RxSTsxVwROh3oiYWbmW5J5P0rtBhuxd
+6oS6xP2OSYjOEbharxiSu9TyvhVuOadlF23VsaQyeZk4EB8+9Uf7uJsOuov5GUT3
+eDYnWgKoLofx/vzJupN7qhqoPVMDQO3n/L10SFuRiiXbvxRHvvD02hhnyjX+CUIN
+L/lr1lIvoP0aKE1mJNilcBmnSpMkUS58Ip6XGBuwBiTv+CQQFHYefrDaBRgKXPyS
+Zhi4RQAIUaGFFiGFdwtPgciPPt1fPHjERLhXwjwDa0fr5awtdlHm9k4wQOl/8uS1
+Lr07kns3NgHBfUGX8N5/D9PnKsgI1MuBl6ivLbOZOq3MvfdPkxBkWeYX4Rbp3bib
+Iy2jR3os8h+X2+xCIEPgrLm1hO3zd++5UlYHABEBAAG0J0VyaWMgQ29vayA8aWxs
+dWFAdXNlcnMuc291cmNlZm9yZ2UubmV0PokB0QQTAQgAOxYhBAqpRa0v2M873QkW
+7iOJmTGQ3bLOBQJn++XUAhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJ
+ECOJmTGQ3bLOHY0L/02/2/N6+LAAAX2A2/JhFqMlPlempsZDhQg4sgaUpwZqlSnx
+ZFUkOpNFG7UiGKZ3Za2lj+WbwSaVWgQhsuuhURel4m2SWy14yi6GFEnW6z2vW82c
+lpEt2cDvG3q8wWFLJzZNIwoyuhhKNUx4HvEWZpzP02Nd0desv0/a+fjQk2Gq+kFn
+U3g/YR2jr3FvTtregGBvafqEnDkLA52o6P9i6d+jarSX6fWtAM4/32aMNqe4KIxU
+GYVlXdGe4C52SGwe7tvzBFjz+NX7FQnGbPsE/4IzX/wAK0JR2/OdlaK6YYdBT5VF
+c8BIDmADu08DUjE9EdzumNKYArlrhl/AoXPkuagYZm9dmx9nf/3PdDEq6Y+gC+F3
+831+9hrAmeuANHFUCmYV+flm9Pgob5Dd3kc50dOJgeuuu9ki/iEOu3kgvC53Ng9R
+aJQabsMAxG7FoKohQGFFcZn4UW/0iTq1ObG2KU6A4TJoirfyjRO+e9yRUIqvAH4j
+e4JrCMvYHwSyO4SBGbQYRXJpYyBDb29rIDxsbHVhQGdteC5jb20+iQHRBBMBCAA7
+FiEECqlFrS/YzzvdCRbuI4mZMZDdss4FAmgRg9ECGwMFCwkIBwICIgIGFQoJCAsC
+BBYCAwECHgcCF4AACgkQI4mZMZDdss6YXQv9H8cKyrdT+xuPwcTbosxElFkl7IP0
+fM5P7GwOBgm6EjoUDqIgAYPyHPhvpRX7m6+4chqqG/glJ03T4MhgyY47X8+gyW2C
+GmYKK0UGhxOGUuxphrw09KwdPpZ33sknkr55gfs0ZNhk38aVYhigtbTW7Y5b1U6k
+phNTAkAywbNLkSyainYKmFPncHWxd+FBvRzKjmtV90GlAFENVPyQm6AofBkPsxNI
+GlbESZZUe887J+GTWW+2go28bJwaWkDoUUMw8cNIuucztfa4Iyn5K0G0bzNEeaoF
+a6J+cwdHGQKiScyEzU+5wN+WFlclhg0FiKM0ca/r1KUJaGC5vuB5jH6pnVjF8TtN
+OWyV7UazPSOU87AMv7I/N9Z9dSOPSp30u7R/LyzcbGjFJv0BSJFx9veuh57Yof6c
+m7IM2AytEudhCwyuSIwM5DFKSFqxXwHA4c0PM735sGvFTzU6cRaq5/ghJFNb8q0O
+K6+XyVGlYnVaSKT45gjDEzIZufcRxi5j6gOUuQGNBGf75dQBDADxDCI9E8MqlyJr
+PSQenIjeI1hGnQHXxnKMbfX32QjTPu9+BkM0Szv9yZIQ5txTMTOwA62BQUiJWxn5
+4iYGDHOIuOy86kZ+frgFgrYi7ie6s+zv41I6yNTu/VmUVwOvVaCLPIQ7PA5UeXGE
+qbPtG2BegyJLN9wlI1/inZYee/D2Sv9AsnMO3+Xfag6U+LWd+WDt0itiZsIahHHX
+wyQBTPJKtDi+F0J+D07Yxv9bnI88h6FQlXTnS8N+vaJtcNUE91qWCoLzu4eC7QxO
+nf1BaUrpXiQXUGyQwGem7i7ESjFAEFXVKHDmLOk0LzTymT6zWW09ywjaoPbzfpgC
+XGHIT4wpb0+szSrZaoADB5hNMgtpZXi65a4C+N55qd/QgZdgTRVlfNot5y9+mKq7
+UreAgh/STkNzZMm4c6hE5SohYPAXvVe47Iu5vPoXYWjNWftxS3xYexiLwEWGsKDc
+gGzE1z0a3vP/75Jwei+1VPS+yYub6xb2fhcJ/OMIWgJKqsQ2e3MAEQEAAYkBtgQY
+AQgAIBYhBAqpRa0v2M873QkW7iOJmTGQ3bLOBQJn++XUAhsMAAoJECOJmTGQ3bLO
+aWQL/R4uQ2rXyQK2xHbgH8UfT5AaGXwnPkGzRRxNd6crNl3QpCyvk+rpNuszRHeI
+1D0HK4wtupROB0kYwjVbGZ0kaj7ZLCLwAdAI43eO/V6MEpo08TdPay/3S0yF4HsL
+YEnGEMjvxhLFi5PsBwejtv9hMaWj84oBHAW8w9a5jPPupQhlNjazLAooUP4+neBY
+/cuzNda+3ujOB4En6Md4FamDUDuYEbLxw1bJbvxCLErCMtYwktHZ/Fq7L/Ys02V1
+Jbhi0SAspNn6c09FVT2F1quItIuruoG6dNeFxuVV0p1/QBstU5EXS3paJm0rZnym
+a4xv79sJ7ZCxcJ0yfpT0EP6LKyJ9nL9koiWDMWYRjTlNzIaWgsXV6Ka86ZJm139i
+IB2RgqMrnQy45DIFgevvsXuFX5Ey8mCYu+YyqosZZGuPIU8hrcm0zoLjyuDsSOzu
+Ay+pen1zbjyXGQZVN9tvRxizAa/3qL7AdilnlZNJKOiCXTGEiSGaKGibfseTWoWs
+Qg719Q==
+=+Fbc
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFZWC4cBCADgb7/oPoCs9SE+/jrzmDT7L+PbYLCygCExxp4mt3CsSzn5xefq
+NGU+aBJnvyongcsYrW173GumDjXCG3GBtnmqs3dFeoqnEsSZFMYiQ4ctmWh48P+W
+uQVQOWuh0CVS2OCFn37b5F9dy3oF6gJFdqbwOXJSgWMA/+StMGSkslTYFlG/JwZ1
+csk9jSwQw/yKDlTiFaqMwIwSXTK5fItSn3F0R+usgMhwRPu8gvK23tmEhnnwgmlR
+xfEwJCLqGnvlW74dRkCjY349GAG1IN2felFfHn0ok/Lbx7coKRoEvHaCVbmtPSmX
+Ps9axAV97wk37wS1dhEXcjxLb9GIZgptgo7DABEBAAG0LlBldGVyIFN0ZXBoZW5z
+b24gPHAudy5zdGVwaGVuc29uQG50bHdvcmxkLmNvbT6JATcEEwEIACEFAlZWC4cC
+GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQpx2anUvbJ7NtaQf/RQ/RLvOG
+iI4XJp/C9JIVHfHL7I801uT8V3y/d2+DehFasR9T+6B/Mf5y22NI31i5XBQuK0Wo
+Zsi7F3bhNHyeVgO/p5JLBmxohByjL9f7B+k9Tt/DyWh66AVaCoam4ACR8TBOlNkD
+p/8U0zzrxE9fQrjjK/PzhpVe97LKScEAu2Zc/qUFp4eTAnlqyosTqvU64+n1PrNC
+CtZVYPnL17GCC4+S7yrh34Kllx+fkoHimTL/cUG+6+7sbmpUImpP+pgNEnL1IzBB
+ajZRl1581McMGhIH1TBYrEVnIhononoOO7qr1eahUCEhVvanyVTnSeTTVR0VgK4s
+joYLwDLM4XidgrkBDQRWVguHAQgA7JTI0botnBMfTAGff4Duoor5m0PuExQFCHcJ
+/df5SyUUskycMlGR73+IbcT2D/zBIFDv5ZhCdOdmIW3CHICK+Ws7N5+KSzlzC+Vf
+2LMmXuyJLhXeTqXI1ta6bIGjXeh5VA9Jd7B8dRQhCn1OrGbFhwtJSGejTmcWiLJW
++2GV9s44e9MlscMHvAk9QAvqrSUJoAkN3OCdgjcpDNVT8ek3NnjCD4xrBTxCcI1n
+KsJeOgNHPkbou9+eHY80amkAkRn2ZSI9n25WjhKAp9QGDNL5wqHLjgHP6WiEwumN
+DWPnPd+5FQHQXy1GHgH2BozfT1KZJ012T0Keuk/hnZJ/TVe4gwARAQABiQEfBBgB
+CAAJBQJWVguHAhsMAAoJEKcdmp1L2yez1T0H/jitvgACci+5PQG1djYwioQIui4J
+1nSg4HxW+4SCpSwlmH2LkKaF3WbjpPTRhYeMZ5zdOvGnjPUZCjGtWkWx0p+Jrpe/
+QIC3CNXerX9fpkr0K7+knqkb1RsjHU/YSsYTDDVJpL3BQOZzVocOjPa1YPTfTBU5
+tsQdA4RORi15LyAWcEAmR+X3qH2JM5pGP23hhOKnrFSSnfBP6ef1/jjRbfK5yItZ
+5DOf6i3WS40zxB67dlBlHZwOQuYA3Sr01hEz4CeAkpV7lQ1gKelm1ZmcFQI6yqcR
+PmVjIuxE1A/gTFe6LaAfCGA6/H1H6LLwWQ/rnUi/seMJ6aRkz/05dg7j5+E=
+=wOVS
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/zsh.spec b/zsh.spec
index 82a14a3..a705f04 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,49 +1,36 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.9
-Release: 20%{?dist}
+Version: 5.9.1
+Release: 1%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
-Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-Source1: zlogin.rhs
-Source2: zlogout.rhs
-Source3: zprofile.rhs
-Source4: zshrc.rhs
-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
+Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+Source1: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
+Source2: zsh-keyring.asc
+
+Source3: zlogin.rhs
+Source4: zlogout.rhs
+Source5: zprofile.rhs
+Source6: zshrc.rhs
+Source7: zshenv.rhs
+Source8: dotzshrc
+Source9: dotzprofile
+
 # 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
-# upstream commit b70b241cc5ca88cc129ff9ba14f8af2e889b90e6
-Patch9: 0009-zsh-support-dnf5.patch
-# upstream commit 071e325c826a89b792056c3faf0c400b8c0c5738
-Patch10: 0010-zsh-fix-dnf5-completion-with-rpm-files.patch
+Patch1: 0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
 
 # downstream patch for rhbz#2449939
 # already fixed upstream in a major refactor of term color attribute handling
 Patch100: 0100-zsh-_IO_putc-SIGSEGV.patch
 
-BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
 BuildRequires: gcc
-BuildRequires: gdbm-devel
 BuildRequires: glibc-langpack-ja
+BuildRequires: gpgverify
+BuildRequires: groff
+BuildRequires: hostname
 BuildRequires: libcap-devel
 BuildRequires: make
 BuildRequires: ncurses-devel
@@ -54,14 +41,6 @@ BuildRequires: texinfo
 Requires(post): grep
 Requires(postun): coreutils grep
 
-# the hostname package is not available on RHEL-6
-%if 12 < 0%{?fedora} || 6 < 0%{?rhel}
-BuildRequires: hostname
-%else
-# /bin and /usr/bin are separate directories on RHEL-6
-%define _bindir /bin
-%endif
-
 Provides: /bin/zsh
 
 %description
@@ -87,8 +66,8 @@ mechanism, and more.
 This package contains the Zsh manual in html format.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
-autoreconf -fiv
 
 # enable parallel build
 sed -e 's|^\.NOTPARALLEL|#.NOTPARALLEL|' -i 'Config/defs.mk.in'
@@ -131,13 +110,13 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/zsh-%{version}
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
-for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
+for i in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
     install -m 644 $i $RPM_BUILD_ROOT%{_sysconfdir}/"$(basename $i .rhs)"
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc
+install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile
 
 # This is just here to shut up rpmlint, and is very annoying.
 # Note that we can't chmod everything as then rpmlint will complain about
@@ -182,6 +161,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Jun 04 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9.1-1
+- rebase to the latest upstream release (rhbz#2483668)
+
 * Tue Mar 24 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9-20
 - fix segfault in _IO_putc (rhbz#2449939)
 

From b7e65312fa16d741d3244e4c1307fc61dba7fe8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Mon, 13 Jul 2026 12:15:06 +0200
Subject: [PATCH 43/45] rebase to the latest upstream release

Resolves: rhbz#2499540
---
 ...dule-loading-problem-with-full-RELRO.patch | 69 -------------------
 0100-zsh-_IO_putc-SIGSEGV.patch               | 25 -------
 sources                                       |  4 +-
 zsh.spec                                      | 12 ++--
 4 files changed, 6 insertions(+), 104 deletions(-)
 delete mode 100644 0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
 delete mode 100644 0100-zsh-_IO_putc-SIGSEGV.patch

diff --git a/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch b/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
deleted file mode 100644
index 2ca953b..0000000
--- a/0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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
-
diff --git a/0100-zsh-_IO_putc-SIGSEGV.patch b/0100-zsh-_IO_putc-SIGSEGV.patch
deleted file mode 100644
index 3adf849..0000000
--- a/0100-zsh-_IO_putc-SIGSEGV.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
-index 8f32c68e3..bd4a67cee 100644
---- a/Src/Zle/zle_tricky.c
-+++ b/Src/Zle/zle_tricky.c
-@@ -2490,15 +2490,17 @@ printfmt(char *fmt, int n, int dopr, int doesc)
- 			    p--;
- 		    } else
- 			atr = match_colour(NULL, is_fg, arg);
--		    if (atr != TXT_ERROR)
-+		    if (atr != TXT_ERROR && dopr)
- 			set_colour_attribute(atr, is_fg ? COL_SEQ_FG :
- 					     COL_SEQ_BG, 0);
- 		    break;
- 		case 'f':
--		    set_colour_attribute(TXTNOFGCOLOUR, COL_SEQ_FG, 0);
-+		    if (dopr)
-+			set_colour_attribute(TXTNOFGCOLOUR, COL_SEQ_FG, 0);
- 		    break;
- 		case 'k':
--		    set_colour_attribute(TXTNOBGCOLOUR, COL_SEQ_BG, 0);
-+		    if (dopr)
-+			set_colour_attribute(TXTNOBGCOLOUR, COL_SEQ_BG, 0);
- 		    break;
- 		case '{':
- 		    if (arg)
diff --git a/sources b/sources
index bd494a5..e248084 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zsh-5.9.1.tar.xz) = e16c13559262577e725b290c35ce6598d58c2acdd204eac619e8ed9b6a918bce39bfbf9d3ef4c5eb877af7d3279c8a4b15439eba6a38c4e4d47d5555d5f79872
-SHA512 (zsh-5.9.1.tar.xz.asc) = 8c9fb393de9b9ff84353ed35f812c8e05e6131c238fd233a2f6e3aa02b0644c7afd597a8b4e7a737152e4478d0d4dae7a5e42559047f100eb536049c4490ceeb
+SHA512 (zsh-5.9.2.tar.xz) = 40bb5eb2cf217e6bcff342fcc9314f082a5d8975abcb56897e86eba5839ddf0ec1ac3feed1e797d4c68cea22228197342916f14bb87309bbcc026a87622bc015
+SHA512 (zsh-5.9.2.tar.xz.asc) = 9657c8fef30124e4ea1b4ab41c80b471990c52c362e53f40c9bcca1be1b48af5d19437ecf6a645dbe9ea328d82cc43f9d88ad3835d23d76e482969017a956bf6
diff --git a/zsh.spec b/zsh.spec
index a705f04..c60fd6f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,6 +1,6 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.9.1
+Version: 5.9.2
 Release: 1%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
@@ -17,13 +17,6 @@ Source7: zshenv.rhs
 Source8: dotzshrc
 Source9: dotzprofile
 
-# upstream commit a84fdd7c8f77935ecce99ff2b0bdba738821ed79
-Patch1: 0003-zsh-fix-module-loading-problem-with-full-RELRO.patch
-
-# downstream patch for rhbz#2449939
-# already fixed upstream in a major refactor of term color attribute handling
-Patch100: 0100-zsh-_IO_putc-SIGSEGV.patch
-
 BuildRequires: coreutils
 BuildRequires: gawk
 BuildRequires: gcc
@@ -161,6 +154,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Mon Jul 13 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9.2-1
+- rebase to the latest upstream release (rhbz#2499540)
+
 * Thu Jun 04 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9.1-1
 - rebase to the latest upstream release (rhbz#2483668)
 

From 05dc358b1a49ce5f15812aa3293b189c707dd9e4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 09:43:40 +0000
Subject: [PATCH 44/45] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 zsh.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsh.spec b/zsh.spec
index c60fd6f..97033ac 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 
@@ -154,6 +154,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Mon Jul 13 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9.2-1
 - rebase to the latest upstream release (rhbz#2499540)
 

From 4a2d5294300503e84cb349010b8358b9bb1dee7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Wed, 22 Jul 2026 16:16:15 +0200
Subject: [PATCH 45/45] fix crash with bracketed-paste-magic and undo

Resolves: rhbz#2484692
---
 zsh-memcpy-sigsegv-bracketed-paste.patch | 83 ++++++++++++++++++++++++
 zsh.spec                                 | 11 +++-
 2 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 zsh-memcpy-sigsegv-bracketed-paste.patch

diff --git a/zsh-memcpy-sigsegv-bracketed-paste.patch b/zsh-memcpy-sigsegv-bracketed-paste.patch
new file mode 100644
index 0000000..5310b19
--- /dev/null
+++ b/zsh-memcpy-sigsegv-bracketed-paste.patch
@@ -0,0 +1,83 @@
+From b258cb7816323050d7e485171c92ad3f1046799e Mon Sep 17 00:00:00 2001
+From: Mikael Magnusson <mikachu@gmail.com>
+Date: Fri, 17 Jul 2026 22:53:21 +0200
+Subject: [PATCH] 54985: fix crash with bracketed-paste-magic and undo
+
+In particular, fc -P/-p didn't interact well with undo. Make sure we
+store/restore histline across those calls.
+
+(cherry-picked from commit 7708d466dfab8dd29f9ae5de12c74af37bf99a4d)
+---
+ Src/Zle/zle_main.c | 8 ++++++++
+ Src/hist.c         | 7 ++++++-
+ Src/zsh.h          | 3 ++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
+index 44ee63d..817e605 100644
+--- a/Src/Zle/zle_main.c
++++ b/Src/Zle/zle_main.c
+@@ -2168,6 +2168,14 @@ zle_main_entry(int cmd, va_list ap)
+ 	break;
+     }
+ 
++    case ZLE_CMD_GET_HIST_LINE:
++    {
++	zlong *p = va_arg(ap, zlong *);
++	*p = histline;
++
++	break;
++    }
++
+     default:
+ #ifdef DEBUG
+ 	    dputs("Bad command %d in zle_main_entry", cmd);
+diff --git a/Src/hist.c b/Src/hist.c
+index f58db23..85f329c 100644
+--- a/Src/hist.c
++++ b/Src/hist.c
+@@ -226,6 +226,7 @@ static struct histsave {
+     HashTable histtab;
+     Histent hist_ring;
+     zlong curhist;
++    zlong histline;
+     zlong histlinect;
+     zlong histsiz;
+     zlong savehistsiz;
+@@ -3846,6 +3847,10 @@ pushhiststack(char *hf, zlong hs, zlong shs, int level)
+     h->histsiz = histsiz;
+     h->savehistsiz = savehistsiz;
+     h->locallevel = level;
++    if (zleactive)
++	zleentry(ZLE_CMD_GET_HIST_LINE, &h->histline);
++    else
++	h->histline = 0;
+ 
+     memset(&lasthist, 0, sizeof lasthist);
+     if (hf) {
+@@ -3898,7 +3903,7 @@ pophiststack(void)
+     hist_ring = h->hist_ring;
+     curhist = h->curhist;
+     if (zleactive)
+-	zleentry(ZLE_CMD_SET_HIST_LINE, curhist);
++	zleentry(ZLE_CMD_SET_HIST_LINE, h->histline);
+     histlinect = h->histlinect;
+     histsiz = h->histsiz;
+     savehistsiz = h->savehistsiz;
+diff --git a/Src/zsh.h b/Src/zsh.h
+index 8fab0eb..32302ec 100644
+--- a/Src/zsh.h
++++ b/Src/zsh.h
+@@ -3244,7 +3244,8 @@ enum {
+     ZLE_CMD_REFRESH,
+     ZLE_CMD_SET_KEYMAP,
+     ZLE_CMD_GET_KEY,
+-    ZLE_CMD_SET_HIST_LINE
++    ZLE_CMD_SET_HIST_LINE,
++    ZLE_CMD_GET_HIST_LINE,
+ };
+ 
+ /***************************************/
+-- 
+2.55.0
+
diff --git a/zsh.spec b/zsh.spec
index 97033ac..8ceb62f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT-Modern-Variant AND ISC AND GPL-2.0-only
 URL: http://zsh.sourceforge.net/
 
@@ -17,6 +17,10 @@ Source7: zshenv.rhs
 Source8: dotzshrc
 Source9: dotzprofile
 
+# https://sourceforge.net/p/zsh/code/ci/7708d466dfab8dd29f9ae5de12c74af37bf99a4d/
+# fix crash with bracketed-paste-magic and undo (rhbz#2484692)
+Patch: zsh-memcpy-sigsegv-bracketed-paste.patch
+
 BuildRequires: coreutils
 BuildRequires: gawk
 BuildRequires: gcc
@@ -46,7 +50,7 @@ mechanism, and more.
 
 %package html
 Summary: Zsh shell manual in html format
-BuildArch:	noarch
+BuildArch: noarch
 
 %description html
 The zsh shell is a command interpreter usable as an interactive login
@@ -154,6 +158,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Wed Jul 22 2026 Lukáš Zaoral <lzaoral@redhat.com> - 5.9.2-3
+- fix crash with bracketed-paste-magic and undo (rhbz#2484692)
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild