rpms/dump/F-13 dump-rh568457.patch, NONE, 1.1 dump-rh576525.patch, NONE, 1.1 dump.spec, 1.56, 1.57

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/dump/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2680

Modified Files:
	dump.spec 
Added Files:
	dump-rh568457.patch dump-rh576525.patch 
Log Message:
- fix invalid EA metainformation in dump, add workaround to restore (#576525)
- don't set extended attributes when in read only mode (#568457)


dump-rh568457.patch:
 xattr.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE dump-rh568457.patch ---
diff -up ./dump-0.4b42/restore/xattr.c.rh568457 ./dump-0.4b42/restore/xattr.c
--- ./dump-0.4b42/restore/xattr.c.rh568457	2008-06-09 15:25:40.000000000 +0200
+++ ./dump-0.4b42/restore/xattr.c	2010-03-04 11:28:40.649246489 +0100
@@ -424,6 +424,9 @@ xattr_cb_set(char *name, char *value, in
 	char *path = (char *)private;
 	int err;
 	
+	if(Nflag)
+		return GOOD;
+	
 	isSELinux;
 #ifdef TRANSSELINUX			/*GAN6May06 SELinux MLS */
 	if (isSELinux)

dump-rh576525.patch:
 dump/traverse.c |    2 ++
 restore/tape.c  |   10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE dump-rh576525.patch ---
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -833,6 +833,8 @@ dump_xattr(dump_ino_t ino, struct dinode *dp) {
 			spcl.c_flags |= DR_EXTATTRIBUTES;
 			spcl.c_extattributes = EXT_XATTR;
 			spcl.c_count = howmany(EXT2_INODE_SIZE(fs->super), TP_BSIZE);
+			for (i = 0; i < spcl.c_count; i++)
+				spcl.c_addr[i] = 1;
 			writeheader(ino);
 			for (i = 0, cp = xattr; i < spcl.c_count; i++, cp += TP_BSIZE)
 				writerec(cp, 0);
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -1238,12 +1238,20 @@ readxattr(char *buffer)
 		skipfile();
 		return (FAIL);
 	}
-	
+
 	memset(xattrbuf, 0, XATTR_MAXSIZE);
 	xattrlen = 0;
 
+	/*
+	 * ugly hack: cope with invalid spcl.c_addr[] records written by
+	 * old versions of dump.
+	 */
+	readmapflag = 1;
+
 	getfile(xtrxattr, xtrnull);
 
+	readmapflag = 0;
+
 	memcpy(buffer, xattrbuf, XATTR_MAXSIZE);
 
 	return (GOOD);


Index: dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dump/F-13/dump.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- dump.spec	10 Feb 2010 14:45:09 -0000	1.56
+++ dump.spec	26 Apr 2010 14:27:16 -0000	1.57
@@ -7,7 +7,7 @@ Summary: Programs for backing up and res
 Name: dump
 Epoch: 1
 Version: 0.4
-Release: 0.4.%{PREVER}%{?dist}
+Release: 0.6.%{PREVER}%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -24,6 +24,8 @@ Obsoletes: dump-static
 Provides: dump-static
 
 Patch0: dump-rh507948.patch
+Patch1: dump-rh568457.patch
+Patch2: dump-rh576525.patch
 
 %description
 The dump package contains both dump and restore. Dump examines files
@@ -50,6 +52,8 @@ restoring files from a backup), and tar 
 %setup -q -n dump-%{VERSION}
 
 %patch0 -p1 -b .rh507948
+%patch1 -p2 -b .rh568457
+%patch2 -p1 -b .rh576525
 
 for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do
     iconv -f iso-8859-1 -t utf-8  $i -o $i.new
@@ -124,6 +128,12 @@ rm -rf %{buildroot}
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Mon Apr 26 2010 Adam Tkac <atkac redhat com> 0.4-0.6.b42
+- fix invalid EA metainformation in dump, add workaround to restore (#576525)
+
+* Thu Mar 4 2010 Jan Görig <jgorig redhat com> 0.4-0.5.b42
+- don't set extended attributes when in read only mode (#568457)
+
 * Wed Feb 10 2010 Adam Tkac <atkac redhat com> 0.4-0.4.b42
 - improve patch for multivol backup issues