From owner-svn-src-user@freebsd.org  Mon Sep 28 17:25:49 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FAF0A0B18C
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 28 Sep 2015 17:25:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 3748110EF;
 Mon, 28 Sep 2015 17:25:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8SHPn52091835;
 Mon, 28 Sep 2015 17:25:49 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8SHPmsd091833;
 Mon, 28 Sep 2015 17:25:48 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201509281725.t8SHPmsd091833@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 28 Sep 2015 17:25:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r288342 - user/gjb/thermite
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Sep 2015 17:25:49 -0000

Author: gjb
Date: Mon Sep 28 17:25:48 2015
New Revision: 288342
URL: https://svnweb.freebsd.org/changeset/base/288342

Log:
  Re-sync with the re@ scripts.
  
  - Allow specifying the sender in send_logmail() where it is
    not ideal to have mail sent from a human address.
  
  - Only set SVNREVISION and BUILDDATE to the contents of the
    relevant files if otherwise unset.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/master.conf
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/master.conf
==============================================================================
--- user/gjb/thermite/master.conf	Mon Sep 28 16:33:38 2015	(r288341)
+++ user/gjb/thermite/master.conf	Mon Sep 28 17:25:48 2015	(r288342)
@@ -9,6 +9,7 @@
 
 use_zfs=1
 emailgoesto=
+emailsentfrom=
 scriptdir="$(dirname $(realpath ${0}))"
 srcdir="${scriptdir}/../release"
 logdir="${scriptdir}/../logs"

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Mon Sep 28 16:33:38 2015	(r288341)
+++ user/gjb/thermite/thermite.sh	Mon Sep 28 17:25:48 2015	(r288342)
@@ -233,12 +233,14 @@ prebuild_setup() {
 # Email log output when a stage has completed
 send_logmail() {
 	[ -z "${emailgoesto}" ] && return 0
+	[ -z "${emailsentfrom}" ] && return 0
 	local _body
 	local _subject
-	_body="${1}"
 	_subject="${2}"
-	tail -n 50 "${_body}" | \
-		mail -s "${_subject} done" ${emailgoesto}
+	_body="$(tail -n 50 ${1})"
+
+	printf "From: ${emailsentfrom}\nTo: ${emailgoesto}\nSubject: ${_subject}\n\n${_body}\n\n" \
+		| /usr/sbin/sendmail -oi -f ${emailsentfrom} ${emailgoesto}
 	return 0
 }
 
@@ -253,9 +255,11 @@ ftp_stage() {
 	info "Staging for ftp: ${_build}"
 	[ ! -z "${EMBEDDEDBUILD}" ] && export EMBEDDEDBUILD
 	[ ! -z "${BOARDNAME}" ] && export BOARDNAME
-	[ -e "${scriptdir}/svnrev_src" ] && \
+	[ ! -z "${SVNREVISION}" ] && export SVNREVISION
+	[ ! -z "${BUILDDATE}" ] && export BUILDDATE
+	[ -z "${SVNREVISION}" -a -e "${scriptdir}/svnrev_src" ] && \
 		export SVNREVISION="$(cat ${scriptdir}/svnrev_src)"
-	[ -e "${scriptdir}/builddate" ] && \
+	[ -z "${BUILDDATE}" -a -e "${scriptdir}/builddate" ] && \
 		export BUILDDATE="$(cat ${scriptdir}/builddate)"
 	chroot ${CHROOTDIR} make -C /usr/src/release \
 		-f Makefile.mirrors \