diff options
| author | kim <kim@pkgsrc.org> | 2019-12-19 16:59:44 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2019-12-19 16:59:44 +0000 |
| commit | 7a4338723b814a8858332f4bf4940399aaf7ee35 (patch) | |
| tree | bbeac54446aa112cd6df0557e63f32fd2f699c45 /security/sudo | |
| parent | 4f7331ce387261a66001addc3e7bfb452fa2f870 (diff) | |
| download | pkgsrc-7a4338723b814a8858332f4bf4940399aaf7ee35.tar.gz | |
Don't touch RLIMIT_STACK for now, see https://gnats.netbsd.org/51158
Diffstat (limited to 'security/sudo')
| -rw-r--r-- | security/sudo/Makefile | 4 | ||||
| -rw-r--r-- | security/sudo/distinfo | 4 | ||||
| -rw-r--r-- | security/sudo/patches/patch-src_limits.c | 15 |
3 files changed, 13 insertions, 10 deletions
diff --git a/security/sudo/Makefile b/security/sudo/Makefile index d74f994ab0f..b543366740e 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.172 2019/12/18 15:56:10 kim Exp $ +# $NetBSD: Makefile,v 1.173 2019/12/19 16:59:44 kim Exp $ DISTNAME= sudo-1.8.29 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= https://www.sudo.ws/dist/ MASTER_SITES+= ftp://ftp.sudo.ws/pub/sudo/ diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 9f51ca733f9..21dee6da817 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.105 2019/12/18 15:56:10 kim Exp $ +$NetBSD: distinfo,v 1.106 2019/12/19 16:59:44 kim Exp $ SHA1 (sudo-1.8.29.tar.gz) = fdce342856f1803478eb549479190370001dca95 RMD160 (sudo-1.8.29.tar.gz) = 706c7c8ec2a90b2e464e138384335b7de91d1c25 @@ -15,4 +15,4 @@ SHA1 (patch-plugins_sudoers_logging.c) = 700ac9540a82bea4f3106cea941b785e5bd3120 SHA1 (patch-plugins_sudoers_starttime.c) = acec2f8a96041381582acff4928233568411f2c6 SHA1 (patch-plugins_sudoers_sudoers.c) = b5aa8a91da50d4b12ea47cd92e29d25ea325b52c SHA1 (patch-src_Makefile.in) = cc6398a810dc394d8e4b50f2b2412cda839c0ca9 -SHA1 (patch-src_limits.c) = d602eb79fd61ae140e3d5eab357c704edc923519 +SHA1 (patch-src_limits.c) = 790c64fed4a4f406ce07b3d0e806866095c0a5ca diff --git a/security/sudo/patches/patch-src_limits.c b/security/sudo/patches/patch-src_limits.c index 59dbf985551..b7ea3d6f062 100644 --- a/security/sudo/patches/patch-src_limits.c +++ b/security/sudo/patches/patch-src_limits.c @@ -1,13 +1,14 @@ -$NetBSD: patch-src_limits.c,v 1.1 2019/12/18 15:56:11 kim Exp $ +$NetBSD: patch-src_limits.c,v 1.2 2019/12/19 16:59:44 kim Exp $ +* Disable RLIMIT_STACK on NetBSD, see https://gnats.netbsd.org/51158 * Indicate the name of the resource for which setrlimit fails. * Simplify resource limit fallback logic a bit. * Don't set the RLIMIT_STACK soft/hard limits to unlimited. * macOS does not allow rlim_cur to be set to RLIM_INFINITY for RLIMIT_NOFILE. --- src/limits.c.orig 2019-10-28 14:28:52.000000000 +0200 -+++ src/limits.c 2019-12-18 17:22:45.500245697 +0200 -@@ -37,28 +37,46 @@ ++++ src/limits.c 2019-12-19 18:52:11.232251175 +0200 +@@ -37,28 +37,48 @@ #ifdef __linux__ # include <sys/prctl.h> #endif @@ -57,13 +58,15 @@ $NetBSD: patch-src_limits.c,v 1.1 2019/12/18 15:56:11 kim Exp $ #ifdef RLIMIT_RSS - { RLIMIT_RSS }, + { "RLIMIT_RSS", RLIMIT_RSS, false, NULL, { RLIM_INFINITY, RLIM_INFINITY } }, ++#endif ++#ifndef __NetBSD__ ++ { "RLIMIT_STACK", RLIMIT_STACK, false, &stack_fallback, { 8192 * 1024, RLIM_INFINITY } } #endif - { RLIMIT_STACK } -+ { "RLIMIT_STACK", RLIMIT_STACK, false, &stack_fallback, { 8192 * 1024, RLIM_INFINITY } } }; static struct rlimit corelimit; -@@ -160,21 +178,39 @@ +@@ -160,21 +180,39 @@ void unlimit_sudo(void) { @@ -110,7 +113,7 @@ $NetBSD: patch-src_limits.c,v 1.1 2019/12/18 15:56:11 kim Exp $ } } -@@ -194,8 +230,8 @@ +@@ -194,8 +232,8 @@ for (idx = 0; idx < nitems(saved_limits); idx++) { struct saved_limit *lim = &saved_limits[idx]; if (lim->saved) { |