1 |
patrick 14/07/30 08:26:27 |
2 |
|
3 |
Added: 02-fix-config.pl-formatting.patch |
4 |
03-reasonable-config.pl-defaults.patch |
5 |
01-fix-configure.pl.patch |
6 |
Log: |
7 |
Bump, ebuild modifications and patches thanks to Lenno Nagel. Fixes #468360 |
8 |
|
9 |
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: 02-fix-config.pl-formatting.patch |
18 |
=================================================================== |
19 |
--- conf/config.pl.dist 2013-09-23 23:05:50.332064754 +0300 |
20 |
+++ conf/config.pl 2013-09-23 23:07:44.110943607 +0300 |
21 |
@@ -87,7 +87,7 @@ |
22 |
# Default value prevents any access from group other, and prevents |
23 |
# group write. |
24 |
# |
25 |
-$Conf{UmaskMode} = 027; |
26 |
+$Conf{UmaskMode} = 27; |
27 |
|
28 |
# |
29 |
# Times at which we wake up, check all the PCs, and schedule necessary |
30 |
@@ -113,7 +113,31 @@ |
31 |
# you want BackupPC_nightly to run (eg: when you don't expect a lot |
32 |
# of regular backups to run). |
33 |
# |
34 |
-$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]; |
35 |
+$Conf{WakeupSchedule} = [ |
36 |
+ 1, |
37 |
+ 2, |
38 |
+ 3, |
39 |
+ 4, |
40 |
+ 5, |
41 |
+ 6, |
42 |
+ 7, |
43 |
+ 8, |
44 |
+ 9, |
45 |
+ 10, |
46 |
+ 11, |
47 |
+ 12, |
48 |
+ 13, |
49 |
+ 14, |
50 |
+ 15, |
51 |
+ 16, |
52 |
+ 17, |
53 |
+ 18, |
54 |
+ 19, |
55 |
+ 20, |
56 |
+ 21, |
57 |
+ 22, |
58 |
+ 23 |
59 |
+]; |
60 |
|
61 |
# |
62 |
# Maximum number of simultaneous backups to run. If there |
63 |
@@ -224,9 +248,9 @@ |
64 |
# Full path to various commands for archiving |
65 |
# |
66 |
$Conf{SplitPath} = ''; |
67 |
-$Conf{ParPath} = ''; |
68 |
-$Conf{CatPath} = ''; |
69 |
-$Conf{GzipPath} = ''; |
70 |
+$Conf{ParPath} = ''; |
71 |
+$Conf{CatPath} = ''; |
72 |
+$Conf{GzipPath} = ''; |
73 |
$Conf{Bzip2Path} = ''; |
74 |
|
75 |
# |
76 |
@@ -302,11 +326,11 @@ |
77 |
# a symbolic link to the new location, or mount the new BackupPC |
78 |
# store at the existing $Conf{TopDir} setting. |
79 |
# |
80 |
-$Conf{TopDir} = ''; |
81 |
-$Conf{ConfDir} = ''; |
82 |
-$Conf{LogDir} = ''; |
83 |
-$Conf{InstallDir} = ''; |
84 |
-$Conf{CgiDir} = ''; |
85 |
+$Conf{TopDir} = ''; |
86 |
+$Conf{ConfDir} = ''; |
87 |
+$Conf{LogDir} = ''; |
88 |
+$Conf{InstallDir} = ''; |
89 |
+$Conf{CgiDir} = ''; |
90 |
|
91 |
# |
92 |
# Whether BackupPC and the CGI script BackupPC_Admin verify that they |
93 |
@@ -316,7 +340,7 @@ |
94 |
# BackupPC might be accidently started as root or the wrong user, |
95 |
# or if the CGI script is not installed correctly. |
96 |
# |
97 |
-$Conf{BackupPCUserVerify} = 1; |
98 |
+$Conf{BackupPCUserVerify} = '1'; |
99 |
|
100 |
# |
101 |
# Maximum number of hardlinks supported by the $TopDir file system |
102 |
@@ -333,7 +357,7 @@ |
103 |
# Advanced option for asking BackupPC to load additional perl modules. |
104 |
# Can be a list (array ref) of module names to load at startup. |
105 |
# |
106 |
-$Conf{PerlModuleLoad} = undef; |
107 |
+$Conf{PerlModuleLoad} = undef; |
108 |
|
109 |
# |
110 |
# Path to init.d script and command to use that script to start the |
111 |
@@ -355,7 +379,7 @@ |
112 |
# needs to be a full path and you can't include shell syntax like |
113 |
# redirection and pipes; put that in a script if you need it. |
114 |
# |
115 |
-$Conf{ServerInitdPath} = ''; |
116 |
+$Conf{ServerInitdPath} = undef; |
117 |
$Conf{ServerInitdStartCmd} = ''; |
118 |
|
119 |
|
120 |
@@ -373,7 +397,7 @@ |
121 |
# time taken for the backup, plus the granularity of $Conf{WakeupSchedule} |
122 |
# will make the actual backup interval a bit longer. |
123 |
# |
124 |
-$Conf{FullPeriod} = 6.97; |
125 |
+$Conf{FullPeriod} = '6.97'; |
126 |
|
127 |
# |
128 |
# Minimum period in days between incremental backups (a user requested |
129 |
@@ -383,7 +407,7 @@ |
130 |
# time taken for the backup, plus the granularity of $Conf{WakeupSchedule} |
131 |
# will make the actual backup interval a bit longer. |
132 |
# |
133 |
-$Conf{IncrPeriod} = 0.97; |
134 |
+$Conf{IncrPeriod} = '0.97'; |
135 |
|
136 |
# |
137 |
# Number of full backups to keep. Must be >= 1. |
138 |
@@ -458,7 +482,9 @@ |
139 |
# $Conf{FullKeepCnt} = 4; |
140 |
# $Conf{FullKeepCnt} = [4]; |
141 |
# |
142 |
-$Conf{FullKeepCnt} = 1; |
143 |
+$Conf{FullKeepCnt} = [ |
144 |
+ 1 |
145 |
+]; |
146 |
|
147 |
# |
148 |
# Very old full backups are removed after $Conf{FullAgeMax} days. However, |
149 |
@@ -470,7 +496,7 @@ |
150 |
# full backups to exceed $Conf{FullAgeMax}. |
151 |
# |
152 |
$Conf{FullKeepCntMin} = 1; |
153 |
-$Conf{FullAgeMax} = 90; |
154 |
+$Conf{FullAgeMax} = 90; |
155 |
|
156 |
# |
157 |
# Number of incremental backups to keep. Must be >= 1. |
158 |
@@ -487,7 +513,7 @@ |
159 |
# matter how old they are. |
160 |
# |
161 |
$Conf{IncrKeepCntMin} = 1; |
162 |
-$Conf{IncrAgeMax} = 30; |
163 |
+$Conf{IncrAgeMax} = 30; |
164 |
|
165 |
# |
166 |
# Level of each incremental. "Level" follows the terminology |
167 |
@@ -565,7 +591,9 @@ |
168 |
# meaning each incremental backed up all the files that |
169 |
# changed since the last full. |
170 |
# |
171 |
-$Conf{IncrLevels} = [1]; |
172 |
+$Conf{IncrLevels} = [ |
173 |
+ 1 |
174 |
+]; |
175 |
|
176 |
# |
177 |
# Disable all full and incremental backups. These settings are |
178 |
@@ -631,7 +659,7 @@ |
179 |
# The default is off. You can turn this on or off at any |
180 |
# time without affecting existing backups. |
181 |
# |
182 |
-$Conf{IncrFill} = 0; |
183 |
+$Conf{IncrFill} = '0'; |
184 |
|
185 |
# |
186 |
# Number of restore logs to keep. BackupPC remembers information about |
187 |
@@ -683,7 +711,7 @@ |
188 |
# '*' => ['/myFiles', '/important'], # these are other shares |
189 |
# }; |
190 |
# |
191 |
-$Conf{BackupFilesOnly} = undef; |
192 |
+$Conf{BackupFilesOnly} = {}; |
193 |
|
194 |
# |
195 |
# List of directories or files to exclude from the backup. For Smb, |
196 |
@@ -739,7 +767,7 @@ |
197 |
# '*' => ['/junk', '/dont_back_this_up'], # these are for other shares |
198 |
# }; |
199 |
# |
200 |
-$Conf{BackupFilesExclude} = undef; |
201 |
+$Conf{BackupFilesExclude} = {}; |
202 |
|
203 |
# |
204 |
# PCs that are always or often on the network can be backed up after |
205 |
@@ -770,7 +798,7 @@ |
206 |
# to just set $Conf{WakeupSchedule} to a restricted schedule. |
207 |
# |
208 |
$Conf{BlackoutBadPingLimit} = 3; |
209 |
-$Conf{BlackoutGoodCnt} = 7; |
210 |
+$Conf{BlackoutGoodCnt} = 7; |
211 |
|
212 |
# |
213 |
# One or more blackout periods can be specified. If a client is |
214 |
@@ -813,11 +841,17 @@ |
215 |
# Saturday night. |
216 |
# |
217 |
$Conf{BlackoutPeriods} = [ |
218 |
- { |
219 |
- hourBegin => 7.0, |
220 |
- hourEnd => 19.5, |
221 |
- weekDays => [1, 2, 3, 4, 5], |
222 |
- }, |
223 |
+ { |
224 |
+ 'hourEnd' => '19.5', |
225 |
+ 'weekDays' => [ |
226 |
+ 1, |
227 |
+ 2, |
228 |
+ 3, |
229 |
+ 4, |
230 |
+ 5 |
231 |
+ ], |
232 |
+ 'hourBegin' => 7 |
233 |
+ } |
234 |
]; |
235 |
|
236 |
# |
237 |
@@ -826,7 +860,7 @@ |
238 |
# backed up. If you have shares that might be empty (and therefore an |
239 |
# empty backup is valid) you should set this flag to 0. |
240 |
# |
241 |
-$Conf{BackupZeroFilesIsFatal} = 1; |
242 |
+$Conf{BackupZeroFilesIsFatal} = '1'; |
243 |
|
244 |
########################################################################### |
245 |
# How to backup a client |
246 |
@@ -922,7 +956,9 @@ |
247 |
# |
248 |
# This setting only matters if $Conf{XferMethod} = 'smb'. |
249 |
# |
250 |
-$Conf{SmbShareName} = 'C$'; |
251 |
+$Conf{SmbShareName} = [ |
252 |
+ 'C$' |
253 |
+]; |
254 |
|
255 |
# |
256 |
# Smbclient share user name. This is passed to smbclient's -U argument. |
257 |
@@ -975,9 +1011,7 @@ |
258 |
# needs to be a full path and you can't include shell syntax like |
259 |
# redirection and pipes; put that in a script if you need it. |
260 |
# |
261 |
-$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName' |
262 |
- . ' $I_option -U $userName -E -d 1' |
263 |
- . ' -c tarmode\\ full -Tc$X_option - $fileList'; |
264 |
+$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -Tc$X_option - $fileList'; |
265 |
|
266 |
# |
267 |
# Command to run smbclient for an incremental dump. |
268 |
@@ -989,9 +1023,7 @@ |
269 |
# needs to be a full path and you can't include shell syntax like |
270 |
# redirection and pipes; put that in a script if you need it. |
271 |
# |
272 |
-$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName' |
273 |
- . ' $I_option -U $userName -E -d 1' |
274 |
- . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList'; |
275 |
+$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList'; |
276 |
|
277 |
# |
278 |
# Command to run smbclient for a restore. |
279 |
@@ -1007,9 +1039,7 @@ |
280 |
# needs to be a full path and you can't include shell syntax like |
281 |
# redirection and pipes; put that in a script if you need it. |
282 |
# |
283 |
-$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName' |
284 |
- . ' $I_option -U $userName -E -d 1' |
285 |
- . ' -c tarmode\\ full -Tx -'; |
286 |
+$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 1 -c tarmode\\ full -Tx -'; |
287 |
|
288 |
########################################################################### |
289 |
# Tar Configuration |
290 |
@@ -1044,7 +1074,9 @@ |
291 |
# |
292 |
# This setting only matters if $Conf{XferMethod} = 'tar'. |
293 |
# |
294 |
-$Conf{TarShareName} = '/'; |
295 |
+$Conf{TarShareName} = [ |
296 |
+ '/' |
297 |
+]; |
298 |
|
299 |
# |
300 |
# Command to run tar on the client. GNU tar is required. You will |
301 |
@@ -1088,9 +1120,7 @@ |
302 |
# needs to be a full path and you can't include shell syntax like |
303 |
# redirection and pipes; put that in a script if you need it. |
304 |
# |
305 |
-$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host' |
306 |
- . ' env LC_ALL=C $tarPath -c -v -f - -C $shareName+' |
307 |
- . ' --totals'; |
308 |
+$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host env LC_ALL=C $tarPath -c -v -f - -C $shareName+ --totals'; |
309 |
|
310 |
# |
311 |
# Extra tar arguments for full backups. Several variables are substituted at |
312 |
@@ -1149,9 +1179,7 @@ |
313 |
# needs to be a full path and you can't include shell syntax like |
314 |
# redirection and pipes; put that in a script if you need it. |
315 |
# |
316 |
-$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host' |
317 |
- . ' env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner' |
318 |
- . ' -v -f - -C $shareName+'; |
319 |
+$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner -v -f - -C $shareName+'; |
320 |
|
321 |
# |
322 |
# Full path for tar on the client. Security caution: normal users should not |
323 |
@@ -1223,7 +1251,9 @@ |
324 |
# |
325 |
# $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot']; |
326 |
# |
327 |
-$Conf{RsyncShareName} = '/'; |
328 |
+$Conf{RsyncShareName} = [ |
329 |
+ '/' |
330 |
+]; |
331 |
|
332 |
# |
333 |
# Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd". |
334 |
@@ -1252,7 +1282,7 @@ |
335 |
# connect to an rsyncd on the client that is not password protected. |
336 |
# Turn off at your own risk. |
337 |
# |
338 |
-$Conf{RsyncdAuthRequired} = 1; |
339 |
+$Conf{RsyncdAuthRequired} = '1'; |
340 |
|
341 |
# |
342 |
# When rsync checksum caching is enabled (by adding the |
343 |
@@ -1275,35 +1305,23 @@ |
344 |
# |
345 |
# This setting has no effect unless checksum caching is turned on. |
346 |
# |
347 |
-$Conf{RsyncCsumCacheVerifyProb} = 0.01; |
348 |
+$Conf{RsyncCsumCacheVerifyProb} = '0.01'; |
349 |
|
350 |
# |
351 |
# Arguments to rsync for backup. Do not edit the first set unless you |
352 |
# have a thorough understanding of how File::RsyncP works. |
353 |
# |
354 |
$Conf{RsyncArgs} = [ |
355 |
- # |
356 |
- # Do not edit these! |
357 |
- # |
358 |
- '--numeric-ids', |
359 |
- '--perms', |
360 |
- '--owner', |
361 |
- '--group', |
362 |
- '-D', |
363 |
- '--links', |
364 |
- '--hard-links', |
365 |
- '--times', |
366 |
- '--block-size=2048', |
367 |
- '--recursive', |
368 |
- |
369 |
- # |
370 |
- # Rsync >= 2.6.3 supports the --checksum-seed option |
371 |
- # which allows rsync checksum caching on the server. |
372 |
- # Uncomment this to enable rsync checksum caching if |
373 |
- # you have a recent client rsync version and you want |
374 |
- # to enable checksum caching. |
375 |
- # |
376 |
- #'--checksum-seed=32761', |
377 |
+ '--numeric-ids', |
378 |
+ '--perms', |
379 |
+ '--owner', |
380 |
+ '--group', |
381 |
+ '-D', |
382 |
+ '--links', |
383 |
+ '--hard-links', |
384 |
+ '--times', |
385 |
+ '--block-size=2048', |
386 |
+ '--recursive', |
387 |
]; |
388 |
|
389 |
# |
390 |
@@ -1358,34 +1376,18 @@ |
391 |
# Note: $Conf{RsyncArgsExtra} doesn't apply to $Conf{RsyncRestoreArgs}. |
392 |
# |
393 |
$Conf{RsyncRestoreArgs} = [ |
394 |
- # |
395 |
- # Do not edit these! |
396 |
- # |
397 |
- '--numeric-ids', |
398 |
- '--perms', |
399 |
- '--owner', |
400 |
- '--group', |
401 |
- '-D', |
402 |
- '--links', |
403 |
- '--hard-links', |
404 |
- '--times', |
405 |
- '--block-size=2048', |
406 |
- '--relative', |
407 |
- '--ignore-times', |
408 |
- '--recursive', |
409 |
- |
410 |
- # |
411 |
- # Rsync >= 2.6.3 supports the --checksum-seed option |
412 |
- # which allows rsync checksum caching on the server. |
413 |
- # Uncomment this to enable rsync checksum caching if |
414 |
- # you have a recent client rsync version and you want |
415 |
- # to enable checksum caching. |
416 |
- # |
417 |
- #'--checksum-seed=32761', |
418 |
- |
419 |
- # |
420 |
- # Add additional arguments here |
421 |
- # |
422 |
+ '--numeric-ids', |
423 |
+ '--perms', |
424 |
+ '--owner', |
425 |
+ '--group', |
426 |
+ '-D', |
427 |
+ '--links', |
428 |
+ '--hard-links', |
429 |
+ '--times', |
430 |
+ '--block-size=2048', |
431 |
+ '--relative', |
432 |
+ '--ignore-times', |
433 |
+ '--recursive', |
434 |
]; |
435 |
|
436 |
########################################################################### |
437 |
@@ -1518,7 +1520,7 @@ |
438 |
# |
439 |
# Set to 0 to disable this feature. |
440 |
# |
441 |
-$Conf{ArchivePar} = 0; |
442 |
+$Conf{ArchivePar} = '0'; |
443 |
|
444 |
# |
445 |
# Archive Size Split |
446 |
@@ -1554,9 +1556,7 @@ |
447 |
# needs to be a full path and you can't include shell syntax like |
448 |
# redirection and pipes; put that in a script if you need it. |
449 |
# |
450 |
-$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost' |
451 |
- . ' $tarCreatePath $splitpath $parpath $host $backupnumber' |
452 |
- . ' $compression $compext $splitsize $archiveloc $parfile *'; |
453 |
+$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost $tarCreatePath $splitpath $parpath $host $backupnumber $compression $compext $splitsize $archiveloc $parfile *'; |
454 |
|
455 |
# |
456 |
# Full path for ssh. Security caution: normal users should not |
457 |
@@ -1628,7 +1628,7 @@ |
458 |
# setting this flag is a great way to verify that the machines have |
459 |
# their netbios name set correctly before turning on DCHP. |
460 |
# |
461 |
-$Conf{FixedIPNetBiosNameCheck} = 0; |
462 |
+$Conf{FixedIPNetBiosNameCheck} = '0'; |
463 |
|
464 |
# |
465 |
# Full path to the ping command. Security caution: normal users |
466 |
@@ -1805,13 +1805,13 @@ |
467 |
# needs to be a full path and you can't include shell syntax like |
468 |
# redirection and pipes; put that in a script if you need it. |
469 |
# |
470 |
-$Conf{DumpPreUserCmd} = undef; |
471 |
-$Conf{DumpPostUserCmd} = undef; |
472 |
-$Conf{DumpPreShareCmd} = undef; |
473 |
-$Conf{DumpPostShareCmd} = undef; |
474 |
-$Conf{RestorePreUserCmd} = undef; |
475 |
+$Conf{DumpPreUserCmd} = undef; |
476 |
+$Conf{DumpPostUserCmd} = undef; |
477 |
+$Conf{DumpPreShareCmd} = undef; |
478 |
+$Conf{DumpPostShareCmd} = undef; |
479 |
+$Conf{RestorePreUserCmd} = undef; |
480 |
$Conf{RestorePostUserCmd} = undef; |
481 |
-$Conf{ArchivePreUserCmd} = undef; |
482 |
+$Conf{ArchivePreUserCmd} = undef; |
483 |
$Conf{ArchivePostUserCmd} = undef; |
484 |
|
485 |
# |
486 |
@@ -1835,7 +1835,7 @@ |
487 |
# that snapshots or dumps a database which fails because |
488 |
# of some database error. |
489 |
# |
490 |
-$Conf{UserCmdCheckStatus} = 0; |
491 |
+$Conf{UserCmdCheckStatus} = '0'; |
492 |
|
493 |
# |
494 |
# Override the client's host name. This allows multiple clients |
495 |
@@ -1873,7 +1873,7 @@ |
496 |
# rounded up (ie: 2.5 means a user will never receive email more |
497 |
# than once every 3 days). |
498 |
# |
499 |
-$Conf{EMailNotifyMinDays} = 2.5; |
500 |
+$Conf{EMailNotifyMinDays} = '2.5'; |
501 |
|
502 |
# |
503 |
# Name to use as the "from" name for email. Depending upon your mail |
504 |
@@ -1928,7 +1928,7 @@ |
505 |
# When there have been no backups in this number of days the user |
506 |
# is sent an email. |
507 |
# |
508 |
-$Conf{EMailNotifyOldBackupDays} = 7.0; |
509 |
+$Conf{EMailNotifyOldBackupDays} = 7; |
510 |
|
511 |
# |
512 |
# This subject and message is sent to a user if their PC has not recently |
513 |
@@ -1955,7 +1955,7 @@ |
514 |
# How old the most recent backup of Outlook files has to be before |
515 |
# notifying user. |
516 |
# |
517 |
-$Conf{EMailNotifyOldOutlookDays} = 5.0; |
518 |
+$Conf{EMailNotifyOldOutlookDays} = 5; |
519 |
|
520 |
# |
521 |
# This subject and message is sent to a user if their Outlook files have |
522 |
@@ -1983,10 +1983,9 @@ |
523 |
# Additional email headers. This sets to charset to |
524 |
# utf8. |
525 |
# |
526 |
-$Conf{EMailHeaders} = <<EOF; |
527 |
-MIME-Version: 1.0 |
528 |
+$Conf{EMailHeaders} = 'MIME-Version: 1.0 |
529 |
Content-Type: text/plain; charset="utf-8" |
530 |
-EOF |
531 |
+'; |
532 |
|
533 |
########################################################################### |
534 |
# CGI user interface configuration settings |
535 |
@@ -2059,7 +2058,7 @@ |
536 |
# be rendered as a link to http://myhost/users/craig.html. |
537 |
# |
538 |
$Conf{CgiUserHomePageCheck} = ''; |
539 |
-$Conf{CgiUserUrlCreate} = 'mailto:%s'; |
540 |
+$Conf{CgiUserUrlCreate} = 'mailto:%s'; |
541 |
|
542 |
# |
543 |
# Date display format for CGI interface. A value of 1 uses US-style |
544 |
@@ -2074,12 +2073,12 @@ |
545 |
# the user is listed in the host file (as either the user or in moreUsers) |
546 |
# are displayed. |
547 |
# |
548 |
-$Conf{CgiNavBarAdminAllHosts} = 1; |
549 |
+$Conf{CgiNavBarAdminAllHosts} = '1'; |
550 |
|
551 |
# |
552 |
# Enable/disable the search box in the navigation bar. |
553 |
# |
554 |
-$Conf{CgiSearchBoxEnable} = 1; |
555 |
+$Conf{CgiSearchBoxEnable} = '1'; |
556 |
|
557 |
# |
558 |
# Additional navigation bar links. These appear for both regular users |
559 |
@@ -2089,31 +2088,34 @@ |
560 |
# just literally displaying name. |
561 |
# |
562 |
$Conf{CgiNavBarLinks} = [ |
563 |
- { |
564 |
- link => "?action=view&type=docs", |
565 |
- lname => "Documentation", # actually displays $Lang->{Documentation} |
566 |
- }, |
567 |
- { |
568 |
- link => "http://backuppc.wiki.sourceforge.net", |
569 |
- name => "Wiki", # displays literal "Wiki" |
570 |
- }, |
571 |
- { |
572 |
- link => "http://backuppc.sourceforge.net", |
573 |
- name => "SourceForge", # displays literal "SourceForge" |
574 |
- }, |
575 |
+ { |
576 |
+ 'link' => '?action=view&type=docs', |
577 |
+ 'lname' => 'Documentation', |
578 |
+ 'name' => undef |
579 |
+ }, |
580 |
+ { |
581 |
+ 'link' => 'http://backuppc.wiki.sourceforge.net', |
582 |
+ 'lname' => undef, |
583 |
+ 'name' => 'Wiki' |
584 |
+ }, |
585 |
+ { |
586 |
+ 'link' => 'http://backuppc.sourceforge.net', |
587 |
+ 'lname' => undef, |
588 |
+ 'name' => 'SourceForge' |
589 |
+ } |
590 |
]; |
591 |
|
592 |
# |
593 |
# Hilight colors based on status that are used in the PC summary page. |
594 |
# |
595 |
$Conf{CgiStatusHilightColor} = { |
596 |
- Reason_backup_failed => '#ffcccc', |
597 |
- Reason_backup_done => '#ccffcc', |
598 |
- Reason_no_ping => '#ffff99', |
599 |
- Reason_backup_canceled_by_user => '#ff9900', |
600 |
- Status_backup_in_progress => '#66cc99', |
601 |
- Disabled_OnlyManualBackups => '#d1d1d1', |
602 |
- Disabled_AllBackupsDisabled => '#d1d1d1', |
603 |
+ 'Reason_backup_failed' => '#ffcccc', |
604 |
+ 'Reason_backup_done' => '#ccffcc', |
605 |
+ 'Reason_backup_canceled_by_user' => '#ff9900', |
606 |
+ 'Reason_no_ping' => '#ffff99', |
607 |
+ 'Disabled_OnlyManualBackups' => '#d1d1d1', |
608 |
+ 'Status_backup_in_progress' => '#66cc99', |
609 |
+ 'Disabled_AllBackupsDisabled' => '#d1d1d1' |
610 |
}; |
611 |
|
612 |
# |
613 |
@@ -2141,7 +2143,7 @@ |
614 |
# 'pl' => 'text/plain', |
615 |
# }; |
616 |
# |
617 |
-$Conf{CgiExt2ContentType} = { }; |
618 |
+$Conf{CgiExt2ContentType} = {}; |
619 |
|
620 |
# |
621 |
# URL (without the leading http://host) for BackupPC's image directory. |
622 |
@@ -2166,7 +2168,7 @@ |
623 |
# |
624 |
# Whether the user is allowed to edit their per-PC config. |
625 |
# |
626 |
-$Conf{CgiUserConfigEditEnable} = 1; |
627 |
+$Conf{CgiUserConfigEditEnable} = '1'; |
628 |
|
629 |
# |
630 |
# Which per-host config variables a non-admin user is allowed |
631 |
@@ -2180,96 +2182,96 @@ |
632 |
# sorts of bad things. |
633 |
# |
634 |
$Conf{CgiUserConfigEdit} = { |
635 |
- FullPeriod => 1, |
636 |
- IncrPeriod => 1, |
637 |
- FullKeepCnt => 1, |
638 |
- FullKeepCntMin => 1, |
639 |
- FullAgeMax => 1, |
640 |
- IncrKeepCnt => 1, |
641 |
- IncrKeepCntMin => 1, |
642 |
- IncrAgeMax => 1, |
643 |
- IncrLevels => 1, |
644 |
- IncrFill => 1, |
645 |
- PartialAgeMax => 1, |
646 |
- RestoreInfoKeepCnt => 1, |
647 |
- ArchiveInfoKeepCnt => 1, |
648 |
- BackupFilesOnly => 1, |
649 |
- BackupFilesExclude => 1, |
650 |
- BackupsDisable => 1, |
651 |
- BlackoutBadPingLimit => 1, |
652 |
- BlackoutGoodCnt => 1, |
653 |
- BlackoutPeriods => 1, |
654 |
- BackupZeroFilesIsFatal => 1, |
655 |
- ClientCharset => 1, |
656 |
- ClientCharsetLegacy => 1, |
657 |
- XferMethod => 1, |
658 |
- XferLogLevel => 1, |
659 |
- SmbShareName => 1, |
660 |
- SmbShareUserName => 1, |
661 |
- SmbSharePasswd => 1, |
662 |
- SmbClientFullCmd => 0, |
663 |
- SmbClientIncrCmd => 0, |
664 |
- SmbClientRestoreCmd => 0, |
665 |
- TarShareName => 1, |
666 |
- TarFullArgs => 1, |
667 |
- TarIncrArgs => 1, |
668 |
- TarClientCmd => 0, |
669 |
- TarClientRestoreCmd => 0, |
670 |
- TarClientPath => 0, |
671 |
- RsyncShareName => 1, |
672 |
- RsyncdClientPort => 1, |
673 |
- RsyncdPasswd => 1, |
674 |
- RsyncdUserName => 1, |
675 |
- RsyncdAuthRequired => 1, |
676 |
- RsyncCsumCacheVerifyProb => 1, |
677 |
- RsyncArgs => 1, |
678 |
- RsyncArgsExtra => 1, |
679 |
- RsyncRestoreArgs => 1, |
680 |
- RsyncClientCmd => 0, |
681 |
- RsyncClientRestoreCmd => 0, |
682 |
- RsyncClientPath => 0, |
683 |
- FtpShareName => 1, |
684 |
- FtpUserName => 1, |
685 |
- FtpPasswd => 1, |
686 |
- FtpBlockSize => 1, |
687 |
- FtpPort => 1, |
688 |
- FtpTimeout => 1, |
689 |
- FtpFollowSymlinks => 1, |
690 |
- FtpRestoreEnabled => 1, |
691 |
- ArchiveDest => 1, |
692 |
- ArchiveComp => 1, |
693 |
- ArchivePar => 1, |
694 |
- ArchiveSplit => 1, |
695 |
- ArchiveClientCmd => 0, |
696 |
- FixedIPNetBiosNameCheck => 1, |
697 |
- NmbLookupCmd => 0, |
698 |
- NmbLookupFindHostCmd => 0, |
699 |
- PingMaxMsec => 1, |
700 |
- PingCmd => 0, |
701 |
- ClientTimeout => 1, |
702 |
- MaxOldPerPCLogFiles => 1, |
703 |
- CompressLevel => 1, |
704 |
- ClientNameAlias => 1, |
705 |
- DumpPreUserCmd => 0, |
706 |
- DumpPostUserCmd => 0, |
707 |
- RestorePreUserCmd => 0, |
708 |
- RestorePostUserCmd => 0, |
709 |
- ArchivePreUserCmd => 0, |
710 |
- ArchivePostUserCmd => 0, |
711 |
- DumpPostShareCmd => 0, |
712 |
- DumpPreShareCmd => 0, |
713 |
- UserCmdCheckStatus => 0, |
714 |
- EMailNotifyMinDays => 1, |
715 |
- EMailFromUserName => 1, |
716 |
- EMailAdminUserName => 1, |
717 |
- EMailUserDestDomain => 1, |
718 |
- EMailNoBackupEverSubj => 1, |
719 |
- EMailNoBackupEverMesg => 1, |
720 |
- EMailNotifyOldBackupDays => 1, |
721 |
- EMailNoBackupRecentSubj => 1, |
722 |
- EMailNoBackupRecentMesg => 1, |
723 |
- EMailNotifyOldOutlookDays => 1, |
724 |
- EMailOutlookBackupSubj => 1, |
725 |
- EMailOutlookBackupMesg => 1, |
726 |
- EMailHeaders => 1, |
727 |
+ FullPeriod => 1, |
728 |
+ IncrPeriod => 1, |
729 |
+ FullKeepCnt => 1, |
730 |
+ FullKeepCntMin => 1, |
731 |
+ FullAgeMax => 1, |
732 |
+ IncrKeepCnt => 1, |
733 |
+ IncrKeepCntMin => 1, |
734 |
+ IncrAgeMax => 1, |
735 |
+ IncrLevels => 1, |
736 |
+ IncrFill => 1, |
737 |
+ PartialAgeMax => 1, |
738 |
+ RestoreInfoKeepCnt => 1, |
739 |
+ ArchiveInfoKeepCnt => 1, |
740 |
+ BackupFilesOnly => 1, |
741 |
+ BackupFilesExclude => 1, |
742 |
+ BackupsDisable => 1, |
743 |
+ BlackoutBadPingLimit => 1, |
744 |
+ BlackoutGoodCnt => 1, |
745 |
+ BlackoutPeriods => 1, |
746 |
+ BackupZeroFilesIsFatal => 1, |
747 |
+ ClientCharset => 1, |
748 |
+ ClientCharsetLegacy => 1, |
749 |
+ XferMethod => 1, |
750 |
+ XferLogLevel => 1, |
751 |
+ SmbShareName => 1, |
752 |
+ SmbShareUserName => 1, |
753 |
+ SmbSharePasswd => 1, |
754 |
+ SmbClientFullCmd => 0, |
755 |
+ SmbClientIncrCmd => 0, |
756 |
+ SmbClientRestoreCmd => 0, |
757 |
+ TarShareName => 1, |
758 |
+ TarFullArgs => 1, |
759 |
+ TarIncrArgs => 1, |
760 |
+ TarClientCmd => 0, |
761 |
+ TarClientRestoreCmd => 0, |
762 |
+ TarClientPath => 0, |
763 |
+ RsyncShareName => 1, |
764 |
+ RsyncdClientPort => 1, |
765 |
+ RsyncdPasswd => 1, |
766 |
+ RsyncdUserName => 1, |
767 |
+ RsyncdAuthRequired => 1, |
768 |
+ RsyncCsumCacheVerifyProb => 1, |
769 |
+ RsyncArgs => 1, |
770 |
+ RsyncArgsExtra => 1, |
771 |
+ RsyncRestoreArgs => 1, |
772 |
+ RsyncClientCmd => 0, |
773 |
+ RsyncClientRestoreCmd => 0, |
774 |
+ RsyncClientPath => 0, |
775 |
+ FtpShareName => 1, |
776 |
+ FtpUserName => 1, |
777 |
+ FtpPasswd => 1, |
778 |
+ FtpBlockSize => 1, |
779 |
+ FtpPort => 1, |
780 |
+ FtpTimeout => 1, |
781 |
+ FtpFollowSymlinks => 1, |
782 |
+ FtpRestoreEnabled => 1, |
783 |
+ ArchiveDest => 1, |
784 |
+ ArchiveComp => 1, |
785 |
+ ArchivePar => 1, |
786 |
+ ArchiveSplit => 1, |
787 |
+ ArchiveClientCmd => 0, |
788 |
+ FixedIPNetBiosNameCheck => 1, |
789 |
+ NmbLookupCmd => 0, |
790 |
+ NmbLookupFindHostCmd => 0, |
791 |
+ PingMaxMsec => 1, |
792 |
+ PingCmd => 0, |
793 |
+ ClientTimeout => 1, |
794 |
+ MaxOldPerPCLogFiles => 1, |
795 |
+ CompressLevel => 1, |
796 |
+ ClientNameAlias => 1, |
797 |
+ DumpPreUserCmd => 0, |
798 |
+ DumpPostUserCmd => 0, |
799 |
+ RestorePreUserCmd => 0, |
800 |
+ RestorePostUserCmd => 0, |
801 |
+ ArchivePreUserCmd => 0, |
802 |
+ ArchivePostUserCmd => 0, |
803 |
+ DumpPostShareCmd => 0, |
804 |
+ DumpPreShareCmd => 0, |
805 |
+ UserCmdCheckStatus => 0, |
806 |
+ EMailNotifyMinDays => 1, |
807 |
+ EMailFromUserName => 1, |
808 |
+ EMailAdminUserName => 1, |
809 |
+ EMailUserDestDomain => 1, |
810 |
+ EMailNoBackupEverSubj => 1, |
811 |
+ EMailNoBackupEverMesg => 1, |
812 |
+ EMailNotifyOldBackupDays => 1, |
813 |
+ EMailNoBackupRecentSubj => 1, |
814 |
+ EMailNoBackupRecentMesg => 1, |
815 |
+ EMailNotifyOldOutlookDays => 1, |
816 |
+ EMailOutlookBackupSubj => 1, |
817 |
+ EMailOutlookBackupMesg => 1, |
818 |
+ EMailHeaders => 1, |
819 |
}; |
820 |
|
821 |
|
822 |
|
823 |
1.1 app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch |
824 |
|
825 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch?rev=1.1&view=markup |
826 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch?rev=1.1&content-type=text/plain |
827 |
|
828 |
Index: 03-reasonable-config.pl-defaults.patch |
829 |
=================================================================== |
830 |
--- conf/config.pl.formatted 2013-09-23 23:12:30.708129365 +0300 |
831 |
+++ conf/config.pl 2013-09-23 23:12:39.448043656 +0300 |
832 |
@@ -1322,6 +1322,8 @@ |
833 |
'--times', |
834 |
'--block-size=2048', |
835 |
'--recursive', |
836 |
+ '--specials', |
837 |
+ '--checksum-seed=32761', |
838 |
]; |
839 |
|
840 |
# |
841 |
@@ -1388,6 +1390,8 @@ |
842 |
'--relative', |
843 |
'--ignore-times', |
844 |
'--recursive', |
845 |
+ '--specials', |
846 |
+ '--checksum-seed=32761', |
847 |
]; |
848 |
|
849 |
########################################################################### |
850 |
@@ -2018,7 +2022,7 @@ |
851 |
# --> administrative users are only craig and celia'. |
852 |
# |
853 |
$Conf{CgiAdminUserGroup} = ''; |
854 |
-$Conf{CgiAdminUsers} = ''; |
855 |
+$Conf{CgiAdminUsers} = 'backuppc'; |
856 |
|
857 |
# |
858 |
# URL of the BackupPC_Admin CGI script. Used for email messages. |
859 |
@@ -2065,7 +2069,7 @@ |
860 |
# dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero |
861 |
# for international dates (DD/MM). |
862 |
# |
863 |
-$Conf{CgiDateFormatMMDD} = 1; |
864 |
+$Conf{CgiDateFormatMMDD} = 2; |
865 |
|
866 |
# |
867 |
# If set, the complete list of hosts appears in the left navigation |
868 |
@@ -2251,7 +2255,7 @@ |
869 |
ClientTimeout => 1, |
870 |
MaxOldPerPCLogFiles => 1, |
871 |
CompressLevel => 1, |
872 |
- ClientNameAlias => 1, |
873 |
+ ClientNameAlias => 0, |
874 |
DumpPreUserCmd => 0, |
875 |
DumpPostUserCmd => 0, |
876 |
RestorePreUserCmd => 0, |
877 |
|
878 |
|
879 |
|
880 |
1.1 app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch |
881 |
|
882 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch?rev=1.1&view=markup |
883 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch?rev=1.1&content-type=text/plain |
884 |
|
885 |
Index: 01-fix-configure.pl.patch |
886 |
=================================================================== |
887 |
--- configure.pl.dist 2013-09-23 23:01:19.524743747 +0300 |
888 |
+++ configure.pl 2013-09-23 23:01:37.344567459 +0300 |
889 |
@@ -158,7 +158,7 @@ |
890 |
# config file to get all the defaults. |
891 |
# |
892 |
my $ConfigPath = ""; |
893 |
-my $ConfigFileOK = 1; |
894 |
+my $ConfigFileOK = 0; |
895 |
while ( 1 ) { |
896 |
if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) { |
897 |
$ConfigPath = "/etc/BackupPC/config.pl"; |
898 |
@@ -213,7 +213,8 @@ |
899 |
$bpc->{LogDir} = $Conf{LogDir} = "$Conf{TopDir}/log" |
900 |
if ( $Conf{LogDir} eq '' ); |
901 |
} |
902 |
- $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; |
903 |
+ # Disable this as it's not really neccessary for this ebuild |
904 |
+ # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir; |
905 |
my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1); |
906 |
if ( $err eq "" ) { |
907 |
print <<EOF; |
908 |
@@ -729,7 +730,7 @@ |
909 |
if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) { |
910 |
$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'"; |
911 |
} else { |
912 |
- $Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'"; |
913 |
+ $Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'"; |
914 |
} |
915 |
} |