summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/patches/0000-compsys-fuser-fix.diff16
-rw-r--r--debian/patches/0001-colors-with-ksharrays.diff16
-rw-r--r--debian/patches/0002-vcs_info-svn-detection.diff14
-rw-r--r--debian/patches/0003-regex-match-crash-fix.diff43
-rw-r--r--debian/patches/0004-support-yodl3.diff40
-rw-r--r--debian/patches/0005-lexer-fix.diff16
-rw-r--r--debian/patches/0006-isident-false-positive.diff29
-rw-r--r--debian/patches/0007-bashish-index-fix.diff42
-rw-r--r--debian/patches/0008-fix-screen-completion.diff35
-rw-r--r--debian/patches/series9
10 files changed, 0 insertions, 260 deletions
diff --git a/debian/patches/0000-compsys-fuser-fix.diff b/debian/patches/0000-compsys-fuser-fix.diff
deleted file mode 100644
index 24b87f535..000000000
--- a/debian/patches/0000-compsys-fuser-fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is included upstream, see:
- <http://www.zsh.org/mla/workers/2010/msg00992.html>
-
-Index: pkg-zsh/Completion/Unix/Command/_fuser
-===================================================================
---- pkg-zsh.orig/Completion/Unix/Command/_fuser 2011-02-11 16:42:14.000000000 +0100
-+++ pkg-zsh/Completion/Unix/Command/_fuser 2011-02-11 16:42:16.000000000 +0100
-@@ -3,7 +3,7 @@
- local -a args arg1
- typeset -A opt_args
-
--if _pick_variant -c $words[1] psmisc=psmisc unix -V; then
-+if _pick_variant -c $words[1] psmisc='(#i)psmisc' unix -V; then
-
- (( $+functions[_fuser_services] )) ||
- _fuser_services() {
diff --git a/debian/patches/0001-colors-with-ksharrays.diff b/debian/patches/0001-colors-with-ksharrays.diff
deleted file mode 100644
index e696c7532..000000000
--- a/debian/patches/0001-colors-with-ksharrays.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from upstream to fix #613162, see:
- <http://www.zsh.org/mla/workers/2011/msg00196.html>
-
-Index: pkg-zsh/Functions/Misc/colors
-===================================================================
---- pkg-zsh.orig/Functions/Misc/colors 2011-02-20 13:09:09.000000000 +0100
-+++ pkg-zsh/Functions/Misc/colors 2011-02-20 13:09:28.000000000 +0100
-@@ -1,6 +1,8 @@
- # Put standard ANSI color codes in shell parameters for easy use.
- # Note that some terminals do not support all combinations.
-
-+emulate -L zsh
-+
- typeset -Ag color colour
-
- color=(
diff --git a/debian/patches/0002-vcs_info-svn-detection.diff b/debian/patches/0002-vcs_info-svn-detection.diff
deleted file mode 100644
index bbd4eb87e..000000000
--- a/debian/patches/0002-vcs_info-svn-detection.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-This is an upstream patch, see:
- <http://www.zsh.org/mla/workers/2011/msg00177.html>
-
-Index: pkg-zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_svn
-===================================================================
---- pkg-zsh.orig/Functions/VCS_Info/Backends/VCS_INFO_detect_svn 2011-02-20 13:14:58.000000000 +0100
-+++ pkg-zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_svn 2011-02-20 13:15:10.000000000 +0100
-@@ -7,5 +7,5 @@
- [[ $1 == '--flavours' ]] && return 1
-
- VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
--[[ -d ".svn" ]] && return 0
-+{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0
- return 1
diff --git a/debian/patches/0003-regex-match-crash-fix.diff b/debian/patches/0003-regex-match-crash-fix.diff
deleted file mode 100644
index d0aaa5aea..000000000
--- a/debian/patches/0003-regex-match-crash-fix.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream fix. See:
- <http://www.zsh.org/mla/workers/2011/msg00027.html>
-
-Index: pkg-zsh/Src/text.c
-===================================================================
---- pkg-zsh.orig/Src/text.c 2011-02-20 13:20:25.000000000 +0100
-+++ pkg-zsh/Src/text.c 2011-02-20 13:20:57.000000000 +0100
-@@ -785,8 +785,7 @@
- taddstr(" ");
- taddstr(ecgetstr(state, EC_NODUP, NULL));
- if (ctype == COND_STREQ ||
-- ctype == COND_STRNEQ ||
-- ctype == COND_REGEX)
-+ ctype == COND_STRNEQ)
- state->pc++;
- } else {
- /* Unary test: `-f foo' etc. */
-Index: pkg-zsh/Test/C02cond.ztst
-===================================================================
---- pkg-zsh.orig/Test/C02cond.ztst 2011-02-20 13:20:36.000000000 +0100
-+++ pkg-zsh/Test/C02cond.ztst 2011-02-20 13:20:57.000000000 +0100
-@@ -306,6 +306,21 @@
- 2:Error message for unknown infix condition
- ?(eval):1: unknown condition: -fail
-
-+ crashme() {
-+ if [[ $1 =~ ^http:* ]]
-+ then
-+ url=${1#*=}
-+ fi
-+ }
-+ which crashme
-+0:Regression test for examining code with regular expression match
-+>crashme () {
-+> if [[ $1 =~ ^http:* ]]
-+> then
-+> url=${1#*=}
-+> fi
-+>}
-+
- %clean
- # This works around a bug in rm -f in some versions of Cygwin
- chmod 644 unmodish
diff --git a/debian/patches/0004-support-yodl3.diff b/debian/patches/0004-support-yodl3.diff
deleted file mode 100644
index 85e41294b..000000000
--- a/debian/patches/0004-support-yodl3.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-This patch is included upstream.
- <http://www.zsh.org/mla/workers/2011/msg00074.html>
-
-Index: pkg-zsh/Config/defs.mk.in
-===================================================================
---- pkg-zsh.orig/Config/defs.mk.in 2011-02-21 21:50:36.000000000 +0100
-+++ pkg-zsh/Config/defs.mk.in 2011-02-21 21:51:33.000000000 +0100
-@@ -73,9 +73,9 @@
- # utilities
- AWK = @AWK@
- ANSI2KNR = @ANSI2KNR@
--YODL = @YODL@
--YODL2TXT = $(YODL)2txt
--YODL2HTML = $(YODL)2html
-+YODL = @YODL@ @YODL_OPTIONS@
-+YODL2TXT = @YODL@2txt
-+YODL2HTML = @YODL@2html
- PDFETEX = @PDFETEX@
- TEXI2PDF = @TEXI2PDF@
-
-Index: pkg-zsh/configure.ac
-===================================================================
---- pkg-zsh.orig/configure.ac 2011-02-21 21:50:42.000000000 +0100
-+++ pkg-zsh/configure.ac 2011-02-21 21:51:33.000000000 +0100
-@@ -539,6 +539,15 @@
- AC_PROG_LN dnl Check for working ln, for "make install"
- AC_PROG_EGREP dnl sets $EGREP to grep -E or egrep
- AC_CHECK_PROGS([YODL], [yodl], [: yodl])
-+
-+YODL_OPTIONS=''
-+if test "x$ac_cv_prog_YODL" = xyodl; then
-+ case `yodl --version` in
-+ *"version 3."*) YODL_OPTIONS='-L' ;;
-+ esac
-+fi
-+AC_SUBST(YODL_OPTIONS)
-+
- AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex])
- AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
- AC_CHECK_PROGS([TEXI2HTML], [texi2html], [])
diff --git a/debian/patches/0005-lexer-fix.diff b/debian/patches/0005-lexer-fix.diff
deleted file mode 100644
index b1a06e9fb..000000000
--- a/debian/patches/0005-lexer-fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Bugfix from upstream. See:
- <http://www.zsh.org/mla/workers/2011/msg00237.html>
-
-Index: pkg-zsh/Src/lex.c
-===================================================================
---- pkg-zsh.orig/Src/lex.c 2011-02-24 22:14:59.000000000 +0100
-+++ pkg-zsh/Src/lex.c 2011-02-24 22:15:04.000000000 +0100
-@@ -1823,7 +1823,7 @@
- int zp = lexflags;
-
- gotword();
-- if (zp == 1 && !lexflags) {
-+ if ((zp & LEXFLAGS_ZLE) && !lexflags) {
- if (zshlextext == copy)
- zshlextext = tokstr;
- return 0;
diff --git a/debian/patches/0006-isident-false-positive.diff b/debian/patches/0006-isident-false-positive.diff
deleted file mode 100644
index f43843b76..000000000
--- a/debian/patches/0006-isident-false-positive.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-False positive fix from upstream:
- <http://www.zsh.org/mla/workers/2011/msg00069.html>
- <http://www.zsh.org/mla/workers/2011/msg00073.html>
-
-Index: pkg-zsh/Src/params.c
-===================================================================
---- pkg-zsh.orig/Src/params.c 2011-03-09 10:15:02.000000000 +0100
-+++ pkg-zsh/Src/params.c 2011-03-09 10:15:10.000000000 +0100
-@@ -1009,6 +1009,8 @@
- * definitely not a valid identifier. */
- if (!*ss)
- return 1;
-+ if (s == ss)
-+ return 0;
- if (*ss != '[')
- return 0;
-
-Index: pkg-zsh/Test/D04parameter.ztst
-===================================================================
---- pkg-zsh.orig/Test/D04parameter.ztst 2011-03-09 10:15:02.000000000 +0100
-+++ pkg-zsh/Test/D04parameter.ztst 2011-03-09 10:15:10.000000000 +0100
-@@ -1401,3 +1401,7 @@
- >a
- >b
- >c
-+
-+ printf "%n" '[0]'
-+1:Regression test for identifier test
-+?(eval):1: not an identifier: [0]
diff --git a/debian/patches/0007-bashish-index-fix.diff b/debian/patches/0007-bashish-index-fix.diff
deleted file mode 100644
index 0b64c5b34..000000000
--- a/debian/patches/0007-bashish-index-fix.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Crash fix from upstream:
- <http://www.zsh.org/mla/workers/2011/msg00076.html>
-
-
-Index: pkg-zsh/Src/subst.c
-===================================================================
---- pkg-zsh.orig/Src/subst.c 2011-03-09 10:25:56.000000000 +0100
-+++ pkg-zsh/Src/subst.c 2011-03-09 10:25:59.000000000 +0100
-@@ -2814,12 +2814,14 @@
- 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) {
-Index: pkg-zsh/Test/D04parameter.ztst
-===================================================================
---- pkg-zsh.orig/Test/D04parameter.ztst 2011-03-09 10:25:56.000000000 +0100
-+++ pkg-zsh/Test/D04parameter.ztst 2011-03-09 10:25:59.000000000 +0100
-@@ -1405,3 +1405,8 @@
- printf "%n" '[0]'
- 1:Regression test for identifier test
- ?(eval):1: not an identifier: [0]
-+
-+ str=rts
-+ print ${str:0:}
-+1:Regression test for missing length after offset
-+?(eval):2: unrecognized modifier
diff --git a/debian/patches/0008-fix-screen-completion.diff b/debian/patches/0008-fix-screen-completion.diff
deleted file mode 100644
index e34557247..000000000
--- a/debian/patches/0008-fix-screen-completion.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-This fix is included upstream:
- <http://www.zsh.org/mla/workers/2011/msg00462.html>
-
-Index: pkg-zsh/Completion/Unix/Command/_screen
-===================================================================
---- pkg-zsh.orig/Completion/Unix/Command/_screen 2011-04-27 20:01:05.000000000 +0200
-+++ pkg-zsh/Completion/Unix/Command/_screen 2011-04-27 20:01:05.000000000 +0200
-@@ -3,6 +3,18 @@
- local curcontext="$curcontext" state line expl
- local scr_cmds sessions
-
-+function __screen_normal() {
-+ if (( CURRENT == 1 )) && [[ $PREFIX == /dev/* ]]; then
-+ _path_files -g '*(%)'
-+ elif (( CURRENT == 2 )) && [[ ${words[1]} == /dev/* ]]; then
-+ _message "baud rate"
-+ elif (( CURRENT > 2 )) && [[ ${words[1]} == /dev/* ]]; then
-+ _message "no more parameters"
-+ else
-+ _normal "$@"
-+ fi
-+}
-+
- scr_cmds=(
- acladd aclchg acldel aclgrp
- aclumask activity addacl allpartial
-@@ -91,7 +103,7 @@
- '-Dx: :->any-sessions' \
- '-dx: :->any-sessions' \
- '-X[execute command as a screen command in the specified session]:screencmd:(${scr_cmds[@]})' \
-- '*::arguments: _normal'
-+ '*::arguments: __screen_normal'
-
- if [[ -n $state ]]; then
- case $state in
diff --git a/debian/patches/series b/debian/patches/series
index ad2dd0fa7..e69de29bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +0,0 @@
-0000-compsys-fuser-fix.diff
-0001-colors-with-ksharrays.diff
-0002-vcs_info-svn-detection.diff
-0003-regex-match-crash-fix.diff
-0004-support-yodl3.diff
-0005-lexer-fix.diff
-0006-isident-false-positive.diff
-0007-bashish-index-fix.diff
-0008-fix-screen-completion.diff
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-23 12:26:36 +0000