From owner-svn-src-all@FreeBSD.ORG  Tue Jan 27 04:06:49 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 125C1948;
 Tue, 27 Jan 2015 04:06:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F26A5673;
 Tue, 27 Jan 2015 04:06:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0R46mHC076744;
 Tue, 27 Jan 2015 04:06:48 GMT (envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0R46mkh076742;
 Tue, 27 Jan 2015 04:06:48 GMT (envelope-from gshapiro@FreeBSD.org)
Message-Id: <201501270406.t0R46mkh076742@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gshapiro set sender to
 gshapiro@FreeBSD.org using -f
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 27 Jan 2015 04:06:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277787 - in head: contrib/sendmail/cf/m4 etc/sendmail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2015 04:06:49 -0000

Author: gshapiro
Date: Tue Jan 27 04:06:47 2015
New Revision: 277787
URL: https://svnweb.freebsd.org/changeset/base/277787

Log:
  Remove build specific details from sendmail.cf/submit.cf in support of
  https://wiki.freebsd.org/ReproducibleBuilds
  
  The contrib/sendmail change will be made in the upstream source for a
  future sendmail release.
  
  Reviewed by:	des
  MFC after:	3 days

Modified:
  head/contrib/sendmail/cf/m4/cfhead.m4
  head/etc/sendmail/Makefile

Modified: head/contrib/sendmail/cf/m4/cfhead.m4
==============================================================================
--- head/contrib/sendmail/cf/m4/cfhead.m4	Tue Jan 27 03:37:58 2015	(r277786)
+++ head/contrib/sendmail/cf/m4/cfhead.m4	Tue Jan 27 04:06:47 2015	(r277787)
@@ -20,7 +20,7 @@
 ifdef(`__win32__', `dnl', `dnl
 ifdef(`TEMPFILE', `dnl', `define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
 syscmd(sh _CF_DIR_`'sh/makeinfo.sh _CF_DIR_ > TEMPFILE)dnl
-include(TEMPFILE)dnl
+ifdef(`_NO_MAKEINFO_',, `include(TEMPFILE)')dnl
 syscmd(rm -f TEMPFILE)dnl')')
 #####
 ######################################################################

Modified: head/etc/sendmail/Makefile
==============================================================================
--- head/etc/sendmail/Makefile	Tue Jan 27 03:37:58 2015	(r277786)
+++ head/etc/sendmail/Makefile	Tue Jan 27 04:06:47 2015	(r277787)
@@ -17,7 +17,8 @@ M4FILES!=	find ${SENDMAIL_CF_DIR} -type 
 
 .mc.cf: ${M4FILES}
 	${RM} ${.TARGET}
-	${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
+	${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ -D_NO_MAKEINFO_ \
+	    ${SENDMAIL_M4_FLAGS} \
 	    ${SENDMAIL_CF_DIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
 	${CHMOD} ${ROMODE} ${.TARGET}