diff options
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 8 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 6 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Doc_Zsh_builtins.yo | 11 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_Builtins_rlimits.c | 41 |
4 files changed, 50 insertions, 16 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 227774ca634..eac7bdafa8d 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.58 2012/08/17 10:53:09 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2012/08/17 12:15:37 wiz Exp $ .include "../../shells/zsh/Makefile.common" ZSH_VERSION= 5.0.0 ZSH_MAINTAINER= uebayasi@NetBSD.org -PKGREVISION= 1 - -USE_TOOLS+= env +PKGREVISION= 2 CONFIGURE_ARGS+= --disable-gdbm @@ -26,8 +24,6 @@ SUBST_FILES.prefix-fixup= \ Functions/Misc/zed \ Functions/Example/cat SUBST_SED.prefix-fixup= \ - -e 's|^\#\!/bin/env|\#\!${TOOLS_PATH.env}|g' \ - -e 's|^\#\! /bin/env|\#\! ${TOOLS_PATH.env}|g' \ -e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g' \ -e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g' \ -e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g' \ diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index eadb5046a6e..5da2ded25a0 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.39 2012/08/17 10:53:09 wiz Exp $ +$NetBSD: distinfo,v 1.40 2012/08/17 12:15:37 wiz Exp $ SHA1 (zsh-5.0.0.tar.bz2) = 692669243433c55384a54b397a1cc926e582e9f2 RMD160 (zsh-5.0.0.tar.bz2) = d2aff295e245dd5e805215c6dcca1e76af8b9725 Size (zsh-5.0.0.tar.bz2) = 3014362 bytes -SHA1 (patch-Doc_Zsh_builtins.yo) = 37f1d49ae99da20b9027b2b386422cc8bb3d509a +SHA1 (patch-Doc_Zsh_builtins.yo) = 04dd90403760c5d774024cbe641d7cc5e6d0877f SHA1 (patch-Src_Builtins_rlimits.awk) = dd397c3d9dd39da15d4338055ce909e787f67cba -SHA1 (patch-Src_Builtins_rlimits.c) = c607f322fe105f79bdb8817020330da1d3eab8ba +SHA1 (patch-Src_Builtins_rlimits.c) = 3faf198d63bdc13eb91a70393a668438b9e9593c SHA1 (patch-Src_prototypes.h) = 14a766668bda382b3fc736ef4fccf49670e1be9c SHA1 (patch-Src_zsh__system.h) = 1d5827a571b897ae139cb7b0c31d3e5a429aa190 SHA1 (patch-ab) = ebde4d35de2754dc9113988930764552c4bf811e diff --git a/shells/zsh/patches/patch-Doc_Zsh_builtins.yo b/shells/zsh/patches/patch-Doc_Zsh_builtins.yo index 302e4d13411..67da37d11a2 100644 --- a/shells/zsh/patches/patch-Doc_Zsh_builtins.yo +++ b/shells/zsh/patches/patch-Doc_Zsh_builtins.yo @@ -1,6 +1,6 @@ -$NetBSD: patch-Doc_Zsh_builtins.yo,v 1.1 2012/08/17 10:53:10 wiz Exp $ +$NetBSD: patch-Doc_Zsh_builtins.yo,v 1.2 2012/08/17 12:15:37 wiz Exp $ -Add support for thread limits. +Add support for thread limits and socket buffer size. From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. --- Doc/Zsh/builtins.yo.orig 2012-03-13 20:04:40.000000000 +0000 @@ -14,7 +14,7 @@ From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. Set or display resource limits of the shell and the processes started by the shell. The value of var(limit) can be a number in the unit specified below or one of the values `tt(unlimited)', which removes the limit on the -@@ -1757,6 +1757,9 @@ When looping over multiple resources, th +@@ -1757,8 +1757,12 @@ When looping over multiple resources, th it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits. @@ -23,8 +23,11 @@ From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. + startsitem() sitem(tt(-a))(Lists all of the current resource limits.) ++sitem(tt(-b))(Socket buffer size in bytes LPAR()N.B. not kilobytes+RPAR()) sitem(tt(-c))(512-byte blocks on the size of core dumps.) -@@ -1769,7 +1772,8 @@ sitem(tt(-n))(open file descriptors.) + sitem(tt(-d))(K-bytes on the size of the data segment.) + sitem(tt(-f))(512-byte blocks on the size of files written.) +@@ -1769,7 +1773,8 @@ sitem(tt(-n))(open file descriptors.) sitem(tt(-q))(Bytes in POSIX message queues.) sitem(tt(-s))(K-bytes on the size of the stack.) sitem(tt(-t))(CPU seconds to be used.) diff --git a/shells/zsh/patches/patch-Src_Builtins_rlimits.c b/shells/zsh/patches/patch-Src_Builtins_rlimits.c index c662237bf9b..62f8b824e3e 100644 --- a/shells/zsh/patches/patch-Src_Builtins_rlimits.c +++ b/shells/zsh/patches/patch-Src_Builtins_rlimits.c @@ -1,6 +1,6 @@ -$NetBSD: patch-Src_Builtins_rlimits.c,v 1.1 2012/08/17 10:53:10 wiz Exp $ +$NetBSD: patch-Src_Builtins_rlimits.c,v 1.2 2012/08/17 12:15:37 wiz Exp $ -Add support for thread limits. +Add support for thread limits and socket buffer size. From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. --- Src/Builtins/rlimits.c.orig 2011-11-04 20:47:24.000000000 +0000 @@ -18,7 +18,42 @@ From Peter Stephenson <Peter.Stephenson@csr.com> on zsh-workers. # if defined(HAVE_RLIMIT_VMEM) && (!defined(HAVE_RLIMIT_RSS) || !defined(RLIMIT_VMEM_IS_RSS)) case RLIMIT_VMEM: if (head) -@@ -791,6 +797,11 @@ bin_ulimit(char *name, char **argv, UNUS +@@ -359,9 +365,7 @@ printulimit(char *nam, int lim, int hard + # ifdef HAVE_RLIMIT_SBSIZE + case RLIMIT_SBSIZE: + if (head) +- printf("-N %2d: socket buffer size (kb) ", RLIMIT_SBSIZE); +- if (limit != RLIM_INFINITY) +- limit /= 1024; ++ printf("-b: socket buffer size (bytes) ", RLIMIT_SBSIZE); + break; + # endif /* HAVE_RLIMIT_SBSIZE */ + # ifdef HAVE_RLIMIT_PTHREAD +@@ -776,21 +780,31 @@ bin_ulimit(char *name, char **argv, UNUS + case 'c': + res = RLIMIT_CORE; + break; +-# ifdef HAVE_RLIMIT_RSS +- case 'm': +- res = RLIMIT_RSS; ++# ifdef HAVE_RLIMIT_SBSIZE ++ case 'b': ++ res = RLIMIT_SBSIZE; + break; +-# endif /* HAVE_RLIMIT_RSS */ ++# endif /* HAVE_RLIMIT_SBSIZE */ + # ifdef HAVE_RLIMIT_MEMLOCK + case 'l': + res = RLIMIT_MEMLOCK; + break; + # endif /* HAVE_RLIMIT_MEMLOCK */ ++# ifdef HAVE_RLIMIT_RSS ++ case 'm': ++ res = RLIMIT_RSS; ++ break; ++# endif /* HAVE_RLIMIT_RSS */ + # ifdef HAVE_RLIMIT_NOFILE + case 'n': res = RLIMIT_NOFILE; break; # endif /* HAVE_RLIMIT_NOFILE */ |