From nobody Sun Sep 21 14:52:59 2025 X-Original-To: dev-commits-src-branches@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 4cV8P84j7Nz68D01; Sun, 21 Sep 2025 14:53:00 +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 4cV8P80ZRLz3vZM; Sun, 21 Sep 2025 14:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466380; 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=ISwQ++LqdvEJOizaJAGD+dqPz2E4bEIuRwbjDhtoxog=; b=OPK/gFia7fIOFLMntTb8V6qg0LgwTTLYSUCQIX6nyPT21Wy+CoUyVq5Tq3y44+oc4Evlht h7I6AlAMn5J5g0qLGw4ZvwDEzeGG1oc7Wo1lb40bqh6yqTFIPps6K1HR9Z2YQWKimYwcWy rZE4MEdh6uoRKVS9IJBxJnap5Yky1nwr4cgDnQSoQOQW55xezC7lcZBkb8zGlK7Ukqsr4d KsMYuVYYo09t24aKzdMTt4g6hww+2K9HS3h1WHmDpu5PWsytpTo0or9YTqkRBPiZg9WNnV QSaF6A8p04mQ0F4UoxKY5UyNTNAMB+UJB5MpYASKuInaIFEQBlQ02GteuxMs7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466380; 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=ISwQ++LqdvEJOizaJAGD+dqPz2E4bEIuRwbjDhtoxog=; b=Is7mSgmzaFCS/FEbpY0TE6/fflqtN49tmhHvryvI9oGjdkz9c8yVJxMpg35xBtZ4E3SQoY qfODlhSkrmGChKPnvFOvFEK7K5r4MxGVoS7YWOgw8IgjU6QJY4c46N7eIZc59SAohOcpRu WzbQ9hXJchmr2OMVTGimpTT6pEi6GGlZrJdEX5ulIA5STybWeWEZskIvaYozICFCGDQ2SI 8lviHIUxpc7xAm0dzOhrfEfiJSj0HuB5owmdBx+Fs+1s0p/f9uvGbD7Ev3sthusyKtppGZ ANulWC2qd2Ui7fM3u8dcPvF53stggSqW7Ck3efjAWWkASZuQ/E11D6f0ukZxiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758466380; a=rsa-sha256; cv=none; b=xBjfEyjwgWOMKZDeQ/5+mQH0+AlsWZ5PUixnuBgnLKSwbJZns0zrzAXYa9ygm7ZYHmQCsE Y+FoYEmXuYXeF3ueHrsAFxkFCMUuZyZD2PJV9WhCxGFQm2ZOoVtrKvUu/tb6DteFp/gMSG SxNh4gStnDeYi0+3/atDEmP20ZOLwjI5Trg/gs/5pHz08+APsZ8lY8TGhsr57Lp3w5/dm7 LI1ZIdxoU3BX6DHoGlI4Wut4iBbXt+pUHaT+1HqQprkYE9fE+wPtKGZKxtgo2WYNl3yol+ tAqsOPy/hk47Si5mIsQcosXT+NK/q6ZjbazN2m0GxVuUTJqdENZy+j/YQqHYzw== 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 4cV8P770dtz3DD; Sun, 21 Sep 2025 14:52:59 +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 58LEqxIY017521; Sun, 21 Sep 2025 14:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LEqxuJ017518; Sun, 21 Sep 2025 14:52:59 GMT (envelope-from git) Date: Sun, 21 Sep 2025 14:52:59 GMT Message-Id: <202509211452.58LEqxuJ017518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 009317e7dab9 - stable/14 - share/sendmail: Use consistent ordering when processing files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 009317e7dab9f202a6c45e76d1949efc7afb4f81 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=009317e7dab9f202a6c45e76d1949efc7afb4f81 commit 009317e7dab9f202a6c45e76d1949efc7afb4f81 Author: Mark Johnston AuthorDate: 2025-09-04 18:02:21 +0000 Commit: Mark Johnston CommitDate: 2025-09-21 14:52:38 +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 (cherry picked from commit 65688fcb79eee1711fa2a83bee4bd2cd0b851d19) --- 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}