rpms/tar
7
0
Fork 0
Code Issues Pull Requests Releases Activity

tar: allow extracting from just single volume

Browse Source 
Resolves: #919897
Version: 2:1.26-20
This commit is contained in:
Pavel Raiskup 2013-03-19 09:51:51 +01:00
parent c58b4220fc
commit b40bf4511c
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tar-1.26-allow-extract-single-volume.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/src/extract.c b/src/extract.c
index 87b383a..340beea 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1415,6 +1415,13 @@ extract_failure (char *file_name, int typeflag)
return 1;
}
+static int
+extract_skip (char *file_name, int typeflag)
+{
+ skip_member ();
+ return 0;
+}
+
typedef int (*tar_extractor_t) (char *file_name, int typeflag);
@@ -1495,7 +1502,7 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
ERROR ((0, 0,
_("%s: Cannot extract -- file is continued from another volume"),
quotearg_colon (current_stat_info.file_name)));
- *fun = extract_failure;
+ *fun = extract_skip;
break;
case GNUTYPE_LONGNAME:

12
tar.spec
View File

@ -5,7 +5,7 @@ Summary: A GNU file archiving program
Name: tar Name: tar
Epoch: 2 Epoch: 2
Version: 1.26 Version: 1.26
Release: 19%{?dist} Release: 20%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Archiving Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/ URL: http://www.gnu.org/software/tar/
@ -82,6 +82,12 @@ Patch11: tar-1.26-posix-biguid.patch
# ~> already upstream (2f6c03cba) # ~> already upstream (2f6c03cba)
Patch12: tar-1.26-pax-big-sparse-files.patch Patch12: tar-1.26-pax-big-sparse-files.patch
# Fix: Allow extracting single volume in a multi-volume archive
# ~> #919897
# ~> http://lists.gnu.org/archive/html/bug-tar/2013-03/msg00002.html
# ~> upstream (beca89bc)
Patch13: tar-1.26-allow-extract-single-volume.patch
# run "make check" by default # run "make check" by default
%bcond_without check %bcond_without check
@ -125,6 +131,7 @@ the rmt package.
%patch10 -p1 -b .xattrs-selinux-acls %patch10 -p1 -b .xattrs-selinux-acls
%patch11 -p1 -b .big_uid_gid %patch11 -p1 -b .big_uid_gid
%patch12 -p1 -b .pax-sparse-big-files %patch12 -p1 -b .pax-sparse-big-files
%patch13 -p1 -b .extract-single-volume
autoreconf -v autoreconf -v
@ -187,6 +194,9 @@ fi
%{_infodir}/tar.info* %{_infodir}/tar.info*
%changelog %changelog
* Tue Mar 19 2013 Pavel Raiskup <praiskup@redhat.com> - 2:1.26-20
- allow extracting single volume from multi-volume archive (#919897)
* Fri Mar 01 2013 Pavel Raiskup <praiskup@redhat.com> - 2:1.26-19 * Fri Mar 01 2013 Pavel Raiskup <praiskup@redhat.com> - 2:1.26-19
- fix creating sparse pax archives containing files of effective - fix creating sparse pax archives containing files of effective
size >8GB (#516309) size >8GB (#516309)