Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Sep 2021 08:02:43 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cef711955c6e - main - security/doas: Update to 6.3p6
Message-ID:  <202109150802.18F82h90046178@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cef711955c6e7e4bb8c943b38a8a8bfecb420141

commit cef711955c6e7e4bb8c943b38a8a8bfecb420141
Author:     Jesse Smith <jsmith@resonatingmedia.com>
AuthorDate: 2021-09-15 07:56:00 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2021-09-15 08:02:21 +0000

    security/doas: Update to 6.3p6
    
    ChangeLog: https://github.com/slicer69/doas/releases/tag/6.3p6
    
    PR:             258483
---
 security/doas/Makefile             |  8 ++++++--
 security/doas/distinfo             |  6 +++---
 security/doas/files/patch-doasedit | 11 +++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/security/doas/Makefile b/security/doas/Makefile
index d57954720d68..9d5ad124fb28 100644
--- a/security/doas/Makefile
+++ b/security/doas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	doas
-PORTVERSION=	6.3p5
+PORTVERSION=	6.3p6
 CATEGORIES=	security
 
 MAINTAINER=	jsmith@resonatingmedia.com
@@ -20,10 +20,12 @@ BINMODE=	4755
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/doas \
+		bin/doasedit \
 		bin/vidoas \
 		etc/doas.conf.sample \
-		man/man5/doas.conf.5.gz \
 		man/man1/doas.1.gz \
+		man/man5/doas.conf.5.gz \
+		man/man8/doasedit.8.gz \
 		man/man8/vidoas.8.gz
 
 # These are upstream's default paths that are set for the GLOBAL_PATH variable
@@ -38,9 +40,11 @@ _GLOBAL_PATH?=	${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vidoas.final ${STAGEDIR}${PREFIX}/bin/vidoas
+	${INSTALL_SCRIPT} ${WRKSRC}/doasedit ${STAGEDIR}${PREFIX}/bin/doasedit
 	${INSTALL_MAN} ${WRKSRC}/doas.1.final ${STAGEDIR}${MAN1PREFIX}/man/man1/doas.1
 	${INSTALL_MAN} ${WRKSRC}/doas.conf.5.final ${STAGEDIR}${MAN5PREFIX}/man/man5/doas.conf.5
 	${INSTALL_MAN} ${WRKSRC}/vidoas.8.final ${STAGEDIR}${MAN5PREFIX}/man/man8/vidoas.8
+	${INSTALL_MAN} ${WRKSRC}/doasedit.8 ${STAGEDIR}${MAN5PREFIX}/man/man8/doasedit.8
 	${INSTALL_DATA} ${WRKSRC}/doas.conf.sample ${STAGEDIR}${PREFIX}/etc/doas.conf.sample
 
 .include <bsd.port.mk>
diff --git a/security/doas/distinfo b/security/doas/distinfo
index 880913bc0f47..f829fe818c33 100644
--- a/security/doas/distinfo
+++ b/security/doas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622999760
-SHA256 (slicer69-doas-6.3p5_GH0.tar.gz) = 22a8ffdd759be7728d16127d13c423b6a6ada8a776c0c392835e69d2f101052c
-SIZE (slicer69-doas-6.3p5_GH0.tar.gz) = 31157
+TIMESTAMP = 1631559181
+SHA256 (slicer69-doas-6.3p6_GH0.tar.gz) = aa6f5d686942d9148506634e7b84af561af2564b689a287434023b1f272c064a
+SIZE (slicer69-doas-6.3p6_GH0.tar.gz) = 32193
diff --git a/security/doas/files/patch-doasedit b/security/doas/files/patch-doasedit
new file mode 100644
index 000000000000..61cad710e13e
--- /dev/null
+++ b/security/doas/files/patch-doasedit
@@ -0,0 +1,11 @@
+--- doasedit.orig	2021-09-13 18:56:31 UTC
++++ doasedit
+@@ -30,7 +30,7 @@ then
+    exit 3
+ fi
+ 
+-temp_file=$(mktemp --tmpdir doasedit.XXXXXXXX)
++temp_file=$(mktemp -t /tmp)
+ if [ ! $? ]
+ then
+    echo "Could not create temporary file."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109150802.18F82h90046178>