From: Bdale Garbee Date: Thu, 18 Jun 2009 15:38:50 +0000 (-0600) Subject: Merge commit 'upstream/0.4b42' X-Git-Tag: debian/0.4b42-1~11 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a864f08d55aeb4954e3e63307a176ba97dc8ca2c;p=debian%2Fdump Merge commit 'upstream/0.4b42' Conflicts: CHANGES MCONFIG.in configure configure.in dump.lsm dump.spec dump/dump.8.in dump/tape.c dump/traverse.c examples/dump_on_cd_3/dump_disk restore/Makefile.in restore/dirs.c restore/main.c restore/restore.8.in restore/restore.c restore/restore.h restore/tape.c restore/xattr.c --- a864f08d55aeb4954e3e63307a176ba97dc8ca2c diff --cc debian/changelog index a09ce4e,0000000..b63fccc mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,463 -1,0 +1,469 @@@ ++dump (0.4b42-1) unstable; urgency=low ++ ++ * new upstream version, closes: #378349 ++ ++ -- Bdale Garbee Thu, 18 Jun 2009 09:36:09 -0600 ++ +dump (0.4b41-6) unstable; urgency=high + + * increase urgency since this minor fix would be good for lenny + * fix bashisms in example shell script, closes: #489570 + + -- Bdale Garbee Fri, 29 Aug 2008 08:51:32 -0600 + +dump (0.4b41-5) unstable; urgency=low + + * eliminate debian/po in the source tree since it is no longer relevant, + closes: #407218 + + -- Bdale Garbee Wed, 21 Feb 2007 17:48:47 +0900 + +dump (0.4b41-4) unstable; urgency=low + + * small addition to the man page to help clarify how level numbers should + be expressed on the dump command line, closes: #378349 + * eliminate handling of obsolete /etc/dumpdates with associated use of + debconf notes, since that change was over 8 years, and no harm will is + done in any case, closes: #388888 + * add autotools-dev support to keep config.sub/config.guess fresh + + -- Bdale Garbee Fri, 8 Dec 2006 18:28:06 -0600 + +dump (0.4b41-3) unstable; urgency=low + + * accept updated Russian translation, closes: #360929 + + -- Bdale Garbee Sat, 15 Apr 2006 01:09:49 -0600 + +dump (0.4b41-2) unstable; urgency=low + + * fix postrm to only remove dumpdates file on purge, closes: #346142 + + -- Bdale Garbee Thu, 5 Jan 2006 20:13:45 -0700 + +dump (0.4b41-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee Mon, 2 Jan 2006 16:18:56 -0700 + +dump (0.4b40-1) unstable; urgency=low + + * new upstream version, closes: #289210, #291644, #307423 + * add debconf-2.0 as an alternate dependency + * updated Swedish translation from Daniel Nylander, closes: #330316 + * remove /var/lib/dumpdates on purge, since we created it on install, + closes: #330363 + * update dependencies in light of libreadline5-dev, closes: #326374 + * rebuild ensures fresh version of zlib in case we've been vulnerable + to CAN-2005-2096, closes: #317966 + * merge Vietnamese translation, closes: #311599 + * merge Czech translation, closes: #315825 + * update debhelper compatibility level, plus a few tweaks to pacify lintian + + -- Bdale Garbee Wed, 28 Sep 2005 00:50:29 -0600 + +dump (0.4b37-2) unstable; urgency=low + + * merge updated de.po, closes: #281076 + + -- Bdale Garbee Sun, 29 May 2005 16:48:06 +0200 + +dump (0.4b37-1) unstable; urgency=low + + * new upstream version + * add --enable-staticz to configure call in rules file, replacing prior hack + * add build deps on libblkid-dev and uuid-dev to avoid using local copy + * updated es.po, closes: #265499 + + -- Bdale Garbee Tue, 7 Sep 2004 10:21:35 -0600 + +dump (0.4b36-2) unstable; urgency=low + + * patch to allow compilation on amd64, closes: #251615 + + -- Bdale Garbee Sun, 30 May 2004 00:04:41 -0300 + +dump (0.4b36-1) unstable; urgency=low + + * new upstream version, clean up diff.gz to remove spurious changes upstream + points out are no longer needed. + + -- Bdale Garbee Sun, 23 May 2004 21:41:50 -0600 + +dump (0.4b35-2) unstable; urgency=low + + * reinstate configure hack to link z and bz2 libs statically but leave + the rest dynamic... originally reported in #117496 and closed by 0.4b25-1. + Apparently the hack got lost during an upstream merge, closes: #249700 + * merge updated ja.po, closes: #234255 + * merge da.po, closes: #233753 + + -- Bdale Garbee Sat, 22 May 2004 23:02:46 -0600 + +dump (0.4b35-1) unstable; urgency=low + + * new upstream version, closes: #225573 + * updated fr.po, closes: #207773 + * updated pt_BR.po, closes: #207965 + * updated nl.po, closes: #216050 + * incorporate ja.po, closes: #229291 + * implement alternatives for rmt, so our version can supercede tar's when + dump is installed, closes: #183901 + + -- Bdale Garbee Sun, 15 Feb 2004 16:46:18 -0700 + +dump (0.4b34-1) unstable; urgency=low + + * new upstream version, closes: #192019, #180476, #160304, #147086, #160305 + * switch to gettext-based debconf templates, closes: #200125 + * update templates text to make symlink issue less vague, closes: #154242 + + -- Bdale Garbee Tue, 19 Aug 2003 16:19:28 -0600 + +dump (0.4b32-1) unstable; urgency=low + + * new upstream version, closes: #169269 + + -- Bdale Garbee Fri, 22 Nov 2002 21:01:43 -0700 + +dump (0.4b31-1) unstable; urgency=low + + * new upstream version, closes: #154875, #154372, #149415, #142559 + + -- Bdale Garbee Sat, 17 Aug 2002 22:20:14 -0600 + +dump (0.4b27-4) unstable; urgency=low + + * add --enable-qfa to build, closes: #138976 + * switch to unmerged translations in the source package + + -- Bdale Garbee Wed, 20 Mar 2002 01:23:11 -0700 + +dump (0.4b27-3) unstable; urgency=low + + * merge russian and french templates translations, closes: #137639, #138067 + + -- Bdale Garbee Tue, 12 Mar 2002 21:15:07 -0700 + +dump (0.4b27-2) unstable; urgency=medium + + * lose the inclusions of since they aren't needed and are + resulting in conflicting declarations on arm, closes: #137354 + + -- Bdale Garbee Sat, 9 Mar 2002 22:43:05 -0700 + +dump (0.4b27-1) unstable; urgency=low + + * new upstream version, closes: #128139 + + -- Bdale Garbee Fri, 15 Feb 2002 16:08:50 -0700 + +dump (0.4b25-1) unstable; urgency=medium + + * new upstream release, closes: #120029 + * fix from upstream for (-C -f -) error reported in 118199, does not fix + the other problem reported in that bug, so leaving the bug open for now + * hack configure to link z and bz2 libs statically, leave the rest dynamic + for now, closes: #117496 + * update build dependencies to ensure compression support, closes: #115769 + * lose the debconf note about dump frequencies in fstab, it's annoying and + not of much real value, closes: #118525, #87174, #88505 + * fix formatting problem in dump/dump.8.in, closes: #118155 + * set priority to medium as we really want this in woody + + -- Bdale Garbee Fri, 23 Nov 2001 16:31:15 -0700 + +dump (0.4b24-1) unstable; urgency=low + + * new upstream version, closes: #112074 + * fold in -pt_BR translations to templates file, closes: #108522 + * cosmetic cleanups to make lintian happy + + -- Bdale Garbee Tue, 25 Sep 2001 22:15:16 -0600 + +dump (0.4b23-3) unstable; urgency=low + + * mege patch for Polish text in templates file, closes: #108135 + * merge uncorrupted version of patch for German text, closes: #86214 + + -- Bdale Garbee Thu, 9 Aug 2001 11:47:32 -0600 + +dump (0.4b23-2) unstable; urgency=low + + * add build dependency on autoconf, since it can be called in some build + circumstances, closes: #106113 + + -- Bdale Garbee Sun, 22 Jul 2001 16:11:39 -0600 + +dump (0.4b23-1) unstable; urgency=low + + * new upstream version, closes: #100564 + * merge patch for German text in templates file, closes: #86214 + * merge patch for Spanish text in templates file, closes: #102812 + * eliminate use of isdefault in debconf config script + + -- Bdale Garbee Fri, 20 Jul 2001 10:07:18 -0600 + +dump (0.4b22-1) unstable; urgency=low + + * new upstream version, closes: #97270 + * try adding --enable-largefile again, closes: #85912 + * new version includes socket descriptor leak fix, closes: #93596 + * e2fs breakage seems fixed, closes: #98145 + * update rules file for BINDIR -> SBINDIR change in Makefile + + -- Bdale Garbee Wed, 30 May 2001 01:53:50 -0600 + +dump (0.4b21-4) unstable; urgency=low + + * patches for gcc-3.0 compliance, hppa/ia64 support + + -- Bdale Garbee Sun, 22 Apr 2001 01:30:03 -0600 + +dump (0.4b21-3) unstable; urgency=medium + + * turn large file support back off, since it's causing segfaults, + reopens 85912, closes: #87567 + + -- Bdale Garbee Tue, 27 Feb 2001 12:07:05 -0700 + +dump (0.4b21-2) unstable; urgency=low + + * apply patch for build problems on alpha and with glibc 2.2.2 from Paul + Slootman, closes: #86665 + * enable large file support, closes: #85912 + + -- Bdale Garbee Wed, 21 Feb 2001 20:57:05 -0700 + +dump (0.4b21-1) unstable; urgency=low + + * new upstream version, closes: #82536 + * merge patch for Swedish text in templates file, closes: #83744 + * merge patch for Dutch text in templates file, closes: #85552 + * update config.sub/config.guess to versions that grok ia64 & hppa + + -- Bdale Garbee Mon, 12 Feb 2001 22:20:09 -0700 + +dump (0.4b20-1) unstable; urgency=low + + * new upstream version + * add debconf support (thanks shaleh!) + * add build dependency on readline so restore can take advantage of it + + -- Bdale Garbee Fri, 24 Nov 2000 22:39:33 -0700 + +dump (0.4b19-1) unstable; urgency=low + + * new upstream version, closes: #69622 + + -- Bdale Garbee Tue, 29 Aug 2000 02:04:09 -0600 + +dump (0.4b18-1) unstable; urgency=low + + * new upstream version, closes: #65090, #66563 + * minor updates to copyright and README.Debian files + + -- Bdale Garbee Wed, 19 Jul 2000 09:49:39 -0600 + +dump (0.4b16-1) frozen unstable; urgency=low + + * target frozen since the segfault is release critical, and this version + has enough good bug fixes to seem like a better choice for potato. + * new upstream with many bug fixes, closes: #56005, #57781, #59624, #60194 + * segfault apparently fixed, closes: #59935 + * make postinst less chatty, only pause if necessary, closes: #54672 + * fix /usr/doc symlink, closes: #54673 + * use of dotted quads for remote dumps fixed upstream, closes: #55110 + * remove no-longer-relevant warning about large filesystems from the long + description in the control file, closes: #59060 + * README.Debian adequately documents the setuid issue, closes: #59808 + * include the upstream changelog and other useful documents + + -- Bdale Garbee Sun, 12 Mar 2000 20:24:54 -0700 + +dump (0.4b12-1) unstable; urgency=low + + * new upstream version, closes: #53302 + * WARNING to Alpha users: This version fixes a bug that made Alpha dumps + incompatible with dumps on other platforms. An unfortunate side-effect + is that it is *not* compatible with dumps made on Alpha with previous + versions of the package. + * the dump executable must be made setuid root so that it can gain a + priveledged port when backing up to a remote tape device using a non-root + user. Since I do *not* intend to ship dump setuid root, document this in + README.Debian for those who need to know. Closes: #54118 + + -- Bdale Garbee Sat, 8 Jan 2000 10:35:30 -0700 + +dump (0.4b11-1) unstable; urgency=low + + * new upstream version, closes: #52448 + * minor postinst hack to aid non-interactive install, closes: #52430 + * upstream believes the "problems dumping large filesystems" that result + in segfaults are really mis-diagnosed cases of the filetype problem that + was fixed in 0.4b10, closes: #49981 + + -- Bdale Garbee Sun, 12 Dec 1999 18:34:53 -0700 + +dump (0.4b10-2) unstable; urgency=low + + * add another build dependency + * add a pause in the postinst after displaying warnings, closes: #51971 + * upstream says time estimates have been fixed, closes: #15817 + + -- Bdale Garbee Sun, 5 Dec 1999 20:33:18 -0700 + +dump (0.4b10-1) unstable; urgency=low + + * new upstream source + * update to current policy + + -- Bdale Garbee Wed, 1 Dec 1999 23:44:57 -0700 + +dump (0.4b9-2) unstable; urgency=medium + + * fix dumpdates path, got broken when upstream maintainer merged some of + my patches, closes: #49192 + + -- Bdale Garbee Fri, 5 Nov 1999 23:41:22 -0700 + +dump (0.4b9-1) unstable; urgency=high + + * new upstream version, includes security fix for symlink restoration + + -- Bdale Garbee Fri, 5 Nov 1999 19:22:06 -0700 + +dump (0.4b8-1) unstable; urgency=low + + * new upstream version, closes: #38365, #47684, #47963, #26982, #38390 + + -- Bdale Garbee Wed, 3 Nov 1999 17:42:09 -0700 + +dump (0.4b7-1) unstable; urgency=low + + * new upstream version, closes: #29775, #11904, #38136, #33818 + + -- Bdale Garbee Sat, 30 Oct 1999 20:24:09 -0600 + +dump (0.4b6-1) unstable; urgency=low + + * new upstream maintainer, new upstream version, closes: #44061 + * tweak rules file to achieve FHS compliance, lintian cleanliness + * apply patch from Eirik Fuller to allow dumping + filesystems not listed in /etc/fstab, closes: #11904 + * apply patch from Abhijit Dasgupta that prevents access + to device nodes during restore, closes: #29775 + * apply patch from Eirik Fuller relating to dumpdates. + In 0.4b4-13, I patched dump to only read dumpdates if the 'u' flag was + specified. The goal was to avoid failing if dumpdates wasn't yet present + during a level 0 dump. The problem is that incrementals *must* read the + dumpdates file regardless of the state of the 'u' flag, or they end up all + looking like full dumps. This new patch ignores the 'u' flag. Instead, + it always skips reading dumpdates for a level 0 dump, and requires a valid + dumpdates be read for an incremental. Closes: #38136, #33818 + * hard-code the --enable-dumpdates-patch stuff since the upstream configure + gets it wrong, and we want the functionality. + + -- Bdale Garbee Sat, 2 Oct 1999 22:30:05 -0600 + +dump (0.4b4-13) frozen unstable; urgency=medium + + * tweak dump/itime.c to not try to read dumpdates if the 'u' option isn't + specified. Closes 30208. + + -- Bdale Garbee Sat, 5 Dec 1998 21:01:45 -0700 + +dump (0.4b4-12) frozen unstable; urgency=medium + + * apply patch from jk@ciss.de that fixes long-standing bug when trying to + specify single files to restore. Closes 22955, 23144, 28051. + * update documentation to reflect the fact that this version of dump can't + handle filesystems larger than 4G. I'm pretty sure the fix will involve + a change in dump format. + + -- Bdale Garbee Sun, 1 Nov 1998 22:32:29 -0700 + +dump (0.4b4-11) unstable; urgency=medium + + * update dump.8 to be explicit about the fact that this version of dump only + works with ext2 filesystems, closes 24976. + * update dump.8 to be document the text output on read errors, in the BUGS + section which already meantions that less than 32 read errors will be + ignored during a dump, closes 22669. + + -- Bdale Garbee Sat, 1 Aug 1998 23:08:38 -0600 + +dump (0.4b4-10) frozen unstable; urgency=medium + + * rebuild again to cope with the messy change of names in the e2fs library + that I thought I'd fixed with the -8 version. + + -- Bdale Garbee Sat, 25 Apr 1998 22:10:26 -0600 + +dump (0.4b4-9) frozen unstable; urgency=medium + + * remove ambiguity in the message displayed by postinst when there are + no users in group disk, closes 20618 + + -- Bdale Garbee Sat, 18 Apr 1998 01:43:43 -0600 + +dump (0.4b4-8) frozen unstable; urgency=medium + + * rebuild to link against latest e2fs libraries + + -- Bdale Garbee Fri, 10 Apr 1998 03:06:10 -0600 + +dump (0.4b4-7) frozen unstable; urgency=low + + * oops... when I moved to debhelper, I forgot to exclude the rmt.8 manpage, + so -6 reinstated the overlap with cpio. This fixes 20595, 20607. + + -- Bdale Garbee Fri, 3 Apr 1998 23:16:47 -0700 + +dump (0.4b4-6) frozen unstable; urgency=low + + * reconfigure package to use debhelper, closes 19293 + * improve behaviour of postinst if /etc/dumpdates is a symlink, closes 19990 + + -- Bdale Garbee Sat, 21 Mar 1998 23:59:33 -0700 + +dump (0.4b4-5) unstable; urgency=low + + * change configure invocation to actually capture CFLAGS correctly + * clean up some of the warnings exposed by actually using -Wall now + + -- Bdale Garbee Sat, 31 Jan 1998 17:13:08 -0700 + +dump (0.4b4-4) unstable; urgency=low + + * cosmetic tweaks to postinst + * patch from Mark Eichin that helps the problems with large filesystems, + closes 15773 and 13045. + + -- Bdale Garbee Wed, 10 Dec 1997 12:29:12 -0700 + +dump (0.4b4-3) unstable; urgency=low + + * Update man page to reflect location of dumpdates file. Closes 15580. + * Add missing 'break' in T clause of main.c arg parsing. Closes 15576. + * Tweak postinst to be more forceful about dumpdates group. Closes 15661. + + -- Bdale Garbee Sun, 7 Dec 1997 11:37:20 -0700 + +dump (0.4b4-2) unstable; urgency=medium + + * Rebuilt to depend on new, officially released, packages of e2fs libs. + This should close all the recent bug reports against dump that resulted + from my accidental release of 0.4b4-1 that depended on unreleased + libraries. + + -- Bdale Garbee Sun, 23 Nov 1997 19:48:12 -0700 + +dump (0.4b4-1) unstable; urgency=low + + * New upstream version (officially still in beta test). + * New maintainer, package reconstructed. + + -- Bdale Garbee Fri, 24 Oct 1997 23:56:53 -0600 + diff --cc restore/restore.h index 3d2a5de,51a3082..459814d --- a/restore/restore.h +++ b/restore/restore.h @@@ -5,7 -5,7 +5,11 @@@ * Stelian Pop , 1999-2000 * Stelian Pop - AlcĂ´ve , 2000-2002 * ++<<<<<<< HEAD:restore/restore.h + * $Id: restore.h,v 1.33 2005/07/07 09:16:08 stelian Exp $ ++======= + * $Id: restore.h,v 1.34 2007/02/22 20:12:50 stelian Exp $ ++>>>>>>> upstream/0.4b42:restore/restore.h */ /*