From nobody Tue Feb 3 02:32:18 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 4f4nZC0sHRz6Qwsb for ; Tue, 03 Feb 2026 02:32:19 +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 4f4nZB6Xmgz3chf for ; Tue, 03 Feb 2026 02:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770085939; 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=Wr5Co+gAHJLP3JVX7SFaau24ygKv9FKwSPXZ2JJ7Pm0=; b=hTNcnQa+qIJLRvvQGCOWLZSsc1PR4x/Y8NHDzBUE6a7iSS1AR1WnxIgpQVokGminodGRG3 7vW0A+xqjqUpRX3hnCN05DIBXz8R6oa5oOYtJN1ikR+RR3jnImf3Y9Wd7CC7qGcl7qs6+y ayKcPTRdJWaTcDy5PrDB4izZXG7xZmkZiQ3mSZfxMjqrD701K16HSerVUSKku1doDrYDOS 1QqNozycaULmgG2shVqCoQ1lBgUbBar04aE1bQIID0skhcr6vihNR01RE3kWjCTmrGRdr4 ORy6la3XZ5tc2cb57zoQYiUaoHFkykJxCXxgLpizpZij19Qc+w1gV6KYF1SrLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770085939; a=rsa-sha256; cv=none; b=lZtoGaDoD8tDhGgunpwwtT4unnbbh+oPG+Nf5ThuNGms1spn3FK6K+17QA7HebMgT2cAXS ypvhG9u+KX2xeC9GjyPZsbpim6033DbSWXkx4LWstgru7+n5I5X3epP9jrLsWSaD9W2L6q oJ+8MR58GoCVq33EO4Kf6bAIU8YVD4MO/lxLToVHs42uO0WKUdQ7pwM1jzrrd6ZXDOQKU8 Z+yZrya9QK0pOx3FLvumAfV8gjRDVzHuFZ9hPPOESq7T1cpZ7MzWtQa9zSrtRX/JzSu1OI sl31b1km9QTr24Eg+ulKBvw8Mc+Lxr9h6+U3mJLZJ6BL/rVlBmHH9pmSBZbcrg== 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=1770085939; 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=Wr5Co+gAHJLP3JVX7SFaau24ygKv9FKwSPXZ2JJ7Pm0=; b=rabuSJE1qUiVbUameGXcS5BYaRHI8qOTVlW3NmeGxB2cQJb2jkV4GG/iDcEOPZRY77J8tT JUwqpOQABQtL3+0Qz0Tj/ucfNnjlncyoomhRNPJRIVXHHEQTPrDFQ/RqfsX69TFhq6y85B EgPujY8kFA0Yq6zNgMyaaE2VbD1KPoHKEOHbnHE5ATyLEoN4eMFJOGJzAw5d//t99cyc0M dHkuC3uVNQyhUfz+7dJmzNVFlXQGDhjuRpkqMBtIuvUR5rWrO1SU9tFdAtK8amIkDaxYTu JnQn5TRN6uEVgJzXVfOgcVXL/CqKPnqv+xF93BVNgWzt0pcxqzglZ+6iO7uvhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f4nZB5p9jztRd for ; Tue, 03 Feb 2026 02:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39567 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 02:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 4fe60704ca37 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 4fe60704ca377fde39e4576638189d6b74a38e0c Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 02:32:18 +0000 Message-Id: <69815e32.39567.283dd59b@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4fe60704ca377fde39e4576638189d6b74a38e0c commit 4fe60704ca377fde39e4576638189d6b74a38e0c Author: Jose Luis Duran AuthorDate: 2026-01-26 20:19:44 +0000 Commit: Jose Luis Duran CommitDate: 2026-02-03 02:28:03 +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 +++--- 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 b274874973a3..3e68f8400c5c 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/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 6e20dce0653f..00335f24e2e4 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 924ddd880000..27b96d68a94c 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -957,7 +957,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