From nobody Tue Feb 3 02:32:48 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 4f4nZn23FZz6Qwsn for ; Tue, 03 Feb 2026 02:32:49 +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 4f4nZm4p1cz3dfq for ; Tue, 03 Feb 2026 02:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770085968; 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=x+HFkCiRfmV/TOfdwqG2EokH+9gRfTwrKrR0Lhzk+iI=; b=M1M9bnR+I1rUDIaAntQ+LMZB+R+7Fa3AyIa4TJZyEcw7Zpuya+I/6w9aWq5l//kPdvFr9m B+VdFVyuu0s0QOzfMN5nWspZp5p/kLvVDIavuiZeQXvcQ2eQPJR4wsPoN3DMHgVRqcCXN5 9Fi3qh21B5Yo60S+GYZpR4L/h4lallTnMeLRqiciz17BB63GOQNMxatDfXp3IL32gVdqpX aboy4RG1QcXMb8qqv8Fi3tRQSNdj1O4h55DpkRrN3tvJ2sirIyhBXr1ek/KIwNISsFpvCf mj3Yefq7O2sy474XWoOAqs5D2lKKw8eBXZ4s1mzfDncqE4yLllYK96YXNmxHbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770085968; a=rsa-sha256; cv=none; b=G6/sjEmeicytKCnWlRxQSOboOXpSiMvR7aVFSPuPOAo6XxG1a15Y02VpuR9JngrkZ31e8w 33qOtlq/dyA4LWoCqQFlbiackVHa9mvApzby3WwMVPC1B8Mx/WJPlfBnIUOU+RJUHhRScZ PQaBpbkQtjj4G0+idKTqNmyBJYLOUqDEM17RUtRBliTKI1kCBroOVBUs8oQO5+TaFi1aZ9 MmjDpDFhKI4bDx3+2Z3Q1WSSr8bGWUTNOnjeXJqj4s67LalXS9BNG2D/xPfgCvbOgbKSEc 7niug7glXq70De/zhoGkVf7euIoMyBY7/sy0FMdrg5ftBhkck6tSeFZHdm1cHQ== 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=1770085968; 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=x+HFkCiRfmV/TOfdwqG2EokH+9gRfTwrKrR0Lhzk+iI=; b=uevoEMXOYcSXxvMQmvwqbhpoFjNK10Z4lU3AeqWjV4jUXe+A315pRGksnvt9iifKf+k5D6 gtvSsMyluobr1cdQtP7kGzkFvzIgR4rv1K6lS2RhmxHpKTFaythX3+dn07DhFy8o5SJCOt rT2gyZ/NbVGoZC1kM3XJK0ryqYEAgvECo7U7fVJ5MDrNWailMNxhitnHz5494l/yo+WLDY OpT1Iob1y/FooWQOXfpa9VzncjRhiK//t3+GoUwkbHatjg5pmDKFh/C3ysXt1oM6+azMSu 7JUW0A9yA/au7DXyhFeTlDaglf/K0rTJGJsvZ/gD07xwHOR81taAghzTuIv7DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4nZm48WHztV5 for ; Tue, 03 Feb 2026 02:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ce4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 02:32:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 1cd151e7bdff - stable/14 - METALOG: Order keyword entries 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/14 X-Git-Reftype: branch X-Git-Commit: 1cd151e7bdff43a5fcf560aeb8ec66b1793de4ce Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 02:32:48 +0000 Message-Id: <69815e50.38ce4.15f8012b@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=1cd151e7bdff43a5fcf560aeb8ec66b1793de4ce commit 1cd151e7bdff43a5fcf560aeb8ec66b1793de4ce Author: Jose Luis Duran AuthorDate: 2026-01-26 20:19:44 +0000 Commit: Jose Luis Duran CommitDate: 2026-02-03 02:30:22 +0000 METALOG: Order keyword entries To facilitate comparison with mtree -C generated output, keep the keywords ordered. No functional change intended. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54872 (cherry picked from commit fe962e33d86f888b496b17251c8bedebf92be8ee) --- lib/libc/gen/Makefile.inc | 6 +++--- sys/conf/kmod.mk | 2 +- sys/modules/Makefile | 2 +- usr.sbin/services_mkdb/Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 6423091f48be..220453266d44 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -587,8 +587,8 @@ install-passwd: .PHONY ${PWD_MKDB_CMD} -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd .if defined(NO_ROOT) && defined(METALOG) ( \ - echo ".${DISTBASE}/etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \ - echo ".${DISTBASE}/etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \ - echo ".${DISTBASE}/etc/passwd type=file mode=0644 uname=root gname=wheel"; \ + echo ".${DISTBASE}/etc/pwd.db type=file uname=root gname=wheel mode=0644"; \ + echo ".${DISTBASE}/etc/spwd.db type=file uname=root gname=wheel mode=0600"; \ + echo ".${DISTBASE}/etc/passwd type=file uname=root gname=wheel mode=0644"; \ ) | cat -l >> ${METALOG} .endif diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 68b37e7efbff..84b7ccbb3ffa 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -383,7 +383,7 @@ afterinstall: _kldxref _kldxref: .PHONY ${KLDXREF_CMD} ${DESTDIR}${KMODDIR} .if defined(NO_ROOT) && defined(METALOG) - echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \ + echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \ cat -l >> ${METALOG} .endif .endif diff --git a/sys/modules/Makefile b/sys/modules/Makefile index cca51592c7ca..dfcb31f74106 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -917,7 +917,7 @@ SUBDIR:= ${SUBDIR:N${reject}} afterinstall: .PHONY ${KLDXREF_CMD} ${DESTDIR}${KMODDIR} .if defined(NO_ROOT) && defined(METALOG) - echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \ + echo ".${DISTBASE}${KMODDIR}/linker.hints type=file uname=root gname=wheel mode=0644" | \ cat -l >> ${METALOG} .endif .endif diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile index 8d8e0f1c0626..6e61ff7b2a04 100644 --- a/usr.sbin/services_mkdb/Makefile +++ b/usr.sbin/services_mkdb/Makefile @@ -16,7 +16,7 @@ afterinstallconfig: ${SERVICES_MKDB_CMD} ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ ${DESTDIR}/etc/services .if defined(NO_ROOT) && defined(METALOG) - echo ".${DISTBASE}/var/db/services.db type=file mode=0644 uname=root gname=wheel" | \ + echo ".${DISTBASE}/var/db/services.db type=file uname=root gname=wheel mode=0644" | \ cat -l >> ${METALOG} .endif .endif