From nobody Thu Apr 18 14:19:26 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 4VL0Jt4DXJz5Gxgl; Thu, 18 Apr 2024 14:19:26 +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 4VL0Jt3krnz4X18; Thu, 18 Apr 2024 14:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713449966; 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=FJCqDs9K1VJsl33l9V+5ALTJW3ouF4LDU3laQbUlKpY=; b=MCZlDcX1eSXFtXHEFweY7Yd+McklPb/fO3ILX/oeEkJmIZk0XFxs1sz7h9p39j06wDbps9 EDMuAxEtKq35p3gk6yjx6A4MM/7oHegNwksb1mT0/R3rXVZ8PbyOPgP4sWl7e6xKpnfPHB 2P/Kla67cMXPYRNHUECd5qCv6V96Oi5VhefUDgLUZbfttvZAt9eyEMzOXif/hpO4C+gtva MRcQcv6QBJevfUbZWaz8j1YOrvYj7IX0KcAJUJ38VqqeSR7K+jEdJ65bVOCvKQz32+VhyI kpAwh7fNA0qW9QMCOVlbS4185uFtvWMikgCJj9AJ5H5eaAOBTcJyl/VVsDOXuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713449966; a=rsa-sha256; cv=none; b=owTt10eUnsp7FN8MYnvrFe37LyHTbcIAyq/KkNVaVtdjQIeFM9M46YGSNtedQyZh9YEcDJ f5vb0C7AIA5xBFpwHSMU0ORobUAfkpmwp6wbP+jbmiebyzn+Gy3MMveL67RsFPCs6ISycA So+AqOJ7xibRFGE/R1WRgpuma/mUj0fIdJLARydDefZQm9ki3kP8vKE9qoTOEqD6qnGuy0 XkFCJ1vbJXPM+w92wEgzlZtjFCW5eVmux4Xve+N4vBpyD8krx3VBM6Gmz0+kbSAzJzheY9 0rVwuzwFQ0UvGpzjjxbnmIWIZf9vamm8jFMZsO5J8c8UNpG13lBKV6Q8J9mwxA== 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=1713449966; 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=FJCqDs9K1VJsl33l9V+5ALTJW3ouF4LDU3laQbUlKpY=; b=ooEgVFmjngBj6tPwu2MNSVuX1HLw0ezwZDs2xQgL/dpG+xg1Selpo4A1Bzr1XgSwIk+Z7o z5ff4HS6vfuavucHQBGyanDjbBivM4Rv0Ic85zo7o1aJtpI05oWWp3wFks8n8D9rM8lfdI 8uTKiki2GE2U3FLBZpykZIC8Ak3WfEWfOOqeINPYaQf+mtF5EG+cgTZ5Q2NvstBJvdPsxG E8nLXtnQ0e2Wh6gwbP8VMPKtmcl9gR3jppX8cDfDYjPO/maZv0WHcx6f04JcS3xUXuprTY unPSZ5kLpws8NOLCx1uPpyFsnYKB+NOuPufg2GawmOfIu0OW8ow7ePbvMMk1jw== 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 4VL0Jt3KM7z1C8r; Thu, 18 Apr 2024 14:19:26 +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 43IEJQUD010636; Thu, 18 Apr 2024 14:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IEJQrS010633; Thu, 18 Apr 2024 14:19:26 GMT (envelope-from git) Date: Thu, 18 Apr 2024 14:19:26 GMT Message-Id: <202404181419.43IEJQrS010633@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: c0e5d8f9bda7 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c0e5d8f9bda7907c83901d25d1d123a5b180443f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c0e5d8f9bda7907c83901d25d1d123a5b180443f commit c0e5d8f9bda7907c83901d25d1d123a5b180443f Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste CommitDate: 2024-04-18 14:05:01 +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) --- 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