Sun Jun 9 18:12:14 2013 UTC ()
Add support for RLIMIT_NTHR (number of threads) that appears in NetBSD
6.99.x. This uses "ulimit -T" as in Linux, not "-r" as in the other shells
on NetBSD. Bump pkgrevision.


(bsiegert)
diff -r1.57 -r1.58 pkgsrc/shells/bash/Makefile
diff -r1.26 -r1.27 pkgsrc/shells/bash/distinfo
diff -r0 -r1.1 pkgsrc/shells/bash/patches/patch-builtins_ulimit.def
cvs diff -r1.57 -r1.58 pkgsrc/shells/bash/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/bash/Makefile 2013/05/10 00:42:41 1.57
+++ pkgsrc/shells/bash/Makefile 2013/06/09 18:12:14 1.58
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.57 2013/05/10 00:42:41 riastradh Exp $ 1# $NetBSD: Makefile,v 1.58 2013/06/09 18:12:14 bsiegert Exp $
2 2
3BASH_VERSION= 4.2 3BASH_VERSION= 4.2
4 4
5DISTNAME= bash-${BASH_VERSION} 5DISTNAME= bash-${BASH_VERSION}
6#PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} 6#PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
7PKGREVISION= 2 7PKGREVISION= 3
8CATEGORIES= shells 8CATEGORIES= shells
9MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ 9MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
10 ftp://ftp.cwru.edu/pub/bash/ 10 ftp://ftp.cwru.edu/pub/bash/
11 11
12#PATCH_SITES= ${MASTER_SITES:=bash-4.0-patches/} 12#PATCH_SITES= ${MASTER_SITES:=bash-4.0-patches/}
13#PATCHFILES+= bash40-001 bash40-002 bash40-003 bash40-004 bash40-005 13#PATCHFILES+= bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://www.gnu.org/software/bash/bash.html 16HOMEPAGE= http://www.gnu.org/software/bash/bash.html
17COMMENT= The GNU Bourne Again Shell 17COMMENT= The GNU Bourne Again Shell
18LICENSE= gnu-gpl-v3 18LICENSE= gnu-gpl-v3
19 19
20CONFLICTS= static-bash-[0-9]* 20CONFLICTS= static-bash-[0-9]*
cvs diff -r1.26 -r1.27 pkgsrc/shells/bash/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/bash/distinfo 2013/02/12 23:31:40 1.26
+++ pkgsrc/shells/bash/distinfo 2013/06/09 18:12:14 1.27
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.26 2013/02/12 23:31:40 tcort Exp $ 1$NetBSD: distinfo,v 1.27 2013/06/09 18:12:14 bsiegert Exp $
2 2
3SHA1 (bash-4.2.tar.gz) = 487840ab7134eb7901fbb2e49b0ee3d22de15cb8 3SHA1 (bash-4.2.tar.gz) = 487840ab7134eb7901fbb2e49b0ee3d22de15cb8
4RMD160 (bash-4.2.tar.gz) = df7ae51783f039a1234d3b720ffcf4bfa5d09673 4RMD160 (bash-4.2.tar.gz) = df7ae51783f039a1234d3b720ffcf4bfa5d09673
5Size (bash-4.2.tar.gz) = 7009201 bytes 5Size (bash-4.2.tar.gz) = 7009201 bytes
6SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d 6SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d
7SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 7SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
8SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75 8SHA1 (patch-ai) = 26825922898567841bed0bf62a8dee3bcc50cd75
9SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e 9SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e
10SHA1 (patch-ak) = 6dfb7195f45f81064f687a4c9febb9dcae721aa7 10SHA1 (patch-ak) = 6dfb7195f45f81064f687a4c9febb9dcae721aa7
 11SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb
11SHA1 (patch-execute_cmd.c) = ce9fe5820188aa218bac74316d45cbdabadb1785 12SHA1 (patch-execute_cmd.c) = ce9fe5820188aa218bac74316d45cbdabadb1785
12SHA1 (patch-lib_sh_eaccess.c) = 484577f09efe67f604c3fb85afdb5a58b64f5b6c 13SHA1 (patch-lib_sh_eaccess.c) = 484577f09efe67f604c3fb85afdb5a58b64f5b6c
File Added: pkgsrc/shells/bash/patches/patch-builtins_ulimit.def
$NetBSD: patch-builtins_ulimit.def,v 1.1 2013/06/09 18:12:14 bsiegert Exp $

Add support for the "number of threads" ulimit that appeared
in NetBSD 6.99.x.
--- builtins/ulimit.def.orig	2013-06-09 17:33:51.000000000 +0000
+++ builtins/ulimit.def
@@ -140,6 +140,10 @@ extern int errno;
 #  define RLIMIT_FILESIZE	256
 #endif
 
+#ifdef RLIMIT_NTHR
+#  define RLIMIT_PTHREAD	RLIMIT_NTHR
+#endif
+
 #define RLIMIT_PIPESIZE	257
 
 #ifdef RLIMIT_NOFILE