summaryrefslogtreecommitdiff
path: root/app-backup/backuppc/files/3.3.0
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
commitd87262dd706fec50cd150aab3e93883b6337466d (patch)
tree246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-backup/backuppc/files/3.3.0
parent71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-backup/backuppc/files/3.3.0')
-rw-r--r--app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch30
-rw-r--r--app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch137
-rw-r--r--app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch64
3 files changed, 0 insertions, 231 deletions
diff --git a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
deleted file mode 100644
index c943fdce68b1..000000000000
--- a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.pl.dist 2013-09-23 23:01:19.524743747 +0300
-+++ configure.pl 2013-09-23 23:01:37.344567459 +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;
-@@ -729,7 +730,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'";
- }
- }
-
diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
deleted file mode 100644
index 79ad6547fa6f..000000000000
--- a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- conf/config.pl.dist 2013-09-23 23:05:50.332064754 +0300
-+++ conf/config.pl 2013-09-23 23:07:44.110943607 +0300
-@@ -355,7 +355,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 +373,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 +383,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 +458,7 @@
- # $Conf{FullKeepCnt} = 4;
- # $Conf{FullKeepCnt} = [4];
- #
--$Conf{FullKeepCnt} = 1;
-+$Conf{FullKeepCnt} = [1];
-
- #
- # Very old full backups are removed after $Conf{FullAgeMax} days. However,
-@@ -688,7 +688,7 @@
- # '*' => ['/myFiles', '/important'], # these are other shares
- # };
- #
--$Conf{BackupFilesOnly} = undef;
-+$Conf{BackupFilesOnly} = {};
-
- #
- # List of directories or files to exclude from the backup. For Smb,
-@@ -749,7 +749,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
-@@ -932,7 +932,7 @@
- #
- # 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.
-@@ -1054,7 +1054,7 @@
- #
- # This setting only matters if $Conf{XferMethod} = 'tar'.
- #
--$Conf{TarShareName} = '/';
-+$Conf{TarShareName} = ['/'];
-
- #
- # Command to run tar on the client. GNU tar is required. You will
-@@ -1233,7 +1233,7 @@
- #
- # $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot'];
- #
--$Conf{RsyncShareName} = '/';
-+$Conf{RsyncShareName} = ['/'];
-
- #
- # Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd".
-@@ -1285,7 +1285,7 @@
- #
- # 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
-@@ -1883,7 +1883,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
-@@ -1938,7 +1938,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
-@@ -1965,7 +1965,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
-@@ -2102,14 +2102,17 @@
- {
- link => "?action=view&type=docs",
- lname => "Documentation", # actually displays $Lang->{Documentation}
-+ name => undef,
- },
- {
- link => "http://backuppc.wiki.sourceforge.net",
- name => "Wiki", # displays literal "Wiki"
-+ lname => undef,
- },
- {
- link => "http://backuppc.sourceforge.net",
- name => "SourceForge", # displays literal "SourceForge"
-+ lname => undef,
- },
- ];
-
diff --git a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
deleted file mode 100644
index 8b54fc87b050..000000000000
--- a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- conf/config.pl.formatted 2013-09-23 23:12:30.708129365 +0300
-+++ conf/config.pl 2013-09-23 23:12:39.448043656 +0300
-@@ -1305,7 +1305,7 @@
- '--times',
- '--block-size=2048',
- '--recursive',
--
-+ '--specials',
- #
- # Rsync >= 2.6.3 supports the --checksum-seed option
- # which allows rsync checksum caching on the server.
-@@ -1313,7 +1313,7 @@
- # you have a recent client rsync version and you want
- # to enable checksum caching.
- #
-- #'--checksum-seed=32761',
-+ '--checksum-seed=32761',
- ];
-
- #
-@@ -1383,6 +1383,7 @@
- '--relative',
- '--ignore-times',
- '--recursive',
-+ '--specials',
-
- #
- # Rsync >= 2.6.3 supports the --checksum-seed option
-@@ -1391,7 +1392,7 @@
- # you have a recent client rsync version and you want
- # to enable checksum caching.
- #
-- #'--checksum-seed=32761',
-+ '--checksum-seed=32761',
-
- #
- # Add additional arguments here
-@@ -2029,7 +2030,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.
-@@ -2076,7 +2077,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
-@@ -2262,7 +2263,7 @@
- ClientTimeout => 1,
- MaxOldPerPCLogFiles => 1,
- CompressLevel => 1,
-- ClientNameAlias => 1,
-+ ClientNameAlias => 0,
- DumpPreUserCmd => 0,
- DumpPostUserCmd => 0,
- RestorePreUserCmd => 0,