[pkgsrc/trunk]: pkgsrc/security/doas security/doas: update to version 6.2p4

[ng0 <ng0%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e49fd66bbdf
branches:  trunk
changeset: 420132:0e49fd66bbdf
user:      ng0 <ng0%pkgsrc.org@localhost>
date:      Wed Jan 01 01:30:19 2020 +0000

description:
security/doas: update to version 6.2p4

Changelog picked from https://github.com/slicer69/doas/releases:

6.2p4:
* Keeping environment variables with keepenv
  On some platforms (seemingly Linux and macOS) it is possible for
  repeated calls to getpwuid() can over-write the original struct
  passwd structure. (This behaviour may vary depending on which
  C library is used. This can lead to the original user's
  environment data being overwritten by the target user's, even
  when "keepenv" is specified in the doas.conf file.
  We now do a deep copy of the original and target users' struct
  passwd information to avoid over-writing the original on platforms
  where libc uses a static area for all calls.

diffstat:

 security/doas/Makefile        |   5 +-
 security/doas/distinfo        |  11 ++---
 security/doas/patches/patch-a |  75 -------------------------------------------
 3 files changed, 7 insertions(+), 84 deletions(-)

diffs (108 lines):

diff -r e845b4701fa4 -r 0e49fd66bbdf security/doas/Makefile
--- a/security/doas/Makefile    Wed Jan 01 01:19:17 2020 +0000
+++ b/security/doas/Makefile    Wed Jan 01 01:30:19 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/12/14 11:19:54 ng0 Exp $
+# $NetBSD: Makefile,v 1.7 2020/01/01 01:30:19 ng0 Exp $
 
-DISTNAME=      doas-6.2p2
-PKGREVISION=   1
+DISTNAME=      doas-6.2p4
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=slicer69/}
 
diff -r e845b4701fa4 -r 0e49fd66bbdf security/doas/distinfo
--- a/security/doas/distinfo    Wed Jan 01 01:19:17 2020 +0000
+++ b/security/doas/distinfo    Wed Jan 01 01:30:19 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2019/12/14 11:19:54 ng0 Exp $
+$NetBSD: distinfo,v 1.5 2020/01/01 01:30:19 ng0 Exp $
 
-SHA1 (doas-6.2p2.tar.gz) = 417cb9de4d1815b342f1bb3fb96f31e2c8b25479
-RMD160 (doas-6.2p2.tar.gz) = d80538763cb0a0367eb2a6e50369743ea66aa1a5
-SHA512 (doas-6.2p2.tar.gz) = 5020559461bc423852c2d30c07df671b8cbf93cec2171ac755eac04f2bf56fca37fda8d72718fbf4150bf70e7855d29d3027cb54d81062d28d2271a290c297a5
-Size (doas-6.2p2.tar.gz) = 25634 bytes
-SHA1 (patch-a) = 4ed8fba651e1c5fcb707b84e6480ae4c8b457d42
+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
diff -r e845b4701fa4 -r 0e49fd66bbdf security/doas/patches/patch-a
--- a/security/doas/patches/patch-a     Wed Jan 01 01:19:17 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-$NetBSD: patch-a,v 1.1 2019/12/14 11:19:54 ng0 Exp $
-
-manpages: patch in the correct installed location of the config file.
-This resolves PR pkg/54717
-Upstream commited as dad0c102327a69cd629bb8035f171929864bd5b0
-
---- /dev/null
-+++ .gitignore
-@@ -0,0 +1,4 @@
-+*.o
-+*.final
-+y.tab.c
-+doas
-
---- Makefile
-+++ Makefile
-@@ -1,3 +1,4 @@
-+AWK?=awk
- CC?=clang
- YACC?=yacc
- BIN=doas
-@@ -39,7 +40,7 @@ ifeq ($(UNAME_S),Darwin)
-     MANDIR=$(DESTDIR)$(PREFIX)/share/man
- endif
- 
--all: $(OBJECTS)
-+all: $(OBJECTS) doas.1.final doas.conf.5.final
-       $(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS)
- 
- env.o: doas.h env.c
-@@ -59,10 +60,18 @@ install: $(BIN)
-       cp $(BIN) $(DESTDIR)$(PREFIX)/bin/
-       chmod 4755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
-       mkdir -p $(MANDIR)/man1
--      cp doas.1 $(MANDIR)/man1/
-+      cp doas.1.final $(MANDIR)/man1/doas.1
-       mkdir -p $(MANDIR)/man5
--      cp doas.conf.5 $(MANDIR)/man5/
-+      cp doas.conf.5.final $(MANDIR)/man5/doas.conf.5
- 
- clean:
-       rm -f $(BIN) $(OBJECTS) y.tab.c
-+      rm -f *.final
- 
-+# Doing it this way allows to change the original files
-+# only partially instead of renaming them.
-+doas.1.final:
-+      $(AWK) -v pfx="$(SYSCONFDIR)" '{gsub("@SUBSTSYSCONFDIR@",pfx); print $$0}' < doas.1 > doas.1.final
-+
-+doas.conf.5.final:
-+      $(AWK) -v pfx="$(SYSCONFDIR)" '{gsub("@SUBSTSYSCONFDIR@",pfx); print $$0}' < doas.conf.5 > doas.conf.5.final
-
---- doas.1
-+++ doas.1
-@@ -91,7 +91,7 @@ It may fail for one of the following reasons:
- .Bl -bullet -compact
- .It
- The config file
--.Pa /usr/local/etc/doas.conf
-+.Pa @SUBSTSYSCONFDIR@/doas.conf
- could not be parsed.
- .It
- The user attempted to run a command which is not permitted.
-
---- doas.conf.5
-+++ doas.conf.5
-@@ -20,7 +20,7 @@
- .Nm doas.conf
- .Nd doas configuration file
- .Sh SYNOPSIS
--.Nm /usr/local/etc/doas.conf
-+.Nm @SUBSTSYSCONFDIR@/doas.conf
- .Sh DESCRIPTION
- The
- .Xr doas 1