diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch | 27 | ||||
| -rw-r--r-- | debian/patches/replace-texi2html-with-makeinfo | 17 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch | 21 |
4 files changed, 68 insertions, 0 deletions
diff --git a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch new file mode 100644 index 000000000..cf1b6ab22 --- /dev/null +++ b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch @@ -0,0 +1,27 @@ +Description: Make A05execution.ztst not fail if setopt MONITOR fails +Author: Bart E. Schaefer <schaefer@brasslantern.com> +Origin: http://www.zsh.org/mla/workers/2013/msg01135.html +Origin: http://www.zsh.org/mla/workers/2013/msg01142.html + +Index: zsh/Test/A05execution.ztst +=================================================================== +--- zsh.orig/Test/A05execution.ztst 2013-12-03 08:49:42.000000000 +0100 ++++ zsh/Test/A05execution.ztst 2013-12-03 08:49:58.000000000 +0100 +@@ -179,7 +179,7 @@ + 0:Status reset by starting a backgrounded command + >0 + +- setopt MONITOR ++ { setopt MONITOR } 2>/dev/null + [[ -o MONITOR ]] || print -u $ZTST_fd 'Unable to change MONITOR option' + repeat 2048; do (return 2 | + return 1 | +@@ -195,7 +195,7 @@ + F:This test checks for a bug in `$pipestatus[]' handling. If it breaks then + F:the bug is still there or it reappeared. See workers-29973 for details. + +- setopt MONITOR ++ { setopt MONITOR } 2>/dev/null + externFunc() { awk >/dev/null 2>&1; true; } + false | true | false | true | externFunc + echo $pipestatus diff --git a/debian/patches/replace-texi2html-with-makeinfo b/debian/patches/replace-texi2html-with-makeinfo new file mode 100644 index 000000000..c738c1490 --- /dev/null +++ b/debian/patches/replace-texi2html-with-makeinfo @@ -0,0 +1,17 @@ +Description: Replace deprecated texi2html with makeinfo +Forwarded: http://www.zsh.org/mla/workers/2013/msg00723.html +Author: Axel Beckert <abe@debian.org> + +Index: zsh/Doc/Makefile.in +=================================================================== +--- zsh.orig/Doc/Makefile.in 2013-12-02 15:26:29.000000000 +0100 ++++ zsh/Doc/Makefile.in 2013-12-02 15:26:29.000000000 +0100 +@@ -41,7 +41,7 @@ + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + DVIPS = dvips +-TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files ++TEXI2HTML = makeinfo --html --output . --ifinfo --split=chapter --node-files + + .SUFFIXES: .yo .1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..e1df562db --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +replace-texi2html-with-makeinfo +use-dev-null-instead-of-dev-tty-for-dash-c-test.patch +fix-A05execution-ztst-setopt-MONITOR.patch diff --git a/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch b/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch new file mode 100644 index 000000000..c8f50fbc2 --- /dev/null +++ b/debian/patches/use-dev-null-instead-of-dev-tty-for-dash-c-test.patch @@ -0,0 +1,21 @@ +Description: Use /dev/null instead of /dev/tty for -c test + Hopefully solves the according test suite failures on Hurd. Suggested + by Bart Martens. +Author: Axel Beckert <abe@debian.org> +Bug: http://www.zsh.org/mla/workers/2013/msg00547.html + +Index: zsh/Test/C02cond.ztst +=================================================================== +--- zsh.orig/Test/C02cond.ztst 2013-09-20 16:21:32.000000000 +0200 ++++ zsh/Test/C02cond.ztst 2013-09-20 17:59:03.000000000 +0200 +@@ -41,8 +41,8 @@ + fi + 0D:-b cond + +- # Use hardcoded /dev/tty because globbing inside /dev fails on Cygwin +- char=/dev/tty ++ # Use hardcoded /dev/null because of /dev/tty issues on GNU/Hurd ++ char=/dev/null + [[ -c $char && ! -c $zerolength ]] + 0:-c cond + |