rpms/dump/devel dump-rh507948.patch,1.1,1.2 dump.spec,1.55,1.56

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/dump/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14770

Modified Files:
	dump-rh507948.patch dump.spec 
Log Message:
- improve patch for multivol backup issues


dump-rh507948.patch:
 dump-0.4b39/restore/restore.c |    7 ++++---
 dump-0.4b42/restore/tape.c    |    6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

Index: dump-rh507948.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dump/devel/dump-rh507948.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dump-rh507948.patch	23 Jul 2009 12:37:41 -0000	1.1
+++ dump-rh507948.patch	10 Feb 2010 14:45:09 -0000	1.2
@@ -9,3 +9,40 @@ diff -up dump-0.4b42/restore/tape.c.rh50
  		blksread = 0;
  	}
  	if (pipein) {
+@@ -3264,11 +3263,14 @@ ReReadInodeFromTape(dump_ino_t theino)
+ 		cntloop++;
+ 		gethead(&spcl);
+ 	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate));
++
++	tpblksread = spcl.c_tapea + spcl.c_volume;
+ #ifdef DEBUG_QFA
+ 	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
+ 	fprintf(stderr, "DEBUG: bufsize %ld\n", bufsize);
+ 	fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
+-	fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
++	fprintf(stderr, "DEBUG: tapea %d\n", spcl.c_tapea);
++	fprintf(stderr, "DEBUG: tpblksread %ld\n", tpblksread);
+ #endif
+ 	findinode(&spcl);
+ 	noresyncmesg = 0;
+--- dump-0.4b39/restore/restore.c	2004-12-15 12:00:01.000000000 +0100
++++ dump-0.4b39/restore/restore.c.rh507948	2010-02-02 16:50:03.817507952 +0100
+@@ -880,14 +880,15 @@ createfiles(void)
+ 	Vprintf(stdout, "Extract requested files\n");
+ 	curfile.action = SKIP;
+ #ifdef USE_QFA
+-	if (tapeposflag)
+-		curfile.ino = 0;
+-	else
++	if (!tapeposflag) {
+ #endif
+ 		if (volinfo[1] == ROOTINO)
+ 			curfile.ino = 0;
+ 		else
+ 			getvol((long)1);
++#ifdef USE_QFA
++	}
++#endif
+ 	skipmaps();
+ 	skipdirs();
+ 	first = lowerbnd(ROOTINO);


Index: dump.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dump/devel/dump.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- dump.spec	24 Jul 2009 20:37:49 -0000	1.55
+++ dump.spec	10 Feb 2010 14:45:09 -0000	1.56
@@ -7,7 +7,7 @@ Summary: Programs for backing up and res
 Name: dump
 Epoch: 1
 Version: 0.4
-Release: 0.3.%{PREVER}%{?dist}
+Release: 0.4.%{PREVER}%{?dist}
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -60,6 +60,9 @@ done
 %build
 autoreconf -fiv
 
+export CFLAGS="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \
+-Wmissing-prototypes -Wno-char-subscripts"
+
 # XXX --enable-kerberos needs krcmd
 %configure --disable-static \
     --enable-transselinux \
@@ -72,8 +75,7 @@ autoreconf -fiv
     --with-mangrp=root \
     --with-manmode=0644
 
-make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \
-                         -Wmissing-prototypes -Wno-char-subscripts" %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -122,6 +124,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Wed Feb 10 2010 Adam Tkac <atkac redhat com> 0.4-0.4.b42
+- improve patch for multivol backup issues
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.4-0.3.b42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild