From owner-svn-src-head@freebsd.org  Wed Jul 29 13:36:19 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 552669AC50D;
 Wed, 29 Jul 2015 13:36:19 +0000 (UTC)
 (envelope-from emaste@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 3EDD618AB;
 Wed, 29 Jul 2015 13:36:19 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6TDaJtC051460;
 Wed, 29 Jul 2015 13:36:19 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6TDaIbn051458;
 Wed, 29 Jul 2015 13:36:18 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201507291336.t6TDaIbn051458@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 29 Jul 2015 13:36:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286010 - head/usr.bin/ar
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jul 2015 13:36:19 -0000

Author: emaste
Date: Wed Jul 29 13:36:17 2015
New Revision: 286010
URL: https://svnweb.freebsd.org/changeset/base/286010

Log:
  ar: enable deterministic mode by default
  
  Ar cannot handle UIDs with more than 6 digits, and storing the mtime,
  uid, gid and mode provides little to negative value anyhow for ar's
  uses. Turn on deterministic (-D) mode by default; it can be disabled by
  the user with -U.
  
  PR:		196929
  Relnotes:	Yes
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D3190

Modified:
  head/usr.bin/ar/ar.1
  head/usr.bin/ar/ar.c

Modified: head/usr.bin/ar/ar.1
==============================================================================
--- head/usr.bin/ar/ar.1	Wed Jul 29 13:14:34 2015	(r286009)
+++ head/usr.bin/ar/ar.1	Wed Jul 29 13:36:17 2015	(r286010)
@@ -210,6 +210,7 @@ and 0644 instead of file mode from the m
 .Ar .
 This ensures that checksums on the resulting archives are reproducible
 when member contents are identical.
+This option is enabled by default.
 If multiple
 .Fl D
 and

Modified: head/usr.bin/ar/ar.c
==============================================================================
--- head/usr.bin/ar/ar.c	Wed Jul 29 13:14:34 2015	(r286009)
+++ head/usr.bin/ar/ar.c	Wed Jul 29 13:36:17 2015	(r286010)
@@ -104,6 +104,8 @@ main(int argc, char **argv)
 
 	bsdar = &bsdar_storage;
 	memset(bsdar, 0, sizeof(*bsdar));
+	/* Enable deterministic mode by default. */
+	bsdar->options |= AR_D;
 
 	if ((bsdar->progname = getprogname()) == NULL)
 		bsdar->progname = "ar";