From nobody Mon Apr 6 19:34:25 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fqKK26KdBz6YbRK for ; Mon, 06 Apr 2026 19:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqKK22rSlz3Vfb for ; Mon, 06 Apr 2026 19:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775504070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JriNmUJT9iGt8FLSQ1iEAQE/u/NegnJG9r+IXIFkr8=; b=njj9tMjBZqFAiqWfS79jyFfQmo31bN+ARcwlxLn075tqQyvDHGAlhQ/oarGEH+F6esa0bj rKTRolgJbNlqxSw6KI0Bpdx22+Ekwf2KO/TAyWXDXDCuNXdvinuKZ9WVWiE540bm8Z/1YN TK+JnhH0AUgOpNJTGnIwuBMvCIvKp/4DezZMIg6RkSw7HXLLh+8VOrkA9ed1Q2x4P0N3kV oeYHmfEY1/jBgoxK5OV4jN3sld7K8Eh40lQQB5gmWjnWKp9rITJd3FJX77RBwsNHdBqtGJ 8DuXN1nvpeT9Cd8a4K9kkWimYZ0ex1NA7G6n0HtRiKXOlrtN6vnUxZARqhT4wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775504070; a=rsa-sha256; cv=none; b=GlTOtyQhQHW9yCFIwFzYpvclj498MTvAIWiHlWFMfO0T7ox98REL1OJCqw5YzvtKe5+nkR vbayWA+yKO3pcQ0mg3L7f2gxjOGqSIq8Sg5Z4lHurauU8cMCMcRSXQs1uiVP1PcPL/VDNn aWugwOConkdPTkZjhMSWOaEfSDtvSkWlEjiD/AZughH3RL0m67uaxzRe8XG16mVpwBVGMy qDBXo1HZvnAGxUE72J1tgkMXqZhn2rhwGWLOznWgZpQsCqsQOn4eBX6D6xi1vD/lml21Zd aIgEJTrgVfzJ9dVk13W8BLdlWKwstLs9OnssbF96MBAnlA4qGRrKyhBk4Mh79w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775504070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8JriNmUJT9iGt8FLSQ1iEAQE/u/NegnJG9r+IXIFkr8=; b=RiEOQj5xeOK0qJxneas6XAFVxofbg+8Q5VsktgEBHouFP59Fcdo6Dzb9lUfEkK/Mcf1gxy kdnJUtx9zzI5PAtt7trJPkIr3t9jsnNlpv6OTEn+zJABcVotOYCIwyKW0RwBgzSamzD6oM sXcJsoDw53C2tCnsw/QDUpofR0CPgQKPMwXUf7MtNhgiK1lGkOjJ2kBmmVlhyHi9OvwLFu IB5EEjchlg1IqhybsmmguPPFxk+pw7YD7B3Gj7xOUffH8BZk1kZSP6jnZdnjTGZNMRtQ0J vIHX4TRokmKsu1MthoJofCmp80+BMXFHRP6SSPYTBFxB12tYUQKXMd+Yl7gjZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqKK22GDxz16DQ for ; Mon, 06 Apr 2026 19:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e92 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 19:34:25 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Jesse Smith From: Vladimir Druzenko Subject: git: b9d5e73e065d - main - security/doas: Update 6.3p13 => 6.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9d5e73e065d00217aaa48639411b6402a20b6df Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 19:34:25 +0000 Message-Id: <69d40ac1.35e92.3fb50a09@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9d5e73e065d00217aaa48639411b6402a20b6df commit b9d5e73e065d00217aaa48639411b6402a20b6df Author: Jesse Smith AuthorDate: 2026-04-06 19:24:56 +0000 Commit: Vladimir Druzenko 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 --- 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