git: 65688fcb79ee - main - share/sendmail: Use consistent ordering when processing files

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=65688fcb79eee1711fa2a83bee4bd2cd0b851d19

commit 65688fcb79eee1711fa2a83bee4bd2cd0b851d19
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-09-04 18:02:21 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
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}