From owner-svn-src-all@freebsd.org  Thu Sep  8 15:53:50 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 DC665BD2177;
 Thu,  8 Sep 2016 15:53:50 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A4DF5F35;
 Thu,  8 Sep 2016 15:53:50 +0000 (UTC)
 (envelope-from vangyzen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88Frn3j006305;
 Thu, 8 Sep 2016 15:53:49 GMT (envelope-from vangyzen@FreeBSD.org)
Received: (from vangyzen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88Frnnn006304;
 Thu, 8 Sep 2016 15:53:49 GMT (envelope-from vangyzen@FreeBSD.org)
Message-Id: <201609081553.u88Frnnn006304@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to
 vangyzen@FreeBSD.org using -f
From: Eric van Gyzen <vangyzen@FreeBSD.org>
Date: Thu, 8 Sep 2016 15:53:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305620 - head/usr.sbin/etcupdate
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Sep 2016 15:53:51 -0000

Author: vangyzen
Date: Thu Sep  8 15:53:49 2016
New Revision: 305620
URL: https://svnweb.freebsd.org/changeset/base/305620

Log:
  etcupdate: preserve the metadata of the destination file
  
  When using diff3 to perform a three-way merge, etcupdate lost the destination
  file's metadata. The metadata from the temporary file were used instead.
  This was unpleasant for rc.d scripts, which require execute permission.
  Use "cat >" to overwrite the destination file's contents while preserving its
  metadata.
  
  Reviewed by:	bapt
  Sponsored by:	Dell Technologies
  Differential Revision:	https://reviews.freebsd.org/D7817

Modified:
  head/usr.sbin/etcupdate/etcupdate.sh

Modified: head/usr.sbin/etcupdate/etcupdate.sh
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.sh	Thu Sep  8 15:27:42 2016	(r305619)
+++ head/usr.sbin/etcupdate/etcupdate.sh	Thu Sep  8 15:53:49 2016	(r305620)
@@ -824,7 +824,9 @@ merge_file()
 			if [ -z "$dryrun" ]; then
 				temp=$(mktemp -t etcupdate)
 				diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp}
-				mv -f ${temp} ${DESTDIR}$1
+				# Use "cat >" to preserve metadata.
+				cat ${temp} > ${DESTDIR}$1
+				rm -f ${temp}
 			fi
 			post_install_file $1
 			echo "  M $1"