From nobody Tue Oct 04 15:50:05 2022 X-Original-To: dev-commits-src-all@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 4Mhhws488Vz4f6rw; Tue, 4 Oct 2022 15:50:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mhhws3fKFz3wNX; Tue, 4 Oct 2022 15:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664898605; 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=RjG4rrZJgnZFQ/kfWUeZxHjAy1TdBT2nVTJxeZxJlSY=; b=jExJeZpVw0WOOobeFneGLFpjF6K0QPObZ4Ujz8ngwSLLfeyBv8pC1y7To3UNsarccHq669 ZUYqKa782DKoCJ0o/ZTwahDsKAKGOn7+yaPPkpqYqEAs9JTDB84Vs/fvpw4//8T6Sk2/Ad 6K4RrkOY00Kw/9vumiCKWR/KsbzEBbe+xgCP5oXbXmti1aaiS8BW34gsVjpeCeKS2+9qFJ V/Up2umD2PWHf2kSXHLhDUmpPrKhntEMC4hEqzoIiORjLOPD0zpSsrArYwyHsGVjX9cm6u epu4rDCQrlFXqrDzKYvNPpPOdlB4T5VDyXY0KEcZV/+5yEGX1DK9+JcQhLkR3Q== 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 4Mhhws2bFFzby7; Tue, 4 Oct 2022 15:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 294Fo55j000657; Tue, 4 Oct 2022 15:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294Fo5V2000654; Tue, 4 Oct 2022 15:50:05 GMT (envelope-from git) Date: Tue, 4 Oct 2022 15:50:05 GMT Message-Id: <202210041550.294Fo5V2000654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 6d2cfa2d34e3 - stable/13 - check/delete-old: Fix /bin/rmail removal condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d2cfa2d34e3ade155f65066f25716dc734ac302 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664898605; 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=RjG4rrZJgnZFQ/kfWUeZxHjAy1TdBT2nVTJxeZxJlSY=; b=sXF2krrWngCg8z98wxvcLUToL0f+6wurNarC2bjfI9roZkSOIh+2UFsoJg3MdUVOurBgy7 1TRgiqAe164sgL8tvyWqmFYVYIcqq0jNIsKQDYhunXutiKSHjBzDxW8vOPqWHrpZwaUnkk /0Gfd1JrSh7/Ok7jFA3GyqUUWZDnaqDrICViYSLg3y2Tc022UGoPY91IptDUxG0pwBW+gT K5m/2RQ6ko5GJYN//lMN7zCSEuV1BoiWNdrRhnICYzub4yqm4OQnkba+BAoUifTDOQmCvE Bu+plg1hIwG4londTZirDl1nsszqlKs/7XzAaHc0pFHVacyNmwo4jABMvwZPHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664898605; a=rsa-sha256; cv=none; b=BAJT80SVhvDZnSysVpgG48pLO7pMtnqb0kAX//Dsi4aPTFjfidykFdQQpGi1e8om/jd81u IF6XErgPAfWlmVHBmETF8mmHZ9Y6/EOtojWj9tweJcdwsrTgIKQz3G1TfhQtHvP/ETC59l YtqmE+4Me/bFIyum0CUNcP7XalTJ0j1MTgI1GsYYU1e3n8Yx4fmSSKjiBkDhByUtu+UZxd snqaIZ1kIB/XGgJfcJgqay/YXc8UEgZSE9pcJCDKz8WSCnzQmR30G9mfNx7gjCBaea5AYu c70XtblgW5tlF4WaD3BwOmoLeonpjGoX+lmHo4GTFjuefVcn8UYH2AOCBiHZ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6d2cfa2d34e3ade155f65066f25716dc734ac302 commit 6d2cfa2d34e3ade155f65066f25716dc734ac302 Author: Dmitry Chagin AuthorDate: 2022-07-21 22:20:25 +0000 Commit: Dmitry Chagin 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