[tar/f18] tar: bugfix for creation of --posix --sparse tarballs

[Pavel Raiskup]

commit d8a23533b91621221000240fd526c1114946b904
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Fri Mar 1 11:49:55 2013 +0100

    tar: bugfix for creation of --posix --sparse tarballs
    
    GNU tar failed to create posix archives containing sparse files of effective
    size (real size stored on the disk) >8GB.
    
    (backport from f19)
    
    Version: 2:1.26-12
    Resolves: #516309

 tar-1.26-pax-big-sparse-files.patch |   66 +++++++++++++++++++++++++++++++++++
 tar.spec                            |    9 +++++
 2 files changed, 75 insertions(+), 0 deletions(-)
---
diff --git a/tar-1.26-pax-big-sparse-files.patch b/tar-1.26-pax-big-sparse-files.patch
new file mode 100644
index 0000000..301eee4
--- /dev/null
+++ b/tar-1.26-pax-big-sparse-files.patch
@@ -0,0 +1,66 @@
+diff --git a/NEWS b/NEWS
+index 12c1dd6..0f07911 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,10 +1,15 @@
+ GNU tar NEWS - User visible changes. 2011-03-12
+ Please send GNU tar bug reports to <bug-tar at gnu.org>
+ 
++** Sparse files with large data
++
++When creating a PAX-format archive, tar no longer arbitrarily restricts
++the size of the representation of a sparse file to be less than 8 GiB.
++
+ 
+ version 1.26 - Sergey Poznyakoff, 2011-03-12
+ 
+-* Bugfixes
++* Bug fixes
+ 
+ ** Fix the --verify option, which broke in version 1.24.
+ 
+diff --git a/src/sparse.c b/src/sparse.c
+index 4b2f982..cfd0c66 100644
+--- a/src/sparse.c
++++ b/src/sparse.c
+@@ -919,6 +919,18 @@ pax_sparse_member_p (struct tar_sparse_file *file)
+           || file->stat_info->sparse_major > 0;
+ }
+ 
++/* Start a header that uses the effective (shrunken) file size.  */
++static union block *
++pax_start_header (struct tar_stat_info *st)
++{
++  off_t realsize = st->stat.st_size;
++  union block *blk;
++  st->stat.st_size = st->archive_file_size;
++  blk = start_header (st);
++  st->stat.st_size = realsize;
++  return blk;
++}
++
+ static bool
+ pax_dump_header_0 (struct tar_sparse_file *file)
+ {
+@@ -968,9 +980,7 @@ pax_dump_header_0 (struct tar_sparse_file *file)
+ 	  return false;
+ 	}
+     }
+-  blk = start_header (file->stat_info);
+-  /* Store the effective (shrunken) file size */
+-  OFF_TO_CHARS (file->stat_info->archive_file_size, blk->header.size);
++  blk = pax_start_header (file->stat_info);
+   finish_header (file->stat_info, blk, block_ordinal);
+   if (save_file_name)
+     {
+@@ -1035,9 +1045,7 @@ pax_dump_header_1 (struct tar_sparse_file *file)
+   if (strlen (file->stat_info->file_name) > NAME_FIELD_SIZE)
+     file->stat_info->file_name[NAME_FIELD_SIZE] = 0;
+ 
+-  blk = start_header (file->stat_info);
+-  /* Store the effective (shrunken) file size */
+-  OFF_TO_CHARS (file->stat_info->archive_file_size, blk->header.size);
++  blk = pax_start_header (file->stat_info);
+   finish_header (file->stat_info, blk, block_ordinal);
+   free (file->stat_info->file_name);
+   file->stat_info->file_name = save_file_name;
diff --git a/tar.spec b/tar.spec
index c020c97..59f3243 100644
--- a/tar.spec
+++ b/tar.spec
@@ -44,6 +44,12 @@ Patch11: tar-1.26-add-skip-old-files-option.patch
 # ~> upstream (it is part of df7b55a8f6354e)
 Patch12: tar-1.26-posix-biguid.patch
 
+# Allow store sparse files of effective size >8GB into pax archives
+# ~> #516309
+# ~> http://lists.gnu.org/archive/html/bug-tar/2013-01/msg00001.html
+# ~> already upstream (2f6c03cba)
+Patch13: tar-1.26-pax-big-sparse-files.patch
+
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -79,6 +85,7 @@ the rmt package.
 %patch10 -p1 -b .gets  %{?_rawbuild}
 %patch11 -p1 -b .skip-old-files
 %patch12 -p1 -b .big_uid_gid
+%patch13 -p1 -b .pax-sparse-big-files
 
 autoreconf
 
@@ -143,6 +150,8 @@ fi
 * Tue Mar 19 2013 Pavel Raiskup <praiskup at redhat.com> - 2:1.26-12
 - sync manpage help2man
 - fix problems with big uids/gids and pax format (> 2^21) (#913406)
+- fix creating sparse pax archives containing files of effective
+  size >8GB (#516309)
 
 * Thu Oct 18 2012 Pavel Raiskup <praiskup at redhat.com> - 2:1.26-11
 - fix bad behaviour of --keep-old-files and add --skip-old-files option