CVS commit: pkgsrc/security/doas

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu May  7 00:24:51 UTC 2026

Modified Files:
        pkgsrc/security/doas: Makefile distinfo
        pkgsrc/security/doas/patches: patch-Makefile

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/doas/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/doas/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/doas/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/doas/Makefile
diff -u pkgsrc/security/doas/Makefile:1.15 pkgsrc/security/doas/Makefile:1.16
--- pkgsrc/security/doas/Makefile:1.15  Thu Dec  9 18:46:38 2021
+++ pkgsrc/security/doas/Makefile       Thu May  7 00:24:51 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/12/09 18:46:38 nikita Exp $
+# $NetBSD: Makefile,v 1.16 2026/05/07 00:24:51 gutteridge Exp $
 
 DISTNAME=      doas-6.3p2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=slicer69/}
 

Index: pkgsrc/security/doas/distinfo
diff -u pkgsrc/security/doas/distinfo:1.9 pkgsrc/security/doas/distinfo:1.10
--- pkgsrc/security/doas/distinfo:1.9   Tue Oct 26 11:17:03 2021
+++ pkgsrc/security/doas/distinfo       Thu May  7 00:24:51 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:17:03 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/05/07 00:24:51 gutteridge Exp $
 
 BLAKE2s (doas-6.3p2.tar.gz) = 2e8277d8a3af530e136e47e3bd0c9d05673a75edf789b28bc7723a285969b179
 SHA512 (doas-6.3p2.tar.gz) = 34b15856912145831d682857df4281e38d1e39017d188f79c70e5e601b605a41aec29e0412252212d646fb439032ed25b2ddedab1073d702a67c6b1e827f53aa
 Size (doas-6.3p2.tar.gz) = 27521 bytes
-SHA1 (patch-Makefile) = 710303b7c858f0d94f0f8bdd873a87e2600f72d0
+SHA1 (patch-Makefile) = 7042f7b354f0cf368b136d9ddb7da0b92b46b536
 SHA1 (patch-compat_compat.h) = b49d6a64f5ee6308446184891b8ece32c919b95a

Index: pkgsrc/security/doas/patches/patch-Makefile
diff -u pkgsrc/security/doas/patches/patch-Makefile:1.1 pkgsrc/security/doas/patches/patch-Makefile:1.2
--- pkgsrc/security/doas/patches/patch-Makefile:1.1     Wed Oct 21 17:34:09 2020
+++ pkgsrc/security/doas/patches/patch-Makefile Thu May  7 00:24:51 2026
@@ -1,10 +1,12 @@
-$NetBSD: patch-Makefile,v 1.1 2020/10/21 17:34:09 kim Exp $
+$NetBSD: patch-Makefile,v 1.2 2026/05/07 00:24:51 gutteridge Exp $
 
 Enable HAVE_LOGIN_CAP_H and reallocarray() on NetBSD.
 
---- Makefile
+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 @@ ifeq ($(UNAME_S),FreeBSD)
+@@ -24,6 +24,11 @@ endif
      CFLAGS+=-DHAVE_LOGIN_CAP_H
      LDFLAGS+=-lutil
  endif
@@ -16,3 +18,16 @@ Enable HAVE_LOGIN_CAP_H and reallocarray
  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