Update to 2.8.5

.gitignore

@@ -1 +1,2 @@
 libarchive-2.8.4.tar.gz
+/libarchive-2.8.5.tar.gz

libarchive-2.8.4-iso9660-data-types.patch

@@ -1,33 +0,0 @@
-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;

libarchive.spec

@@ -1,6 +1,6 @@
 Name:           libarchive
-Version:        2.8.4
+Version:        2.8.5
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats 
 
 Group:          System Environment/Libraries
@@ -22,11 +22,6 @@ BuildRequires: openssl-devel
 BuildRequires: libxml2-devel
 
 
-# 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 
 streaming archive formats, including most popular tar variants, several cpio 
@@ -45,7 +40,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p0 -b .iso9660-testsuite
 
 
 %build
@@ -88,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  5 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.8.5-1
+- Update to 2.8.5
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1 +1 @@
-83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz
+9caf51dcf6213e9c9f5a1c27448b9c90  libarchive-2.8.5.tar.gz