From 0f8a0c84a8609c9ac2aeffd60fdf3739522c267b Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Jun 11 2010 12:38:40 +0000
Subject: - update to 0.4b43

- patches merged
- dump-rh568457.patch
- dump-rh576525.patch

---

diff --git a/.cvsignore b/.cvsignore
index 7516309..ba8d72f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dump-0.4b42.tar.gz
+dump-0.4b43.tar.gz
diff --git a/dump-rh507948.patch b/dump-rh507948.patch
index 7089e7b..b1d1a23 100644
--- a/dump-rh507948.patch
+++ b/dump-rh507948.patch
@@ -1,14 +1,6 @@
 diff -up dump-0.4b42/restore/tape.c.rh507948 dump-0.4b42/restore/tape.c
 --- dump-0.4b42/restore/tape.c.rh507948	2009-07-23 14:28:17.998903816 +0200
 +++ dump-0.4b42/restore/tape.c	2009-07-23 14:29:27.058903991 +0200
-@@ -474,7 +474,6 @@ getvol(long nextvol)
- 	if (nextvol == 1) {
- 		tapesread = 0;
- 		gettingfile = 0;
--		tpblksread = 0;
- 		blksread = 0;
- 	}
- 	if (pipein) {
 @@ -3264,11 +3263,14 @@ ReReadInodeFromTape(dump_ino_t theino)
  		cntloop++;
  		gethead(&spcl);
diff --git a/dump-rh568457.patch b/dump-rh568457.patch
deleted file mode 100644
index 975e28b..0000000
--- a/dump-rh568457.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
diff --git a/dump-rh576525.patch b/dump-rh576525.patch
deleted file mode 100644
index 4631d8f..0000000
--- a/dump-rh576525.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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);
diff --git a/dump.spec b/dump.spec
index 0526918..d3d97c9 100644
--- a/dump.spec
+++ b/dump.spec
@@ -1,13 +1,13 @@
 %define _sbindir /sbin
 
-%define PREVER b42
+%define PREVER b43
 %define VERSION 0.4%{PREVER}
 
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Epoch: 1
 Version: 0.4
-Release: 0.6.%{PREVER}%{?dist}
+Release: 0.7.%{PREVER}%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -24,8 +24,6 @@ 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
@@ -52,8 +50,6 @@ restoring files from a backup), and tar (an archiving program).
 %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
@@ -128,6 +124,12 @@ rm -rf %{buildroot}
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Fri Jun 11 2010 Adam Tkac <atkac redhat com> 0.4-0.7.b43
+- update to 0.4b43
+- patches merged
+  - dump-rh568457.patch
+  - dump-rh576525.patch
+
 * 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)
 
diff --git a/sources b/sources
index 67cdb9b..3a6ea8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7202465ed687da2540a7b2b44a09f1b9  dump-0.4b42.tar.gz
+a708cbac8a0f69dd55aecbb80bb290ca  dump-0.4b43.tar.gz