From nobody Tue Jun 18 14:20:57 2024 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 4W3TST5MJVz5Nt2M; Tue, 18 Jun 2024 14:20:57 +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 4W3TST4sXpz4RrB; Tue, 18 Jun 2024 14:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718720457; 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=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=; b=LWG9OuqeZvAjafLoPs9OpNfmdz+IYM8tr17jt97C1fhUSOVvHmF5hzorE9msTsxeJQrAAe VUhg+iMWqLsLxchCihNVELFDZP/KrwTVXkGwhuS8YL3x4rakRHcV3bnd52mzo1xBO00OJf 8R4YBuRy9jXDu9MVetvcw6LSO/RddOuMfH6PAyZRbDIoIGIPjCVBlaAD26/D/S2VBAm+I9 xNvQu0JxL6bc4N4Rklf0u5x+xmZRhfM1ERxeUyeVdcYwTV+GeglMB/GQy6QpBe07rsOBTL Sb77X5xJhAhlqi4fP4GGImBE3X5ec5klWhTO0S3rxP8b+GGN0rseOB63PYqVNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718720457; a=rsa-sha256; cv=none; b=SQiK6NGisIyBmgzpVeUf1DLo9OcUaiySiDWYA0zAYlR44v9g3d0mYoRE706i7KiemT+BFI nu0VOtmTRZ6l9OdIWeWRKuZwfBGRJkbjcA3ZrQW9c0ql1EOgOafJxti/3k6UsqcmcljCDc lEcqYEpk7hxzmjli5HzCyMAmp4WsVUOR8KQ9OjAuST1olIkWmezNRCkw6wLiTYORlKCKto w65ZC9ZLecv7lnO06i2O8zO6onvlMR3+9R9WHmZscxtIeJYKyKZ2wZNadEUqTbnybHwnOE pGtJ6KvIwcVLITgZFmYe4dJW29P0WC2BPpa/0aBRJrzlKMw0QNwvCFUbZL4rkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718720457; 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=N9JO1LM9PvzEtb8/WXvlOJaI8jqd6lbhgkH11xX5+MY=; b=OGYmkv5j9speJ3CnL0gz8tw2mYamiXU11wWSs11VR4CosF12dA1EpTdRn+Y2TrfawlS/SI PqzR6wM0Y67Qw8IPG2kRL0kxkBr7YrHi8GHcaKS37vO3m3M/T9PrOTXfyLdO759F5OyOKa vkA8z8x1KoyinNviIJEZbchYiwWnVLu6BAKJczMr8c5c+rIQWAMd+Xhv+tk6UVp1TVaUuN 4L/UjEhgz/gIdNVzt+CDCxV2P5pJ/1AjtjFrig1VYlCbKZn23/UWAK/3usSEiMXuz2aM4Y MqybzpfYuRAV4CMHQpsNVqTr4PjkKOtWy7QhYmkfFQoDfGsmyg0KRjQLmcJ4ug== 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 4W3TST4SyPz1222; Tue, 18 Jun 2024 14:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45IEKvSn027164; Tue, 18 Jun 2024 14:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IEKvlx027161; Tue, 18 Jun 2024 14:20:57 GMT (envelope-from git) Date: Tue, 18 Jun 2024 14:20:57 GMT Message-Id: <202406181420.45IEKvlx027161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6e1a7ade2169 - stable/13 - mergemaster: postpone removal to FreeBSD 15 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e1a7ade216905cb8befde9eeb6af8e0527156ab Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1a7ade216905cb8befde9eeb6af8e0527156ab commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste CommitDate: 2024-06-18 14:20:41 +0000 mergemaster: postpone removal to FreeBSD 15 Mergemaster has been deprecated for quite some time, but was not removed prior to FreeBSD 14.0. Update the deprecation notice in the man page to reflect this. PR: 274967 Reported by: naddy Sponsored by: The FreeBSD Foundation (cherry picked from commit 73cce7d8886bc59284c757decb49deba046e73fc) (cherry picked from commit c0e5d8f9bda7907c83901d25d1d123a5b180443f) --- usr.sbin/mergemaster/mergemaster.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 695f1bba3474..20d746de347c 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 2, 2023 +.Dd April 16, 2024 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -45,7 +45,7 @@ The .Nm utility is deprecated and may not be available in -.Fx 14.0 +.Fx 15.0 or later. Users are advised to use .Xr etcupdate 8