From nobody Thu Sep 4 18:08:37 2025 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 4cHnXj3dc7z66WTL; Thu, 04 Sep 2025 18:08:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHnXj2Rjmz3H7F; Thu, 04 Sep 2025 18:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009317; 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=PNgau+ZXLdZ59swjfTdkAsewlwq+62ZylcX/sey7kQU=; b=wfeRFxidbf0HcLkGWuxtLWd7yiz3r3Cl1qatogathtYy+23KSyzmTxvs88CEMgYicz/l1F HNdrV9s1dcBcKBLXDvV4yg2O2Ft2dr/iAUdjGKrzDYDFDlzfqUBFl+7kfqtV80zOVAmhCl vwP8n9rvyXKcbDmdi4eRs1yp7B/Mz1AteUszsEVFk2Ll+XpbG0YrLLzbM6PemtbkL+tM+o Ah9eKE2xUTIispznniLheq8QM8r0KPGycDY9FKBT4sK66OFM7ajfiHg04g80XjCgVu+h74 egzeIoCshkPgarxvVutPUBUWPq16MX1WYuNehMnyH0SopC7zeTJeE01AWMd0Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009317; 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=PNgau+ZXLdZ59swjfTdkAsewlwq+62ZylcX/sey7kQU=; b=b75iBo9Y64+EgtW1jiO/I2L1VxrKnBT/X4ikbuBwymJRMXK3+uCKKHPw/e8tLFBYGs/4ZY skwjqysa2R7U3NbDBdT68Pt6OWpAtFBna2B+w6BybBGH8dBP/yrOtoDCim/1zE+I73t+Qo OkcZRbezpgP6kvKZqcLODr5g5BKDc8Mc7fr3KiImVFpmQF73oXSffSNzc/L3gWHCLPP5d7 /Ad8wcL4iX7wLubcN4F+yFy0frpept4EGEradexuVXagMTKZtvVGbAKdC7LeSFP7utY6o6 PrpQJsT5g3K+grhDC64dEQSBwv9pkoXy56tG+GLKeQkHbrWYvUHQR2ogUiYZcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757009317; a=rsa-sha256; cv=none; b=LQ5bRcnv8fpwVK7vxePZwBS0BmxBijuQ2cpPVFq4cmtU0kz58YyOIU+FVW7H5kVGAumCUG kJNGl82iVKeI9m3dPvXMkNgRK8dVLlv5XIPkNbxFgEnw+Z9eBjbYfeOwtxi7r5XCHcYlPo AcLDhvxCNgKy8aGNq2VGfresk+E2bCaAcxPjeGG5ljsc0Ti4iv0atQZnYZGyTuFqFxvK31 V2UMjjWHR0jtCXfzdJceu2eCo0SWOyLIYTOfvmWubZitcrVx2QRqWEjmyM6aSuvKvCmZnG QyznUbkVHPP+2fWG1scImDKOCNvfUKI4N5lgBREiUb4rpoLo5FtHOULYnCzm0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cHnXj1tbfz1CKS; Thu, 04 Sep 2025 18:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584I8blc021114; Thu, 4 Sep 2025 18:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584I8bCF021111; Thu, 4 Sep 2025 18:08:37 GMT (envelope-from git) Date: Thu, 4 Sep 2025 18:08:37 GMT Message-Id: <202509041808.584I8bCF021111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 65688fcb79ee - main - share/sendmail: Use consistent ordering when processing files 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65688fcb79eee1711fa2a83bee4bd2cd0b851d19 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=65688fcb79eee1711fa2a83bee4bd2cd0b851d19 commit 65688fcb79eee1711fa2a83bee4bd2cd0b851d19 Author: Mark Johnston AuthorDate: 2025-09-04 18:02:21 +0000 Commit: Mark Johnston CommitDate: 2025-09-04 18:06:28 +0000 share/sendmail: Use consistent ordering when processing files Otherwise files are handled in the order returned by find(1). This in turn results in inconsistent ordering of files in the METALOG mtree file produced by "make installworld -DNO_ROOT", which results in non-reproducible filesystem images. Reviewed by: gshapiro, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52349 --- share/sendmail/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index b6b4d2ec726c..db868b7b33b9 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -6,8 +6,8 @@ FILESGROUPS+= SM SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail CFDIR= cf CFPACKAGE= sendmail -CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) -CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) +CFDIRS!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type d -print) +CFFILES!= (cd ${SENDMAIL_DIR}; find -s -L ${CFDIR} \( \( -name CVS -o -name .svn \) -prune \) -o -type f -print) SMFILES= ${CFFILES} SMFILESDIR= ${DDIR}