From c17223a3708144b8a7c35093dd22a88087f94213 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Mon, 10 Nov 2008 12:32:43 +0000
Subject: [PATCH] fixed bug #465803: labels with --multi-volume (upstream
 patch)

---
 tar-1.16-multiVolLabels.patch | 12 ++++++++++++
 tar.spec                      |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tar-1.16-multiVolLabels.patch

diff --git a/tar-1.16-multiVolLabels.patch b/tar-1.16-multiVolLabels.patch
new file mode 100644
index 0000000..8e3936f
--- /dev/null
+++ b/tar-1.16-multiVolLabels.patch
@@ -0,0 +1,12 @@
+diff -ruNp tar-1.20.orig/src/buffer.c tar-1.20/src/buffer.c
+--- tar-1.20.orig/src/buffer.c	2008-11-07 19:16:05.578337476 +0100
++++ tar-1.20/src/buffer.c	2008-11-07 19:16:39.415962458 +0100
+@@ -1290,7 +1290,7 @@ _write_volume_label (const char *str)
+ 
+       memset (label, 0, BLOCKSIZE);
+ 
+-      strcpy (label->header.name, volume_label_option);
++      strcpy (label->header.name, str);
+       assign_string (&current_stat_info.file_name,
+ 		     label->header.name);
+       current_stat_info.had_trailing_slash =
diff --git a/tar.spec b/tar.spec
index 1987254..5a37009 100644
--- a/tar.spec
+++ b/tar.spec
@@ -2,7 +2,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.20
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -15,6 +15,7 @@ Patch3: tar-1.19-xattrs.patch
 Patch4: tar-1.19-xattrs-conf.patch
 Patch5: tar-1.17-wildcards.patch
 Patch6: tar-1.19-null-terminator.patch
+Patch7: tar-1.16-multiVolLabels.patch
 Prereq: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel libselinux-devel gawk
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,6 +42,7 @@ the rmt package.
 %patch4 -p1 -b .xattrs-conf
 %patch5 -p1 -b .wildcards
 %patch6 -p1 -b .nullterm
+%patch7 -p1 -b .multiVolLabels
 
 %build
 %configure --bindir=/bin --libexecdir=/sbin
@@ -91,6 +93,9 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Nov 10 2008 Kamil Dudka <kdudka@redhat.com> 2:1.20-4
+- fixed bug #465803: labels with --multi-volume (upstream patch)
+
 * Fri Oct 10 2008 Ondrej Vasik <ovasik@redhat.com> 2:1.20-3
 - Fixed wrong documentation for xattrs options (#466517)
 - fixed bug with null file terminator and change dirs