head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.1.0.44
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.42
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.40
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.38
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.36
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.34
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.32
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.30
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.28
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.26
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.24
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.22
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.20
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.18
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.16
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.14
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.12
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.10
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.8
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.6
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.4
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.2
	pkgsrc-2020Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2026.05.07.00.24.51;	author gutteridge;	state Exp;
branches;
next	1.1;
commitid	ylZB1QHTF1AqCOEG;

1.1
date	2020.10.21.17.34.09;	author kim;	state Exp;
branches;
next	;
commitid	HXgwBhgfQhfgnNsC;


desc
@@


1.2
log
@doas: add pkgsrc-specific paths to GLOBAL_PATH and SAFE_PATH

Issue noted by Takashi Shimizu on pkgsrc-users@@.

This follows how these paths are defined ordering-wise based on doas.h.
The existing SunOS override approach in Makefile varies here, as added
that way upstream. The SunOS setting was left as-is, to keep with the
POLA. (Someone may be surprised by the change on other OSes,
regardless; so it goes.)
@
text
@$NetBSD: patch-Makefile,v 1.1 2020/10/21 17:34:09 kim Exp $

Enable HAVE_LOGIN_CAP_H and reallocarray() on NetBSD.

Add pkgsrc-specific paths to GLOBAL_PATH and SAFE_PATH.

--- Makefile.orig	2020-08-07 21:42:52.000000000 +0000
+++ Makefile
@@@@ -24,6 +24,11 @@@@ endif
     CFLAGS+=-DHAVE_LOGIN_CAP_H
     LDFLAGS+=-lutil
 endif
+ifeq ($(UNAME_S),NetBSD)
+    CFLAGS+=-DHAVE_LOGIN_CAP_H -D_OPENBSD_SOURCE
+    OBJECTS=doas.o env.o y.tab.o
+    LDFLAGS+=-lutil
+endif
 ifeq ($(UNAME_S),SunOS)
     SAFE_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin
     GLOBAL_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin
@@@@ -31,6 +36,12 @@@@ ifeq ($(UNAME_S),SunOS)
     CFLAGS+=-DSOLARIS_PAM -DSAFE_PATH=\"$(SAFE_PATH)\" -DGLOBAL_PATH=\"$(GLOBAL_PATH)\"
     COMPAT=errc.o pm_pam_conv.o setresuid.o verrc.o
     OBJECTS+=$(COMPAT:%.o=compat/%.o)
+# Add pkgsrc-specific paths; follow the ordering approach for each used in doas.h,
+# rather than what's done for SunOS above.
+else
+    SAFE_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$(PREFIX)/bin:$(PREFIX)/sbin
+    GLOBAL_PATH?=$(PREFIX)/sbin:$(PREFIX)/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+    CFLAGS+=-DSAFE_PATH=\"$(SAFE_PATH)\" -DGLOBAL_PATH=\"$(GLOBAL_PATH)\"
 endif
 ifeq ($(UNAME_S),Darwin)
     CPPFLAGS+=-Icompat
@


1.1
log
@doas: Use setusercontext(3)

Calling setusercontext(3) makes per-user temporary storage work (see
per_user_tmp in security(7) and rc.conf(5)).

May as well use our reallocarray(3) instead of the bundled compat code.
@
text
@d1 1
a1 1
$NetBSD$
d5 3
a7 1
--- Makefile
d9 1
a9 1
@@@@ -24,6 +24,11 @@@@ ifeq ($(UNAME_S),FreeBSD)
d21 13
@