Skip site navigation (1)Skip section navigation (2)



index | | raw e-mail

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

commit b9d5e73e065d00217aaa48639411b6402a20b6df
Author:     Jesse Smith <jsmith@resonatingmedia.com>
AuthorDate: 2026-04-06 19:24:56 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-04-06 19:24:56 +0000

    security/doas: Update 6.3p13 => 6.4
    
    Changelog:
    - Fix some typos in the documentation.
    - Cause doasedit to better handle shell variables and find the best
      text editor for altering files.
    
    Improve port:
    - Move BINMODE=4755 to plist: "@(,,4755) bin/doas" - BINMODE is applied
      universally (to all programs and scripts). This means helper scripts
      like doasedit, which are meant to be run as a regular user, were also
      installed as setuid. This is a potential security issue.
    - Move plist to file.
    - Add "@sample" for "etc/doas.conf.sample".
    
    PR:             293628
    Sponsored by:   UNIS Labs
    MFH:            2026Q2
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 security/doas/Makefile  | 12 +-----------
 security/doas/distinfo  |  6 +++---
 security/doas/pkg-plist |  8 ++++++++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/security/doas/Makefile b/security/doas/Makefile
index d0b419bd2f06..5b8aca21a5fe 100644
--- a/security/doas/Makefile
+++ b/security/doas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	doas
-PORTVERSION=	6.3p13
+PORTVERSION=	6.4
 CATEGORIES=	security
 MASTER_SITES=	https://codeberg.org/thejessesmith/doas/archive/${PORTVERSION}${EXTRACT_SUFX}?dummy=/
 
@@ -21,20 +21,10 @@ MAKE_ENV+=	TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
 
 CONFLICTS=	opendoas
 
-BINMODE=	4755
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/doas \
-		bin/doasedit \
-		bin/vidoas \
-		etc/doas.conf.sample \
-		share/man/man1/doas.1.gz \
-		share/man/man5/doas.conf.5.gz \
-		share/man/man8/doasedit.8.gz \
-		share/man/man8/vidoas.8.gz
-
 # These are upstream's default paths that are set for the GLOBAL_PATH variable
 # in doas.h since the 6.1 release. Those paths are then used for target user's
 # PATH variable instead of those of the original user.
diff --git a/security/doas/distinfo b/security/doas/distinfo
index c611ad3751a8..e6b76b5273e7 100644
--- a/security/doas/distinfo
+++ b/security/doas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757209805
-SHA256 (doas-6.3p13.tar.gz) = 2cca9003856e92ec0a50b3e559b7f3132bf8293dc8302613933f8ed06c8c7fc5
-SIZE (doas-6.3p13.tar.gz) = 34883
+TIMESTAMP = 1772842448
+SHA256 (doas-6.4.tar.gz) = 33e1fba4346db7f3578b1c7ed75c9a42f2b90fe1dfdea60d5af23c248f0997d4
+SIZE (doas-6.4.tar.gz) = 35007
diff --git a/security/doas/pkg-plist b/security/doas/pkg-plist
new file mode 100644
index 000000000000..9302f4c09bc9
--- /dev/null
+++ b/security/doas/pkg-plist
@@ -0,0 +1,8 @@
+@(,,4755) bin/doas
+bin/doasedit
+bin/vidoas
+@sample etc/doas.conf.sample
+share/man/man1/doas.1.gz
+share/man/man5/doas.conf.5.gz
+share/man/man8/doasedit.8.gz
+share/man/man8/vidoas.8.gz


home | help