From nobody Thu Jul 21 22:22:47 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 4LpnBb6612z4XgLq; Thu, 21 Jul 2022 22:22:47 +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 4LpnBb5ckzz3wHY; Thu, 21 Jul 2022 22:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658442167; 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=9qLKyVtxuHCYcRX5RhFnlKRJNVU3eWcDOyYRVoJ4tdU=; b=e9hP7yTY6z03HJTbTK8wUe8OrM4eypXEBJkjO47GVRWtZTRlye3VbUwTLGVopCiLoVUYGs bfJMiQ9cV4ypAgl3KQZJtLXILD/GaKux6Yk6WdMV4iGeAJ7F5MQauJToPzJo1bOljW3+m4 K3txkMPSDXmQNaS7YDkToP59ty8tG5L8qq1o+I+BxABu/y/pSm+L+326JEn72YfHoFYU3/ 3F35OpzYyFdEiyh71orG08uOOvhN/+gv48UvOhMMKwqAcMhycW2bAUPx8YhKoCNW7uE95P VxSd4oIP2gvVaDHYfGVU2TXgQ9YY+5g2lGYLfpc5CnVBYAigIQD/p6n33P0yfA== 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 4LpnBb4gjyzdhr; Thu, 21 Jul 2022 22:22:47 +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 26LMMlLW013169; Thu, 21 Jul 2022 22:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LMMlU3013168; Thu, 21 Jul 2022 22:22:47 GMT (envelope-from git) Date: Thu, 21 Jul 2022 22:22:47 GMT Message-Id: <202207212222.26LMMlU3013168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 55736146389f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 55736146389f997fe3e2453f1d48d96ff1ad5b7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658442167; 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=9qLKyVtxuHCYcRX5RhFnlKRJNVU3eWcDOyYRVoJ4tdU=; b=Aanl0H9gVvGo3fdILk261x0WV8ILv0ChUjRMcofpMJhe6ULGk4b8SdtKxgaiyw7OGoUeGE y6jT2u8L6rMivXxGQw5AtRrznr1xYaftYvFPQj8In/z6AuFzrj7pt1dysxGeM7PRv+RVFp dilJ8TixMLRn93nWNNwsV/tU4otqH1vE6uhs3tKLe5rw7XVZ7OWpard/dXgKi8ZXbyGRsR 276Su6rpZjjlfgnBk4lP1GUIV3Nz12Qk6IOTrMv+jfAaSQa6u/T1fDJmaflSHpAreIPDj1 dzgjxBAMFfBbGeNghdD8nQ5QoWS4ia1zlBF8o6B97f8axPn2AtuYifcHPe+ZXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658442167; a=rsa-sha256; cv=none; b=NT5WsxjVfEgalQhs0DOiHc83/IkuFaOwl8ib+26wdZbuZhj1GVAlsZV3bu3L78omhBP2rs DkXeZkLNxvOum9RWTHtIrRPAN9jsXw40IlURjpK8XaDRkDyjTAfqWNmOWdLqmRE19Kdb2C 3S/bx1nQS1sg3qCK/dTWgT1h/ur6ZckaarMedCxy8NSvWcnZZLmb/unXiMuDo1XH9N6RYQ 2GzjFkNJSLAP8ctIL7nWGh6zl5/GwydEaera+uv9hAubMLjp8pCP9d4xlaV7eBC5niLLuY oi5jS0rXJuJP8Vnf6EsAZVhCuqHjghQoY9fof7DgA1OLa8klUTM8DK6QI2FZSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=55736146389f997fe3e2453f1d48d96ff1ad5b7a commit 55736146389f997fe3e2453f1d48d96ff1ad5b7a Author: Dmitry Chagin AuthorDate: 2022-07-21 22:20:25 +0000 Commit: Dmitry Chagin CommitDate: 2022-07-21 22:20:25 +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. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35874 MFC after: 2 weeks --- 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 7f67b0c8056d..1b26bfa7473d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7673,7 +7673,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