From 0933519fe94da71880c2f10b7d4b49671361775c Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Jan 30 2007 14:31:57 +0000 Subject: fixed dumping of 2TB systems --- diff --git a/dump-0.4b37-2TB.patch b/dump-0.4b37-2TB.patch new file mode 100644 index 0000000..704eb88 --- /dev/null +++ b/dump-0.4b37-2TB.patch @@ -0,0 +1,21 @@ +--- dump-0.4b37/dump/tape.c.2TB 2004-07-07 13:07:29.000000000 +0200 ++++ dump-0.4b37/dump/tape.c 2005-08-22 09:57:45.000000000 +0200 +@@ -475,10 +475,14 @@ + } + + blks = 0; +- if (spcl.c_type != TS_END) { +- for (i = 0; i < spcl.c_count; i++) +- if (spcl.c_addr[i] != 0) +- blks++; ++ if (spcl.c_type == TS_CLRI || spcl.c_type == TS_BITS) { ++ blks = spcl.c_count; ++ } else { ++ if (spcl.c_type != TS_END) { ++ for (i = 0; i < spcl.c_count; i++) ++ if (spcl.c_addr[i] != 0) ++ blks++; ++ } + } + slp->count = lastspclrec + blks + 1 - spcl.c_tapea; + slp->tapea = spcl.c_tapea; diff --git a/dump.spec b/dump.spec index 208bd51..e073bc2 100644 --- a/dump.spec +++ b/dump.spec @@ -3,7 +3,7 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ @@ -11,6 +11,7 @@ Source: dump-%{version}.tar.bz2 Patch0: dump-selinux.patch Patch1: dump-dmfix.patch Patch2: dump-immutable.patch +Patch3: dump-0.4b37-2TB.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, ncurses-devel @@ -48,6 +49,7 @@ restoring files from a backup), and tar (an archiving program). %patch0 -p1 -b .selinux %patch1 -p1 -b .dmfix %patch2 -p1 -b .orig +%patch3 -p1 -b .2TB %build @@ -119,6 +121,9 @@ rm -rf %{buildroot} %{_mandir}/man8/rmt.8* %changelog +* Tue Jan 30 2007 Adam Tkac 0.4b41-5.fc7 +- fixed dumping of 2TB systems + * Mon Jan 29 2007 Adam Tkac 0.4b41-4.fc7 - added Andrew Kroeger's patch. Immutable files are restored correctly