public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/zsh] rawhide: rebase to the latest upstream release
Date: Mon, 13 Jul 2026 10:24:25 GMT	[thread overview]
Message-ID: <178393826587.1.8617461191510193756.rpms-zsh-b7e65312fa16@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/zsh
            Branch : rawhide
            Commit : b7e65312fa16d741d3244e4c1307fc61dba7fe8e
            Author : Lukáš Zaoral <lzaoral@redhat.com>
            Date   : 2026-07-13T12:15:06+02:00
            Stats  : +6/-104 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/zsh/c/b7e65312fa16d741d3244e4c1307fc61dba7fe8e?branch=rawhide

            Log:
            rebase to the latest upstream release

Resolves: rhbz#2499540

---
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)
 

             reply	other threads:[~2026-07-13 10:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-13 10:24  [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-06-04  9:03 [rpms/zsh] rawhide: rebase to the latest upstream release 

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178393826587.1.8617461191510193756.rpms-zsh-b7e65312fa16@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox