diff --git a/724fd07a67f135c74eba57e9f25fd342201ec722.patch b/724fd07a67f135c74eba57e9f25fd342201ec722.patch deleted file mode 100644 index 9de6dae..0000000 --- a/724fd07a67f135c74eba57e9f25fd342201ec722.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 724fd07a67f135c74eba57e9f25fd342201ec722 -Author: Peter Stephenson -Date: Sat Dec 3 17:24:45 2011 +0000 - - 29934: Stef van Vlierberghe: uninitialised memory after lexer realloc - -diff --git a/Src/lex.c b/Src/lex.c -index 90c4eff..05f54f8 100644 ---- a/Src/lex.c -+++ b/Src/lex.c -@@ -567,22 +567,14 @@ add(int c) - { - *bptr++ = c; - if (bsiz == ++len) { --#if 0 -- int newbsiz; -- -- newbsiz = bsiz * 8; -- while (newbsiz < inbufct) -- newbsiz *= 2; -- bptr = len + (tokstr = (char *)hrealloc(tokstr, bsiz, newbsiz)); -- bsiz = newbsiz; --#endif -- - int newbsiz = bsiz * 2; - - if (newbsiz > inbufct && inbufct > bsiz) - newbsiz = inbufct; - - bptr = len + (tokstr = (char *)hrealloc(tokstr, bsiz, newbsiz)); -+ /* len == bsiz, so bptr is at the start of newly allocated memory */ -+ memset(bptr, 0, newbsiz - bsiz); - bsiz = newbsiz; - } - } diff --git a/74eed99c312de05e19b54ba6b5d37a0aeb4ba713.patch b/74eed99c312de05e19b54ba6b5d37a0aeb4ba713.patch deleted file mode 100644 index a1627fd..0000000 --- a/74eed99c312de05e19b54ba6b5d37a0aeb4ba713.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 74eed99c312de05e19b54ba6b5d37a0aeb4ba713 -Author: Peter Stephenson -Date: Sat Dec 3 23:15:37 2011 +0000 - - 29940: metafy() added null termination even if buffer was not modifiable - -diff --git a/Src/utils.c b/Src/utils.c -index 6c2ea98..014cb2f 100644 ---- a/Src/utils.c -+++ b/Src/utils.c -@@ -3959,7 +3959,7 @@ metafy(char *buf, int len, int heap) - if (imeta(*e++)) - meta++; - -- if (meta || heap == META_DUP || heap == META_HEAPDUP) { -+ if (meta || heap == META_DUP || heap == META_HEAPDUP || *e != '\0') { - switch (heap) { - case META_REALLOC: - buf = zrealloc(buf, len + meta + 1); -@@ -4002,8 +4002,8 @@ metafy(char *buf, int len, int heap) - meta--; - } - } -+ *e = '\0'; - } -- *e = '\0'; - return buf; - } - diff --git a/zsh-4.3.13.tar.bz2 b/zsh-4.3.13.tar.bz2 deleted file mode 100644 index 433b55d..0000000 --- a/zsh-4.3.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c -size 2964918 diff --git a/zsh-4.3.14.tar.bz2 b/zsh-4.3.14.tar.bz2 new file mode 100644 index 0000000..96e915c --- /dev/null +++ b/zsh-4.3.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a85a31e243c10106b159923b164935b11bc282d1388bbabe1c77408c93f6b2b8 +size 2965367 diff --git a/zsh.changes b/zsh.changes index e508c49..c3444f0 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 7 13:28:25 UTC 2011 - idonmez@suse.com + +- Update to zsh 4.3.14 + * Drop 74eed99c312de05e19b54ba6b5d37a0aeb4ba713.patch and + 724fd07a67f135c74eba57e9f25fd342201ec722.patch, fixed upstream + * Fix for nanosecond timestamp support + ------------------------------------------------------------------- Mon Dec 5 09:40:23 UTC 2011 - idoenmez@suse.de diff --git a/zsh.spec b/zsh.spec index 2f57ef6..7364368 100644 --- a/zsh.spec +++ b/zsh.spec @@ -18,7 +18,7 @@ Name: zsh -Version: 4.3.13 +Version: 4.3.14 Release: 4 License: MIT Summary: Shell with comprehensive completion @@ -42,9 +42,6 @@ Source16: dotzshrc.rh Source17: zshprompt.pl %endif Patch1: %{name}-4.3.12-disable-c02cond-test.patch -# Fixes from zsh.git -Patch100: 724fd07a67f135c74eba57e9f25fd342201ec722.patch -Patch101: 74eed99c312de05e19b54ba6b5d37a0aeb4ba713.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Requires(pre): %{install_info_prereq} @@ -99,8 +96,6 @@ This package contains the Zsh manual in html format. %prep %setup -q -n %{name}-%{version} %patch1 -%patch100 -p1 -%patch101 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl