Hello community, here is the log from the commit of package file-roller for openSUSE:Factory checked in at 2015-10-30 16:35:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file-roller (Old) and /work/SRC/openSUSE:Factory/.file-roller.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file-roller" Changes: -------- --- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2015-09-11 09:00:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes 2015-10-30 16:35:51.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Oct 24 12:06:25 UTC 2015 - [email protected] + +- Add patch: file-roller-extract-sparse-file.patch: Fix extraction + of sparse file (bsc#923449, bgo#747091). + +------------------------------------------------------------------- New: ---- file-roller-extract-sparse-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file-roller.spec ++++++ --- /var/tmp/diff_new_pack.MST1Lw/_old 2015-10-30 16:35:52.000000000 +0100 +++ /var/tmp/diff_new_pack.MST1Lw/_new 2015-10-30 16:35:52.000000000 +0100 @@ -28,6 +28,8 @@ Patch0: file-roller-3.4-change-archiver-priority.patch # PATCH-FEATURE-OPENSUSE file-roller-pkg-match.patch bnc#696530 [email protected] -- List package match names for automatic installation using PK. Patch1: file-roller-pkg-match.patch +# PATCH-FIX-UPSTREAM file-roller-extract-sparse-file.patch bsc#923449 bgo#747091 [email protected] -- file-roller does not extract file correctly +Patch2: file-roller-extract-sparse-file.patch # Needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -98,6 +100,7 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 translation-update-upstream %build ++++++ file-roller-extract-sparse-file.patch ++++++ diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c index 9a11e45..83b9ade 100644 --- a/src/fr-archive-libarchive.c +++ b/src/fr-archive-libarchive.c @@ -582,7 +582,7 @@ extract_archive_thread (GSimpleAsyncResult *result, const char *relative_path; GFile *file; GFile *parent; - GOutputStream *ostream; + struct archive *ext; const void *buffer; size_t buffer_size; int64_t offset; @@ -777,16 +777,21 @@ extract_archive_thread (GSimpleAsyncResult *result, break; case AE_IFREG: - ostream = (GOutputStream *) g_file_replace (file, NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, cancellable, &load_data->error); - if (ostream == NULL) + ext = archive_write_disk_new(); + if (ext == NULL) break; + archive_write_disk_set_options(ext, ARCHIVE_EXTRACT_TIME|ARCHIVE_EXTRACT_PERM|ARCHIVE_EXTRACT_ACL|ARCHIVE_EXTRACT_FFLAGS); + archive_write_disk_set_standard_lookup(ext); + archive_entry_set_pathname(entry, g_file_get_path(file)); + archive_write_header(ext, entry); while ((r = archive_read_data_block (a, &buffer, &buffer_size, &offset)) == ARCHIVE_OK) { - if (g_output_stream_write (ostream, buffer, buffer_size, cancellable, &load_data->error) == -1) + if ((r = archive_write_data_block(ext, buffer, buffer_size, offset)) < ARCHIVE_OK) break; fr_archive_progress_inc_completed_bytes (load_data->archive, buffer_size); } - _g_object_unref (ostream); + archive_write_close(ext); + archive_write_free (ext); if (r != ARCHIVE_EOF) load_data->error = _g_error_new_from_archive_error (archive_error_string (a));
