diff options
author | 2014-10-17 05:39:07 +0000 | |
---|---|---|
committer | 2014-10-17 05:39:07 +0000 | |
commit | a3a47bc8c7e269e8fc10ef328a867d72ed29728a (patch) | |
tree | 49264c566c42cb3ee5d681acff78ac46e888e395 /app-shells/zsh/files | |
parent | Add live ebuild. (diff) | |
download | gentoo-2-a3a47bc8c7e269e8fc10ef328a867d72ed29728a.tar.gz gentoo-2-a3a47bc8c7e269e8fc10ef328a867d72ed29728a.tar.bz2 gentoo-2-a3a47bc8c7e269e8fc10ef328a867d72ed29728a.zip |
Remove old.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-shells/zsh/files')
-rw-r--r-- | app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch | 179 | ||||
-rw-r--r-- | app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch | 57 |
2 files changed, 0 insertions, 236 deletions
diff --git a/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch b/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch deleted file mode 100644 index da76df7784aa..000000000000 --- a/app-shells/zsh/files/zsh-5.0.2-texinfo-5.1.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- zsh-5.0.2/Doc/zsh.texi -+++ zsh-5.0.2/Doc/zsh.texi -@@ -1,4 +1,3 @@ -- - \input texinfo.tex - @c %**start of header - @iftex -@@ -389,6 +388,7 @@ - - @end table - -+@noindent - The up-to-date source code is available via anonymous CVS and Git from - Sourceforge. See @t{http://sourceforge.net/projects/zsh/} for details. - A summary of instructions for the CVS and Git archives can be found at -@@ -430,8 +430,8 @@ - @item @t{<zsh-announce-unsubscribe@@zsh.org>} - @item @t{<zsh-users-unsubscribe@@zsh.org>} - @item @t{<zsh-workers-unsubscribe@@zsh.org>} --@item - @end table -+@sp 1 - - @noindent - YOU ONLY NEED TO JOIN ONE OF THE MAILING LISTS AS THEY ARE NESTED. -@@ -1080,8 +1080,8 @@ - @item @t{/etc/zshrc} - @item @t{/etc/zlogin} - @item @t{/etc/zlogout} (installation-specific - @t{/etc} is the default) --@item - @end table -+@sp 1 - @c (avoiding a yodl bug) - - @noindent -@@ -1651,8 +1651,8 @@ - @item Errors in variable substitution syntax - @item Failure to convert characters in @t{$'}...@t{'} expressions - similar options --@item - @end table -+@sp 1 - - @noindent - If the @t{POSIX_BUILTINS} option is set, more errors associated with -@@ -14685,8 +14685,8 @@ - used for contexts in the parameter @t{zle_highlight}, - @ref{Character Highlighting}; - for example, @t{standout} or @t{fg=red,bold}. --@item - @end table -+@sp 1 - - @noindent - For example, -@@ -22643,8 +22643,7 @@ - described above. - - @findex _pick_variant --@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c} --@var{command} ] [ @t{-r} @var{name} ] -+@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c} @var{command} ] [ @t{-r} @var{name} ] - @itemx @var{label}@t{=}@var{pattern} ... @var{label} [ @var{args} ... ] - This function is used to resolve situations where a single command name - requires more than one type of handling, either because it -@@ -23260,8 +23259,8 @@ - @item @t{compctl} @t{-M} @var{match-specs} ... - @item @t{compctl} @t{-L} [ @t{-CDTM} ] [ @var{command} ... ] - @item @t{compctl} @t{+} @var{command} ... --@item - @end table -+@sp 1 - - @noindent - Control the editor's completion behavior according to the supplied set -@@ -23405,8 +23404,8 @@ - @item [ @t{-y} @var{func-or-var} ] [ @t{-l} @var{cmd} ] [ @t{-h} @var{cmd} ] [ @t{-U} ] - @item [ @t{-t} @var{continue} ] [ @t{-J} @var{name} ] [ @t{-V} @var{name} ] - @item [ @t{-M} @var{match-spec} ] --@item - @end table -+@sp 1 - - @noindent - The remaining @var{options} specify the type of command arguments -@@ -23838,8 +23837,8 @@ - @noindent - @table @asis - @item @t{compctl} [ @t{-CDT} ] @var{options} @t{+} @var{options} [ @t{+} ... ] [ @t{+} ] @var{command} ... --@item - @end table -+@sp 1 - - @noindent - The form with `@t{+}' specifies alternative options. Completion is -@@ -23866,8 +23865,8 @@ - @item [ @var{command} ... ] - @item @t{compctl} [ @t{-CDT} ] @var{options} [ @t{-x} @var{pattern} @var{options} @t{-} ... @t{-}@t{-} ] - @item [ @t{+} @var{options} [ @t{-x} ... @t{-}@t{-} ] ... [@t{+}] ] [ @var{command} ... ] --@item - @end table -+@sp 1 - - @noindent - The form with `@t{-x}' specifies extended completion for the -@@ -24980,7 +24979,7 @@ - The subcommand @t{position} writes various positions associated with - @var{targetwin} into the array named @var{array}. - These are, in order: --@table @asis -+@itemize @bullet - @item - The y and x coordinates of the cursor relative to the top left - of @var{targetwin} -@@ -24989,7 +24988,7 @@ - screen - @item - The size of @var{targetwin} in y and x dimensions. --@end table -+@end itemize - - @noindent - Outputting characters and strings are achieved by @t{char} and @t{string} -@@ -28870,30 +28869,37 @@ - it returns status 0 and sets elements of the associative - array @t{reply} as follows: - @table @asis --@item timeNL()The time as a string of digits in the same units as -+@item time -+The time as a string of digits in the same units as - @t{$EPOCHSECONDS} --@item schedtimeNL()The regularly scheduled time. This may differ from -+@item schedtime -+The regularly scheduled time. This may differ from - the actual event time @t{time} if this is a recurring event and the next - occurrence has been rescheduled. Then @t{time} gives the actual time - and @t{schedtime} the time of the regular recurrence before modification. - @item text1 - The text from the line not including the date and time of the - event, but including any @t{WARN} or @t{RPT} keywords and values. --@item warntimeNL()Any warning time given by the @t{WARN} keyword as a string -+@item warntime -+Any warning time given by the @t{WARN} keyword as a string - of digits containing the time at which to warn in the same units as - @t{$EPOCHSECONDS}. (Note this is an absolute time, not the relative time - passed down.) Not set no @t{WARN} keyword and value were - matched. --@item warnstrNL()The raw string matched after the @t{WARN} keyword, else unset. --@item rpttimeNL()Any recurrence time given by the @t{RPT} keyword as a string -+@item warnstr -+The raw string matched after the @t{WARN} keyword, else unset. -+@item rpttime -+Any recurrence time given by the @t{RPT} keyword as a string - of digits containing the time of the recurrence in the same units - as @t{$EPOCHSECONDS}. (Note this is an absolute time.) Not set if - no @t{RPT} keyword and value were matched. --@item schedrpttimeNL()The next regularly scheduled occurrence of a recurring -+@item schedrpttime -+The next regularly scheduled occurrence of a recurring - event before modification. This may differ from @t{rpttime}, which is the - actual time of the event that may have been rescheduled from the regular - time. --@item rptstrNL()The raw string matched after the @t{RPT} keyword, else unset. -+@item rptstr -+The raw string matched after the @t{RPT} keyword, else unset. - @item text2 - The text from the line after removal of the date and any - keywords and values. -@@ -35504,8 +35510,8 @@ - @noindent - @example - zstyle+ ':foo:bar' style1 value1 \ -- + ':baz' style2 value2 \ -- + ':frob' style3 value3 -+ +':baz' style2 value2 \ -+ +':frob' style3 value3 - @end example - - @noindent diff --git a/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch b/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch deleted file mode 100644 index 1e1847a60ede..000000000000 --- a/app-shells/zsh/files/zsh-fix-parameter-modifier-crash.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 44757a653cb547ae7b556e8c92629d296d3c1f12 Mon Sep 17 00:00:00 2001 -From: Peter Stephenson <pws@users.sourceforge.net> -Date: Tue, 22 Jan 2013 16:28:58 +0000 -Subject: [PATCH] 30993: fix parameter modifier crash with :wq on empty string - ---- - ChangeLog | 8 +++++++- - Src/subst.c | 10 +++++++++- - Test/D04parameter.ztst | 7 +++++++ - 3 files changed, 23 insertions(+), 2 deletions(-) - -diff --git a/Src/subst.c b/Src/subst.c -index 974a845..a4df256 100644 ---- a/Src/subst.c -+++ b/Src/subst.c -@@ -3707,6 +3707,11 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags) - char *y; - - x = val; -+ if (!x) { -+ /* Shouldn't have got here with a NULL string. */ -+ DPUTS(1, "value is NULL in paramsubst"); -+ return NULL; -+ } - if (prenum || postnum) - x = dopadding(x, prenum, postnum, preone, postone, - premul, postmul -@@ -4021,7 +4026,10 @@ modify(char **str, char **ptr) - all = tmp; - t = e; - } -- *str = all; -+ if (!all) -+ *str = dupstring(""); -+ else -+ *str = all; - - } else { - switch (c) { -diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst -index 01f8412..bea9459 100644 ---- a/Test/D04parameter.ztst -+++ b/Test/D04parameter.ztst -@@ -1544,3 +1544,10 @@ - 0:Regression test for shwordsplit with null or unset IFS and quoted array - >abc - >a b c -+ -+ foo= -+ print ${foo:wq} -+ print ${:wq} -+0:Empty parameter shouldn't cause modifiers to crash the shell -+> -+> --- -1.8.1.5 - |