From owner-svn-src-all@FreeBSD.ORG  Wed Dec 21 15:02:37 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A29F3106566B;
	Wed, 21 Dec 2011 15:02:37 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 919448FC12;
	Wed, 21 Dec 2011 15:02:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBLF2bAG073598;
	Wed, 21 Dec 2011 15:02:37 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBLF2b6P073596;
	Wed, 21 Dec 2011 15:02:37 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112211502.pBLF2b6P073596@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 21 Dec 2011 15:02:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228771 - head/contrib/libarchive/libarchive
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 21 Dec 2011 15:02:37 -0000

Author: mm
Date: Wed Dec 21 15:02:37 2011
New Revision: 228771
URL: http://svn.freebsd.org/changeset/base/228771

Log:
  Partial merge of r224691 from lib/libarchive:
  
  Add compatibility for ISO images created with unfixed makefs that
  violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD.
  This allows tar to read FreeBSD distribution ISO images created
  with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1).
  
  MFC after:	2 weeks

Modified:
  head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c

Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c	Wed Dec 21 14:58:44 2011	(r228770)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c	Wed Dec 21 15:02:37 2011	(r228771)
@@ -895,8 +895,10 @@ isPVD(struct iso9660 *iso9660, const uns
 		return (0);
 
 	/* Reserved field must be 0. */
+	/* FreeBSD: makefs erroneously created images with 0x20 */
 	for (i = 0; i < PVD_reserved4_size; ++i)
-		if (h[PVD_reserved4_offset + i] != 0)
+		if (h[PVD_reserved4_offset + i] != 0 &&
+		    h[PVD_reserved4_offset + i] != 32)
 			return (0);
 
 	/* Reserved field must be 0. */