pool/zsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 330592 from shells

Browse Source 
- Update to version 5.1.1
  * Bug fixes for regressions in 5.1 release
- Remove read1char_signals.patch, fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/330592
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2015-09-17 07:18:28 +00:00 committed by Git OBS Bridge
commit cc5604074d
5 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
read1char_signals.patch
View File

@ -1,28 +0,0 @@
commit 3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c
Author: Barton E. Schaefer <schaefer@zsh.org>
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);

3
zsh-5.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec
size 2788676

3
zsh-5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3a654fa0ef26cb1a3228c9257101870e72899fde1cd815388b1b2cbbdfa59b4
size 2785404

7
zsh.changes
View File

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

4
zsh.spec
View File

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