From nobody Sun Jan 18 03:57:56 2026 X-Original-To: dev-commits-src-branches@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 4dv0DN5NXdz6NkMp for ; Sun, 18 Jan 2026 03:57:56 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dv0DN4XBlz3yH9 for ; Sun, 18 Jan 2026 03:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768708676; 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=mb/smL2SKn59xv0/lzjaEP8WaunKyuNKkSGhfTQKzz4=; b=ZrFTgnUleumydy1OS0KMTj3dMEBq224gkCZjhajmUqCTR5/jw1QgBtcrXNZPkQ+0IDVYyW KJxEs7bOdKTVIpZ3yuJQYnEmMJgyu25po9JRbswUJ/Jp7/r9Z1+FpztOK4CobjOoyy3EQt doSnJcOLQC3mUmr/VhGY7qKeRTykBpMd52tv84dJKVCiL0fcWJciqAC1e6Bq7NJgFXqDqS kQrxKnjVOlOVqAq36Mk0hywSXc3DuOQOIvdKa67mGWrCAxuE9Sed1PoFdjWbp1uC1CeFpM yjqOCRSbf2LBDv39IgLuQg5H6NRDjRvTJ4ot4iKV9Upjrry2xKJlNXJYcSEO5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768708676; 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=mb/smL2SKn59xv0/lzjaEP8WaunKyuNKkSGhfTQKzz4=; b=j/U2OFZCoFwVaOEHZGeZ+HmApkmRuo/pTvOmQDnH6xmuRbScrDWL7TbGO67S/Ss2iREeoI R86q5KUt4XahXJXroeHxfWzHcpqgOuxXhOztl2sM/fPtbUD/M2uflaay6dgDlTCr5LMdpX YdaIcdlJsD/hj71rF3kx7//3ng81carm+L7I5MVjuap92Nt3qceHK6geA3oMjvEirdhcu5 SmqgIztIgR5V5k3kP76u9WGtqCjxpfz9Q8saUd1tX8dw2So4EtVYTjqpk2VbMRdhjbsA5f 0RQazWCNG5BY/k02rCdpLY/oLB0cd07AjdX98lQ65ZTpde8vuB+M62qUQHBqOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768708676; a=rsa-sha256; cv=none; b=oT0ORzzg+Jgb0dgg9TsMxrpW889loCYLmIfl1KPgc1EkqrjhAThn99/5PLXxQbIrRuchKt BgtRkVb3lMGvR7LsQM4uCTyFCmDhsvsLUFAJtdQOBDnXzZCcOUMIImMqzRs8/FPu+dmN+F m+mDtLUH9ChY6U1BURP+yCGIoGjUFTcjIyFfB5KLr0oEGtRqBzWAVdX0EgImjvTC/KG/Kg yus01tuuo0sPnCgMRYrsDV86/U0DNGHhG+kCY4xueSVjyPA08U+uetElpI3XDnmOM2Q72B PWiwZUswatB48510fTQLm+TH8z1CVtG3ypIRWq2EAco+TEXpIwFB2D1CBDvX2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dv0DN41l5zTWb for ; Sun, 18 Jan 2026 03:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 246c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Jan 2026 03:57:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: f957857c4835 - stable/14 - Import latest mtree from NetBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f957857c48351396dbd0127bc0fdd47f69e82f6d Auto-Submitted: auto-generated Date: Sun, 18 Jan 2026 03:57:56 +0000 Message-Id: <696c5a44.246c9.3f665940@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f957857c48351396dbd0127bc0fdd47f69e82f6d commit f957857c48351396dbd0127bc0fdd47f69e82f6d Author: Jose Luis Duran AuthorDate: 2026-01-11 16:42:18 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-18 03:55:38 +0000 Import latest mtree from NetBSD Merge commit '7e59b238fcf32f3d365e78ddc702ca494e1ff68d' This commit partially reverts the previous vendor import, given that the "type" keyword has been historically mandatory and should not be removed by "-R all". This was clarified in the man page. Reported by: glebius PR: 219467 MFC after: 1 week (cherry picked from commit 4250d2ad991b7bb9915e4c6b6d93b17369747ff0) --- contrib/mtree/create.c | 7 +++---- contrib/mtree/mtree.8 | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c index 191d69c6a537..68abbfa0258b 100644 --- a/contrib/mtree/create.c +++ b/contrib/mtree/create.c @@ -1,4 +1,4 @@ -/* $NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $ */ +/* $NetBSD: create.c,v 1.81 2026/01/10 14:53:39 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: create.c,v 1.80 2025/12/18 18:16:48 christos Exp $"); +__RCSID("$NetBSD: create.c,v 1.81 2026/01/10 14:53:39 christos Exp $"); #endif #endif /* not lint */ @@ -236,8 +236,7 @@ statf(FILE *fp, int indent, FTSENT *p) offset += fprintf(fp, "%*s", (INDENTNAMELEN + indent) - offset, ""); - if (keys & F_TYPE && - !S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) + if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag)) output(fp, indent, &offset, "type=%s", inotype(p->fts_statp->st_mode)); if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) { diff --git a/contrib/mtree/mtree.8 b/contrib/mtree/mtree.8 index 99e3199de943..4421cf735c99 100644 --- a/contrib/mtree/mtree.8 +++ b/contrib/mtree/mtree.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: mtree.8,v 1.78 2023/12/02 13:26:09 christos Exp $ +.\" $NetBSD: mtree.8,v 1.80 2026/01/10 17:12:04 uwe Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -56,7 +56,7 @@ .\" .\" @(#)mtree.8 8.2 (Berkeley) 12/11/93 .\" -.Dd December 2, 2023 +.Dd January 8, 2026 .Dt MTREE 8 .Os .Sh NAME @@ -178,8 +178,8 @@ and respectively. . .It Fl f Ar spec -Read the specification from -.Ar file , +Read the specification from the file +.Ar spec , instead of from the standard input. .Pp If this option is specified twice, the two specifications are compared @@ -242,18 +242,14 @@ If is specified, add all of the other keywords. . .It Fl k Ar keywords -Use the +Use the mandatory .Sy type keyword plus the specified (whitespace or comma separated) .Ar keywords -instead of the current set of keywords. +to replace the current set of keywords. If .Ql all -is specified, use all of the other keywords. -If the -.Sy type -keyword is not desired, suppress it with -.Fl R Cm type . +is specified, use all of the available keywords. . .It Fl L Follow all symbolic links in the file hierarchy. @@ -338,9 +334,13 @@ This occurs when the directory is a symbolic link. .It Fl R Ar keywords Remove the specified (whitespace or comma separated) keywords from the current set of keywords. +The +.Sy type +keyword is mandatory and is always retained. If .Ql all -is specified, remove all of the other keywords. +is specified, remove all keywords except +.Sy type . . .It Fl r Remove any files in the file hierarchy that are not described in the