diff --git a/read1char_signals.patch b/read1char_signals.patch deleted file mode 100644 index 1ac6719..0000000 --- a/read1char_signals.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c -Author: Barton E. Schaefer -Date: Tue Sep 1 11:26:06 2015 -0700 - - 36376: handle signals during read1char() so it is possible to interrupt correct/correctall prompts - -diff --git a/Src/utils.c b/Src/utils.c -index 4c4dc55..90f7c33 100644 ---- a/Src/utils.c -+++ b/Src/utils.c -@@ -2538,11 +2538,16 @@ static int - read1char(int echo) - { - char c; -+ int q = queue_signal_level(); - -+ dont_queue_signals(); - while (read(SHTTY, &c, 1) != 1) { -- if (errno != EINTR || errflag || retflag || breaks || contflag) -+ if (errno != EINTR || errflag || retflag || breaks || contflag) { -+ restore_queue_signals(q); - return -1; -+ } - } -+ restore_queue_signals(q); - if (echo) - write_loop(SHTTY, &c, 1); - return STOUC(c); diff --git a/zsh-5.1.1.tar.xz b/zsh-5.1.1.tar.xz new file mode 100644 index 0000000..8f73d05 --- /dev/null +++ b/zsh-5.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec +size 2788676 diff --git a/zsh-5.1.tar.xz b/zsh-5.1.tar.xz deleted file mode 100644 index 6b9f9ac..0000000 --- a/zsh-5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3a654fa0ef26cb1a3228c9257101870e72899fde1cd815388b1b2cbbdfa59b4 -size 2785404 diff --git a/zsh.changes b/zsh.changes index 22f428c..6d53e6f 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 12 07:47:27 UTC 2015 - idonmez@suse.com + +- Update to version 5.1.1 + * Bug fixes for regressions in 5.1 release +- Remove read1char_signals.patch, fixed upstream. + ------------------------------------------------------------------- Tue Sep 1 18:57:20 UTC 2015 - idonmez@suse.com diff --git a/zsh.spec b/zsh.spec index 01794ff..21c252d 100644 --- a/zsh.spec +++ b/zsh.spec @@ -17,7 +17,7 @@ Name: zsh -Version: 5.1 +Version: 5.1.1 Release: 0 Summary: Shell with comprehensive completion License: MIT @@ -39,7 +39,6 @@ Source17: zshprompt.pl Patch1: trim-unneeded-completions.patch # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion Patch2: zsh-osc-completion.patch -Patch3: read1char_signals.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -99,7 +98,6 @@ This package contains the Zsh manual in html format. %patch1 -p1 %endif %patch2 -p1 -%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl