CVS commit: pkgsrc/security/doas

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Wed Oct 21 17:34:09 UTC 2020

Modified Files:
        pkgsrc/security/doas: Makefile distinfo
Added Files:
        pkgsrc/security/doas/patches: patch-Makefile patch-compat_compat.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/doas/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/doas/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/doas/patches/patch-Makefile \
    pkgsrc/security/doas/patches/patch-compat_compat.h

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.10 pkgsrc/security/doas/Makefile:1.11
--- pkgsrc/security/doas/Makefile:1.10  Wed Oct 21 15:25:23 2020
+++ pkgsrc/security/doas/Makefile       Wed Oct 21 17:34:09 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2020/10/21 15:25:23 kim Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/21 17:34:09 kim Exp $
 
 DISTNAME=      doas-6.2p4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=slicer69/}
 

Index: pkgsrc/security/doas/distinfo
diff -u pkgsrc/security/doas/distinfo:1.5 pkgsrc/security/doas/distinfo:1.6
--- pkgsrc/security/doas/distinfo:1.5   Wed Jan  1 01:30:19 2020
+++ pkgsrc/security/doas/distinfo       Wed Oct 21 17:34:09 2020
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2020/01/01 01:30:19 ng0 Exp $
+$NetBSD: distinfo,v 1.6 2020/10/21 17:34:09 kim Exp $
 
 SHA1 (doas-6.2p4.tar.gz) = dd90972c3a120ae2b96432bae2c7a78c4c729166
 RMD160 (doas-6.2p4.tar.gz) = a8ed8677fbffd48bf87b4fa5c6b0dd98f0c5e428
 SHA512 (doas-6.2p4.tar.gz) = 951686a58300ab6ffcdd7b98502df832b35c43787234c52c71c42eaca9e4dbeb1c2e33e7535a9b8babdb2f38840f6cff1045f6a90fa609029590e7c1384b8a75
 Size (doas-6.2p4.tar.gz) = 26098 bytes
+SHA1 (patch-Makefile) = 710303b7c858f0d94f0f8bdd873a87e2600f72d0
+SHA1 (patch-compat_compat.h) = b49d6a64f5ee6308446184891b8ece32c919b95a

Added files:

Index: pkgsrc/security/doas/patches/patch-Makefile
diff -u /dev/null pkgsrc/security/doas/patches/patch-Makefile:1.1
--- /dev/null   Wed Oct 21 17:34:09 2020
+++ pkgsrc/security/doas/patches/patch-Makefile Wed Oct 21 17:34:09 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2020/10/21 17:34:09 kim Exp $
+
+Enable HAVE_LOGIN_CAP_H and reallocarray() on NetBSD.
+
+--- Makefile
++++ Makefile
+@@ -24,6 +24,11 @@ ifeq ($(UNAME_S),FreeBSD)
+     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
Index: pkgsrc/security/doas/patches/patch-compat_compat.h
diff -u /dev/null pkgsrc/security/doas/patches/patch-compat_compat.h:1.1
--- /dev/null   Wed Oct 21 17:34:09 2020
+++ pkgsrc/security/doas/patches/patch-compat_compat.h  Wed Oct 21 17:34:09 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-compat_compat.h,v 1.1 2020/10/21 17:34:09 kim Exp $
+
+Do not provide a prototype for reallocarray(3) on NetBSD.
+
+--- compat/compat.h
++++ compat/compat.h
+@@ -13,7 +13,9 @@ extern const char *__progname;
+ 
+ const char *getprogname(void);
+ 
++#if !defined(__NetBSD__)
+ void *reallocarray(void *optr, size_t nmemb, size_t size);
++#endif
+ 
+ void setprogname(const char *progname);
+