From owner-svn-src-head@freebsd.org  Thu Jul 13 04:42:30 2017
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 CCA76D949F1;
 Thu, 13 Jul 2017 04:42:30 +0000 (UTC) (envelope-from mm@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 9910164B1E;
 Thu, 13 Jul 2017 04:42:30 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6D4gT5Y069333;
 Thu, 13 Jul 2017 04:42:29 GMT (envelope-from mm@FreeBSD.org)
Received: (from mm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D4gTw2069332;
 Thu, 13 Jul 2017 04:42:29 GMT (envelope-from mm@FreeBSD.org)
Message-Id: <201707130442.v6D4gTw2069332@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org
 using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 13 Jul 2017 04:42:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320931 - head/contrib/libarchive/libarchive
X-SVN-Group: head
X-SVN-Commit-Author: mm
X-SVN-Commit-Paths: head/contrib/libarchive/libarchive
X-SVN-Commit-Revision: 320931
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jul 2017 04:42:30 -0000

Author: mm
Date: Thu Jul 13 04:42:29 2017
New Revision: 320931
URL: https://svnweb.freebsd.org/changeset/base/320931

Log:
  Fix libarchive mismerge of r320927
  
  MFC after:	1 week
  X-MFC-with:	320927
  Reported by:	Ngie Cooper <ngie@FreeBSD.org>

Modified:
  head/contrib/libarchive/libarchive/archive.h

Modified: head/contrib/libarchive/libarchive/archive.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive.h	Thu Jul 13 03:52:54 2017	(r320930)
+++ head/contrib/libarchive/libarchive/archive.h	Thu Jul 13 04:42:29 2017	(r320931)
@@ -36,7 +36,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003001
+#define	ARCHIVE_VERSION_NUMBER 3003002
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */