D51529.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51529.diff
View Options

	diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
	--- a/ObsoleteFiles.inc
	+++ b/ObsoleteFiles.inc
	@@ -51,6 +51,9 @@
	# xargs -n1 \| sort \| uniq -d;
	# done

	+# 20250725: This file is now installed in /etc/dma
	+OLD_FILES+=usr/share/examples/dma/auth.conf
	+
	# 20250716: Remove an old manual page, vn(4) was removed in FreeBSD 5.0
	OLD_FILES+=usr/share/man/man4/vn.4.gz

	diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
	--- a/libexec/dma/dmagent/Makefile
	+++ b/libexec/dma/dmagent/Makefile
	@@ -17,12 +17,14 @@
	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
	--- a/tools/build/mk/OptionalObsoleteFiles.inc
	+++ b/tools/build/mk/OptionalObsoleteFiles.inc
	@@ -1473,12 +1473,12 @@
	.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