rpms/libarchive/F-13 libarchive-2.8.4-iso9660-data-types.patch, NONE, 1.1 libarchive.spec, 1.19, 1.20 sources, 1.15, 1.16

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/libarchive/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13007

Modified Files:
	libarchive.spec sources 
Added Files:
	libarchive-2.8.4-iso9660-data-types.patch 
Log Message:
* Wed Jun 30 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.8.4-1
- Update to 2.8.4


libarchive-2.8.4-iso9660-data-types.patch:
 archive_read_support_format_iso9660.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libarchive-2.8.4-iso9660-data-types.patch ---
Index: libarchive/archive_read_support_format_iso9660.c
===================================================================
--- libarchive/archive_read_support_format_iso9660.c	(revision 1983)
+++ libarchive/archive_read_support_format_iso9660.c	(revision 1984)
@@ -924,7 +924,7 @@
 	if (parent->offset + parent->size > iso9660->volume_size) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Directory is beyond end-of-media: %s",
-		    parent->name);
+		    parent->name.s);
 		return (ARCHIVE_WARN);
 	}
 	if (iso9660->current_position < parent->offset) {
@@ -1220,7 +1220,7 @@
 
 	if (file->offset + file->size > iso9660->volume_size) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-		    "File is beyond end-of-media: %s", file->name);
+		    "File is beyond end-of-media: %s", file->name.s);
 		iso9660->entry_bytes_remaining = 0;
 		iso9660->entry_sparse_offset = 0;
 		return (ARCHIVE_WARN);
@@ -1279,8 +1279,8 @@
 	if ((file->mode & AE_IFMT) != AE_IFDIR &&
 	    file->offset < iso9660->current_position) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-		    "Ignoring out-of-order file @%x (%s) %jd < %jd",
-		    file,
+		    "Ignoring out-of-order file @%jx (%s) %jd < %jd",
+		    (intmax_t)file->number,
 		    iso9660->pathname.s,
 		    file->offset, iso9660->current_position);
 		iso9660->entry_bytes_remaining = 0;


Index: libarchive.spec
===================================================================
RCS file: /cvs/extras/rpms/libarchive/F-13/libarchive.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- libarchive.spec	16 Mar 2010 14:30:02 -0000	1.19
+++ libarchive.spec	30 Jun 2010 15:54:20 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           libarchive
-Version:        2.8.3
+Version:        2.8.4
 Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats 
 
@@ -21,9 +21,11 @@ BuildRequires: libattr-devel
 BuildRequires: openssl-devel
 BuildRequires: libxml2-devel
 
-# The patch touches Makefile.am files:
-BuildRequires: automake autoconf
-BuildRequires: libtool
+
+# from upstream
+# https://bugzilla.redhat.com/show_bug.cgi?id=597243
+Patch0: libarchive-2.8.4-iso9660-data-types.patch
+
 
 %description
 Libarchive is a programming library that can create and read several different 
@@ -43,11 +45,10 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p0 -b .iso9660-testsuite
 
 
 %build
-libtoolize --force  || :
-autoreconf  || :
 %configure --disable-static --disable-bsdtar --disable-bsdcpio
 make %{?_smp_mflags}
 
@@ -87,6 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 30 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.8.4-1
+- Update to 2.8.4
+
+* Fri Jun 25 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.8.3-2
+- Fix ISO9660 reader data type mismatches (#597243)
+
 * Tue Mar 16 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.8.3-1
 - Update to 2.8.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libarchive/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Mar 2010 14:30:02 -0000	1.15
+++ sources	30 Jun 2010 15:54:20 -0000	1.16
@@ -1 +1 @@
-fe8d917e101d4b37580124030842a1d0  libarchive-2.8.3.tar.gz
+83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz