Wed Jun 25 08:39:11 2014 UTC ()
Fix ulimit(1) for thread limits; patch from upstream.
Bump PKGREVISION.


(wiz)
diff -r1.65 -r1.66 pkgsrc/shells/zsh/Makefile
diff -r1.46 -r1.47 pkgsrc/shells/zsh/distinfo
diff -r0 -r1.4 pkgsrc/shells/zsh/patches/patch-Src_Builtins_rlimits.c
cvs diff -r1.65 -r1.66 pkgsrc/shells/zsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Makefile 2014/01/08 16:30:01 1.65
+++ pkgsrc/shells/zsh/Makefile 2014/06/25 08:39:11 1.66
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.65 2014/01/08 16:30:01 ryoon Exp $ 1# $NetBSD: Makefile,v 1.66 2014/06/25 08:39:11 wiz Exp $
2 2
3.include "../../shells/zsh/Makefile.common" 3.include "../../shells/zsh/Makefile.common"
4 4
5ZSH_VERSION= 5.0.5 5ZSH_VERSION= 5.0.5
 6PKGREVISION= 1
6ZSH_MAINTAINER= uebayasi@NetBSD.org 7ZSH_MAINTAINER= uebayasi@NetBSD.org
7 8
8CONFIGURE_ARGS+= --disable-gdbm 9CONFIGURE_ARGS+= --disable-gdbm
9 10
10SUBST_CLASSES+= prefix-fixup 11SUBST_CLASSES+= prefix-fixup
11SUBST_STAGE.prefix-fixup= pre-configure 12SUBST_STAGE.prefix-fixup= pre-configure
12SUBST_FILES.prefix-fixup= \ 13SUBST_FILES.prefix-fixup= \
13 Misc/globtests \ 14 Misc/globtests \
14 Misc/globtests.ksh \ 15 Misc/globtests.ksh \
15 Test/ztst.zsh \ 16 Test/ztst.zsh \
16 Test/runtests.zsh \ 17 Test/runtests.zsh \
17 Util/reporter \ 18 Util/reporter \
18 Functions/Calendar/calendar_add \ 19 Functions/Calendar/calendar_add \
cvs diff -r1.46 -r1.47 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2014/01/08 16:30:01 1.46
+++ pkgsrc/shells/zsh/distinfo 2014/06/25 08:39:11 1.47
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.46 2014/01/08 16:30:01 ryoon Exp $ 1$NetBSD: distinfo,v 1.47 2014/06/25 08:39:11 wiz Exp $
2 2
3SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16 3SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16
4RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0 4RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0
5Size (zsh-5.0.5.tar.bz2) = 3104375 bytes 5Size (zsh-5.0.5.tar.bz2) = 3104375 bytes
6SHA1 (patch-ac) = f83e5f38c262c779f32e0368815ce02308bc3fff 6SHA1 (patch-Src_Builtins_rlimits.c) = 45b0e661fbf3ec77fdba95c7b2586a155065fa2f
 7SHA1 (patch-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee
7SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
8SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013 9SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
File Added: pkgsrc/shells/zsh/patches/Attic/patch-Src_Builtins_rlimits.c
$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);