From 07bfbf59a6fc3c08257e520da729cf8840dacfa3e0d442b1164cf8f9600d0056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 16 Dec 2019 10:14:36 +0000 Subject: [PATCH 1/4] - Update to version 5.8~pre1 (5.7.1-test-1) * Please see the included NEWS for new functionality OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=207 --- zsh-5.7.1-test-1.tar.xz | 3 +++ zsh-5.7.1-test-1.tar.xz.asc | 11 +++++++++++ zsh-5.7.1.tar.xz | 3 --- zsh-5.7.1.tar.xz.asc | 11 ----------- zsh.changes | 6 ++++++ zsh.spec | 15 +++++++++------ 6 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 zsh-5.7.1-test-1.tar.xz create mode 100644 zsh-5.7.1-test-1.tar.xz.asc delete mode 100644 zsh-5.7.1.tar.xz delete mode 100644 zsh-5.7.1.tar.xz.asc diff --git a/zsh-5.7.1-test-1.tar.xz b/zsh-5.7.1-test-1.tar.xz new file mode 100644 index 0000000..f15d2ab --- /dev/null +++ b/zsh-5.7.1-test-1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5d7f5fdec1189c78b76c6cbbfcd8680d2c2f3abed5d8bf70dac6e5bbdafb025 +size 3176336 diff --git a/zsh-5.7.1-test-1.tar.xz.asc b/zsh-5.7.1-test-1.tar.xz.asc new file mode 100644 index 0000000..947790d --- /dev/null +++ b/zsh-5.7.1-test-1.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl31MeIACgkQrPgUbK6M +u8RBXQgAxNAEYB590ArdctZzJxp43nWPyULDe31X08skGqInpRwQ4B5og4Ra1JM7 +SSF2YvYG+RcHPzPPVlKjinQ1Rxg/5kL/cyQM/mkM2TSxc6uk0Ejub1kiuoZeqR9t +/Srb3qRnTgGHZqvZduffQQaNKANW03C7Pha6shNbXE5i/vog/BmSr0LsEtA8FAWA +ZNXAZtgCvwwV6jSFFmsu2/TSPAx4GB/pglMtH+SQCLEmxhE+rP7qEG9uZD0cHtCR +XeUzPrEBHZvfZqzo+c42u0DbGme9D41ZCggcTypeFjpMy6Uz4gsAUiv2u780O9ij +l+d7bgLZBG1zM+p95GHsuCQ58qBAaQ== +=43SX +-----END PGP SIGNATURE----- diff --git a/zsh-5.7.1.tar.xz b/zsh-5.7.1.tar.xz deleted file mode 100644 index 60a88bb..0000000 --- a/zsh-5.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8 -size 3126308 diff --git a/zsh-5.7.1.tar.xz.asc b/zsh-5.7.1.tar.xz.asc deleted file mode 100644 index 0c0cf4c..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.changes b/zsh.changes index 4265e6a..69ed5bb 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 16 10:08:27 UTC 2019 - Ismail Dönmez + +- Update to version 5.8~pre1 (5.7.1-test-1) + * Please see the included NEWS for new functionality + ------------------------------------------------------------------- Mon Feb 4 13:15:17 UTC 2019 - Ismail Dönmez diff --git a/zsh.spec b/zsh.spec index 8c69fd2..165701b 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,7 @@ # # spec file for package zsh # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +# Only for -test builds +%define _version 5.7.1-test-1 + %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version} %if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 %global __requires_exclude ^/bin/zsh$ @@ -25,14 +28,14 @@ BuildRequires: texi2html BuildRequires: texinfo %endif Name: zsh -Version: 5.7.1 +Version: 5.8~pre1 Release: 0%{?dist} Summary: Shell with comprehensive completion License: MIT Group: System/Shells -Url: http://www.zsh.org -Source0: https://downloads.sourceforge.net/project/zsh/zsh/%{version}/zsh-%{version}.tar.xz -Source1: https://downloads.sourceforge.net/project/zsh/zsh/%{version}/zsh-%{version}.tar.xz.asc +URL: http://www.zsh.org +Source0: https://downloads.sourceforge.net/project/zsh/zsh-test/%{_version}/zsh-%{_version}.tar.xz +Source1: https://downloads.sourceforge.net/project/zsh/zsh-test/%{_version}/zsh-%{_version}.tar.xz.asc Source2: %{name}.keyring Source3: zshrc Source4: zshenv @@ -91,7 +94,7 @@ mechanism, and more. This package contains the Zsh manual in HTML format. %prep -%setup -q +%setup -q -n %{name}-%{_version} %if 0%{?suse_version} %patch1 -p1 %endif From 9393f4e3c98b879e70eff8acf308dc3af7bd7c5067f20e46316514bf8a0f3357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 16 Dec 2019 10:20:48 +0000 Subject: [PATCH 2/4] * The zsh/zutil module's zparseopts builtin learnt an -F option to abort parsing when an unrecognised option-like parameter is encountered. * The zsh/files module gained a chmod builtin. * Several changes have been made to the way completion functions track 'precommands' (such as `command` and `env`) and determine whether the command being completed for is a shell builtin. Developers of completion functions may wish to familiarise themselves with `_normal -p` and `_pick_variant -b`. * The option CD_SILENT was added to suppress all output from cd (whether explicit or implicit with AUTO_CD). It is disabled by default. * The compadd builtin's -o option now takes an optional argument to specify the order of completion matches. This affects the display of candidate matches and the order in which they are selected when cycling between them using menu completion. * The :h and :t modifiers in parameter expansion (if braces are present), glob qualifiers and history expansion may take following decimal digit arguments in order to keep that many leading or trailing path components instead of the defaults of all but one (:h) and one (:t). In an absolute path the leading '/' counts as one component. * The functions builtin gained a -c option to efficiently copy functions. - See included ChangeLog for the complete list of changes. OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=208 --- zsh.changes | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/zsh.changes b/zsh.changes index 69ed5bb..64ed68c 100644 --- a/zsh.changes +++ b/zsh.changes @@ -2,7 +2,27 @@ Mon Dec 16 10:08:27 UTC 2019 - Ismail Dönmez - Update to version 5.8~pre1 (5.7.1-test-1) - * Please see the included NEWS for new functionality + * The zsh/zutil module's zparseopts builtin learnt an -F option to abort + parsing when an unrecognised option-like parameter is encountered. + * The zsh/files module gained a chmod builtin. + * Several changes have been made to the way completion functions track + 'precommands' (such as `command` and `env`) and determine whether the + command being completed for is a shell builtin. Developers of completion + functions may wish to familiarise themselves with `_normal -p` and + `_pick_variant -b`. + * The option CD_SILENT was added to suppress all output from cd (whether + explicit or implicit with AUTO_CD). It is disabled by default. + * The compadd builtin's -o option now takes an optional argument to + specify the order of completion matches. This affects the display + of candidate matches and the order in which they are selected when + cycling between them using menu completion. + * The :h and :t modifiers in parameter expansion (if braces are present), + glob qualifiers and history expansion may take following decimal digit + arguments in order to keep that many leading or trailing path components + instead of the defaults of all but one (:h) and one (:t). In an absolute + path the leading '/' counts as one component. + * The functions builtin gained a -c option to efficiently copy functions. +- See included ChangeLog for the complete list of changes. ------------------------------------------------------------------- Mon Feb 4 13:15:17 UTC 2019 - Ismail Dönmez From f3bbddc76de16a1c10558ae5352189e1f6c03b446dc8debc65105c0e42278614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 16 Dec 2019 15:11:39 +0000 Subject: [PATCH 3/4] - Add 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch to fix a re-entrancy problem. OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=209 --- ...0d1f553631ecb641e98f4bf48bc2a44e5b82.patch | 106 ++++++++++++++++++ zsh.changes | 6 + zsh.spec | 2 + 3 files changed, 114 insertions(+) create mode 100644 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch diff --git a/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch b/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch new file mode 100644 index 0000000..1efa0e0 --- /dev/null +++ b/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch @@ -0,0 +1,106 @@ +From 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82 Mon Sep 17 00:00:00 2001 +From: Peter Stephenson +Date: Sun, 15 Dec 2019 19:04:04 +0000 +Subject: [PATCH] 45025: fix re-entrancy problem with memory management in + readoutput(). + +This could cause a signal received during $(...) to corrupt memory. +--- + ChangeLog | 6 ++++++ + Src/exec.c | 61 ++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 42 insertions(+), 25 deletions(-) + +diff --git a/Src/exec.c b/Src/exec.c +index 9dc91a71e..64eee7dc4 100644 +--- a/Src/exec.c ++++ b/Src/exec.c +@@ -4646,19 +4646,25 @@ getoutput(char *cmd, int qt) + return NULL; + } + +-/* read output of command substitution */ ++/* read output of command substitution ++ * ++ * The file descriptor "in" is closed by the function. ++ * ++ * "qt" indicates if the substitution was in double quotes. ++ * ++ * "readerror", if not NULL, is used to return any error that ++ * occurred during the read. ++ */ + + /**/ + mod_export LinkList + readoutput(int in, int qt, int *readerror) + { + LinkList ret; +- char *buf, *ptr; +- int bsiz, c, cnt = 0; +- FILE *fin; ++ char *buf, *bufptr, *ptr, inbuf[64]; ++ int bsiz, c, cnt = 0, readret; + int q = queue_signal_level(); + +- fin = fdopen(in, "r"); + ret = newlinklist(); + ptr = buf = (char *) hcalloc(bsiz = 64); + /* +@@ -4670,33 +4676,38 @@ readoutput(int in, int qt, int *readerror) + */ + dont_queue_signals(); + child_unblock(); +- while ((c = fgetc(fin)) != EOF || errno == EINTR) { +- if (c == EOF) { +- errno = 0; +- clearerr(fin); +- continue; +- } +- if (imeta(c)) { +- *ptr++ = Meta; +- c ^= 32; +- cnt++; ++ for (;;) { ++ readret = read(in, inbuf, 64); ++ if (readret <= 0) { ++ if (readret < 0 && errno == EINTR) ++ continue; ++ else ++ break; + } +- if (++cnt >= bsiz) { +- char *pp; +- queue_signals(); +- pp = (char *) hcalloc(bsiz *= 2); +- dont_queue_signals(); ++ for (bufptr = inbuf; bufptr < inbuf + readret; bufptr++) { ++ c = *bufptr; ++ if (imeta(c)) { ++ *ptr++ = Meta; ++ c ^= 32; ++ cnt++; ++ } ++ if (++cnt >= bsiz) { ++ char *pp; ++ queue_signals(); ++ pp = (char *) hcalloc(bsiz *= 2); ++ dont_queue_signals(); + +- memcpy(pp, buf, cnt - 1); +- ptr = (buf = pp) + cnt - 1; ++ memcpy(pp, buf, cnt - 1); ++ ptr = (buf = pp) + cnt - 1; ++ } ++ *ptr++ = c; + } +- *ptr++ = c; + } + child_block(); + restore_queue_signals(q); + if (readerror) +- *readerror = ferror(fin) ? errno : 0; +- fclose(fin); ++ *readerror = readret < 0 ? errno : 0; ++ close(in); + while (cnt && ptr[-1] == '\n') + ptr--, cnt--; + *ptr = '\0'; diff --git a/zsh.changes b/zsh.changes index 64ed68c..dad3f0a 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 16 15:03:50 UTC 2019 - Ismail Dönmez + +- Add 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch to fix a + re-entrancy problem. + ------------------------------------------------------------------- Mon Dec 16 10:08:27 UTC 2019 - Ismail Dönmez diff --git a/zsh.spec b/zsh.spec index 165701b..1247587 100644 --- a/zsh.spec +++ b/zsh.spec @@ -43,6 +43,7 @@ Source5: zprofile Patch1: trim-unneeded-completions.patch # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion Patch2: zsh-osc-completion.patch +Patch3: 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch BuildRequires: groff BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -99,6 +100,7 @@ This package contains the Zsh manual in HTML format. %patch1 -p1 %endif %patch2 -p1 +%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl From dd5bd851bfccfc03c8ef72dd939d76e4598d6072b82c84a918afa7fb58c5a77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 22 Dec 2019 09:27:57 +0000 Subject: [PATCH 4/4] - Update to version 5.8~pre2 (5.7.1-test-2) - Drop 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch, fixed upstream. OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=210 --- ...0d1f553631ecb641e98f4bf48bc2a44e5b82.patch | 106 ------------------ zsh-5.7.1-test-1.tar.xz | 3 - zsh-5.7.1-test-1.tar.xz.asc | 11 -- zsh-5.7.1-test-2.tar.xz | 3 + zsh-5.7.1-test-2.tar.xz.asc | 11 ++ zsh.changes | 7 ++ zsh.spec | 6 +- 7 files changed, 23 insertions(+), 124 deletions(-) delete mode 100644 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch delete mode 100644 zsh-5.7.1-test-1.tar.xz delete mode 100644 zsh-5.7.1-test-1.tar.xz.asc create mode 100644 zsh-5.7.1-test-2.tar.xz create mode 100644 zsh-5.7.1-test-2.tar.xz.asc diff --git a/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch b/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch deleted file mode 100644 index 1efa0e0..0000000 --- a/1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82 Mon Sep 17 00:00:00 2001 -From: Peter Stephenson -Date: Sun, 15 Dec 2019 19:04:04 +0000 -Subject: [PATCH] 45025: fix re-entrancy problem with memory management in - readoutput(). - -This could cause a signal received during $(...) to corrupt memory. ---- - ChangeLog | 6 ++++++ - Src/exec.c | 61 ++++++++++++++++++++++++++++++++---------------------- - 2 files changed, 42 insertions(+), 25 deletions(-) - -diff --git a/Src/exec.c b/Src/exec.c -index 9dc91a71e..64eee7dc4 100644 ---- a/Src/exec.c -+++ b/Src/exec.c -@@ -4646,19 +4646,25 @@ getoutput(char *cmd, int qt) - return NULL; - } - --/* read output of command substitution */ -+/* read output of command substitution -+ * -+ * The file descriptor "in" is closed by the function. -+ * -+ * "qt" indicates if the substitution was in double quotes. -+ * -+ * "readerror", if not NULL, is used to return any error that -+ * occurred during the read. -+ */ - - /**/ - mod_export LinkList - readoutput(int in, int qt, int *readerror) - { - LinkList ret; -- char *buf, *ptr; -- int bsiz, c, cnt = 0; -- FILE *fin; -+ char *buf, *bufptr, *ptr, inbuf[64]; -+ int bsiz, c, cnt = 0, readret; - int q = queue_signal_level(); - -- fin = fdopen(in, "r"); - ret = newlinklist(); - ptr = buf = (char *) hcalloc(bsiz = 64); - /* -@@ -4670,33 +4676,38 @@ readoutput(int in, int qt, int *readerror) - */ - dont_queue_signals(); - child_unblock(); -- while ((c = fgetc(fin)) != EOF || errno == EINTR) { -- if (c == EOF) { -- errno = 0; -- clearerr(fin); -- continue; -- } -- if (imeta(c)) { -- *ptr++ = Meta; -- c ^= 32; -- cnt++; -+ for (;;) { -+ readret = read(in, inbuf, 64); -+ if (readret <= 0) { -+ if (readret < 0 && errno == EINTR) -+ continue; -+ else -+ break; - } -- if (++cnt >= bsiz) { -- char *pp; -- queue_signals(); -- pp = (char *) hcalloc(bsiz *= 2); -- dont_queue_signals(); -+ for (bufptr = inbuf; bufptr < inbuf + readret; bufptr++) { -+ c = *bufptr; -+ if (imeta(c)) { -+ *ptr++ = Meta; -+ c ^= 32; -+ cnt++; -+ } -+ if (++cnt >= bsiz) { -+ char *pp; -+ queue_signals(); -+ pp = (char *) hcalloc(bsiz *= 2); -+ dont_queue_signals(); - -- memcpy(pp, buf, cnt - 1); -- ptr = (buf = pp) + cnt - 1; -+ memcpy(pp, buf, cnt - 1); -+ ptr = (buf = pp) + cnt - 1; -+ } -+ *ptr++ = c; - } -- *ptr++ = c; - } - child_block(); - restore_queue_signals(q); - if (readerror) -- *readerror = ferror(fin) ? errno : 0; -- fclose(fin); -+ *readerror = readret < 0 ? errno : 0; -+ close(in); - while (cnt && ptr[-1] == '\n') - ptr--, cnt--; - *ptr = '\0'; diff --git a/zsh-5.7.1-test-1.tar.xz b/zsh-5.7.1-test-1.tar.xz deleted file mode 100644 index f15d2ab..0000000 --- a/zsh-5.7.1-test-1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5d7f5fdec1189c78b76c6cbbfcd8680d2c2f3abed5d8bf70dac6e5bbdafb025 -size 3176336 diff --git a/zsh-5.7.1-test-1.tar.xz.asc b/zsh-5.7.1-test-1.tar.xz.asc deleted file mode 100644 index 947790d..0000000 --- a/zsh-5.7.1-test-1.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl31MeIACgkQrPgUbK6M -u8RBXQgAxNAEYB590ArdctZzJxp43nWPyULDe31X08skGqInpRwQ4B5og4Ra1JM7 -SSF2YvYG+RcHPzPPVlKjinQ1Rxg/5kL/cyQM/mkM2TSxc6uk0Ejub1kiuoZeqR9t -/Srb3qRnTgGHZqvZduffQQaNKANW03C7Pha6shNbXE5i/vog/BmSr0LsEtA8FAWA -ZNXAZtgCvwwV6jSFFmsu2/TSPAx4GB/pglMtH+SQCLEmxhE+rP7qEG9uZD0cHtCR -XeUzPrEBHZvfZqzo+c42u0DbGme9D41ZCggcTypeFjpMy6Uz4gsAUiv2u780O9ij -l+d7bgLZBG1zM+p95GHsuCQ58qBAaQ== -=43SX ------END PGP SIGNATURE----- diff --git a/zsh-5.7.1-test-2.tar.xz b/zsh-5.7.1-test-2.tar.xz new file mode 100644 index 0000000..46fff64 --- /dev/null +++ b/zsh-5.7.1-test-2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6036e53b8dc417030e6ef9901ed82e2df8455f18f6e1b6264212caf2341f9ac6 +size 3180532 diff --git a/zsh-5.7.1-test-2.tar.xz.asc b/zsh-5.7.1-test-2.tar.xz.asc new file mode 100644 index 0000000..724aba0 --- /dev/null +++ b/zsh-5.7.1-test-2.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl3+3oYACgkQrPgUbK6M +u8QI9gf9GLHCdE1IwWV0aWjoZRYjQ7UhoGu8ZWGk5CFqkWM69FhZvvtc3/tl7Zxr +APn3GNGayLQ+ub2eZR/dw/2lI21FeF6tnYabdedfs88mkuj2MbGIDQV1iGVAmGbG +pTzemf2+3UaeHs6M6mc7juwlmhRoHaeM8wCkGdcGpbsD+LAon5+AMg1PTyZOnXuU +ql3mifDTDoNo8ME3xc0/67g33tpmCHKAISN900B65yCBtWv0st7JMULpAUGWlhrG +g4etSaWo6oyby4DKTIe5udvDfPCDe3lbI0UMStt4/TzAgV/0WJb4BKMLxJ+4w1Tj +dm+TvPXQnb5n6Bnx1fryfXzjOExEpw== +=mYIM +-----END PGP SIGNATURE----- diff --git a/zsh.changes b/zsh.changes index dad3f0a..64d1d08 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 22 09:19:39 UTC 2019 - Ismail Dönmez + +- Update to version 5.8~pre2 (5.7.1-test-2) +- Drop 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch, fixed + upstream. + ------------------------------------------------------------------- Mon Dec 16 15:03:50 UTC 2019 - Ismail Dönmez diff --git a/zsh.spec b/zsh.spec index 1247587..a1b2640 100644 --- a/zsh.spec +++ b/zsh.spec @@ -17,7 +17,7 @@ # Only for -test builds -%define _version 5.7.1-test-1 +%define _version 5.7.1-test-2 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version} %if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 @@ -28,7 +28,7 @@ BuildRequires: texi2html BuildRequires: texinfo %endif Name: zsh -Version: 5.8~pre1 +Version: 5.8~pre2 Release: 0%{?dist} Summary: Shell with comprehensive completion License: MIT @@ -43,7 +43,6 @@ Source5: zprofile Patch1: trim-unneeded-completions.patch # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion Patch2: zsh-osc-completion.patch -Patch3: 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch BuildRequires: groff BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -100,7 +99,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