From nobody Mon Jan 26 20:21:08 2026 X-Original-To: dev-commits-src-main@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 4f0Kg95Zp8z6PYGR for ; Mon, 26 Jan 2026 20:21:09 +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 4f0Kg82ScJz3xGG for ; Mon, 26 Jan 2026 20:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769458868; 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=GOH9GBJFNt7+kJH+INNxxSQ4AoBfjZaZWNPoe2xDj90=; b=wtTaFDeaPY6fewfw9lbCmjecLg0m9I4+mXIowK5xcmZ9biL8ZczzmPgLWp9yleDnvUZJNs 6CmtgNsBy0rsAeZ31xlmnDVuvATJ84qgMye4lUjORnnCZCPQuGnmL98WpC+4rF6l76jl2a Kn8uGDF5yE5mb3nImgtMiJ8XeXGNM2QmYROmTrk7ZI6DjCebIbmUR6cDcuG37PUsskXgZF hm8vVMOchRaf3ajcUDELuOGA7MsaBPg3Zqs630XvQGK3zsPYuS7unJwciXbu5KaH7yK2I0 6/Rke5jiw0AGeyMHnvw5ooJRYcR1oA6FHTjT5US17XPH2JSz1UiCc7bPCpRLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769458868; 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=GOH9GBJFNt7+kJH+INNxxSQ4AoBfjZaZWNPoe2xDj90=; b=cH9mwGOk8G7JTzEfbbWEfczAALo9e1SyNgkKjyIJi/W8s4+GVRe0lRjD4LWm1l5UHluncP eDhHUCoB0+Oe5qUg/uWXkg9xzeqSBWUEyENndWd6b8JZBPUeEzf+bUBusFT30Ex8dSwgwv 0Fip2ow0hKPiyyoIeCQXyDNz1+SlAfLlvEzA+XZ3UXUducElUzvALM4sqwmICjyae26kvR xnhwWwM5fzwj9rVa/dIOPpC1P4HUPLg9qNUNJlma64AVj8Jcs7TlVGqFrw7Bb2NZgeOTPG ROlfKbGSB4O2S8IWspVcbB85VSePp63z/5oZg3ZrFyuu2wCjXlYD7kxdGnDzrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769458868; a=rsa-sha256; cv=none; b=BVFzwMyuVEZwhjSdY7Wfw4AXCbBb3xgZMm9R6+1KmExm/luNBF4kkm61vceahn0hsNd8uq ExIKW19haoWNgzj/xpMLjEoSE8YKeKYh9C7CqtSohfiqOemvTEL8gbAXio028nrMBOsl5l R7qEZC5XG+yiCDhXT723LhZFxh8Nj/N9GcueP65M4cbyO9E29fg6HFq1HEDWG89h7oqauA wT5uBMKdvMfqipp3M2Udprq4dqWHOlxE/LnbQFuje+iGIrI2375ypvf/ahCuAo21z7Lvj7 B5oj8m3Wf9xKos+FCq3QtWTZb9BA5rdNQ+PVlhV7ytrhlEYqvkevLL1lbFH7BQ== 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 4f0Kg81xJ2zc8K for ; Mon, 26 Jan 2026 20:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 242fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 20:21:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: fe962e33d86f - main - METALOG: Order keyword entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fe962e33d86f888b496b17251c8bedebf92be8ee Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 20:21:08 +0000 Message-Id: <6977ccb4.242fa.453e5dbb@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=fe962e33d86f888b496b17251c8bedebf92be8ee commit fe962e33d86f888b496b17251c8bedebf92be8ee Author: Jose Luis Duran AuthorDate: 2026-01-26 20:19:44 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-26 20:19:44 +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 --- lib/libc/gen/Makefile.inc | 6 +++--- share/man/Makefile | 4 ++-- sys/conf/kmod.mk | 2 +- sys/modules/Makefile | 2 +- usr.sbin/services_mkdb/Makefile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 5d151a71ff7d..9b92abb6282a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -585,8 +585,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/share/man/Makefile b/share/man/Makefile index 51e560e199a5..9a8054f0651a 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -10,13 +10,13 @@ makedb: .if ${MK_MAN_UTILS} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/man .if defined(NO_ROOT) && defined(METALOG) - echo ".${DISTBASE}${BINDIR}/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \ + echo ".${DISTBASE}${BINDIR}/man/mandoc.db type=file uname=root gname=wheel mode=0644" | \ cat -l >> ${METALOG} .endif .if ${MK_OPENSSL} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man .if defined(NO_ROOT) && defined(METALOG) - echo ".${DISTBASE}${BINDIR}/openssl/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \ + echo ".${DISTBASE}${BINDIR}/openssl/man/mandoc.db type=file uname=root gname=wheel mode=0644" | \ cat -l >> ${METALOG} .endif .endif diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index edc311348971..17358428a023 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 538cd7a1f37d..caf703bb318d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -967,7 +967,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 c1c7ca0bfcff..175b190d4982 100644 --- a/usr.sbin/services_mkdb/Makefile +++ b/usr.sbin/services_mkdb/Makefile @@ -15,7 +15,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