From owner-svn-src-all@FreeBSD.ORG  Tue Sep 13 05:52:35 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 005A31065673;
	Tue, 13 Sep 2011 05:52:34 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E43A68FC0C;
	Tue, 13 Sep 2011 05:52:34 +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 p8D5qY3N062126;
	Tue, 13 Sep 2011 05:52:34 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8D5qYZF062123;
	Tue, 13 Sep 2011 05:52:34 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <201109130552.p8D5qYZF062123@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 13 Sep 2011 05:52:34 +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: r225525 - head/lib/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: Tue, 13 Sep 2011 05:52:35 -0000

Author: kientzle
Date: Tue Sep 13 05:52:34 2011
New Revision: 225525
URL: http://svn.freebsd.org/changeset/base/225525

Log:
  Fix cpio on ARM.
  
  PR:		bin/160430
  Submitted by:	Ian Lepore
  Approved by:	re (Kostik Belousov)
  MFC after:	7 days

Modified:
  head/lib/libarchive/archive_read_support_format_cpio.c
  head/lib/libarchive/archive_write_set_format_cpio.c

Modified: head/lib/libarchive/archive_read_support_format_cpio.c
==============================================================================
--- head/lib/libarchive/archive_read_support_format_cpio.c	Tue Sep 13 02:46:22 2011	(r225524)
+++ head/lib/libarchive/archive_read_support_format_cpio.c	Tue Sep 13 05:52:34 2011	(r225525)
@@ -54,7 +54,7 @@ struct cpio_bin_header {
 	unsigned char	c_mtime[4];
 	unsigned char	c_namesize[2];
 	unsigned char	c_filesize[4];
-};
+} __packed;
 
 struct cpio_odc_header {
 	char	c_magic[6];
@@ -68,7 +68,7 @@ struct cpio_odc_header {
 	char	c_mtime[11];
 	char	c_namesize[6];
 	char	c_filesize[11];
-};
+} __packed;
 
 struct cpio_newc_header {
 	char	c_magic[6];
@@ -85,7 +85,7 @@ struct cpio_newc_header {
 	char	c_rdevminor[8];
 	char	c_namesize[8];
 	char	c_crc[8];
-};
+} __packed;
 
 struct links_entry {
         struct links_entry      *next;

Modified: head/lib/libarchive/archive_write_set_format_cpio.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_cpio.c	Tue Sep 13 02:46:22 2011	(r225524)
+++ head/lib/libarchive/archive_write_set_format_cpio.c	Tue Sep 13 05:52:34 2011	(r225525)
@@ -74,7 +74,7 @@ struct cpio_header {
 	char	c_mtime[11];
 	char	c_namesize[6];
 	char	c_filesize[11];
-};
+} __packed;
 
 /*
  * Set output format to 'cpio' format.