From nobody Sat Jul 26 10:00:37 2025 X-Original-To: dev-commits-src-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 4bq0c623Ghz63Jsy; Sat, 26 Jul 2025 10:00:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bq0c6061qz3j45; Sat, 26 Jul 2025 10:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753524038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3DgYDKtld8ucbE1WmK7uo23mZyazw1lLstzAJcW6io=; b=Lg5SJfHSYFhxGQ2eb7y33lib9Eix1yD0md5LVvRpIM+HiKIV2xEfBBfP/C7vWlvpSsNMP7 2pPAgqnt5HiFsi5SZotJcamJDl5EMysSl1NGe+WqgA6U3P5LUq/PeN6MdoSKfyhP1D+KBj VxR5RMLHNXKN8bJ7r5QRG9uo1YpqeX4p/OEwvFQ5KwSeqpdE3QOGblMVWk3bj/xeORLIZ7 NkeRjk8WuSqBpuI9RIucki6fgYnkVgbzhHYJJVEej80EkLwXK8ozg1WBcXKGQvL0qRajFN At0xAU8AUYrSWpE8IsYgr48bLwgtcOcQuGCUDoK1N9wJzSKwD+xFekkId+EcPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753524038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3DgYDKtld8ucbE1WmK7uo23mZyazw1lLstzAJcW6io=; b=hgBt1VGgUGurF74s78jlXuOHraQEbY06uJTxRGl7ZynTHcHIktquKKdWtF3NkD4gQdzB+P bnaYLmvYYQOSXp0UaTQEp4sUfxvz7vTiPK1CkNiMP+dvTSXtEKjXE3xIUPlesBPuQuiafP ds4kbU9xjuvBVMo7d6bTmQGAtH/b+R63Yvsr55NXhoZPIPxiXooD/9YIdMmEsEsRZdky9Q QfbijDAmnIfKqCNElxE97iAI+FGqyDJh3jB3U4mKT43REfF2ulXxkTMDSNfGVRxuAXF/un p6il03//Quh0GMKxR3lKdj+VH8SsPWYCwM8aqO3627vzWXBgQyfpNPUIuty7DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753524038; a=rsa-sha256; cv=none; b=VLLMN2rutYdB/HqOcpoKngzaKIUy1m9YcbyKR5Q5Ny4WH517o48EVTRggElSindgCOUWYZ 5iUUHhofu1jnE9l0kv7cL8YqB7hy+pCzxlVRDQr9KB//IL60pcDXYThA6dMUTtjaN58LRq Y4pRuN316XSlmKiNEqokfSrcj8OlgU6f3brcFulj9RJx2wE+7DYFaYj0c6NJ9dq2FNC6uK N/bRZw39JE2TeQyh7Hv5E9/aC1U7eBoHdtG9FKo5o/JG+SmSn8tvPugMzHSkRsYn/qlZ37 d2D7vJRBVI5/tKI5yvz0xyTyRNym/9ADtn13HFlD1htP0XyXnpQoyk25kc2gJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bq0c56MB1z9Gn; Sat, 26 Jul 2025 10:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56QA0ba7068036; Sat, 26 Jul 2025 10:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56QA0bpe068033; Sat, 26 Jul 2025 10:00:37 GMT (envelope-from git) Date: Sat, 26 Jul 2025 10:00:37 GMT Message-Id: <202507261000.56QA0bpe068033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a3d4ae7cf351 - main - dma: Don't install dma.conf world-readable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3d4ae7cf351cc283a670d8400a89518a6b31d63 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d4ae7cf351cc283a670d8400a89518a6b31d63 commit a3d4ae7cf351cc283a670d8400a89518a6b31d63 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-26 09:59:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-26 09:59:53 +0000 dma: Don't install dma.conf world-readable While here, install auth.conf into /etc as well. MFC after: 3 days PR: 288409 Reviewed by: ivy, bapt Differential Revision: https://reviews.freebsd.org/D51529 --- ObsoleteFiles.inc | 3 +++ libexec/dma/dmagent/Makefile | 6 ++++-- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 385e891049e7..10f99c5d6047 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250726: This file is now installed in /etc/dma +OLD_FILES+=usr/share/examples/dma/auth.conf + # 20250725: libbsnmp bumped to version 7 OLD_LIBS+=usr/lib/libbsnmp.so.6 diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 5f7deeea0b05..c8a3bd44a53c 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -17,12 +17,14 @@ SRCS= aliases_parse.y \ util.c MAN8= dma.8 MLINKS= dma.8 dma.conf.5 -CONFS= dma.conf +CONFSMODE= 0640 +CONFSGRP= mail +CONFS= auth.conf dma.conf CONFSDIR= ${CONFDIR}/dma CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L YFLAGS+= -i CLEANFILES= aliases_parse.i -FILES= auth.conf mailer.conf +FILES= mailer.conf FILESDIR= ${SHAREDIR}/examples/dma BINMODE= 2555 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3183c5f0b45c..f7eb1e979d07 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1473,12 +1473,12 @@ OLD_DIRS+=usr/share/dict .endif .if ${MK_DMAGENT} == no +OLD_FILES+=etc/dma/auth.conf OLD_FILES+=etc/dma/dma.conf OLD_DIRS+=etc/dma OLD_FILES+=usr/libexec/dma OLD_FILES+=usr/libexec/dma-mbox-create OLD_FILES+=usr/share/man/man8/dma.8.gz -OLD_FILES+=usr/share/examples/dma/auth.conf OLD_FILES+=usr/share/examples/dma/mailer.conf OLD_DIRS+=usr/share/examples/dma .endif