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