Date: Tue, 4 Oct 2022 15:50:05 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6d2cfa2d34e3 - stable/13 - check/delete-old: Fix /bin/rmail removal condition Message-ID: <202210041550.294Fo5V2000654@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6d2cfa2d34e3ade155f65066f25716dc734ac302 commit 6d2cfa2d34e3ade155f65066f25716dc734ac302 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2022-07-21 22:20:25 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-10-04 15:48:27 +0000 check/delete-old: Fix /bin/rmail removal condition When WITHOUT_SENDMAIL is enabled and WITHOUT_MAILWRAPPER is disabled we install /bin/rmail as a link to the /usr/sbin/mailwrapper. Ensure make delete-old does not unlink /bin/rmail in that case. PR: 266604 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35874 MFC after: 2 weeks (cherry picked from commit 55736146389f997fe3e2453f1d48d96ff1ad5b7a) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 697c7570b9a1..7000eff5ed87 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7681,7 +7681,9 @@ OLD_FILES+=etc/periodic/daily/440.status-mailq OLD_FILES+=etc/periodic/daily/460.status-mail-rejects OLD_FILES+=etc/periodic/daily/500.queuerun OLD_FILES+=etc/rc.d/sendmail +.if ${MK_MAILWRAPPER} == no OLD_FILES+=bin/rmail +.endif OLD_FILES+=usr/bin/vacation OLD_FILES+=usr/include/libmilter/mfapi.h OLD_FILES+=usr/include/libmilter/mfdef.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210041550.294Fo5V2000654>