diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/further-mitigate-test-suite-hangs.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/update-debian-sections.patch | 51 |
3 files changed, 70 insertions, 0 deletions
diff --git a/debian/patches/further-mitigate-test-suite-hangs.patch b/debian/patches/further-mitigate-test-suite-hangs.patch new file mode 100644 index 000000000..8c96e6996 --- /dev/null +++ b/debian/patches/further-mitigate-test-suite-hangs.patch @@ -0,0 +1,17 @@ +Origin: http://www.zsh.org/mla/workers/2014/msg01250.html +Author: Bart Schaefer <schaefer@brasslantern.com> +Bug-Debian: https://bugs.debian.org/759870 +Description: Add a sleep call which should prevent a race condition in coproc + +Index: zsh/Test/A05execution.ztst +=================================================================== +--- zsh.orig/Test/A05execution.ztst 2015-08-30 22:03:54.257198175 +0200 ++++ zsh/Test/A05execution.ztst 2015-08-30 22:03:54.257198175 +0200 +@@ -208,6 +208,7 @@ + print -u $ZTST_fd 'This test takes 5 seconds to fail...' + { printf "%d\n" {1..20000} } 2>/dev/null | ( read -e ) + hang(){ printf "%d\n" {2..20000} | cat }; hang 2>/dev/null | ( read -e ) ++ sleep 1 ;: avoid coproc exit race condition + print -p done + read -et 6 -p + 0:Bug regression: piping a shell construct to an external process may hang diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..cb6fdacc2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +further-mitigate-test-suite-hangs.patch +update-debian-sections.patch diff --git a/debian/patches/update-debian-sections.patch b/debian/patches/update-debian-sections.patch new file mode 100644 index 000000000..390f5c701 --- /dev/null +++ b/debian/patches/update-debian-sections.patch @@ -0,0 +1,51 @@ +From a7204dd6176d4c1305de7092525c8037fd335acf Mon Sep 17 00:00:00 2001 +From: Josh Triplett <josh@joshtriplett.org> +Date: Thu, 8 Dec 2016 20:19:18 -0800 +Subject: [PATCH] Update for new programming language sections +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=847540;filename=0001-Update-for-new-programming-language-sections.patch;msg=13 +Bug-Debian: https://bugs.debian.org/847540 +Forwarded: not-yet +Reviewed-By: Axel Beckert <abe@debian.org>, Daniel Shahaf <danielsh@apache.org> + +--- + Completion/Debian/Command/_dak | 2 +- + Completion/Debian/Command/_debfoster | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Completion/Debian/Command/_dak b/Completion/Debian/Command/_dak +index 086196c4a..d06f55d23 100644 +--- a/Completion/Debian/Command/_dak ++++ b/Completion/Debian/Command/_dak +@@ -37,7 +37,7 @@ + '(-n --no-action)'{-n,--no-action}'[do not do anything]' + '(-s --suite)'{-s,--suite=}':suite:_values -s , "suite list" oldstable stable testing unstable experimental' + ':package:_deb_packages avail' +- ':section:(admin base comm contrib/admin contrib/comm contrib/devel contrib/doc contrib/games contrib/graphics contrib/interpreters contrib/kde contrib/libdevel contrib/libs contrib/mail contrib/math contrib/misc contrib/net contrib/otherosfs contrib/perl contrib/python contrib/science contrib/sound contrib/tex contrib/text contrib/utils contrib/web contrib/x11 devel doc editors electronics embedded games gnome graphics hamradio interpreters kde libdevel libs mail math misc net news non-free/admin non-free/base non-free/comm non-free/devel non-free/doc non-free/editors non-free/electronics non-free/games non-free/graphics non-free/hamradio non-free/libdevel non-free/libs non-free/mail non-free/math non-free/misc non-free/net non-free/news non-free/otherosfs non-free/python non-free/science non-free/sound non-free/tex non-free/text non-free/utils non-free/web non-free/x11 oldlibs otherosfs perl python science shells sound tex text utils web x11)' ++ ':section:({,contrib/,non-free/}{admin,cli-mono,comm,database,debug,devel,doc,editors,education,electronics,embedded,fonts,games,gnome,gnu-r,gnustep,graphics,hamradio,haskell,httpd,interpreters,introspection,java,javascript,kde,kernel,libdevel,libs,lisp,localization,mail,math,metapackages,misc,net,news,ocaml,oldlibs,otherosfs,perl,php,python,ruby,rust,science,shells,sound,tex,text,utils,vcs,video,web,x11,xfce,zope})' + ':priority:(extra important optional required standard)' + ) + ;; +diff --git a/Completion/Debian/Command/_debfoster b/Completion/Debian/Command/_debfoster +index 08a1078e2..4c041bc36 100644 +--- a/Completion/Debian/Command/_debfoster ++++ b/Completion/Debian/Command/_debfoster +@@ -44,10 +44,13 @@ + ;; + *(#i)(no|)keepsections*) + _wanted values expl 'section' compadd \ +- x11 web utils text tex sound shells science \ +- otherosfs oldlibs news net misc math mail libs \ +- interpreters hamradio graphics games electronics \ +- editors doc devel comm base admin && ret=0 ++ zope xfce x11 web video vcs utils text tex sound shells \ ++ science rust ruby python php perl otherosfs oldlibs ocaml \ ++ news net misc metapackages math mail localization lisp libs \ ++ libdevel kernel kde javascript java introspection \ ++ interpreters httpd haskell hamradio graphics gnustep gnu-r \ ++ gnome games fonts embedded electronics education editors doc \ ++ devel debug database comm cli-mono admin && ret=0 + ;; + *(#i)guessdepends*) + _wanted values expl 'name extension' \ +-- +2.11.0 |