[gentoo-commits] gentoo-x86 commit in app-backup/backuppc/files/3.2.0: 05-nicelevel.patch 03-reasonable-config.pl-defaults.patch 01-fix-configure.pl.patch 02-fix-config.pl-formatting.patch 04-add-docdir-marker.patch

[Patrick Lauer (patrick)]

patrick     11/08/29 10:41:07

  Added:                05-nicelevel.patch
                        03-reasonable-config.pl-defaults.patch
                        01-fix-configure.pl.patch
                        02-fix-config.pl-formatting.patch
                        04-add-docdir-marker.patch
  Log:
  Bump for #287133, ebuild from the portage-backup overlay. Thanks to Lenno Nagel.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-backup/backuppc/files/3.2.0/05-nicelevel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/05-nicelevel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/05-nicelevel.patch?rev=1.1&content-type=text/plain

Index: 05-nicelevel.patch
===================================================================
--- init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
+++ init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
@@ -21,7 +21,7 @@
 start() {
 	checkconfig || return 1
 	ebegin "Starting BackupPC"
-	start-stop-daemon --start --chuid ${USER} --user ${USER} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS}
+	start-stop-daemon --start --chuid ${USER} --user ${USER} --nicelevel ${NICELEVEL} --pidfile ${PID_FILE} --exec ${EXEC} -- ${EXEC_OPTIONS}
 	eend $?
 }
 
--- init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
+++ init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
@@ -3,3 +3,4 @@
 PID_FILE=__LOGDIR__/BackupPC.pid
 EXEC=__INSTALLDIR__/bin/BackupPC
 EXEC_OPTIONS=-d
+NICELEVEL=0



1.1                  app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/03-reasonable-config.pl-defaults.patch?rev=1.1&content-type=text/plain

Index: 03-reasonable-config.pl-defaults.patch
===================================================================
--- conf/config.pl.formatted	2010-09-03 23:09:13.035788559 +0300
+++ conf/config.pl	2010-09-03 23:10:19.314788450 +0300
@@ -1319,6 +1319,8 @@
   '--times',
   '--block-size=2048',
   '--recursive',
+  '--specials',
+  '--checksum-seed=32761',
 ];
 
 #
@@ -1385,6 +1387,8 @@
   '--relative',
   '--ignore-times',
   '--recursive',
+  '--specials',
+  '--checksum-seed=32761',
 ];
 
 ###########################################################################
@@ -2015,7 +2019,7 @@
 #    --> administrative users are only craig and celia'.
 #
 $Conf{CgiAdminUserGroup} = '';
-$Conf{CgiAdminUsers}     = '';
+$Conf{CgiAdminUsers}     = 'backuppc';
 
 #
 # URL of the BackupPC_Admin CGI script.  Used for email messages.
@@ -2062,7 +2066,7 @@
 # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero
 # for international dates (DD/MM).
 #
-$Conf{CgiDateFormatMMDD} = 1;
+$Conf{CgiDateFormatMMDD} = 2;
 
 #
 # If set, the complete list of hosts appears in the left navigation
@@ -2248,7 +2252,7 @@
   ClientTimeout => 1,
   MaxOldPerPCLogFiles => 1,
   CompressLevel => 1,
-  ClientNameAlias => 1,
+  ClientNameAlias => 0,
   DumpPreUserCmd => 0,
   DumpPostUserCmd => 0,
   RestorePreUserCmd => 0,



1.1                  app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/01-fix-configure.pl.patch?rev=1.1&content-type=text/plain

Index: 01-fix-configure.pl.patch
===================================================================
--- configure.pl.orig	2010-07-31 20:52:58.000000000 +0300
+++ configure.pl	2010-09-03 22:09:46.437788435 +0300
@@ -158,7 +158,7 @@
 # config file to get all the defaults.
 #
 my $ConfigPath = "";
-my $ConfigFileOK = 1;
+my $ConfigFileOK = 0;
 while ( 1 ) {
     if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
         $ConfigPath = "/etc/BackupPC/config.pl";
@@ -213,7 +213,8 @@
         $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
                     if ( $Conf{LogDir} eq '' );
     }
-    $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
+    # Disable this as it's not really neccessary for this ebuild
+    # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
     my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
     if ( $err eq "" ) {
         print <<EOF;
@@ -726,7 +727,7 @@
     if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
 	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
     } else {
-	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
+	$Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'";
     }
 }
 



1.1                  app-backup/backuppc/files/3.2.0/02-fix-config.pl-formatting.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/02-fix-config.pl-formatting.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/02-fix-config.pl-formatting.patch?rev=1.1&content-type=text/plain

Index: 02-fix-config.pl-formatting.patch
===================================================================
--- conf/config.pl.dist	2010-09-03 23:08:05.795789517 +0300
+++ conf/config.pl	2010-09-03 23:08:37.513788393 +0300
@@ -87,7 +87,7 @@
 # Default value prevents any access from group other, and prevents
 # group write.
 #
-$Conf{UmaskMode} = 027;
+$Conf{UmaskMode} = 27;
 
 #
 # Times at which we wake up, check all the PCs, and schedule necessary
@@ -113,7 +113,31 @@
 # you want BackupPC_nightly to run (eg: when you don't expect a lot
 # of regular backups to run).
 #
-$Conf{WakeupSchedule} = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
+$Conf{WakeupSchedule} = [
+  1,
+  2,
+  3,
+  4,
+  5,
+  6,
+  7,
+  8,
+  9,
+  10,
+  11,
+  12,
+  13,
+  14,
+  15,
+  16,
+  17,
+  18,
+  19,
+  20,
+  21,
+  22,
+  23
+];
 
 #
 # Maximum number of simultaneous backups to run.  If there
@@ -224,9 +248,9 @@
 # Full path to various commands for archiving
 #
 $Conf{SplitPath} = '';
-$Conf{ParPath}   = '';
-$Conf{CatPath}   = '';
-$Conf{GzipPath}  = '';
+$Conf{ParPath} = '';
+$Conf{CatPath} = '';
+$Conf{GzipPath} = '';
 $Conf{Bzip2Path} = '';
 
 #
@@ -302,11 +326,11 @@
 # a symbolic link to the new location, or mount the new BackupPC
 # store at the existing $Conf{TopDir} setting.
 #
-$Conf{TopDir}      = '';
-$Conf{ConfDir}     = '';
-$Conf{LogDir}      = '';
-$Conf{InstallDir}  = '';
-$Conf{CgiDir}      = '';
+$Conf{TopDir} = '';
+$Conf{ConfDir} = '';
+$Conf{LogDir} = '';
+$Conf{InstallDir} = '';
+$Conf{CgiDir} = '';
 
 #
 # Whether BackupPC and the CGI script BackupPC_Admin verify that they
@@ -316,7 +340,7 @@
 # BackupPC might be accidently started as root or the wrong user,
 # or if the CGI script is not installed correctly.
 #
-$Conf{BackupPCUserVerify} = 1;
+$Conf{BackupPCUserVerify} = '1';
 
 #
 # Maximum number of hardlinks supported by the $TopDir file system
@@ -333,7 +357,7 @@
 # Advanced option for asking BackupPC to load additional perl modules.
 # Can be a list (array ref) of module names to load at startup.
 #
-$Conf{PerlModuleLoad}     = undef;
+$Conf{PerlModuleLoad} = undef;
 
 #
 # Path to init.d script and command to use that script to start the
@@ -355,7 +379,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{ServerInitdPath} = '';
+$Conf{ServerInitdPath} = undef;
 $Conf{ServerInitdStartCmd} = '';
 
 
@@ -373,7 +397,7 @@
 # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
 # will make the actual backup interval a bit longer.
 #
-$Conf{FullPeriod} = 6.97;
+$Conf{FullPeriod} = '6.97';
 
 #
 # Minimum period in days between incremental backups (a user requested
@@ -383,7 +407,7 @@
 # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
 # will make the actual backup interval a bit longer.
 #
-$Conf{IncrPeriod} = 0.97;
+$Conf{IncrPeriod} = '0.97';
 
 #
 # Number of full backups to keep.  Must be >= 1.
@@ -458,7 +482,9 @@
 #    $Conf{FullKeepCnt} = 4;
 #    $Conf{FullKeepCnt} = [4];
 #
-$Conf{FullKeepCnt} = 1;
+$Conf{FullKeepCnt} = [
+  1
+];
 
 #
 # Very old full backups are removed after $Conf{FullAgeMax} days.  However,
@@ -470,7 +496,7 @@
 # full backups to exceed $Conf{FullAgeMax}.
 #
 $Conf{FullKeepCntMin} = 1;
-$Conf{FullAgeMax}     = 90;
+$Conf{FullAgeMax} = 90;
 
 #
 # Number of incremental backups to keep.  Must be >= 1.
@@ -487,7 +513,7 @@
 # matter how old they are.
 #
 $Conf{IncrKeepCntMin} = 1;
-$Conf{IncrAgeMax}     = 30;
+$Conf{IncrAgeMax} = 30;
 
 #
 # Level of each incremental.  "Level" follows the terminology
@@ -565,7 +591,9 @@
 # meaning each incremental backed up all the files that
 # changed since the last full.
 #
-$Conf{IncrLevels} = [1];
+$Conf{IncrLevels} = [
+  1
+];
 
 #
 # Disable all full and incremental backups.  These settings are
@@ -631,7 +659,7 @@
 # The default is off.  You can turn this on or off at any
 # time without affecting existing backups.
 #
-$Conf{IncrFill} = 0;
+$Conf{IncrFill} = '0';
 
 #
 # Number of restore logs to keep.  BackupPC remembers information about
@@ -683,7 +711,7 @@
 #       '*' => ['/myFiles', '/important'],      # these are other shares
 #    };
 #
-$Conf{BackupFilesOnly} = undef;
+$Conf{BackupFilesOnly} = {};
 
 #
 # List of directories or files to exclude from the backup.  For Smb,
@@ -739,7 +767,7 @@
 #       '*' => ['/junk', '/dont_back_this_up'], # these are for other shares
 #    };
 #
-$Conf{BackupFilesExclude} = undef;
+$Conf{BackupFilesExclude} = {};
 
 #
 # PCs that are always or often on the network can be backed up after
@@ -770,7 +798,7 @@
 # to just set $Conf{WakeupSchedule} to a restricted schedule.
 #
 $Conf{BlackoutBadPingLimit} = 3;
-$Conf{BlackoutGoodCnt}      = 7;
+$Conf{BlackoutGoodCnt} = 7;
 
 #
 # One or more blackout periods can be specified.  If a client is
@@ -813,11 +841,17 @@
 # Saturday night.
 #
 $Conf{BlackoutPeriods} = [
-    {
-	hourBegin =>  7.0,
-	hourEnd   => 19.5,
-	weekDays  => [1, 2, 3, 4, 5],
-    },
+  {
+    'hourEnd' => '19.5',
+    'weekDays' => [
+      1,
+      2,
+      3,
+      4,
+      5
+    ],
+    'hourBegin' => 7
+  }
 ];
 
 #
@@ -826,7 +860,7 @@
 # backed up.  If you have shares that might be empty (and therefore an
 # empty backup is valid) you should set this flag to 0.
 #
-$Conf{BackupZeroFilesIsFatal} = 1;
+$Conf{BackupZeroFilesIsFatal} = '1';
 
 ###########################################################################
 # How to backup a client
@@ -922,7 +956,9 @@
 #
 # This setting only matters if $Conf{XferMethod} = 'smb'.
 #
-$Conf{SmbShareName} = 'C$';
+$Conf{SmbShareName} = [
+  'C$'
+];
 
 #
 # Smbclient share user name.  This is passed to smbclient's -U argument.
@@ -975,9 +1011,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName'
-	    . ' $I_option -U $userName -E -N -d 1'
-            . ' -c tarmode\\ full -Tc$X_option - $fileList';
+$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -Tc$X_option - $fileList';
 
 #
 # Command to run smbclient for an incremental dump.
@@ -989,9 +1023,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName'
-	    . ' $I_option -U $userName -E -N -d 1'
-	    . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList';
+$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList';
 
 #
 # Command to run smbclient for a restore.
@@ -1007,9 +1039,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName'
-            . ' $I_option -U $userName -E -N -d 1'
-            . ' -c tarmode\\ full -Tx -';
+$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -Tx -';
 
 ###########################################################################
 # Tar Configuration
@@ -1044,7 +1074,9 @@
 #
 # This setting only matters if $Conf{XferMethod} = 'tar'.
 #
-$Conf{TarShareName} = '/';
+$Conf{TarShareName} = [
+  '/'
+];
 
 #
 # Full command to run tar on the client.  GNU tar is required.  You will
@@ -1085,9 +1117,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host'
-                    . ' env LC_ALL=C $tarPath -c -v -f - -C $shareName+'
-                    . ' --totals';
+$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host env LC_ALL=C $tarPath -c -v -f - -C $shareName+ --totals';
 
 #
 # Extra tar arguments for full backups.  Several variables are substituted at
@@ -1146,9 +1176,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host'
-		   . ' env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner'
-		   . ' -v -f - -C $shareName+';
+$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner -v -f - -C $shareName+';
 
 #
 # Full path for tar on the client. Security caution: normal users should not
@@ -1220,7 +1248,9 @@
 #
 #     $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot'];
 #
-$Conf{RsyncShareName} = '/';
+$Conf{RsyncShareName} = [
+  '/'
+];
 
 #
 # Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd".
@@ -1249,7 +1279,7 @@
 # connect to an rsyncd on the client that is not password protected.
 # Turn off at your own risk.
 #
-$Conf{RsyncdAuthRequired} = 1;
+$Conf{RsyncdAuthRequired} = '1';
 
 #
 # When rsync checksum caching is enabled (by adding the
@@ -1272,35 +1302,23 @@
 #   
 # This setting has no effect unless checksum caching is turned on.
 #   
-$Conf{RsyncCsumCacheVerifyProb} = 0.01;
+$Conf{RsyncCsumCacheVerifyProb} = '0.01';
 
 #
 # Arguments to rsync for backup.  Do not edit the first set unless you
 # have a thorough understanding of how File::RsyncP works.
 #
 $Conf{RsyncArgs} = [
-	    #
-	    # Do not edit these!
-	    #
-            '--numeric-ids',
-            '--perms',
-            '--owner',
-            '--group',
-            '-D',
-            '--links',
-            '--hard-links',
-            '--times',
-            '--block-size=2048',
-            '--recursive',
-
-	    #
-	    # Rsync >= 2.6.3 supports the --checksum-seed option
-            # which allows rsync checksum caching on the server.
-	    # Uncomment this to enable rsync checksum caching if
-            # you have a recent client rsync version and you want
-            # to enable checksum caching.
-	    #
-	    #'--checksum-seed=32761',
+  '--numeric-ids',
+  '--perms',
+  '--owner',
+  '--group',
+  '-D',
+  '--links',
+  '--hard-links',
+  '--times',
+  '--block-size=2048',
+  '--recursive',
 ];
 
 #
@@ -1355,34 +1373,18 @@
 # Note: $Conf{RsyncArgsExtra} doesn't apply to $Conf{RsyncRestoreArgs}.
 #
 $Conf{RsyncRestoreArgs} = [
-	    #
-	    # Do not edit these!
-	    #
-	    '--numeric-ids',
-	    '--perms',
-	    '--owner',
-	    '--group',
-	    '-D',
-	    '--links',
-            '--hard-links',
-	    '--times',
-	    '--block-size=2048',
-	    '--relative',
-	    '--ignore-times',
-	    '--recursive',
-
-	    #
-	    # Rsync >= 2.6.3 supports the --checksum-seed option
-            # which allows rsync checksum caching on the server.
-	    # Uncomment this to enable rsync checksum caching if
-            # you have a recent client rsync version and you want
-            # to enable checksum caching.
-	    #
-	    #'--checksum-seed=32761',
-
-	    #
-	    # Add additional arguments here
-	    #
+  '--numeric-ids',
+  '--perms',
+  '--owner',
+  '--group',
+  '-D',
+  '--links',
+  '--hard-links',
+  '--times',
+  '--block-size=2048',
+  '--relative',
+  '--ignore-times',
+  '--recursive',
 ];
 
 ###########################################################################
@@ -1515,7 +1517,7 @@
 #
 # Set to 0 to disable this feature.
 #
-$Conf{ArchivePar} = 0;
+$Conf{ArchivePar} = '0';
 
 #
 # Archive Size Split
@@ -1551,9 +1553,7 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost'
-	. ' $tarCreatePath $splitpath $parpath $host $backupnumber'
-	. ' $compression $compext $splitsize $archiveloc $parfile *';
+$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost $tarCreatePath $splitpath $parpath $host $backupnumber $compression $compext $splitsize $archiveloc $parfile *';
 
 #
 # Full path for ssh. Security caution: normal users should not
@@ -1625,7 +1625,7 @@
 # setting this flag is a great way to verify that the machines have
 # their netbios name set correctly before turning on DCHP.
 #
-$Conf{FixedIPNetBiosNameCheck} = 0;
+$Conf{FixedIPNetBiosNameCheck} = '0';
 
 #
 # Full path to the ping command.  Security caution: normal users
@@ -1802,13 +1802,13 @@
 # needs to be a full path and you can't include shell syntax like
 # redirection and pipes; put that in a script if you need it.
 #
-$Conf{DumpPreUserCmd}     = undef;
-$Conf{DumpPostUserCmd}    = undef;
-$Conf{DumpPreShareCmd}    = undef;
-$Conf{DumpPostShareCmd}   = undef;
-$Conf{RestorePreUserCmd}  = undef;
+$Conf{DumpPreUserCmd} = undef;
+$Conf{DumpPostUserCmd} = undef;
+$Conf{DumpPreShareCmd} = undef;
+$Conf{DumpPostShareCmd} = undef;
+$Conf{RestorePreUserCmd} = undef;
 $Conf{RestorePostUserCmd} = undef;
-$Conf{ArchivePreUserCmd}  = undef;
+$Conf{ArchivePreUserCmd} = undef;
 $Conf{ArchivePostUserCmd} = undef;
 
 #
@@ -1832,7 +1832,7 @@
 # that snapshots or dumps a database which fails because
 # of some database error.
 #
-$Conf{UserCmdCheckStatus} = 0;
+$Conf{UserCmdCheckStatus} = '0';
 
 #
 # Override the client's host name.  This allows multiple clients
@@ -1870,7 +1870,7 @@
 # rounded up (ie: 2.5 means a user will never receive email more
 # than once every 3 days).
 #
-$Conf{EMailNotifyMinDays} = 2.5;
+$Conf{EMailNotifyMinDays} = '2.5';
 
 #
 # Name to use as the "from" name for email.  Depending upon your mail
@@ -1925,7 +1925,7 @@
 # When there have been no backups in this number of days the user
 # is sent an email.
 #
-$Conf{EMailNotifyOldBackupDays} = 7.0;
+$Conf{EMailNotifyOldBackupDays} = 7;
 
 #
 # This subject and message is sent to a user if their PC has not recently
@@ -1952,7 +1952,7 @@
 # How old the most recent backup of Outlook files has to be before
 # notifying user.
 #
-$Conf{EMailNotifyOldOutlookDays} = 5.0;
+$Conf{EMailNotifyOldOutlookDays} = 5;
 
 #
 # This subject and message is sent to a user if their Outlook files have
@@ -1980,10 +1980,9 @@
 # Additional email headers.  This sets to charset to
 # utf8.
 #
-$Conf{EMailHeaders} = <<EOF;
-MIME-Version: 1.0
+$Conf{EMailHeaders} = 'MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-EOF
+';
 
 ###########################################################################
 # CGI user interface configuration settings
@@ -2056,7 +2055,7 @@
 #      be rendered as a link to http://myhost/users/craig.html.
 #
 $Conf{CgiUserHomePageCheck} = '';
-$Conf{CgiUserUrlCreate}     = 'mailto:%s';
+$Conf{CgiUserUrlCreate} = 'mailto:%s';
 
 #
 # Date display format for CGI interface.  A value of 1 uses US-style
@@ -2071,12 +2070,12 @@
 # the user is listed in the host file (as either the user or in moreUsers)
 # are displayed.
 #
-$Conf{CgiNavBarAdminAllHosts} = 1;
+$Conf{CgiNavBarAdminAllHosts} = '1';
 
 #
 # Enable/disable the search box in the navigation bar.
 #
-$Conf{CgiSearchBoxEnable} = 1;
+$Conf{CgiSearchBoxEnable} = '1';
 
 #
 # Additional navigation bar links.  These appear for both regular users
@@ -2086,31 +2085,34 @@
 # just literally displaying name.
 #
 $Conf{CgiNavBarLinks} = [
-    {
-        link  => "?action=view&type=docs",
-        lname => "Documentation",    # actually displays $Lang->{Documentation}
-    },
-    {
-        link  => "http://backuppc.wiki.sourceforge.net",
-        name  => "Wiki",              # displays literal "Wiki"
-    },
-    {
-        link  => "http://backuppc.sourceforge.net",
-        name  => "SourceForge",      # displays literal "SourceForge"
-    },
+  {
+    'link' => '?action=view&type=docs',
+    'lname' => 'Documentation',
+    'name' => undef
+  },
+  {
+    'link' => 'http://backuppc.wiki.sourceforge.net',
+    'lname' => undef,
+    'name' => 'Wiki'
+  },
+  {
+    'link' => 'http://backuppc.sourceforge.net',
+    'lname' => undef,
+    'name' => 'SourceForge'
+  }
 ];
 
 #
 # Hilight colors based on status that are used in the PC summary page.
 #
 $Conf{CgiStatusHilightColor} = {
-    Reason_backup_failed           => '#ffcccc',
-    Reason_backup_done             => '#ccffcc',
-    Reason_no_ping                 => '#ffff99',
-    Reason_backup_canceled_by_user => '#ff9900',
-    Status_backup_in_progress      => '#66cc99',
-    Disabled_OnlyManualBackups     => '#d1d1d1',   
-    Disabled_AllBackupsDisabled    => '#d1d1d1',          
+  'Reason_backup_failed' => '#ffcccc',
+  'Reason_backup_done' => '#ccffcc',
+  'Reason_backup_canceled_by_user' => '#ff9900',
+  'Reason_no_ping' => '#ffff99',
+  'Disabled_OnlyManualBackups' => '#d1d1d1',
+  'Status_backup_in_progress' => '#66cc99',
+  'Disabled_AllBackupsDisabled' => '#d1d1d1'
 };
 
 #
@@ -2138,7 +2140,7 @@
 #                 'pl'  => 'text/plain',
 #          };
 #
-$Conf{CgiExt2ContentType} = { };
+$Conf{CgiExt2ContentType} = {};
 
 #
 # URL (without the leading http://host) for BackupPC's image directory.
@@ -2163,7 +2165,7 @@
 #
 # Whether the user is allowed to edit their per-PC config.
 #
-$Conf{CgiUserConfigEditEnable} = 1;
+$Conf{CgiUserConfigEditEnable} = '1';
 
 #
 # Which per-host config variables a non-admin user is allowed
@@ -2177,96 +2179,96 @@
 # sorts of bad things.
 #
 $Conf{CgiUserConfigEdit} = {
-        FullPeriod                => 1,
-        IncrPeriod                => 1,
-        FullKeepCnt               => 1,
-        FullKeepCntMin            => 1,
-        FullAgeMax                => 1,
-        IncrKeepCnt               => 1,
-        IncrKeepCntMin            => 1,
-        IncrAgeMax                => 1,
-        IncrLevels                => 1,
-        IncrFill                  => 1,
-        PartialAgeMax             => 1,
-        RestoreInfoKeepCnt        => 1,
-        ArchiveInfoKeepCnt        => 1,
-        BackupFilesOnly           => 1,
-        BackupFilesExclude        => 1,
-        BackupsDisable            => 1,
-        BlackoutBadPingLimit      => 1,
-        BlackoutGoodCnt           => 1,
-        BlackoutPeriods           => 1,
-        BackupZeroFilesIsFatal    => 1,
-        ClientCharset             => 1,
-        ClientCharsetLegacy       => 1,
-        XferMethod                => 1,
-        XferLogLevel              => 1,
-        SmbShareName              => 1,
-        SmbShareUserName          => 1,
-        SmbSharePasswd            => 1,
-        SmbClientFullCmd          => 0,
-        SmbClientIncrCmd          => 0,
-        SmbClientRestoreCmd       => 0,
-        TarShareName              => 1,
-        TarFullArgs               => 1,
-        TarIncrArgs               => 1,
-        TarClientCmd              => 0,
-        TarClientRestoreCmd       => 0,
-        TarClientPath             => 0,
-        RsyncShareName            => 1,
-        RsyncdClientPort          => 1,
-        RsyncdPasswd              => 1,
-        RsyncdUserName            => 1,
-        RsyncdAuthRequired        => 1,
-        RsyncCsumCacheVerifyProb  => 1,
-        RsyncArgs                 => 1,
-        RsyncArgsExtra            => 1,
-        RsyncRestoreArgs          => 1,
-        RsyncClientCmd            => 0,
-        RsyncClientRestoreCmd     => 0,
-        RsyncClientPath           => 0,
-        FtpShareName              => 1,
-        FtpUserName               => 1,
-        FtpPasswd                 => 1,
-        FtpBlockSize              => 1,
-        FtpPort                   => 1,
-        FtpTimeout                => 1,
-        FtpFollowSymlinks         => 1,
-        FtpRestoreEnabled         => 1,
-        ArchiveDest               => 1,
-        ArchiveComp               => 1,
-        ArchivePar                => 1,
-        ArchiveSplit              => 1,
-        ArchiveClientCmd          => 0,
-        FixedIPNetBiosNameCheck   => 1,
-        NmbLookupCmd              => 0,
-        NmbLookupFindHostCmd      => 0,
-        PingMaxMsec               => 1,
-        PingCmd                   => 0,
-        ClientTimeout             => 1,
-        MaxOldPerPCLogFiles       => 1,
-        CompressLevel             => 1,
-        ClientNameAlias           => 1,
-        DumpPreUserCmd            => 0,
-        DumpPostUserCmd           => 0,
-        RestorePreUserCmd         => 0,
-        RestorePostUserCmd        => 0,
-        ArchivePreUserCmd         => 0,
-        ArchivePostUserCmd        => 0,
-        DumpPostShareCmd          => 0,
-        DumpPreShareCmd           => 0,
-        UserCmdCheckStatus        => 0,
-        EMailNotifyMinDays        => 1,
-        EMailFromUserName         => 1,
-        EMailAdminUserName        => 1,
-        EMailUserDestDomain       => 1,
-        EMailNoBackupEverSubj     => 1,
-        EMailNoBackupEverMesg     => 1,
-        EMailNotifyOldBackupDays  => 1,
-        EMailNoBackupRecentSubj   => 1,
-        EMailNoBackupRecentMesg   => 1,
-        EMailNotifyOldOutlookDays => 1,
-        EMailOutlookBackupSubj    => 1,
-        EMailOutlookBackupMesg    => 1,
-        EMailHeaders              => 1,
+  FullPeriod => 1,
+  IncrPeriod => 1,
+  FullKeepCnt => 1,
+  FullKeepCntMin => 1,
+  FullAgeMax => 1,
+  IncrKeepCnt => 1,
+  IncrKeepCntMin => 1,
+  IncrAgeMax => 1,
+  IncrLevels => 1,
+  IncrFill => 1,
+  PartialAgeMax => 1,
+  RestoreInfoKeepCnt => 1,
+  ArchiveInfoKeepCnt => 1,
+  BackupFilesOnly => 1,
+  BackupFilesExclude => 1,
+  BackupsDisable => 1,
+  BlackoutBadPingLimit => 1,
+  BlackoutGoodCnt => 1,
+  BlackoutPeriods => 1,
+  BackupZeroFilesIsFatal => 1,
+  ClientCharset => 1,
+  ClientCharsetLegacy => 1,
+  XferMethod => 1,
+  XferLogLevel => 1,
+  SmbShareName => 1,
+  SmbShareUserName => 1,
+  SmbSharePasswd => 1,
+  SmbClientFullCmd => 0,
+  SmbClientIncrCmd => 0,
+  SmbClientRestoreCmd => 0,
+  TarShareName => 1,
+  TarFullArgs => 1,
+  TarIncrArgs => 1,
+  TarClientCmd => 0,
+  TarClientRestoreCmd => 0,
+  TarClientPath => 0,
+  RsyncShareName => 1,
+  RsyncdClientPort => 1,
+  RsyncdPasswd => 1,
+  RsyncdUserName => 1,
+  RsyncdAuthRequired => 1,
+  RsyncCsumCacheVerifyProb => 1,
+  RsyncArgs => 1,
+  RsyncArgsExtra => 1,
+  RsyncRestoreArgs => 1,
+  RsyncClientCmd => 0,
+  RsyncClientRestoreCmd => 0,
+  RsyncClientPath => 0,
+  FtpShareName => 1,
+  FtpUserName => 1,
+  FtpPasswd => 1,
+  FtpBlockSize => 1,
+  FtpPort => 1,
+  FtpTimeout => 1,
+  FtpFollowSymlinks => 1,
+  FtpRestoreEnabled => 1,
+  ArchiveDest => 1,
+  ArchiveComp => 1,
+  ArchivePar => 1,
+  ArchiveSplit => 1,
+  ArchiveClientCmd => 0,
+  FixedIPNetBiosNameCheck => 1,
+  NmbLookupCmd => 0,
+  NmbLookupFindHostCmd => 0,
+  PingMaxMsec => 1,
+  PingCmd => 0,
+  ClientTimeout => 1,
+  MaxOldPerPCLogFiles => 1,
+  CompressLevel => 1,
+  ClientNameAlias => 1,
+  DumpPreUserCmd => 0,
+  DumpPostUserCmd => 0,
+  RestorePreUserCmd => 0,
+  RestorePostUserCmd => 0,
+  ArchivePreUserCmd => 0,
+  ArchivePostUserCmd => 0,
+  DumpPostShareCmd => 0,
+  DumpPreShareCmd => 0,
+  UserCmdCheckStatus => 0,
+  EMailNotifyMinDays => 1,
+  EMailFromUserName => 1,
+  EMailAdminUserName => 1,
+  EMailUserDestDomain => 1,
+  EMailNoBackupEverSubj => 1,
+  EMailNoBackupEverMesg => 1,
+  EMailNotifyOldBackupDays => 1,
+  EMailNoBackupRecentSubj => 1,
+  EMailNoBackupRecentMesg => 1,
+  EMailNotifyOldOutlookDays => 1,
+  EMailOutlookBackupSubj => 1,
+  EMailOutlookBackupMesg => 1,
+  EMailHeaders => 1,
 };



1.1                  app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch?rev=1.1&content-type=text/plain

Index: 04-add-docdir-marker.patch
===================================================================
--- lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
+++ lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
@@ -86,7 +86,7 @@
         $file = $bpc->ConfDir() . "/hosts";
         $linkHosts = 1;
     } elsif ( $type eq "docs" ) {
-        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
+        $file = "__DOCDIR__/BackupPC.html";
     } elsif ( $host ne "" ) {
         if ( !defined($In{num}) ) {
             # get the latest LOG file