diff options
| author | wiz <wiz@pkgsrc.org> | 2014-06-25 08:39:11 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-06-25 08:39:11 +0000 |
| commit | c590b06399f0aad50b299be47bd5331bc6fb0875 (patch) | |
| tree | 5f000b58df5ebd5a34f1ee7558d6c70f1b1b93bf /shells | |
| parent | f0266b4b7a4abb38b2f76afe1ff247e73cf72f35 (diff) | |
| download | pkgsrc-c590b06399f0aad50b299be47bd5331bc6fb0875.tar.gz | |
Fix ulimit(1) for thread limits; patch from upstream.
Bump PKGREVISION.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 3 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 5 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Src_Builtins_rlimits.c | 36 |
3 files changed, 41 insertions, 3 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 582f1a220b5..f164797ccc6 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.65 2014/01/08 16:30:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.66 2014/06/25 08:39:11 wiz Exp $ .include "../../shells/zsh/Makefile.common" ZSH_VERSION= 5.0.5 +PKGREVISION= 1 ZSH_MAINTAINER= uebayasi@NetBSD.org CONFIGURE_ARGS+= --disable-gdbm diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 02b114955cd..0f887e6c334 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.46 2014/01/08 16:30:01 ryoon Exp $ +$NetBSD: distinfo,v 1.47 2014/06/25 08:39:11 wiz Exp $ SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16 RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0 Size (zsh-5.0.5.tar.bz2) = 3104375 bytes -SHA1 (patch-ac) = f83e5f38c262c779f32e0368815ce02308bc3fff +SHA1 (patch-Src_Builtins_rlimits.c) = 45b0e661fbf3ec77fdba95c7b2586a155065fa2f +SHA1 (patch-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013 diff --git a/shells/zsh/patches/patch-Src_Builtins_rlimits.c b/shells/zsh/patches/patch-Src_Builtins_rlimits.c new file mode 100644 index 00000000000..bfbc15569f9 --- /dev/null +++ b/shells/zsh/patches/patch-Src_Builtins_rlimits.c @@ -0,0 +1,36 @@ +$NetBSD: patch-Src_Builtins_rlimits.c,v 1.4 2014/06/25 08:39:11 wiz Exp $ + +Fix thread limit display in ulimit. +From upstream, Peter Stephenson <p.stephenson@samsung.com>. + +--- Src/Builtins/rlimits.c.orig 2013-11-27 19:00:20.000000000 +0000 ++++ Src/Builtins/rlimits.c +@@ -32,12 +32,14 @@ + + #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY) + +-#ifdef RLIMIT_POSIXLOCKS ++#if defined(HAVE_RLIMIT_POSIXLOCKS) && !defined(HAVE_RLIMIT_LOCKS) + # define RLIMIT_LOCKS RLIMIT_POSIXLOCKS ++# define HAVE_RLIMIT_LOCKS 1 + #endif + +-#ifdef RLIMIT_NTHR ++#if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_PTHREAD) + # define RLIMIT_PTHREAD RLIMIT_NTHR ++# define HAVE_RLIMIT_PTHREAD 1 + #endif + + enum { +@@ -876,6 +878,11 @@ bin_ulimit(char *name, char **argv, UNUS + res = RLIMIT_KQUEUES; + break; + # endif ++# ifdef HAVE_RLIMIT_PTHREAD ++ case 'T': ++ res = RLIMIT_PTHREAD; ++ break; ++# endif + default: + /* unrecognised limit */ + zwarnnam(name, "bad option: -%c", *options); |