correctly store long sparse file names in PAX archives (#656834)
This commit is contained in:
Kamil Dudka
parent
09fbc03c38
commit
e654d406f8
126
tar-1.25-sparse-names.patch
Normal file
126
tar-1.25-sparse-names.patch
Normal file
@ -0,0 +1,126 @@
|
||||
From 3f7aebf6e15d2ee39f55528cc9f423b330e68272 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Poznyakoff <gray@gnu.org.ua>
|
||||
Date: Sat, 27 Nov 2010 14:35:08 +0200
|
||||
Subject: [PATCH] Correctly store long sparse file names in PAX archives.
|
||||
|
||||
* src/sparse.c (pax_dump_header_1): Make sure the created header name is
|
||||
shorter than NAME_FIELD_SIZE bytes.
|
||||
* tests/sparse04.at: New testcase.
|
||||
* tests/Makefile.am (TESTSUITE_AT): Add sparse04.at.
|
||||
* tests/testsuite.at: Include sparse04.at.
|
||||
* NEWS: Update.
|
||||
---
|
||||
src/sparse.c | 9 ++++++---
|
||||
tests/Makefile.am | 1 +
|
||||
tests/sparse04.at | 47 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
tests/testsuite.at | 1 +
|
||||
4 files changed, 55 insertions(+), 3 deletions(-)
|
||||
create mode 100644 tests/sparse04.at
|
||||
|
||||
diff --git a/src/sparse.c b/src/sparse.c
|
||||
index 9680b60..696773f 100644
|
||||
--- a/src/sparse.c
|
||||
+++ b/src/sparse.c
|
||||
@@ -991,7 +991,7 @@ pax_dump_header_1 (struct tar_sparse_file *file)
|
||||
off_t size = 0;
|
||||
struct sp_array *map = file->stat_info->sparse_map;
|
||||
char *save_file_name = file->stat_info->file_name;
|
||||
-
|
||||
+
|
||||
#define COPY_STRING(b,dst,src) do \
|
||||
{ \
|
||||
char *endp = b->buffer + BLOCKSIZE; \
|
||||
@@ -1029,8 +1029,11 @@ pax_dump_header_1 (struct tar_sparse_file *file)
|
||||
xheader_store ("GNU.sparse.name", file->stat_info, NULL);
|
||||
xheader_store ("GNU.sparse.realsize", file->stat_info, NULL);
|
||||
|
||||
- file->stat_info->file_name = xheader_format_name (file->stat_info,
|
||||
- "%d/GNUSparseFile.%p/%f", 0);
|
||||
+ file->stat_info->file_name =
|
||||
+ xheader_format_name (file->stat_info, "GNUSparseFile.%p/%f", 0);
|
||||
+ /* Make sure the created header name is shorter than NAME_FIELD_SIZE: */
|
||||
+ 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 */
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 12e8c1b..b14b40a 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -145,6 +145,7 @@ TESTSUITE_AT = \
|
||||
sparse01.at\
|
||||
sparse02.at\
|
||||
sparse03.at\
|
||||
+ sparse04.at\
|
||||
sparsemv.at\
|
||||
sparsemvp.at\
|
||||
spmvp00.at\
|
||||
diff --git a/tests/sparse04.at b/tests/sparse04.at
|
||||
new file mode 100644
|
||||
index 0000000..4d41be7
|
||||
--- /dev/null
|
||||
+++ b/tests/sparse04.at
|
||||
@@ -0,0 +1,47 @@
|
||||
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
+#
|
||||
+# Test suite for GNU tar.
|
||||
+# Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
+#
|
||||
+# This program is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 3, or (at your option)
|
||||
+# any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program; if not, write to the Free Software
|
||||
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
+# 02110-1301, USA.
|
||||
+
|
||||
+AT_SETUP([storing long sparse file names])
|
||||
+AT_KEYWORDS([sparse sparse04])
|
||||
+
|
||||
+# Description: Tar versions from 1.15.92 to 1.25 would incorrectly
|
||||
+# store sparse file names longer than 100 characters in pax mode.
|
||||
+# Namely, the `path' keyword of the produced PAX header would contain the
|
||||
+# crafted name of the header itself, instead of that of the file.
|
||||
+# Reported by: Kamil Dudka <kdudka@redhat.com>
|
||||
+# References: <201011250026.44908.kdudka@redhat.com>,
|
||||
+# http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00099.html
|
||||
+
|
||||
+m4_define([NAME_111],
|
||||
+ [123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960])
|
||||
+
|
||||
+AT_TAR_CHECK([
|
||||
+genfile --sparse --file NAME_111 --block-size 512 8M A || AT_SKIP_TEST
|
||||
+tar -c --sparse --posix NAME_111 | tar t
|
||||
+],
|
||||
+[0],
|
||||
+[NAME_111
|
||||
+],
|
||||
+[],
|
||||
+[],
|
||||
+[],
|
||||
+[pax])
|
||||
+
|
||||
+AT_CLEANUP
|
||||
diff --git a/tests/testsuite.at b/tests/testsuite.at
|
||||
index d18b16e..6f06417 100644
|
||||
--- a/tests/testsuite.at
|
||||
+++ b/tests/testsuite.at
|
||||
@@ -223,6 +223,7 @@ m4_include([shortrec.at])
|
||||
m4_include([sparse01.at])
|
||||
m4_include([sparse02.at])
|
||||
m4_include([sparse03.at])
|
||||
+m4_include([sparse04.at])
|
||||
m4_include([sparsemv.at])
|
||||
m4_include([spmvp00.at])
|
||||
m4_include([spmvp01.at])
|
||||
--
|
||||
1.7.3.2
|
||||
|
||||
8
tar.spec
8
tar.spec
@ -5,7 +5,7 @@ Summary: A GNU file archiving program
|
||||
Name: tar
|
||||
Epoch: 2
|
||||
Version: 1.25
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Archiving
|
||||
URL: http://www.gnu.org/software/tar/
|
||||
@ -32,6 +32,8 @@ Patch6: tar-1.23-oldarchive.patch
|
||||
Patch7: tar-sigpipe.patch
|
||||
#fix failure with --one-file-system and --listed-incremental when archiving / (#654718)
|
||||
Patch8: tar-1.25-listedincremental.patch
|
||||
#Correctly store long sparse file names in PAX archives (#656834)
|
||||
Patch9: tar-1.25-sparse-names.patch
|
||||
Requires: info
|
||||
BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
|
||||
%if %{WITH_SELINUX}
|
||||
@ -63,6 +65,7 @@ the rmt package.
|
||||
%patch6 -p1 -b .oldarchive
|
||||
%patch7 -p1 -b .fail
|
||||
%patch8 -p1 -b .listed
|
||||
%patch9 -p1 -b .sparse
|
||||
|
||||
autoreconf
|
||||
|
||||
@ -124,6 +127,9 @@ fi
|
||||
%{_infodir}/tar.info*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 08 2010 Kamil Dudka <kdudka@redhat.com> 2:1.25-3
|
||||
- correctly store long sparse file names in PAX archives (#656834)
|
||||
|
||||
* Tue Nov 23 2010 Ondrej Vasik <ovasik@redhat.com> 2:1.25-2
|
||||
- fix issue with --one-file-system and --listed-incremental
|
||||
(#654718)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user