From nobody Sun Jan 18 03:58:13 2026 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 4dv0Dk1G36z6NkwY for ; Sun, 18 Jan 2026 03:58:14 +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 4dv0Dj6Vsjz40Q8 for ; Sun, 18 Jan 2026 03:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768708693; 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=nBiWbnFK9qQjzxc0BqmLTzOIi2+8xcPf+whLhRxgvPM=; b=BJkl25yE1qCkbJA2HKraiWDt1HoS9V0JNZnrXe5RqSn29S5hONMrys/Itl0xomDV8b0OmL FM045j/K79PsZdWUHGblChUm1KOrdTI9qyfTUleSbg1m9EbON7nXsugqkUIKSxhzCfEVz7 T2wVFA/oHp7WykW8eRni60axGmpYG1SYqgQTVqf3XmUSDOlZuoDJb+k00rGe2JDo9aZo/5 9SjOJEYvjUMn/T2l8Dhcl88NbSrgId/YEwB75pLJvG0FBRYymkY0NhTnbiWTlU9Vx2O4RL Spw9On9Hj1oC2FIbnMScrSVRg2cV6wNmpyB9fYG7uB3x+uFOpfTgkQ1qkZZDXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768708693; 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=nBiWbnFK9qQjzxc0BqmLTzOIi2+8xcPf+whLhRxgvPM=; b=PFXBWrkEuQRXcYWnlffE600M/Y2KCuopclQTv2J/ukO5hPDfgT5O3/N1A1F0wiRG/gEZeF UzQP9aQl+pUmKCxtPFHs1/VsqQxFU3EATXhGGrRiz1kcCv+OsbrpeDyABdlairEHJHtD5w WCnoWzsO1xtGyUI71h4tIivA0JgJNhfo+Bz+QRcpXew1H9HeB81inEWgy7salZZitgu6pO y0af16Zk6T+vmu4VXnlV22tti30Z/ivBTIPGXykwTbHRsUztraBA4iv1KRVze1R8mtbH5r fJn7DGIdbG8ytWdfPqEijR0YFsTSIgmqKr9HTcs5S1RtnwNwIhgEYBFR+zVM2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768708693; a=rsa-sha256; cv=none; b=PFmAkczMzDN5vHkhhYXSo8eaJjXgjUe5vstBu8SjZS6ckhOIeJewFkvr6a9aCmzvRXzeMJ OeusA6Np6B/cmkXyXGrY3n65blatVfw4N5b3drvfTh+9+HColqEdOYCx0FmNmrm45hJbAM ht3W4mK3ZKZQSpblLJGe5Zj3PbLsCc6JCBMftGOJWKIUrLk2ZNR3RFTVL7G04PQM15ceaf FWPLwx22F/g/rU75ElxFs055r1OfJST1hv9aPPLrgI46zdjCM+DbBr9lz1ja0PAL0xH2fN njQzA1EFzCHvWaqDX7T/xjHMCJ0GUPFnRBgjlPjXPzclkbW47YNJFJUHoidzdw== 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 4dv0Dj65N2zTWc for ; Sun, 18 Jan 2026 03:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23eb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Jan 2026 03:58:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: fc614b08ef6c - stable/13 - Import latest mtree from NetBSD 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fc614b08ef6cce1568f449de1bf562d0b2d5f777 Auto-Submitted: auto-generated Date: Sun, 18 Jan 2026 03:58:13 +0000 Message-Id: <696c5a55.23eb3.7b03a4c5@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=fc614b08ef6cce1568f449de1bf562d0b2d5f777 commit fc614b08ef6cce1568f449de1bf562d0b2d5f777 Author: Jose Luis Duran AuthorDate: 2026-01-11 16:42:18 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-18 03:57:12 +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