diff options
| author | tron <tron@pkgsrc.org> | 2001-12-17 19:26:24 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-12-17 19:26:24 +0000 |
| commit | 0479880c165c2b9c203914956b712493da75218e (patch) | |
| tree | 768336964bf489dd76773a5c95a493808b0509ee /shells/tcsh | |
| parent | faea29976f9929a3a9d42f0086b7f6837ecc9209 (diff) | |
| download | pkgsrc-0479880c165c2b9c203914956b712493da75218e.tar.gz | |
Add fix for problems reported in PR kern/14968. The patch was provided
by Christos Zoulas in private e-mail.
Diffstat (limited to 'shells/tcsh')
| -rw-r--r-- | shells/tcsh/distinfo | 3 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-aa | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 7c7d80e7c4e..8a149c9925d 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2001/09/03 01:57:21 kim Exp $ +$NetBSD: distinfo,v 1.6 2001/12/17 19:26:24 tron Exp $ SHA1 (tcsh-6.11.tar.gz) = bfc2ccd2d9e04975308cdf0a50b7383e580594b6 Size (tcsh-6.11.tar.gz) = 716863 bytes +SHA1 (patch-aa) = d133152687288556ab9ea2b3ed8d0c7c4363d4fd SHA1 (patch-ac) = 5e7424ad50ddcd7e75c04d3c64c2136cc360bbdf SHA1 (patch-af) = 8db810383f043e65858b5925988cac5fd193c948 SHA1 (patch-ag) = e71ea3d9dd4ea70040ab18702260d3c8890b9da9 diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa new file mode 100644 index 00000000000..1916c531586 --- /dev/null +++ b/shells/tcsh/patches/patch-aa @@ -0,0 +1,29 @@ +$NetBSD: patch-aa,v 1.6 2001/12/17 19:26:25 tron Exp $ + +--- sh.func.c.orig Tue Mar 13 13:53:50 2001 ++++ sh.func.c Mon Dec 17 20:23:03 2001 +@@ -2143,6 +2143,9 @@ + else + rlim.rlim_cur = limit; + ++ if (rlim.rlim_cur > rlim.rlim_max) ++ rlim.rlim_max = rlim.rlim_cur; ++ + if (setrlimit(lp->limconst, &rlim) < 0) { + # else /* BSDLIMIT */ + if (limit != RLIM_INFINITY && lp->limconst == RLIMIT_FSIZE) +@@ -2153,10 +2156,10 @@ + # endif /* aiws */ + if (ulimit(toset(lp->limconst), limit) < 0) { + # endif /* BSDLIMIT */ +- xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit\n"), bname, lp->limname, +- limit == RLIM_INFINITY ? CGETS(15, 2, "remove") : +- CGETS(15, 3, "set"), +- hard ? CGETS(14, 4, " hard") : ""); ++ xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname, ++ lp->limname, limit == RLIM_INFINITY ? CGETS(15, 2, "remove") : ++ CGETS(15, 3, "set"), hard ? CGETS(14, 4, " hard") : "", ++ strerror(errno)); + return (-1); + } + return (0); |