From f4b6325fa38272820b0b7ef839aad474acfb04896f4465ad9b3c11eba72700be Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 7 Mar 2011 14:14:09 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/zsh revision 23.0 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=e730055b3afbaad8c7818390bc1a3000 --- zsh.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zsh.spec b/zsh.spec index 7ce1b9b..d8b45c8 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,7 @@ # -# spec file for package zsh (Version 4.3.10) +# spec file for package zsh # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: zsh Version: 4.3.11 -Release: 5 +Release: 1 License: Other uncritical OpenSource License Group: System/Shells BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,7 +136,6 @@ groff Doc/intro.ms > intro.txt %{__ln_s} -f ../../bin/zsh %{buildroot}/usr/bin/zsh %fdupes $RPM_BUILD_ROOT - %clean %{__rm} -rf %{buildroot} From b2c96680710e6a6c5c5605126a05660f05b0c3d7e3c6d455b9fe4faef3503bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 15 Mar 2011 14:12:09 +0000 Subject: [PATCH 2/3] Fix crash with OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=44 --- _service:download_url:zsh-4.3.11-doc.tar.bz2 | 3 -- _service:download_url:zsh-4.3.11.tar.bz2 | 3 -- subst-crash.patch | 36 ++++++++++++++++++++ zsh.changes | 5 +++ zsh.spec | 2 ++ 5 files changed, 43 insertions(+), 6 deletions(-) delete mode 100644 _service:download_url:zsh-4.3.11-doc.tar.bz2 delete mode 100644 _service:download_url:zsh-4.3.11.tar.bz2 create mode 100644 subst-crash.patch diff --git a/_service:download_url:zsh-4.3.11-doc.tar.bz2 b/_service:download_url:zsh-4.3.11-doc.tar.bz2 deleted file mode 100644 index 9e0652b..0000000 --- a/_service:download_url:zsh-4.3.11-doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c -size 2687527 diff --git a/_service:download_url:zsh-4.3.11.tar.bz2 b/_service:download_url:zsh-4.3.11.tar.bz2 deleted file mode 100644 index 5e69eac..0000000 --- a/_service:download_url:zsh-4.3.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 -size 2868429 diff --git a/subst-crash.patch b/subst-crash.patch new file mode 100644 index 0000000..7ef899d --- /dev/null +++ b/subst-crash.patch @@ -0,0 +1,36 @@ +From aa58d139ff3ffa7258a6273bf279d70f9ee31916 Mon Sep 17 00:00:00 2001 +From: Peter Stephenson +Date: Tue, 18 Jan 2011 10:29:58 +0000 +Subject: [PATCH] Mikael: 28637: ${foo:0:} caused crash + +--- + ChangeLog | 6 +++++- + Src/subst.c | 14 ++++++++------ + Test/D04parameter.ztst | 5 +++++ + 3 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/Src/subst.c b/Src/subst.c +index 24d515d..37d63ca 100644 +--- a/Src/subst.c ++++ b/Src/subst.c +@@ -2814,12 +2814,14 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub) + zerr("invalid length: %s", check_offset); + return NULL; + } +- length = mathevali(check_offset); +- if (errflag) +- return NULL; +- if (length < (zlong)0) { +- zerr("invalid length: %s", check_offset); +- return NULL; ++ if (check_offset) { ++ length = mathevali(check_offset); ++ if (errflag) ++ return NULL; ++ if (length < (zlong)0) { ++ zerr("invalid length: %s", check_offset); ++ return NULL; ++ } + } + } + if (horrible_offset_hack) { diff --git a/zsh.changes b/zsh.changes index 41ed8ef..46618ed 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 15 13:40:24 UTC 2011 - ismail@namtrac.org + +- Fix crash with ${foo:0:} + ------------------------------------------------------------------- Wed Dec 29 02:07:58 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/zsh.spec b/zsh.spec index d8b45c8..af641b3 100644 --- a/zsh.spec +++ b/zsh.spec @@ -46,6 +46,7 @@ Patch0: %{name}-%{version}-doc_makefile.patch Patch1: %{name}-%{version}-doc_intro_paths.patch Patch2: %{name}-%{version}-run-help_pager.patch Patch3: zsh-cleanup.patch +Patch4: subst-crash.patch Summary: Shell with comprehensive completion %define do_profiling 0 @@ -67,6 +68,7 @@ Authors: %patch1 %patch2 %patch3 +%patch4 -p1 # Fix bindir path in some files perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \ Functions/Misc/zcalc Functions/Example/cat \ From cb64f6501cbc4a681f0ebddebace8d1fe7d0d5332dd19fd26ff07ebaa4309712 Mon Sep 17 00:00:00 2001 From: OBS User _service Date: Tue, 15 Mar 2011 14:13:30 +0000 Subject: [PATCH 3/3] generated via source service OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=45 --- _service:download_url:zsh-4.3.11-doc.tar.bz2 | 3 +++ _service:download_url:zsh-4.3.11.tar.bz2 | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 _service:download_url:zsh-4.3.11-doc.tar.bz2 create mode 100644 _service:download_url:zsh-4.3.11.tar.bz2 diff --git a/_service:download_url:zsh-4.3.11-doc.tar.bz2 b/_service:download_url:zsh-4.3.11-doc.tar.bz2 new file mode 100644 index 0000000..9e0652b --- /dev/null +++ b/_service:download_url:zsh-4.3.11-doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c +size 2687527 diff --git a/_service:download_url:zsh-4.3.11.tar.bz2 b/_service:download_url:zsh-4.3.11.tar.bz2 new file mode 100644 index 0000000..5e69eac --- /dev/null +++ b/_service:download_url:zsh-4.3.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05 +size 2868429