Wed Jun 25 12:19:09 2014 UTC ()
Update to upgraded patch from upstream. Ride bump.


(wiz)
diff -r1.47 -r1.48 pkgsrc/shells/zsh/distinfo
diff -r1.4 -r1.5 pkgsrc/shells/zsh/patches/patch-Src_Builtins_rlimits.c
cvs diff -r1.47 -r1.48 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2014/06/25 08:39:11 1.47
+++ pkgsrc/shells/zsh/distinfo 2014/06/25 12:19:09 1.48
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.47 2014/06/25 08:39:11 wiz Exp $ 1$NetBSD: distinfo,v 1.48 2014/06/25 12:19:09 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-Src_Builtins_rlimits.c) = 45b0e661fbf3ec77fdba95c7b2586a155065fa2f 6SHA1 (patch-Src_Builtins_rlimits.c) = f35b74b34415c6dfda2a7429f9bc6170bb68e980
7SHA1 (patch-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee 7SHA1 (patch-ac) = ee0cb8f39bdfd6f9a8facc3ba861c4f438aabcee
8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
9SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013 9SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
cvs diff -r1.4 -r1.5 pkgsrc/shells/zsh/patches/Attic/patch-Src_Builtins_rlimits.c (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/Attic/patch-Src_Builtins_rlimits.c 2014/06/25 08:39:11 1.4
+++ pkgsrc/shells/zsh/patches/Attic/patch-Src_Builtins_rlimits.c 2014/06/25 12:19:09 1.5
@@ -1,36 +1,62 @@ @@ -1,36 +1,62 @@
1$NetBSD: patch-Src_Builtins_rlimits.c,v 1.4 2014/06/25 08:39:11 wiz Exp $ 1$NetBSD: patch-Src_Builtins_rlimits.c,v 1.5 2014/06/25 12:19:09 wiz Exp $
2 2
3Fix thread limit display in ulimit. 3Fix thread limit display in ulimit.
4From upstream, Peter Stephenson <p.stephenson@samsung.com>. 4From upstream, Peter Stephenson <p.stephenson@samsung.com>.
5 5
6--- Src/Builtins/rlimits.c.orig 2013-11-27 19:00:20.000000000 +0000 6--- Src/Builtins/rlimits.c.orig 2013-11-27 19:00:20.000000000 +0000
7+++ Src/Builtins/rlimits.c 7+++ Src/Builtins/rlimits.c
8@@ -32,12 +32,14 @@ 8@@ -32,12 +32,17 @@
9  9
10 #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY) 10 #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY)
11  11
12-#ifdef RLIMIT_POSIXLOCKS 12-#ifdef RLIMIT_POSIXLOCKS
13+#if defined(HAVE_RLIMIT_POSIXLOCKS) && !defined(HAVE_RLIMIT_LOCKS) 13+#if defined(HAVE_RLIMIT_POSIXLOCKS) && !defined(HAVE_RLIMIT_LOCKS)
14 # define RLIMIT_LOCKS RLIMIT_POSIXLOCKS 14 # define RLIMIT_LOCKS RLIMIT_POSIXLOCKS
15+# define HAVE_RLIMIT_LOCKS 1 15+# define HAVE_RLIMIT_LOCKS 1
16 #endif 16 #endif
17  17
18-#ifdef RLIMIT_NTHR 18-#ifdef RLIMIT_NTHR
19+#if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_PTHREAD) 19+#if defined(HAVE_RLIMIT_NTHR) && !defined(HAVE_RLIMIT_PTHREAD)
20 # define RLIMIT_PTHREAD RLIMIT_NTHR 20 # define RLIMIT_PTHREAD RLIMIT_NTHR
21+# define HAVE_RLIMIT_PTHREAD 1 21+# define HAVE_RLIMIT_PTHREAD 1
 22+# define THREAD_FMT "-T: threads "
 23+#else
 24+# define THREAD_FMT "-T: threads per process "
22 #endif 25 #endif
23  26
24 enum { 27 enum {
25@@ -876,6 +878,11 @@ bin_ulimit(char *name, char **argv, UNUS 28@@ -373,7 +378,7 @@ printulimit(char *nam, int lim, int hard
 29 # ifdef HAVE_RLIMIT_PTHREAD
 30 case RLIMIT_PTHREAD:
 31 if (head)
 32- printf("-T: threads per process ");
 33+ printf(THREAD_FMT);
 34 break;
 35 # endif /* HAVE_RLIMIT_PTHREAD */
 36 # ifdef HAVE_RLIMIT_NICE
 37@@ -860,6 +865,13 @@ bin_ulimit(char *name, char **argv, UNUS
 38 case 'r':
 39 res = RLIMIT_RTPRIO;
 40 break;
 41+# else
 42+# ifdef HAVE_RLIMIT_NTHR
 43+ /* For compatibility with sh on NetBSD */
 44+ case 'r':
 45+ res = RLIMIT_NTHR;
 46+ break;
 47+# endif /* HAVE_RLIMIT_NTHR */
 48 # endif
 49 # ifdef HAVE_RLIMIT_NPTS
 50 case 'p':
 51@@ -876,6 +888,11 @@ bin_ulimit(char *name, char **argv, UNUS
26 res = RLIMIT_KQUEUES; 52 res = RLIMIT_KQUEUES;
27 break; 53 break;
28 # endif 54 # endif
29+# ifdef HAVE_RLIMIT_PTHREAD 55+# ifdef HAVE_RLIMIT_PTHREAD
30+ case 'T': 56+ case 'T':
31+ res = RLIMIT_PTHREAD; 57+ res = RLIMIT_PTHREAD;
32+ break; 58+ break;
33+# endif 59+# endif
34 default: 60 default:
35 /* unrecognised limit */ 61 /* unrecognised limit */
36 zwarnnam(name, "bad option: -%c", *options); 62 zwarnnam(name, "bad option: -%c", *options);