rpms/tar/devel tar-1.16-multiVolLabels.patch, NONE, 1.1 tar.spec, 1.72, 1.73

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13710

Modified Files:
	tar.spec 
Added Files:
	tar-1.16-multiVolLabels.patch 
Log Message:
fixed bug #465803: labels with --multi-volume (upstream patch)

tar-1.16-multiVolLabels.patch:

--- NEW FILE tar-1.16-multiVolLabels.patch ---
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 =


Index: tar.spec
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- tar.spec	10 Oct 2008 21:31:21 -0000	1.72
+++ tar.spec	10 Nov 2008 12:32:43 -0000	1.73
@@ -2,7 +2,7 @@
 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 @@
 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 @@
 %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 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Nov 10 2008 Kamil Dudka <kdudka at redhat.com> 2:1.20-4
+- fixed bug #465803: labels with --multi-volume (upstream patch)
+
 * Fri Oct 10 2008 Ondrej Vasik <ovasik at redhat.com> 2:1.20-3
 - Fixed wrong documentation for xattrs options (#466517)
 - fixed bug with null file terminator and change dirs