From owner-svn-src-all@FreeBSD.ORG  Sun Jan 29 22:20:29 2012
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 09399106564A;
	Sun, 29 Jan 2012 22:20:29 +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 E86958FC12;
	Sun, 29 Jan 2012 22:20:28 +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 q0TMKSnQ055332;
	Sun, 29 Jan 2012 22:20:28 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0TMKSXR055330;
	Sun, 29 Jan 2012 22:20:28 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201201292220.q0TMKSXR055330@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 29 Jan 2012 22:20:28 +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: r230759 - 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: Sun, 29 Jan 2012 22:20:29 -0000

Author: mm
Date: Sun Jan 29 22:20:28 2012
New Revision: 230759
URL: http://svn.freebsd.org/changeset/base/230759

Log:
  Uupdate code to vendor rev. 4183 (release/2.8)
  
  Fixes vendor issue 224:
  "Mishandling CD9660 images with RockRidge extensions from FreeBSD makefs"
  
  References:
  http://code.google.com/p/libarchive/issues/detail?id=224
  
  MFC after:	1 week

Modified:
  head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Directory Properties:
  head/contrib/libarchive/   (props changed)
  head/contrib/libarchive/libarchive/   (props changed)

Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c	Sun Jan 29 22:12:48 2012	(r230758)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c	Sun Jan 29 22:20:28 2012	(r230759)
@@ -1778,6 +1778,19 @@ parse_file_info(struct archive_read *a, 
 				free(file);
 				return (NULL);
 			}
+			/*
+			 * A file size of symbolic link files in ISO images
+			 * made by makefs is not zero and its location is
+			 * the same as those of next regular file. That is
+			 * the same as hard like file and it causes unexpected
+			 * error. 
+			 */
+			if (file->size > 0 &&
+			    (file->mode & AE_IFMT) == AE_IFLNK) {
+				file->size = 0;
+				file->number = -1;
+				file->offset = -1;
+			}
 		} else
 			/* If there isn't SUSP, disable parsing
 			 * rock ridge extensions. */