diff -Nru storebackup-3.1/bin/storeBackupCheckBackup.pl storebackup-3.2/bin/storeBackupCheckBackup.pl --- storebackup-3.1/bin/storeBackupCheckBackup.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/bin/storeBackupCheckBackup.pl 2009-07-18 19:09:30.000000000 +0100 @@ -606,6 +606,7 @@ open(OUT, "> $tmpName") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$tmpName>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); # print "-------------$f----------, $md5sum\n"; @@ -627,7 +628,8 @@ unless (sysopen(FILE, $f, O_RDONLY)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot open <$f>"]); + '-str' => ["cannot open <$f>"], + '-add' => [__FILE__, __LINE__]); return 1; } } @@ -674,7 +676,8 @@ unless (opendir(DIR, $f)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot open <$f>"]); + '-str' => ["cannot open <$f>"], + '-add' => [__FILE__, __LINE__]); return 1; } my ($entry, @entries, %inode2md5); diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/bin/storeBackup.pl /tmp/Yyl0in0QJ8/storebackup-3.2/bin/storeBackup.pl --- storebackup-3.1/bin/storeBackup.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/bin/storeBackup.pl 2009-07-18 19:09:30.000000000 +0100 @@ -30,7 +30,7 @@ #use warnings; -my $VERSION = '$Id: storeBackup.pl 360 2009-05-22 21:04:50Z hjc $ '; +my $VERSION = '$Id: storeBackup.pl 361 2009-07-18 13:37:37Z hjc $ '; our @VERSION; push @VERSION, $VERSION; my ($VERSIONpName, $VERSIONsvnID) = $VERSION =~ /Id:\s+(\S+)\s+(\d+)/; @@ -194,7 +194,7 @@ [--exceptRule rule] [--includeRule rule] [--exceptTypes types] [--cpIsGnu] [--linkSymlinks] [--precommand job] [--postcommand job] - [--followLinks depth] + [--followLinks depth] [--highLatency] [--ignorePerms] [--lateLinks [--lateCompress]] [--checkBlocksSuffix suffix] [--checkBlocksMinSize size] [--checkBlocksBS] @@ -380,6 +380,11 @@ follow symbolic links like directories up to depth default = 0 -> do not follow links +=item B<--highLatency> + + use this for a very high latency line (eg. vpn over + the internet) for better parallelization + =item B<--ignorePerms> If this option choosen, files will not necessarily have @@ -781,12 +786,14 @@ suppress (unwanted) warnings in the log files; to suppress warnings, the following keys can be used: - excDir (suppresses the warning that excluded directories - do not exist) + excDir (suppresses the warning that excluded directories + do not exist) fileChange (suppresses the warning that a file has changed during the backup) crSeries (suppresses the warning that storeBackup had to create the 'default' series) + hashCollision (suppresses the warning if a possible + hash collision is detected) This option can be repeated multiple times on the command line. =item B<--linkToRecent> @@ -970,8 +977,8 @@ # will result in one filename, not in three. # If an option should have *no value*, write: # logFiles = -# If you want the default value, uncomment it: -# #logFile = +# If you want the default value, comment it: +;logFile = # You can also use environment variables, like \$XXX or \${XXX} like in # a shell. Single quotes will mask environment variables, while double # quotes will not. @@ -1096,6 +1103,13 @@ # follow links ;followLinks= +# use this only if you write your backup over a high latency line +# like a vpn over the internet +# storebackup will use more parallelization at the cost of more +# cpu power +# possible values are 'yes' and 'no'; default is 'no' +;highLatency= + # If this option is disabled, then the files in the backup will not # neccessarily have the same permissions and owner as the originals. # This speeds up backups on network drives a lot. Correct permissions @@ -1111,9 +1125,11 @@ # the backup) # crSeries (suppresses the warning that storeBackup had to create the # 'default' series) +# hashCollision (suppresses the warning if a possible +# hash collision is detected) # This option can be repeated multiple times on the command line. # Example usage in conf file: -# suppressWarning = excDir fileChange crSeries +# suppressWarning = excDir fileChange crSeries hashCollision # By default no warnings are suppressed. ;suppressWarning= @@ -1566,6 +1582,10 @@ '-cf_key' => 'followLinks', '-default' => 0, '-pattern' => '\A\d+\Z'), + Option->new('-name' => 'highLatency', + '-cl_option' => '--highLatency', + '-cf_key' => 'highLatency', + '-cf_noOptSet' => ['yes', 'no']), Option->new('-name' => 'ignorePerms', '-cl_option' => '--ignorePerms', '-cf_key' => 'ignorePerms', @@ -1774,7 +1794,7 @@ '-cf_key' => 'suppressWarning', '-multiple' => 'yes', '-pattern' => - '\AexcDir\Z|\AfileChange\Z|\AcrSeries\Z'), + '\AexcDir\Z|\AfileChange\Z|\AcrSeries\Z|\AhashCollision\Z'), Option->new('-name' => 'linkToRecent', '-cl_option' => '--linkToRecent', '-cf_key' => 'linkToRecent', @@ -1832,7 +1852,6 @@ '-cl_option' => '--logInBackupDirFileName', '-cf_key' => 'logInBackupDirFileName', - '-only_if' => '[logInBackupDirFileName]', '-default' => $logInBackupDirFileName, '-only_if' => '[logInBackupDir]'), @@ -1904,6 +1923,8 @@ my $precommand = $CheckPar->getOptWithPar('precommand'); my $postcommand = $CheckPar->getOptWithPar('postcommand'); my $followLinks = $CheckPar->getOptWithPar('followLinks'); +my $highLatency = $CheckPar->getOptWithoutPar('highLatency'); +$main::minCopyWithFork = 0 if $highLatency; my $ignorePerms = $CheckPar->getOptWithoutPar('ignorePerms'); my $preservePerms = not $ignorePerms; my $lateLinks = $CheckPar->getOptWithoutPar('lateLinks'); @@ -2836,7 +2857,6 @@ { $logInBackupDirFileName = $adminDirs->getAktDir() . "/$logInBackupDirFileName", - $prLog2 = printLog->new('-kind' => $prLogKind, '-file' => $logInBackupDirFileName, '-withTime' => 'yes', @@ -3321,7 +3341,8 @@ unless (sysopen(FILE, $sourceDir, O_RDONLY)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot open <$sourceDir>"]); + '-str' => ["cannot open <$sourceDir>"], + '-add' => [__FILE__, __LINE__]); ++$noErrors; return 0; } @@ -3338,9 +3359,10 @@ '-prLog' => $prLog); my $tinySched = tinyWaitScheduler->new('-prLog' => $prLog); - my $direct = 0; + my $direct = 0; # == 1 -> do not fork for compression $direct = 1 if $compressBlock eq 'u'; - $direct = 1 if $main::IOCompressDirect and $blockSize < 1024**2 + $direct = 1 if $main::IOCompressDirect + and $blockSize < $main::minCopyWithFork and $compressBlock eq 'c'; #print "direct = <$direct>\n"; @@ -4692,7 +4714,6 @@ $actCtime, $actMtime, $uid, $gid, $t) == 1) { -# print EXCL_LOG "$relFileName\n" if $writeExcludeLog; $exclLog->print("$relFileName\n") if $writeExcludeLog; $main::stat->incr_noExcludeRule(); next; @@ -4704,7 +4725,6 @@ $actCtime, $actMtime, $uid, $gid, $t) == 1) { -# print EXCL_LOG "$relFileName\n" if $writeExcludeLog; $exclLog->print("$relFileName\n") if $writeExcludeLog; $main::stat->incr_noIncludeRule(); } @@ -4731,7 +4751,6 @@ my ($oldCompr, $oldCtime, $oldMtime, $oldSize, $md5sum); my $n = ($oldCompr, $oldCtime, $oldMtime, $oldSize, $md5sum) = $oldFilename->getInodebackupComprCtimeMtimeSizeMD5($relFileName); - # check checkBlocksRule if ($t eq 'f' and $checkBlocksRule->hasLine()) # this line results { # in a warning due to a bug in perl @@ -5713,7 +5732,6 @@ { #print "-0.1- blockFile: <$targetDir><$file> <$md5>\n"; $main::stat->incr_noBlockedFiles(); -# if ($md5 =~ /\Acalc-(\d+)-(\w)\Z/) # blocksize + c/u (compress) if (ref($md5) eq 'ARRAY') { my ($ruleBS, $ruleCompress, $parallel, @ruleRead) @@ -5736,9 +5754,13 @@ '-exit' => 1); $main::stat->incr_noDirs($uid, $gid); + my ($x, $backupDir); + ($x, $x, $x, $backupDir, $x) = + $oldFilename->getFilename($md5); + if ($lateLinks) { - my $from = "$prevBackupOwnSeries/$file"; + my $from = "$backupDir/$file"; my $to = "$targetDir/$file"; $prLog->print('-kind' => 'E', '-str' => @@ -5757,9 +5779,8 @@ } else { -#print "-0.2 hard link $prevBackupOwnSeries/$file $targetDir/$file\n"; - - &::hardLinkDir("$prevBackupOwnSeries/$file", +#print "-0.2 hard link $backupDir/$file $targetDir/$file\n"; + &::hardLinkDir("$backupDir/$file", "$targetDir/$file", '.*', $prLog); my $blockMD5File = "$targetDir/$file/$blockCheckSumFile.bz2"; my $block = pipeFromFork->new('-exec' => 'bzip2', @@ -5844,7 +5865,37 @@ $oldFile = "$backupDir/$linkFile"; $internalOld = ($backupDirIndex == 0) ? 'internal' : 'old'; -#print "-1-\n"; +#print "-1- $newFile $oldFile\n"; + my ($x, $oldSize); + if ($backupDirIndex == 0) # first occurrence + { # in sourceDir + if (-e "$sourceDir/$linkFile") + { + $oldSize = (stat("$sourceDir/$linkFile"))[7]; + } + else + { + $oldSize = -1; + } + } + else + { + ($x, $x, $x, $oldSize, $x) = + $oldFilename->getInodebackupComprCtimeMtimeSizeMD5($linkFile); + } + if ($oldSize != $size and $oldSize > -1) + { + my $comment = $comprOld eq 'u'? '' : + ' (with uncompressed files from backup)'; + $prLog->print('-kind' => 'W', + '-str' => + ["possible hash collision between", + "<$oldFile> (size = $oldSize) and", + "<$newFile> (size = $size)", + "not linked, check md5 sums$comment"]) + unless exists $suppressWarning{'hashCollision'}; + $linkFile = undef; # do not link + } } else # Datei ist noch nicht bekannt { @@ -6095,6 +6146,8 @@ "of <$targetDir/$file>"]); my $lastMD5 = ; chomp $lastMD5; + my $lastSize = ; + chomp $lastSize; close(TMPMD5); unlink $tmpMD5File; @@ -6107,13 +6160,14 @@ unless exists $$suppressWarning{'fileChange'}; next; } - if ($lastMD5 ne $md5) + if ($lastMD5 ne $md5 or $lastSize != $size) { $prLog->print('-kind' => 'W', '-str' => ["file <$dir/$file> changed during backup"]) unless exists $$suppressWarning{'fileChange'}; $md5 = $lastMD5; + $size = $lastSize; } $prLog->print('-kind' => 'D', @@ -6421,6 +6475,8 @@ "of <$targetDir/$file>"]); my $lastMD5 = ; chomp $lastMD5; + my $lastSize = ; + chomp $lastSize; close(TMPMD5); unlink $tmpMD5File; @@ -6434,13 +6490,14 @@ next; } - if ($lastMD5 ne $md5) + if ($lastMD5 ne $md5 or $lastSize != $size) { $prLog->print('-kind' => 'W', '-str' => ["file <$dir/$file> changed during backup"]) unless exists $$suppressWarning{'fileChange'}; $md5 = $lastMD5; + $size = $lastSize; } $prLog->print('-kind' => 'D', @@ -6514,6 +6571,7 @@ open(BLOCK, "< $tmpName") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$tmpName>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my ($statSourceSize, $statStbuSize, $statNoForksCP, $statNoForksCompress, $statNoBlocks, $statNoLateLinks, $allMD5, $blockMD5, @@ -6716,6 +6774,7 @@ open(TO, ">", $to) or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$to>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); # $prLog->print('-kind' => 'E', # '-str' => @@ -7138,8 +7197,9 @@ sub addSumNewCopy # byte { my $self = shift; + my $a = shift; - $self->{'sumNewCopy'} += shift; + $self->{'sumNewCopy'} += $a ? $a : 0; ++$self->{'noCopiedFiles'}; } @@ -7148,9 +7208,11 @@ sub addSumNewCompr # byte { my $self = shift; + my $a1 = shift; + my $a2 = shift; - $self->{'sumNewCompr'} += shift; - $self->{'sumNewComprOrigSize'} += shift; + $self->{'sumNewCompr'} += $a1 ? $a1 : 0; + $self->{'sumNewComprOrigSize'} += $a2 ? $a2 : 0; ++$self->{'noCompressedFiles'}; } @@ -7501,6 +7563,7 @@ open(FILE, "> $tmpfile") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$tmpfile>, exiting"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); chmod 0600, $tmpfile; $self->{'FILE'} = *FILE; diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/bin/storeBackupSearch.pl /tmp/Yyl0in0QJ8/storebackup-3.2/bin/storeBackupSearch.pl --- storebackup-3.1/bin/storeBackupSearch.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/bin/storeBackupSearch.pl 2009-07-18 19:09:30.000000000 +0100 @@ -110,7 +110,7 @@ storeBackupSearch.pl -g configFile - storeBackupSearch.pl [-f configFile] [-b backupDirDir] + storeBackupSearch.pl -b backupDirDir [-f configFile] [-s rule] [--absPath] [-w file] [--parJobs number] [-d level] [--once] [--print] [backupRoot . . .] diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/debian/changelog /tmp/Yyl0in0QJ8/storebackup-3.2/debian/changelog --- storebackup-3.1/debian/changelog 2009-07-24 17:25:02.000000000 +0100 +++ storebackup-3.2/debian/changelog 2009-07-24 17:25:03.000000000 +0100 @@ -1,3 +1,11 @@ +storebackup (3.2-1) unstable; urgency=low + + * New Upstream Version + - bug fix release (Closes: #532188, #532176, #532183) + * Debian Policy 3.8.2 + + -- Ryan Niebur Sun, 19 Jul 2009 15:45:45 -0700 + storebackup (3.1-2) unstable; urgency=high * set urgency to high to make the migration to testing happen diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/debian/control /tmp/Yyl0in0QJ8/storebackup-3.2/debian/control --- storebackup-3.1/debian/control 2009-07-24 17:25:02.000000000 +0100 +++ storebackup-3.2/debian/control 2009-07-24 17:25:03.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ryan Niebur DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.2), perl -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://www.nongnu.org/storebackup/ Vcs-Browser: http://git.ryan52.info/?p=storebackup;a=summary Vcs-Git: git://git.ryan52.info/git/storebackup diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/doc/ChangeLog /tmp/Yyl0in0QJ8/storebackup-3.2/doc/ChangeLog --- storebackup-3.1/doc/ChangeLog 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/doc/ChangeLog 2009-07-18 19:09:29.000000000 +0100 @@ -1,9 +1,9 @@ -Copyright (c) 2002-2008 by Heinz-Josef Claes (see README) +Copyright (c) 2002-2009 by Heinz-Josef Claes (see README) Published under the GNU General Public License v3 or any later version ---------------------------- -version 1.0 +version 1.0 2002.05.07 first official release ---------------------------- @@ -776,7 +776,7 @@ comprRule ---------------------------- -version 3.1 2009.05.* +version 3.1 2009.05.24 storeBackup.pl - storeBackup did not backup sockets, now it does - for new files, the md5 sum is now calculated before *and* @@ -820,3 +820,20 @@ - man pages for all programs (Thanks to Ryan Niebur) all programs - solved issues with single quotes in path and filenames + +---------------------------- +version 3.2 2009.07.18 + storeBackup.pl + - new option --highLatency, useful on high latency lines + - corrected some typos in print statements to log files + - now also checks for size of files if files with two equal + md5 sums are detected + - fixed a bug when using *block* options. storeBackup.pl stopped + with an error message when blocked file was existing with same + path, filename, contents and times in another series but did + not exist in the own series of that backup. + - plus some very minor enhancements + all programs: + - if an option in a configuration file is set to nothing, the + default value (if exists) is used + diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/doc/README /tmp/Yyl0in0QJ8/storebackup-3.2/doc/README --- storebackup-3.1/doc/README 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/doc/README 2009-07-18 19:09:29.000000000 +0100 @@ -1145,7 +1145,7 @@ EXAMPLE 4: searchRule = ( '$mtime > &::DATE("14d")' and '$mtime < &::DATE("3d12h")' ) - and not '$file =~ m#\.bak$' + and not '$file =~ m#\.bak$#' Finds all files younger than 14 days and older than 3 days, 12 hours, but only if they do not end with '.bak'. See how 'and', 'not', '(' and ')' have at least one white space diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/checkParam2.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/checkParam2.pl --- storebackup-3.1/lib/checkParam2.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/checkParam2.pl 2009-07-18 19:09:30.000000000 +0100 @@ -407,9 +407,16 @@ foreach $actKey (keys %keys) { $l = $keys{$actKey}{'line'}; - $keys{$actKey}{'parts'} = - splitQuotedLine($l, "in configuration file at line " . - $keys{$actKey}{'lineno'}); + my $v = splitQuotedLine($l, "in configuration file at line " . + $keys{$actKey}{'lineno'}); + if (@$v) + { + $keys{$actKey}{'parts'} = $v; + } + else + { + delete $keys{$actKey}; # value is not set in config file + } } return $self; @@ -1129,10 +1136,11 @@ foreach $k (sort keys %$optWithPar) { my $hidden = $self->{'namePointer'}{$k}->get('-hidden'); - my $show = $params{'-showHidden'} || $hidden eq 'no'; + my $show = $params{'-showHidden'} eq 'yes' || $hidden eq 'no'; + next unless $show; if (not defined $optWithPar->{$k}{'value'}) { - print "\t\t$k\t\n" if $show; + print "\t\t$k\t\n"; } elsif (ref($optWithPar->{$k}{'value'}) eq 'ARRAY') { @@ -1140,26 +1148,26 @@ my $p; foreach $p (@{$optWithPar->{$k}{'value'}}) { - print "\t\t\t<$p>\n" if $show; + print "\t\t\t<$p>\n"; } } else { - print "\t\t$k\t<", $optWithPar->{$k}{'value'}, ">\n" if $show; + print "\t\t$k\t<", $optWithPar->{$k}{'value'}, ">\n"; } } print "\toptions without parameters:\n"; foreach $k (sort keys %$optWithoutPar) { my $hidden = $self->{'namePointer'}{$k}->get('-hidden'); - my $show = $params{'-showHidden'} || $hidden eq 'no'; + my $show = $params{'-showHidden'} eq 'yes' || $hidden eq 'no'; print "\t\t$k\n" if $show; } my $lp = ''; $lp = ' (' . $self->{'listMapping'} . ')' if defined $self->{'listMapping'}; print "\tlist parameters$lp:\n"; - foreach $k (sort @$parList) + foreach $k (@$parList) { print "\t\t<$k>\n"; } @@ -1176,7 +1184,12 @@ die "option <$par> does not have a parameter, use getOptWithoutPar" unless $self->{'namePointer'}{$par}->get('-param') eq 'yes'; - return $self->{'Erg'}{'withPar'}{$par}{'value'}; + my $r = $self->{'Erg'}{'withPar'}{$par}{'value'}; + if (ref($r) eq 'ARRAY') + { + $r = undef if @$r == 0; + } + return $r; } ######################################## diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/evalTools.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/evalTools.pl --- storebackup-3.1/lib/evalTools.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/evalTools.pl 2009-07-18 19:09:30.000000000 +0100 @@ -19,7 +19,7 @@ # -push @VERSION, '$Id: evalTools.pl 346 2008-08-30 07:51:16Z hjc $ '; +push @VERSION, '$Id: evalTools.pl 361 2009-07-18 13:37:37Z hjc $ '; use strict; @@ -151,6 +151,7 @@ open(FILE, "> $tmpfile") or $prLog->print('-kind' => 'E', '-str' => [$self->{'prefix'} ."cannot open <$tmpfile>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my $funcName = "::EVAL$id"; print FILE "sub $funcName\n\{\n", @@ -284,7 +285,7 @@ [$self->{'prefix'} . "syntax error checking <" . $self->{'line'} . '>', $@, - "(Hint: allways mask '(', ')', '/' " . + "(Hint: always mask '(', ')', '/' " . "and reserved words)"]) if $params{'-printError'}; exit $params{'-exitOnError'} if $params{'-exitOnError'}; diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/fileDir.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/fileDir.pl --- storebackup-3.1/lib/fileDir.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/fileDir.pl 2009-07-18 19:09:30.000000000 +0100 @@ -20,7 +20,7 @@ -push @VERSION, '$Id: fileDir.pl 357 2009-05-02 15:05:33Z hjc $ '; +push @VERSION, '$Id: fileDir.pl 361 2009-07-18 13:37:37Z hjc $ '; use Fcntl qw(O_RDWR O_CREAT); use POSIX; @@ -265,7 +265,7 @@ my $prLog = shift; $path =~ m#\A(.*)/.*\Z#s; - &makeDirPath($1); + &makeDirPath($1, $prLog); } @@ -283,11 +283,12 @@ &makeDirPath($p1, $prLog); - $prLog->print('-kind' => 'E', - '-str' => ["cannot create directory <$path>"], - '-exit' => 1) - unless mkdir $path, 0700; - + unless (mkdir $path, 0700) + { + return if -e $path; + $prLog->print('-kind' => 'E', + '-str' => ["cannot create directory <$path>"]); + } return; } diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/prLog.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/prLog.pl --- storebackup-3.1/lib/prLog.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/prLog.pl 2009-07-18 19:09:30.000000000 +0100 @@ -19,7 +19,7 @@ # -push @VERSION, '$Id: prLog.pl 356 2009-04-27 08:51:49Z hjc $ '; +push @VERSION, '$Id: prLog.pl 361 2009-07-18 13:37:37Z hjc $ '; use IO::Handle; @@ -194,11 +194,13 @@ # Defaultwerte f"ur Parameter setzen my (%params) = ('-kind' => undef, - '-str' => [], # Liste mit auszugebenden Strings + '-str' => [], # Liste mit auszugebenden Strings + '-add' => [], # add as comma sep. list in [] to last line '-exit' => undef ); - &::checkObjectParams(\%params, \@_, 'printLog::print', ['-kind']); + &::checkObjectParams(\%params, \@_, 'printLog::print', + ['-kind', '-str']); my $closeFile = $params{'-closeFile'}; if ($closeFile eq 'yes') @@ -231,6 +233,12 @@ } push @a, "$k $t" . $hostname . "$pid$a"; } + my $add = $params{'-add'}; + if (@$add) + { + $a[@a-1] .= ' [' . join(', ', @$add) . ']'; + } + $self->__print(@a); if (defined($self->{'encounteredStop'}->{$kind}) and diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/stbuMd5cp.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/stbuMd5cp.pl --- storebackup-3.1/lib/stbuMd5cp.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/stbuMd5cp.pl 2009-07-18 19:09:30.000000000 +0100 @@ -18,7 +18,7 @@ # along with this program. If not, see . # -# '$Id $ '; +# '$Id$ '; use Fcntl; use Digest::MD5 qw(md5_hex); @@ -37,29 +37,31 @@ unless (sysopen(IN, $fileToRead, O_RDONLY)) { - print STDERR "cannot open <$fileToRead>\n"; + print STDERR "cannot open <$fileToRead> (", __FILE__, " ", __LINE__, ")\n"; exit 1; } unless (sysopen(OUT, $fileToSave, O_CREAT|O_WRONLY, 0700)) { - print STDERR "cannot open <$fileToSave>\n"; + print STDERR "cannot open <$fileToSave> (", __FILE__, " ", __LINE__, ")\n"; exit 2; } my $md5 = Digest::MD5->new(); -my $buffer; -while (sysread(IN, $buffer, 4096)) +my ($buffer, $n, $size); +$size = 0; +while ($n = sysread(IN, $buffer, 4096)) { syswrite OUT, $buffer; $md5->add($buffer); + $size += $n; } close(OUT); close(IN); open(MD5, '>', $md5RetFile) or exit 3; -print MD5 $md5->hexdigest(), "\n"; +print MD5 $md5->hexdigest(), "\n$size\n"; close(MD5); exit 0; diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/stbuMd5Exec.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/stbuMd5Exec.pl --- storebackup-3.1/lib/stbuMd5Exec.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/stbuMd5Exec.pl 2009-07-18 19:09:30.000000000 +0100 @@ -18,7 +18,7 @@ # along with this program. If not, see . # -# '$Id $ '; +# '$Id$ '; use Fcntl; use Digest::MD5 qw(md5_hex); @@ -38,30 +38,32 @@ unless (sysopen(IN, $fileToRead, O_RDONLY)) { - print STDERR "cannot open <$fileToRead>\n"; + print STDERR "cannot open <$fileToRead> (", __FILE__, " ", __LINE__, ")\n"; exit 1; } unless (pipe_to_fork('COMP', $fileToSave, [$comprProg, @comprProgFlags])) { - print STDERR "cannot exec <$comprProg>\n"; + print STDERR "cannot exec <$comprProg> (", __FILE__, " ", __LINE__, ")\n"; exit 2; } chmod 0700, $fileToSave; my $md5 = Digest::MD5->new(); -my $buffer; -while (sysread(IN, $buffer, 4096)) +my ($buffer, $n, $size); +$size = 0; +while ($n = sysread(IN, $buffer, 4096)) { syswrite COMP, $buffer; $md5->add($buffer); + $size += $n; } close(COMP); close(IN); open(MD5, '>', $md5RetFile) or exit 3; -print MD5 $md5->hexdigest(), "\n"; +print MD5 $md5->hexdigest(), "\n$size\n"; close(MD5); exit 0; diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/lib/storeBackupLib.pl /tmp/Yyl0in0QJ8/storebackup-3.2/lib/storeBackupLib.pl --- storebackup-3.1/lib/storeBackupLib.pl 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/lib/storeBackupLib.pl 2009-07-18 19:09:30.000000000 +0100 @@ -18,7 +18,7 @@ # along with this program. If not, see . # -push @VERSION, '$Id: storeBackupLib.pl 360 2009-05-22 21:04:50Z hjc $ '; +push @VERSION, '$Id: storeBackupLib.pl 361 2009-07-18 13:37:37Z hjc $ '; use strict; @@ -30,7 +30,7 @@ # Suchen von Dateien nach Namen (Pattern), Größe, Datum, etc. # Löschen von Teilbäumen in einem Backup -$main::STOREBACKUPVERSION = "3.1"; +$main::STOREBACKUPVERSION = "3.2"; ################################################## sub buildDBMs @@ -121,8 +121,12 @@ my $md5pack = pack('H32', $md5sum); - next if not exists $md5InThisBackup{$md5pack} - and exists $$dbmKeyIsMD5Sum{$md5pack}; + if ((not exists $md5InThisBackup{$md5pack} + and (exists $$dbmKeyIsMD5Sum{$md5pack})) + or exists $$dbmKeyIsFilename{"$index/$fname"}) + { + next; + } ++$noEntriesInDBM; $md5InThisBackup{$md5pack} = 1; @@ -130,6 +134,8 @@ $backupDirIndex, "$index/$fname"); $$dbmKeyIsFilename{"$index/$fname"} = pack('aIIFH32', $compr, $ctime, $mtime, $size, $md5sum); + +#print "### <$index/$fname> <$f> - $size\n"; } @@ -170,6 +176,7 @@ open(IN, "<", $f) or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$f>, exiting"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); } else # "$f.bz2" @@ -298,6 +305,7 @@ opendir(BACKUPROOT, $allBackupsRoot) or $prLog->print('-kind' => 'E', '-str' => ["cannot opendir <$allBackupsRoot>, exiting"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my (@dirs, $entry); while ($entry = readdir BACKUPROOT) @@ -486,6 +494,7 @@ opendir(DIR, $from) or $prLog->print('-kind' => 'E', '-str' => ["cannot opendir <$from>, exiting"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my $entry; my $anz = 0; @@ -1983,6 +1992,7 @@ opendir(DIR, $rootDir) or $prLog->print('-kind' => 'E', '-str' => ["cannot opendir <$rootDir>, exiting"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my (@dirs) = (); my (@finished) = (); @@ -2152,6 +2162,7 @@ open(FILE, "$checkSumFile.info") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$checkSumFile.info>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my ($l, %meta, %metaField, @meta); while ($l = ) @@ -2304,6 +2315,7 @@ $prLog->print('-kind' => 'E', '-str' => ["cannot open <$checkSumFile>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); } else @@ -2415,6 +2427,7 @@ open(FILE, ">", "$checkSumFile.notFinished") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$checkSumFile.notFinished>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); $self->{"checkSumFile.notFinished"} = "$checkSumFile.notFinished"; print FILE "$$\n" or @@ -2429,6 +2442,7 @@ open(FILE, ">", "$checkSumFile.info") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$checkSumFile.info>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); chmod $chmodMD5File, "$checkSumFile.info"; my $l; @@ -2465,6 +2479,7 @@ open(FILE, "> $checkSumFile") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$checkSumFile>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); chmod $chmodMD5File, $self->{'checkSumFile'}; @@ -2497,6 +2512,7 @@ open(BLOCKFILE, "> $blockCheckSumFile") or $prLog->print('-kind' => 'E', '-str' => ["cannot open <$blockCheckSumFile>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); chmod $chmodMD5File, $self->{'blockCheckSumFile'}; print BLOCKFILE "# md5 compr filename\n" or @@ -2955,7 +2971,8 @@ { $prLog->print('-kind' => 'E', '-str' => ["cannot open <.storebackupLinks> in <$d>". - " please check your backup or permissions of this program!"] + " please check your backup or permissions of this program!"], + '-add' => [__FILE__, __LINE__] ); $error++; next; @@ -2981,7 +2998,8 @@ unless (open(FILE, $f)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot open <$f>"]); + '-str' => ["cannot open <$f>"], + '-add' => [__FILE__, __LINE__]); $error++; next; } @@ -3060,7 +3078,8 @@ unless (open(FILE, $f)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot open <$f>"]); + '-str' => ["cannot open <$f>"], + '-add' => [__FILE__, __LINE__]); $error++; next; } @@ -3512,7 +3531,8 @@ unless (opendir(DIR, $dir)) { $prLog->print('-kind' => 'E', - '-str' => ["cannot opendir <$dir>"]) + '-str' => ["cannot opendir <$dir>"], + '-add' => [__FILE__, __LINE__]) if $verbose; return ($series, $backup, $renamed); } @@ -3634,6 +3654,7 @@ open(FILE, $file) or $prLog->print('-kind' => 'E', '-str' => ["${ar}cannot open <$file>"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); my ($l, @l); while ($l = ) @@ -3650,6 +3671,7 @@ open(FILE, "> $file") or $prLog->print('-kind' => 'E', '-str' => ["${ar}cannot open <$file> for writing"], + '-add' => [__FILE__, __LINE__], '-exit' => 1); print FILE join("\n", @l), "\n"; diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/llt.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/llt.1 --- storebackup-3.1/man/man1/llt.1 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/man/man1/llt.1 2009-07-18 19:09:31.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,15 +124,19 @@ .\" ======================================================================== .\" .IX Title "LLT 1" -.TH LLT 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH LLT 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" llt \- list create, access and modification times of files .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 3 -\& llt [-r] [-i] [-a|-m|-c] [files] [dirs] +\& llt [\-r] [\-i] [\-a|\-m|\-c] [files] [dirs] \&or -\& llt -e time +\& llt \-e time .Ve .SH "OPTIONS" .IX Header "OPTIONS" @@ -154,7 +153,7 @@ .IP "\fB\-\-insensitive\fR, \fB\-i\fR" 8 .IX Item "--insensitive, -i" .Vb 1 -\& case insensitively (not with -a, -m or -c) +\& case insensitively (not with \-a, \-m or \-c) .Ve .IP "\fB\-\-access\fR, \fB\-a\fR" 8 .IX Item "--access, -a" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/multitail.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/multitail.pl.1 --- storebackup-3.1/man/man1/multitail.pl.1 2009-05-23 09:09:42.000000000 +0100 +++ storebackup-3.2/man/man1/multitail.pl.1 2009-07-18 19:09:31.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,15 +124,19 @@ .\" ======================================================================== .\" .IX Title "MULTITAIL 1" -.TH MULTITAIL 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH MULTITAIL 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" multitail.pl \- Read multiple log files. The log files can be written round. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 4 -\& multitail.pl [-a] [-d delay] [-p begin|end] [-t] -\& [-o outFile [-m max] [-P] -\& [[-n noFiles] | [-s [-c compressprog]] ] +\& multitail.pl [\-a] [\-d delay] [\-p begin|end] [\-t] +\& [\-o outFile [\-m max] [\-P] +\& [[\-n noFiles] | [\-s [\-c compressprog]] ] \& ] files... .Ve .SH "OPTIONS" @@ -190,20 +189,20 @@ .IP "\fB\-l\fR, \fB\-\-maxlines\fR" 8 .IX Item "-l, --maxlines" .Vb 3 -\& maximal number of lines to read per --delay in one chunk +\& maximal number of lines to read per \-\-delay in one chunk \& from a log file (default = 100) -\& this value multiplied with [-d] is the number read at once +\& this value multiplied with [\-d] is the number read at once .Ve .IP "\fB\-s\fR, \fB\-\-saveLogs\fR" 8 .IX Item "-s, --saveLogs" .Vb 2 \& save log files with date and time instead of deleting the -\& old (with [-noOldFiles]) +\& old (with [\-noOldFiles]) .Ve .IP "\fB\-c\fR, \fB\-\-compressWith\fR" 8 .IX Item "-c, --compressWith" .Vb 1 -\& compress saved log files (e.g. with -c 'gzip -9') +\& compress saved log files (e.g. with \-c \*(Aqgzip \-9\*(Aq) .Ve .IP "\fB\-V\fR" 8 .IX Item "-V" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupCheckBackup.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupCheckBackup.pl.1 --- storebackup-3.1/man/man1/storeBackupCheckBackup.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupCheckBackup.pl.1 2009-07-18 19:09:31.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,13 +124,17 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPCHECKBACKUP 1" -.TH STOREBACKUPCHECKBACKUP 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPCHECKBACKUP 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupCheckBackup.pl \- checks if a file in the backup is missing or corrupted .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 2 -\& storeBackupCheckBackup.pl -b backupDir [-v level] [-p number] +\& storeBackupCheckBackup.pl \-b backupDir [\-v level] [\-p number] \& [backupRoot . . .] .Ve .SH "DESCRIPTION" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupConvertBackup.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupConvertBackup.pl.1 --- storebackup-3.1/man/man1/storeBackupConvertBackup.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupConvertBackup.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,7 +124,11 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPCONVERTBACKUP 1" -.TH STOREBACKUPCONVERTBACKUP 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPCONVERTBACKUP 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupConvertBackup.pl \- converts old backups created with storeBackup.pl to the newest version, .SH "SYNOPSIS" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupDel.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupDel.pl.1 --- storebackup-3.1/man/man1/storeBackupDel.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupDel.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,23 +124,27 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPDEL 1" -.TH STOREBACKUPDEL 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPDEL 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupDel.pl \- this program deletes backups created by storeBackup .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 11 -\& storeBackupDel.pl [-f configFile] [--print] -\& [-b backupDirectory] [-S series] [--doNotDelete] -\& [--deleteNotFinishedDirs] [-L lockFile] -\& [--keepAll timePeriod] [--keepWeekday entry] [--keepFirstOfYear] -\& [--keepLastOfYear] [--keepFirstOfMonth] [--keepLastOfMonth] -\& [--keepFirstOfWeek] [--keepLastOfWeek] -\& [--keepDuplicate] [--keepMinNumber] [--keepMaxNumber] -\& [-l logFile -\& [--plusLogStdout] [--suppressTime] [-m maxFilelen] -\& [[-n noOfOldFiles] | [--saveLogs] -\& [--compressWith compressprog]] +\& storeBackupDel.pl [\-f configFile] [\-\-print] +\& [\-b backupDirectory] [\-S series] [\-\-doNotDelete] +\& [\-\-deleteNotFinishedDirs] [\-L lockFile] +\& [\-\-keepAll timePeriod] [\-\-keepWeekday entry] [\-\-keepFirstOfYear] +\& [\-\-keepLastOfYear] [\-\-keepFirstOfMonth] [\-\-keepLastOfMonth] +\& [\-\-keepFirstOfWeek] [\-\-keepLastOfWeek] +\& [\-\-keepDuplicate] [\-\-keepMinNumber] [\-\-keepMaxNumber] +\& [\-l logFile +\& [\-\-plusLogStdout] [\-\-suppressTime] [\-m maxFilelen] +\& [[\-n noOfOldFiles] | [\-\-saveLogs] +\& [\-\-compressWith compressprog]] .Ve .SH "WARNING" .IX Header "WARNING" @@ -174,7 +173,7 @@ .Vb 3 \& directory of backup series \& same parameter as in storeBackup / relative path -\& from backupDir, default is 'default' +\& from backupDir, default is \*(Aqdefault\*(Aq .Ve .IP "\fB\-\-lockFile\fR, \fB\-L\fR" 8 .IX Item "--lockFile, -L" @@ -198,77 +197,77 @@ .Vb 6 \& keep backups which are not older than the specified amount \& of time. This is like a default value for all days in -\& --keepWeekday. Begins deleting at the end of the script -\& the time range has to be specified in format 'dhms', e.g. +\& \-\-keepWeekday. Begins deleting at the end of the script +\& the time range has to be specified in format \*(Aqdhms\*(Aq, e.g. \& 10d4h means 10 days and 4 hours \& default = $keepAll; .Ve .IP "\fB\-\-keepWeekday\fR" 8 .IX Item "--keepWeekday" -.Vb 15 +.Vb 10 \& keep backups for the specified days for the specified \& amount of time. Overwrites the default values choosen in -\& --keepAll. 'Mon,Wed:40d Sat:60d10m' means: +\& \-\-keepAll. \*(AqMon,Wed:40d Sat:60d10m\*(Aq means: \& keep backups of Mon and Wed 40days + 5mins \& keep backups of Sat 60days + 10mins \& keep backups of the rest of the days like spcified in -\& --keepAll (default $keepAll) -\& if you also use the 'archive flag' it means to not -\& delete the affected directories via --keepMaxNumber: -\& a10d4h means 10 days and 4 hours and 'archive flag' -\& e.g. 'Mon,Wed:a40d Sat:60d10m' means: -\& keep backups of Mon and Wed 40days + 5mins + 'archive' +\& \-\-keepAll (default $keepAll) +\& if you also use the \*(Aqarchive flag\*(Aq it means to not +\& delete the affected directories via \-\-keepMaxNumber: +\& a10d4h means 10 days and 4 hours and \*(Aqarchive flag\*(Aq +\& e.g. \*(AqMon,Wed:a40d Sat:60d10m\*(Aq means: +\& keep backups of Mon and Wed 40days + 5mins + \*(Aqarchive\*(Aq \& keep backups of Sat 60days + 10mins \& keep backups of the rest of the days like specified in -\& --keepAll (default $keepAll) +\& \-\-keepAll (default $keepAll) .Ve .IP "\fB\-\-keepFirstOfYear\fR" 8 .IX Item "--keepFirstOfYear" .Vb 2 \& do not delete the first backup of a year -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfYear\fR" 8 .IX Item "--keepLastOfYear" .Vb 2 \& do not delete the last backup of a year -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepFirstOfMonth\fR" 8 .IX Item "--keepFirstOfMonth" .Vb 2 \& do not delete the first backup of a month -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfMonth\fR" 8 .IX Item "--keepLastOfMonth" .Vb 2 \& do not delete the last backup of a month -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-firstDayOfWeek\fR" 8 .IX Item "--firstDayOfWeek" .Vb 2 -\& default: 'Sun'. This value is used for calculating -\& --keepFirstOfWeek and --keepLastOfWeek +\& default: \*(AqSun\*(Aq. This value is used for calculating +\& \-\-keepFirstOfWeek and \-\-keepLastOfWeek .Ve .IP "\fB\-\-keepFirstOfWeek\fR" 8 .IX Item "--keepFirstOfWeek" .Vb 2 \& do not delete the first backup of a week -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfWeek\fR" 8 .IX Item "--keepLastOfWeek" .Vb 2 \& do not delete the last backup of a week -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepDuplicate\fR" 8 .IX Item "--keepDuplicate" .Vb 3 \& keep multiple backups of one day up to timePeriod -\& format is timePeriod, 'archive flag' is not possible +\& format is timePeriod, \*(Aqarchive flag\*(Aq is not possible \& default = $keepDuplicate; .Ve .IP "\fB\-\-keepMinNumber\fR" 8 @@ -283,11 +282,11 @@ \& Try to keep only that maximum of backups. If you have \& more backups, the following sequence of deleting will \& happen: -\& - delete all duplicates of a day, beginning with the +\& \- delete all duplicates of a day, beginning with the \& old once, except the oldest of every day -\& - if this is not enough, delete the rest of the backups +\& \- if this is not enough, delete the rest of the backups \& beginning with the oldest, but *never* a backup with -\& the 'archive flag' or the last backup +\& the \*(Aqarchive flag\*(Aq or the last backup .Ve .IP "\fB\-\-keepRelative\fR, \fB\-R\fR" 8 .IX Item "--keepRelative, -R" @@ -295,11 +294,11 @@ \& Alternative deletion scheme. If you use this option, all other \& keep options are ignored. Preserves backups depending \& on their *relative* age. Example: -\& -R '1d 7d 2m 3m' +\& \-R \*(Aq1d 7d 2m 3m\*(Aq \& will (try to) ensure that there is always -\& - One backup between 1 day and 7 days old -\& - One backup between 5 days and 2 months old -\& - One backup between 2 months and 3 months old +\& \- One backup between 1 day and 7 days old +\& \- One backup between 5 days and 2 months old +\& \- One backup between 2 months and 3 months old \& If there is no backup for a specified timespan \& (e.g. because the last backup was done more than 2 weeks \& ago) the next older backup will be used for this timespan. @@ -312,7 +311,7 @@ .IP "\fB\-\-plusLogStdout\fR" 8 .IX Item "--plusLogStdout" .Vb 2 -\& if you specify a log file with --logFile you can +\& if you specify a log file with \-\-logFile you can \& additionally print the output to STDOUT with this flag .Ve .IP "\fB\-\-suppressTime\fR" 8 @@ -334,13 +333,13 @@ .IX Item "--saveLogs" .Vb 2 \& save log files with date and time instead of deleting the -\& old (with [-noOldFiles]) +\& old (with [\-noOldFiles]) .Ve .IP "\fB\-\-compressWith\fR" 8 .IX Item "--compressWith" .Vb 2 -\& compress saved log files (e.g. with 'gzip -9') -\& default is 'bzip2' +\& compress saved log files (e.g. with \*(Aqgzip \-9\*(Aq) +\& default is \*(Aqbzip2\*(Aq .Ve .SH "COPYRIGHT" .IX Header "COPYRIGHT" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackup_du.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackup_du.pl.1 --- storebackup-3.1/man/man1/storeBackup_du.pl.1 2009-05-23 09:09:44.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackup_du.pl.1 2009-07-18 19:09:33.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,13 +124,17 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUP_DU 1" -.TH STOREBACKUP_DU 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUP_DU 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackup_du.pl \- evaluates the disk usage in one or more backup directories. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 1 -\& storeBackup_du.pl [-v] [-l] backupdirs ... +\& storeBackup_du.pl [\-v] [\-l] backupdirs ... .Ve .SH "OPTIONS" .IX Header "OPTIONS" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupls.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupls.pl.1 --- storebackup-3.1/man/man1/storeBackupls.pl.1 2009-05-23 09:09:44.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupls.pl.1 2009-07-18 19:09:33.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,14 +124,18 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPLS 1" -.TH STOREBACKUPLS 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPLS 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupls.pl \- Lists backup directories generated with storeBackup.pl with week day. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 2 -\& storeBackupls.pl -f configFile [--print] [storeBackup-dir] -\& storeBackupls.pl [-v] [--print] storeBackup-dir +\& storeBackupls.pl \-f configFile [\-\-print] [storeBackup\-dir] +\& storeBackupls.pl [\-v] [\-\-print] storeBackup\-dir .Ve .SH "OPTIONS" .IX Header "OPTIONS" @@ -160,7 +159,7 @@ .IX Item "storeBackup-dir" .Vb 2 \& directory where the storeBackup directories are -\& overwrites the path in the config file if used with -f +\& overwrites the path in the config file if used with \-f .Ve .SH "COPYRIGHT" .IX Header "COPYRIGHT" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupMount.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupMount.pl.1 --- storebackup-3.1/man/man1/storeBackupMount.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupMount.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,14 +124,18 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPMOUNT 1" -.TH STOREBACKUPMOUNT 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPMOUNT 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupMount.pl \- runs storeBackup backing up to an nfs mount .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 2 -\& storeBackupMount.pl -c configFile [-s server] [-l logFile] [-d] -\& [-p pathToStoreBackup] [-k killTime] [-m] mountPoints... +\& storeBackupMount.pl \-c configFile [\-s server] [\-l logFile] [\-d] +\& [\-p pathToStoreBackup] [\-k killTime] [\-m] mountPoints... .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" @@ -163,8 +162,8 @@ .IX Item "--configFile, -c" .Vb 3 \& configuration file for storeBackup. -\& if option 'logFile' is set in the configration file, -\& that log file is read online, if it is different from -l +\& if option \*(AqlogFile\*(Aq is set in the configration file, +\& that log file is read online, if it is different from \-l .Ve .IP "\fB\-\-logFile\fR, \fB\-l\fR" 8 .IX Item "--logFile, -l" @@ -188,7 +187,7 @@ .Vb 4 \& time until storeBackup.pl will be killed. \& default is 365 days. -\& the time range has to be specified in format 'dhms', e.g. +\& the time range has to be specified in format \*(Aqdhms\*(Aq, e.g. \& 10d4h means 10 days and 4 hours .Ve .IP "\fB\-\-keepExistingMounts\fR, \fB\-m\fR" 8 diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackup.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackup.pl.1 --- storebackup-3.1/man/man1/storeBackup.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackup.pl.1 2009-07-18 19:09:31.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,7 +124,11 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUP 1" -.TH STOREBACKUP 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUP 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackup.pl \- fancy compressing managing checksumming hard\-linking cp \-ua .SH "DESCRIPTION" @@ -146,77 +145,77 @@ You can overwrite options in the configuration file on the command line. .SH "SYNOPSIS" .IX Header "SYNOPSIS" -.Vb 71 -\& $prog --help +.Vb 10 +\& $prog \-\-help \&or -\& $prog -g configFile +\& $prog \-g configFile \&or -\& $prog [-f configFile] [-s sourceDir] -\& [-b backupDirectory] [-S series] [--print] -\& [-T tmpdir] [-L lockFile] [--unlockBeforeDel] -\& [--exceptDirs dir1,dir2,dir3] [--contExceptDirsErr] -\& [--includeDirs dir1,dir2,dir3] -\& [--exceptRule rule] [--includeRule rule] -\& [--exceptTypes types] [--cpIsGnu] [--linkSymlinks] -\& [--precommand job] [--postcommand job] -\& [--followLinks depth] -\& [--ignorePerms] [--lateLinks [--lateCompress]] -\& [--checkBlocksSuffix suffix] [--checkBlocksMinSize size] -\& [--checkBlocksBS] -\& [--checkBlocksRule0 rule [--checkBlocksBS0 size] -\& [--checkBlocksCompr0] [--checkBlocksRead0 filter] -\& [--checkBlocksParallel0]] -\& [--checkBlocksRule1 rule [--checkBlocksBS1 size] -\& [--checkBlocksCompr1] [--checkBlocksRead1 filter] -\& [--checkBlocksParallel1]] -\& [--checkBlocksRule2 rule [--checkBlocksBS2 size] -\& [--checkBlocksCompr2] [--checkBlocksRead2 filter] -\& [--checkBlocksParallel2]] -\& [--checkBlocksRule3 rule [--checkBlocksBS3 size] -\& [--checkBlocksCompr3] [--checkBlocksRead3 filter] -\& [--checkBlocksParallel3]] -\& [--checkBlocksRule4 rule [--checkBlocksBS4 size] -\& [--checkBlocksCompr4] [--checkBlocksRead4 filter] -\& [--checkBlocksParallel4]] -\& [--checkDevices0 list [--checkDevicesDir0] -\& [--checkDevicesBS0] [checkDevicesCompr0] -\& [--checkDevicesParallel0]] -\& [--checkDevices1 list [--checkDevicesDir1] -\& [--checkDevicesBS1] [checkDevicesCompr1] -\& [--checkDevicesParallel1]] -\& [--checkDevices2 list [--checkDevicesDir2] -\& [--checkDevicesBS2] [checkDevicesCompr2] -\& [--checkDevicesParallel2]] -\& [--checkDevices3 list [--checkDevicesDir3] -\& [--checkDevicesBS3] [checkDevicesCompr3] -\& [--checkDevicesParallel3]] -\& [--checkDevices4 list [--checkDevicesDir4] -\& [--checkDevicesBS4] [checkDevicesCompr4] -\& [--checkDevicesParallel1]] -\& [--saveRAM] [-c compress] [-u uncompress] [-p postfix] -\& [--noCompress number] [--queueCompress number] -\& [--noCopy number] [--queueCopy number] -\& [--withUserGroupStat] [--userGroupStatFile filename] -\& [--exceptSuffix suffixes] [--addExceptSuffix suffixes] -\& [--minCompressSize size] [--comprRule] -\& [--doNotCompressMD5File] [--chmodMD5File] [-v] -\& [-d level][--progressReport number] [--printDepth] -\& [--ignoreReadError] -\& [--suppressWarning key] [--linkToRecent name] -\& [--doNotDelete] [--deleteNotFinishedDirs] -\& [--resetAtime] [--keepAll timePeriod] [--keepWeekday entry] -\& [[--keepFirstOfYear] [--keepLastOfYear] -\& [--keepFirstOfMonth] [--keepLastOfMonth] -\& [--firstDayOfWeek day] [--keepFirstOfWeek] -\& [--keepLastOfWeek] [--keepDuplicate] [--keepMinNumber] -\& [--keepMaxNumber] -\& | [--keepRelative] ] -\& [-l logFile -\& [--plusLogStdout] [--suppressTime] [-m maxFilelen] -\& [[-n noOfOldFiles] | [--saveLogs]] -\& [--compressWith compressprog]] -\& [--logInBackupDir [--compressLogInBackupDir] -\& [--logInBackupDirFileName logFile]] +\& $prog [\-f configFile] [\-s sourceDir] +\& [\-b backupDirectory] [\-S series] [\-\-print] +\& [\-T tmpdir] [\-L lockFile] [\-\-unlockBeforeDel] +\& [\-\-exceptDirs dir1,dir2,dir3] [\-\-contExceptDirsErr] +\& [\-\-includeDirs dir1,dir2,dir3] +\& [\-\-exceptRule rule] [\-\-includeRule rule] +\& [\-\-exceptTypes types] [\-\-cpIsGnu] [\-\-linkSymlinks] +\& [\-\-precommand job] [\-\-postcommand job] +\& [\-\-followLinks depth] [\-\-highLatency] +\& [\-\-ignorePerms] [\-\-lateLinks [\-\-lateCompress]] +\& [\-\-checkBlocksSuffix suffix] [\-\-checkBlocksMinSize size] +\& [\-\-checkBlocksBS] +\& [\-\-checkBlocksRule0 rule [\-\-checkBlocksBS0 size] +\& [\-\-checkBlocksCompr0] [\-\-checkBlocksRead0 filter] +\& [\-\-checkBlocksParallel0]] +\& [\-\-checkBlocksRule1 rule [\-\-checkBlocksBS1 size] +\& [\-\-checkBlocksCompr1] [\-\-checkBlocksRead1 filter] +\& [\-\-checkBlocksParallel1]] +\& [\-\-checkBlocksRule2 rule [\-\-checkBlocksBS2 size] +\& [\-\-checkBlocksCompr2] [\-\-checkBlocksRead2 filter] +\& [\-\-checkBlocksParallel2]] +\& [\-\-checkBlocksRule3 rule [\-\-checkBlocksBS3 size] +\& [\-\-checkBlocksCompr3] [\-\-checkBlocksRead3 filter] +\& [\-\-checkBlocksParallel3]] +\& [\-\-checkBlocksRule4 rule [\-\-checkBlocksBS4 size] +\& [\-\-checkBlocksCompr4] [\-\-checkBlocksRead4 filter] +\& [\-\-checkBlocksParallel4]] +\& [\-\-checkDevices0 list [\-\-checkDevicesDir0] +\& [\-\-checkDevicesBS0] [checkDevicesCompr0] +\& [\-\-checkDevicesParallel0]] +\& [\-\-checkDevices1 list [\-\-checkDevicesDir1] +\& [\-\-checkDevicesBS1] [checkDevicesCompr1] +\& [\-\-checkDevicesParallel1]] +\& [\-\-checkDevices2 list [\-\-checkDevicesDir2] +\& [\-\-checkDevicesBS2] [checkDevicesCompr2] +\& [\-\-checkDevicesParallel2]] +\& [\-\-checkDevices3 list [\-\-checkDevicesDir3] +\& [\-\-checkDevicesBS3] [checkDevicesCompr3] +\& [\-\-checkDevicesParallel3]] +\& [\-\-checkDevices4 list [\-\-checkDevicesDir4] +\& [\-\-checkDevicesBS4] [checkDevicesCompr4] +\& [\-\-checkDevicesParallel1]] +\& [\-\-saveRAM] [\-c compress] [\-u uncompress] [\-p postfix] +\& [\-\-noCompress number] [\-\-queueCompress number] +\& [\-\-noCopy number] [\-\-queueCopy number] +\& [\-\-withUserGroupStat] [\-\-userGroupStatFile filename] +\& [\-\-exceptSuffix suffixes] [\-\-addExceptSuffix suffixes] +\& [\-\-minCompressSize size] [\-\-comprRule] +\& [\-\-doNotCompressMD5File] [\-\-chmodMD5File] [\-v] +\& [\-d level][\-\-progressReport number] [\-\-printDepth] +\& [\-\-ignoreReadError] +\& [\-\-suppressWarning key] [\-\-linkToRecent name] +\& [\-\-doNotDelete] [\-\-deleteNotFinishedDirs] +\& [\-\-resetAtime] [\-\-keepAll timePeriod] [\-\-keepWeekday entry] +\& [[\-\-keepFirstOfYear] [\-\-keepLastOfYear] +\& [\-\-keepFirstOfMonth] [\-\-keepLastOfMonth] +\& [\-\-firstDayOfWeek day] [\-\-keepFirstOfWeek] +\& [\-\-keepLastOfWeek] [\-\-keepDuplicate] [\-\-keepMinNumber] +\& [\-\-keepMaxNumber] +\& | [\-\-keepRelative] ] +\& [\-l logFile +\& [\-\-plusLogStdout] [\-\-suppressTime] [\-m maxFilelen] +\& [[\-n noOfOldFiles] | [\-\-saveLogs]] +\& [\-\-compressWith compressprog]] +\& [\-\-logInBackupDir [\-\-compressLogInBackupDir] +\& [\-\-logInBackupDirFileName logFile]] \& [otherBackupSeries ...] .Ve .SH "OPTIONS" @@ -256,7 +255,7 @@ .IP "\fB\-\-series\fR, \fB\-S\fR" 8 .IX Item "--series, -S" .Vb 2 -\& series directory, default is 'default' +\& series directory, default is \*(Aqdefault\*(Aq \& relative path from backupDir .Ve .IP "\fB\-\-tmpdir\fR, \fB\-T\fR" 8 @@ -303,13 +302,13 @@ .IX Item "--exceptRule" .Vb 2 \& Files to exclude from backing up. -\& see README: 'including / excluding files and directories' +\& see README: \*(Aqincluding / excluding files and directories\*(Aq .Ve .IP "\fB\-\-includeRule\fR" 8 .IX Item "--includeRule" .Vb 2 -\& Files to include in the backug up - like exceptRule -\& see README: 'including / excluding files and directories' +\& Files to include in the backug up \- like exceptRule +\& see README: \*(Aqincluding / excluding files and directories\*(Aq .Ve .IP "\fB\-\-writeExcludeLog\fR" 8 .IX Item "--writeExcludeLog" @@ -321,18 +320,18 @@ .IX Item "--exceptTypes" .Vb 8 \& do not save the specified type of files, allowed: Sbcfpl -\& S - file is a socket -\& b - file is a block special file -\& c - file is a character special file -\& f - file is a plain file -\& p - file is a named pipe -\& l - file is a symbolic link +\& S \- file is a socket +\& b \- file is a block special file +\& c \- file is a character special file +\& f \- file is a plain file +\& p \- file is a named pipe +\& l \- file is a symbolic link \& Sbc can only be saved when using option [cpIsGnu] .Ve .IP "\fB\-\-cpIsGnu\fR" 8 .IX Item "--cpIsGnu" .Vb 3 -\& Activate this option if your systems cp is a full-featured +\& Activate this option if your systems cp is a full\-featured \& GNU version. In this case you will be able to also backup \& several special file types like sockets. .Ve @@ -344,7 +343,7 @@ .IP "\fB\-\-precommand\fR" 8 .IX Item "--precommand" .Vb 5 -\& exec job before starting the backup, checks lockFile (-L) +\& exec job before starting the backup, checks lockFile (\-L) \& before starting (e.g. can be used for rsync) \& stops execution if job returns exit status != 0 \& This parameter is parsed like a line in the configuration @@ -362,7 +361,13 @@ .IX Item "--followLinks" .Vb 2 \& follow symbolic links like directories up to depth -\& default = 0 -> do not follow links +\& default = 0 \-> do not follow links +.Ve +.IP "\fB\-\-highLatency\fR" 8 +.IX Item "--highLatency" +.Vb 2 +\& use this for a very high latency line (eg. vpn over +\& the internet) for better parallelization .Ve .IP "\fB\-\-ignorePerms\fR" 8 .IX Item "--ignorePerms" @@ -378,12 +383,12 @@ \& do *not* write hard links to existing files in the backup \& during the backup \& you have to call the program storeBackupWriteLateLink.pl -\& later on your server if you set this flag to 'yes' +\& later on your server if you set this flag to \*(Aqyes\*(Aq .Ve .IP "\fB\-\-lateCompress\fR" 8 .IX Item "--lateCompress" .Vb 3 -\& only in combination with --lateLinks +\& only in combination with \-\-lateLinks \& compression from files >= minCompressSize will be done \& later, the file is (temporarily) copied into the backup .Ve @@ -392,19 +397,19 @@ .Vb 4 \& Files with suffix for which storeBackup will make an md5 \& check on blocks of that file. Executed after -\& --checkBlocksRule(n) +\& \-\-checkBlocksRule(n) \& This option can be repeated multiple times .Ve .IP "\fB\-\-checkBlocksMinSize\fR" 8 .IX Item "--checkBlocksMinSize" .Vb 2 -\& Only check files specified in --checkBlocksSuffix if there +\& Only check files specified in \-\-checkBlocksSuffix if there \& file size is at least this value, default is 100M .Ve .IP "\fB\-\-checkBlocksBS\fR" 8 .IX Item "--checkBlocksBS" .Vb 2 -\& Block size for files specified with --checkBlocksSuffix +\& Block size for files specified with \-\-checkBlocksSuffix \& Default is $checkBlocksBSdefault (1 megabyte) .Ve .IP "\fB\-\-checkBlocksCompr\fR" 8 @@ -435,18 +440,18 @@ .IX Item "--checkBlocksRead0" .Vb 6 \& Filter for reading the file to treat as a blocked file -\& eg. 'gzip -d' if the file is compressed. Default is no +\& eg. \*(Aqgzip \-d\*(Aq if the file is compressed. Default is no \& read filter. \& This parameter is parsed like the line in the \& configuration file and normally has to be quoted, -\& eg. 'gzip -9' +\& eg. \*(Aqgzip \-9\*(Aq .Ve .IP "\fB\-\-checkBlocksParallel0\fR" 8 .IX Item "--checkBlocksParallel0" .Vb 3 \& Read files specified here in parallel to "normal" ones. \& This only makes sense if they are on a different disk. -\& Default value is 'no' +\& Default value is \*(Aqno\*(Aq .Ve .IP "\fB\-\-checkBlocksRule1\fR" 8 .IX Item "--checkBlocksRule1" @@ -517,7 +522,7 @@ .Vb 3 \& Read devices specified in parallel to the rest of the \& backup. This only makes sense if they are on a different -\& disk. Default value is 'no' +\& disk. Default value is \*(Aqno\*(Aq .Ve .IP "\fB\-\-checkDevices1\fR" 8 .IX Item "--checkDevices1" @@ -564,7 +569,7 @@ .IX Item "--saveRAM" .PD .Vb 2 -\& write temporary dbm files in --tmpdir +\& write temporary dbm files in \-\-tmpdir \& use this if you do not have enough RAM .Ve .IP "\fB\-\-compress\fR, \fB\-c\fR" 8 @@ -573,15 +578,15 @@ \& compress command (with options), default is \& This parameter is parsed like the line in the \& configuration file and normally has to be quoted, -\& eg. 'gzip -9' +\& eg. \*(Aqgzip \-9\*(Aq .Ve .IP "\fB\-\-uncompress\fR, \fB\-u\fR" 8 .IX Item "--uncompress, -u" .Vb 4 -\& uncompress command (with options), default is +\& uncompress command (with options), default is \& This parameter is parsed like the line in the \& configuration file and normally has to be quoted, eg. -\& 'gzip -d' +\& \*(Aqgzip \-d\*(Aq .Ve .IP "\fB\-\-postfix\fR, \fB\-p\fR" 8 .IX Item "--postfix, -p" @@ -628,17 +633,17 @@ .Vb 8 \& do not compress files with the following \& suffix (uppercase included): -\& ('\e.zip', '\e.bz2', '\e.gz', '\e.tgz', '\e.jpg', '\e.gif', -\& '\e.tiff', '\e.tif', '\e.mpeg', '\e.mpg', '\e.mp3', '\e.ogg', -\& '\e.gpg', '\e.png') +\& (\*(Aq\e.zip\*(Aq, \*(Aq\e.bz2\*(Aq, \*(Aq\e.gz\*(Aq, \*(Aq\e.tgz\*(Aq, \*(Aq\e.jpg\*(Aq, \*(Aq\e.gif\*(Aq, +\& \*(Aq\e.tiff\*(Aq, \*(Aq\e.tif\*(Aq, \*(Aq\e.mpeg\*(Aq, \*(Aq\e.mpg\*(Aq, \*(Aq\e.mp3\*(Aq, \*(Aq\e.ogg\*(Aq, +\& \*(Aq\e.gpg\*(Aq, \*(Aq\e.png\*(Aq) \& This option can be repeated multiple times \& If you do not want any compression, set this option -\& to '.*' +\& to \*(Aq.*\*(Aq .Ve .IP "\fB\-\-addExceptSuffix\fR" 8 .IX Item "--addExceptSuffix" .Vb 1 -\& like --exceptSuffix, but do not replace defaults, add +\& like \-\-exceptSuffix, but do not replace defaults, add .Ve .IP "\fB\-\-minCompressSize\fR" 8 .IX Item "--minCompressSize" @@ -649,7 +654,7 @@ .IP "\fB\-\-comprRule\fR" 8 .IX Item "--comprRule" .Vb 2 -\& alternative to --exceptSuffix and minCompressSize: +\& alternative to \-\-exceptSuffix and minCompressSize: \& definition of a rule which files will be compressed .Ve .IP "\fB\-\-doNotCompressMD5File\fR" 8 @@ -673,12 +678,12 @@ .Vb 3 \& generate debug messages, levels are 0 (none, default), \& 1 (some), 2 (many) messages, especially in -\& --exceptRule and --includeRule +\& \-\-exceptRule and \-\-includeRule .Ve .IP "\fB\-\-resetAtime\fR" 8 .IX Item "--resetAtime" .Vb 3 -\& reset access time in the source directory - but this will +\& reset access time in the source directory \- but this will \& change ctime (time of last modification of file status \& information) .Ve @@ -698,77 +703,77 @@ .Vb 6 \& keep backups which are not older than the specified amount \& of time. This is like a default value for all days in -\& --keepWeekday. Begins deleting at the end of the script -\& the time range has to be specified in format 'dhms', e.g. +\& \-\-keepWeekday. Begins deleting at the end of the script +\& the time range has to be specified in format \*(Aqdhms\*(Aq, e.g. \& 10d4h means 10 days and 4 hours \& default = 20d .Ve .IP "\fB\-\-keepWeekday\fR" 8 .IX Item "--keepWeekday" -.Vb 15 +.Vb 10 \& keep backups for the specified days for the specified \& amount of time. Overwrites the default values choosen in -\& --keepAll. 'Mon,Wed:40d Sat:60d10m' means: +\& \-\-keepAll. \*(AqMon,Wed:40d Sat:60d10m\*(Aq means: \& keep backups from Mon and Wed 40days + 5mins \& keep backups from Sat 60days + 10mins \& keep backups from the rest of the days like spcified in -\& --keepAll (default $keepAll) -\& if you also use the 'archive flag' it means to not -\& delete the affected directories via --keepMaxNumber: -\& a10d4h means 10 days and 4 hours and 'archive flag' -\& e.g. 'Mon,Wed:a40d5m Sat:60d10m' means: -\& keep backups from Mon and Wed 40days + 5mins + 'archive' +\& \-\-keepAll (default $keepAll) +\& if you also use the \*(Aqarchive flag\*(Aq it means to not +\& delete the affected directories via \-\-keepMaxNumber: +\& a10d4h means 10 days and 4 hours and \*(Aqarchive flag\*(Aq +\& e.g. \*(AqMon,Wed:a40d5m Sat:60d10m\*(Aq means: +\& keep backups from Mon and Wed 40days + 5mins + \*(Aqarchive\*(Aq \& keep backups from Sat 60days + 10mins \& keep backups from the rest of the days like specified in -\& --keepAll (default 30d) +\& \-\-keepAll (default 30d) .Ve .IP "\fB\-\-keepFirstOfYear\fR" 8 .IX Item "--keepFirstOfYear" .Vb 2 \& do not delete the first backup of a year -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfYear\fR" 8 .IX Item "--keepLastOfYear" .Vb 2 \& do not delete the last backup of a year -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepFirstOfMonth\fR" 8 .IX Item "--keepFirstOfMonth" .Vb 2 \& do not delete the first backup of a month -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfMonth\fR" 8 .IX Item "--keepLastOfMonth" .Vb 2 \& do not delete the last backup of a month -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-firstDayOfWeek\fR" 8 .IX Item "--firstDayOfWeek" .Vb 2 -\& default: 'Sun'. This value is used for calculating -\& --keepFirstOfWeek and --keepLastOfWeek +\& default: \*(AqSun\*(Aq. This value is used for calculating +\& \-\-keepFirstOfWeek and \-\-keepLastOfWeek .Ve .IP "\fB\-\-keepFirstOfWeek\fR" 8 .IX Item "--keepFirstOfWeek" .Vb 2 \& do not delete the first backup of a week -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepLastOfWeek\fR" 8 .IX Item "--keepLastOfWeek" .Vb 2 \& do not delete the last backup of a week -\& format is timePeriod with possible 'archive flag' +\& format is timePeriod with possible \*(Aqarchive flag\*(Aq .Ve .IP "\fB\-\-keepDuplicate\fR" 8 .IX Item "--keepDuplicate" .Vb 3 \& keep multiple backups of one day up to timePeriod -\& format is timePeriod, 'archive flag' is not possible +\& format is timePeriod, \*(Aqarchive flag\*(Aq is not possible \& default = 7d .Ve .IP "\fB\-\-keepMinNumber\fR" 8 @@ -782,11 +787,11 @@ .Vb 7 \& Try to keep only that maximum of backups. If you have more \& backups, the following sequence of deleting will happen: -\& - delete all duplicates of a day, beginning with the old +\& \- delete all duplicates of a day, beginning with the old \& once, except the last of every day -\& - if this is not enough, delete the rest of the backups +\& \- if this is not enough, delete the rest of the backups \& beginning with the oldest, but *never* a backup with -\& the 'archive flag' or the last backup +\& the \*(Aqarchive flag\*(Aq or the last backup .Ve .IP "\fB\-\-keepRelative\fR, \fB\-R\fR" 8 .IX Item "--keepRelative, -R" @@ -794,11 +799,11 @@ \& Alternative deletion scheme. If you use this option, all \& other keep options are ignored. Preserves backups depending \& on their *relative* age. Example: -\& -R '1d 7d 61d 92b' +\& \-R \*(Aq1d 7d 61d 92b\*(Aq \& will (try to) ensure that there is always -\& - One backup between 1 day and 7 days old -\& - One backup between 5 days and 2 months old -\& - One backup between ~2 months and ~3 months old +\& \- One backup between 1 day and 7 days old +\& \- One backup between 5 days and 2 months old +\& \- One backup between ~2 months and ~3 months old \& If there is no backup for a specified timespan \& (e.g. because the last backup was done more than 2 weeks \& ago) the next older backup will be used for this timespan. @@ -806,7 +811,7 @@ .IP "\fB\-\-progressReport\fR, \fB\-P\fR" 8 .IX Item "--progressReport, -P" .Vb 1 -\& print progress report after each 'number' files +\& print progress report after each \*(Aqnumber\*(Aq files .Ve .IP "\fB\-\-printDepth\fR, \fB\-D\fR" 8 .IX Item "--printDepth, -D" @@ -821,15 +826,17 @@ .Ve .IP "\fB\-\-suppressWarning\fR" 8 .IX Item "--suppressWarning" -.Vb 9 +.Vb 11 \& suppress (unwanted) warnings in the log files; \& to suppress warnings, the following keys can be used: -\& excDir (suppresses the warning that excluded directories -\& do not exist) +\& excDir (suppresses the warning that excluded directories +\& do not exist) \& fileChange (suppresses the warning that a file has changed \& during the backup) \& crSeries (suppresses the warning that storeBackup had to -\& create the 'default' series) +\& create the \*(Aqdefault\*(Aq series) +\& hashCollision (suppresses the warning if a possible +\& hash collision is detected) \& This option can be repeated multiple times on the command line. .Ve .IP "\fB\-\-linkToRecent\fR" 8 @@ -847,7 +854,7 @@ .IP "\fB\-\-plusLogStdout\fR" 8 .IX Item "--plusLogStdout" .Vb 2 -\& if you specify a log file with --logFile you can +\& if you specify a log file with \-\-logFile you can \& additionally print the output to STDOUT with this flag .Ve .IP "\fB\-\-suppressTime\fR" 8 @@ -869,13 +876,13 @@ .IX Item "--saveLogs" .Vb 2 \& save log files with date and time instead of deleting the -\& old (with [-noOldFiles]) +\& old (with [\-noOldFiles]) .Ve .IP "\fB\-\-compressWith\fR" 8 .IX Item "--compressWith" .Vb 4 -\& compress saved log files (e.g. with 'gzip -9') -\& default is 'bzip2' +\& compress saved log files (e.g. with \*(Aqgzip \-9\*(Aq) +\& default is \*(Aqbzip2\*(Aq \& This parameter is parsed like a line in the configuration \& file and normally has to be quoted. .Ve @@ -884,7 +891,7 @@ .Vb 3 \& write log file (also) in the backup directory \& Be aware that this log does not contain all error -\& messages of the one specified with --logFile! +\& messages of the one specified with \-\-logFile! .Ve .IP "\fB\-\-compressLogInBackupDir\fR" 8 .IX Item "--compressLogInBackupDir" @@ -899,19 +906,19 @@ .Ve .IP "\fBotherBackupSeries\fR" 8 .IX Item "otherBackupSeries" -.Vb 13 +.Vb 10 \& List of other backup series to consider for \& hard linking. Relative path from backupDir! \& Format (examples): -\& backupSeries/2002.08.29_08.25.28 -> consider this backup +\& backupSeries/2002.08.29_08.25.28 \-> consider this backup \& or -\& 0:backupSeries ->last (youngest) in /backupSeries -\& 1:backupSeries ->one before last in /backupSeries -\& n:backupSeries -> -\& n'th before last in /backupSeries -\& 3-5:backupSeries -> +\& 0:backupSeries \->last (youngest) in /backupSeries +\& 1:backupSeries \->one before last in /backupSeries +\& n:backupSeries \-> +\& n\*(Aqth before last in /backupSeries +\& 3\-5:backupSeries \-> \& 3rd, 4th and 5th in /backupSeries -\& all:backupSeries -> all in /backupSeries +\& all:backupSeries \-> all in /backupSeries \& default is to link to the last backup in every series .Ve .SH "COPYRIGHT" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupRecover.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupRecover.pl.1 --- storebackup-3.1/man/man1/storeBackupRecover.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupRecover.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,15 +124,19 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPRECOVER 1" -.TH STOREBACKUPRECOVER 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPRECOVER 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupRecover.pl \- recovers files saved with storeBackup.pl. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 3 -\& storeBackupRecover.pl -r restore [-b root] -t targetDir [--flat] -\& [-o] [--tmpdir] [--noHardLinks] [-p number] [-v] [-n] -\& [--cpIsGnu] [--noGnuCp] +\& storeBackupRecover.pl \-r restore [\-b root] \-t targetDir [\-\-flat] +\& [\-o] [\-\-tmpdir] [\-\-noHardLinks] [\-p number] [\-v] [\-n] +\& [\-\-cpIsGnu] [\-\-noGnuCp] .Ve .SH "OPTIONS" .IX Header "OPTIONS" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupSearch.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupSearch.pl.1 --- storebackup-3.1/man/man1/storeBackupSearch.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupSearch.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,19 +124,21 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPSEARCH 1" -.TH STOREBACKUPSEARCH 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPSEARCH 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupSearch.pl \- locates different versions of a file saved with storeBackup.pl. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 1 -\& storeBackupSearch.pl -g configFile -.Ve -.PP -.Vb 3 -\& storeBackupSearch.pl [-f configFile] [-b backupDirDir] -\& [-s rule] [--absPath] [-w file] [--parJobs number] -\& [-d level] [--once] [--print] [backupRoot . . .] +\& storeBackupSearch.pl \-g configFile +\& +\& storeBackupSearch.pl \-b backupDirDir [\-f configFile] +\& [\-s rule] [\-\-absPath] [\-w file] [\-\-parJobs number] +\& [\-d level] [\-\-once] [\-\-print] [backupRoot . . .] .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" @@ -173,7 +170,7 @@ .IX Item "--searchRule, -s" .Vb 2 \& rule for searching -\& see README: 'including / excluding files and directories' +\& see README: \*(Aqincluding / excluding files and directories\*(Aq .Ve .IP "\fB\-\-absPath\fR, \fB\-a\fR" 8 .IX Item "--absPath, -a" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupUpdateBackup.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupUpdateBackup.pl.1 --- storebackup-3.1/man/man1/storeBackupUpdateBackup.pl.1 2009-05-23 09:09:43.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupUpdateBackup.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,24 +124,26 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPUPDATEBACKUP 1" -.TH STOREBACKUPUPDATEBACKUP 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPUPDATEBACKUP 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupUpdateBackup.pl \- updates / finalizes backups created by storeBackup.pl with option \-\-lateLink, \-\-lateCompress .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 7 -\& storeBackupUpdateBackup.pl -b backupDirectory [--autorepair] -\& [--print] [--verbose] [--debug] [--lockFile] [--noCompress] -\& [--progressReport number] [--checkOnly] -\& [--logFile -\& [--suppressTime] [-m maxFilelen] -\& [[-n noOfOldFiles] | [--saveLogs]] -\& [--compressWith compressprog]] -.Ve -.PP -.Vb 2 -\& storeBackupUpdateBackup.pl --interactive --backupDir topLevlDir -\& [--autorepair] [--print] +\& storeBackupUpdateBackup.pl \-b backupDirectory [\-\-autorepair] +\& [\-\-print] [\-\-verbose] [\-\-debug] [\-\-lockFile] [\-\-noCompress] +\& [\-\-progressReport number] [\-\-checkOnly] +\& [\-\-logFile +\& [\-\-suppressTime] [\-m maxFilelen] +\& [[\-n noOfOldFiles] | [\-\-saveLogs]] +\& [\-\-compressWith compressprog]] +\& +\& storeBackupUpdateBackup.pl \-\-interactive \-\-backupDir topLevlDir +\& [\-\-autorepair] [\-\-print] .Ve .SH "WARNING" .IX Header "WARNING" @@ -159,7 +156,7 @@ .IX Item "--interactive, -i" .Vb 2 \& interactive mode for reparing / deleting currupted -\& backups created with option '--lateLinks' +\& backups created with option \*(Aq\-\-lateLinks\*(Aq .Ve .IP "\fB\-\-backupDir\fR, \fB\-b\fR" 8 .IX Item "--backupDir, -b" @@ -206,7 +203,7 @@ .IP "\fB\-\-checkOnly\fR" 8 .IX Item "--checkOnly" .Vb 1 -\& B<-c> do not perform any action, only check consistency +\& B<\-c> do not perform any action, only check consistency .Ve .IP "\fB\-\-progressReport\fR" 8 .IX Item "--progressReport" @@ -249,13 +246,13 @@ .IX Item "--saveLogs" .Vb 2 \& save log files with date and time instead of deleting the -\& old (with [-noOldFiles]) +\& old (with [\-noOldFiles]) .Ve .IP "\fB\-\-compressWith\fR" 8 .IX Item "--compressWith" .Vb 2 -\& compress saved log files (e.g. with 'gzip -9'). -\& default is 'bzip2' +\& compress saved log files (e.g. with \*(Aqgzip \-9\*(Aq). +\& default is \*(Aqbzip2\*(Aq .Ve .SH "COPYRIGHT" .IX Header "COPYRIGHT" diff -Nru /tmp/q6qEyuDqnu/storebackup-3.1/man/man1/storeBackupVersions.pl.1 /tmp/Yyl0in0QJ8/storebackup-3.2/man/man1/storeBackupVersions.pl.1 --- storebackup-3.1/man/man1/storeBackupVersions.pl.1 2009-05-23 09:09:44.000000000 +0100 +++ storebackup-3.2/man/man1/storeBackupVersions.pl.1 2009-07-18 19:09:32.000000000 +0100 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.35 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -25,11 +17,11 @@ .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- @@ -48,22 +40,25 @@ . ds R" '' 'br\} .\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.if \nF \{\ +.ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na +.el \{\ +. de IX +.. +.\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -129,14 +124,18 @@ .\" ======================================================================== .\" .IX Title "STOREBACKUPVERSIONS 1" -.TH STOREBACKUPVERSIONS 1 "2009-05-23" "perl v5.8.8" "User Contributed Perl Documentation" +.TH STOREBACKUPVERSIONS 1 "2009-07-18" "perl v5.10.0" "User Contributed Perl Documentation" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh .SH "NAME" storeBackupVersions.pl \- locates different versions of a file saved with storeBackup.pl. .SH "SYNOPSIS" .IX Header "SYNOPSIS" .Vb 2 -\& storeBackupVersions.pl -f file [-b root] [-v] -\& [-l [-a | [-s] [-u] [-g] [-M] [-c] [-m]]] +\& storeBackupVersions.pl \-f file [\-b root] [\-v] +\& [\-l [\-a | [\-s] [\-u] [\-g] [\-M] [\-c] [\-m]]] .Ve .SH "OPTIONS" .IX Header "OPTIONS" @@ -164,7 +163,7 @@ .IP "\fB\-\-showAll\fR, \fB\-A\fR" 8 .IX Item "--showAll, -A" .Vb 1 -\& same as: [-s -u -g -M -c -m] +\& same as: [\-s \-u \-g \-M \-c \-m] .Ve .IP "\fB\-\-size\fR, \fB\-s\fR" 8 .IX Item "--size, -s"