CVS commit: pkgsrc/security/doas

["ng0" <ng0%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ng0
Date:           Sat Dec 14 11:19:54 UTC 2019

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

Log Message:
security/doas: resolve PR pkg/54717.

patch in the correct installed location of the config file
in the manpages.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/doas/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/doas/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/doas/patches/patch-a

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.5 pkgsrc/security/doas/Makefile:1.6
--- pkgsrc/security/doas/Makefile:1.5   Fri Nov 29 15:27:42 2019
+++ pkgsrc/security/doas/Makefile       Sat Dec 14 11:19:54 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/11/29 15:27:42 ng0 Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/14 11:19:54 ng0 Exp $
 
 DISTNAME=      doas-6.2p2
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=slicer69/}
 

Index: pkgsrc/security/doas/distinfo
diff -u pkgsrc/security/doas/distinfo:1.3 pkgsrc/security/doas/distinfo:1.4
--- pkgsrc/security/doas/distinfo:1.3   Tue Oct 15 12:24:01 2019
+++ pkgsrc/security/doas/distinfo       Sat Dec 14 11:19:54 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/10/15 12:24:01 ng0 Exp $
+$NetBSD: distinfo,v 1.4 2019/12/14 11:19:54 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

Added files:

Index: pkgsrc/security/doas/patches/patch-a
diff -u /dev/null pkgsrc/security/doas/patches/patch-a:1.1
--- /dev/null   Sat Dec 14 11:19:54 2019
+++ pkgsrc/security/doas/patches/patch-a        Sat Dec 14 11:19:54 2019
@@ -0,0 +1,75 @@
+$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