Merge lp:~allison/ubuntu/oneiric/backuppc/bug-852484 into lp:ubuntu/oneiric/backuppc
- Oneiric (11.10)
- bug-852484
- Merge into oneiric
Proposed by
Dave Walker
Status: | Merged |
---|---|
Merged at revision: | 34 |
Proposed branch: | lp:~allison/ubuntu/oneiric/backuppc/bug-852484 |
Merge into: | lp:ubuntu/oneiric/backuppc |
Diff against target: |
1367 lines (+200/-140) 74 files modified
ChangeLog (+24/-1) README (+7/-7) bin/BackupPC (+1/-1) bin/BackupPC_archive (+1/-1) bin/BackupPC_archiveHost (+1/-1) bin/BackupPC_archiveStart (+1/-1) bin/BackupPC_attribPrint (+1/-1) bin/BackupPC_dump (+1/-1) bin/BackupPC_fixupBackupSummary (+1/-1) bin/BackupPC_link (+1/-1) bin/BackupPC_nightly (+1/-1) bin/BackupPC_restore (+1/-1) bin/BackupPC_sendEmail (+1/-1) bin/BackupPC_serverMesg (+1/-1) bin/BackupPC_tarCreate (+1/-1) bin/BackupPC_tarExtract (+1/-1) bin/BackupPC_tarPCCopy (+1/-1) bin/BackupPC_trashClean (+1/-1) bin/BackupPC_zcat (+1/-1) bin/BackupPC_zipCreate (+1/-1) cgi-bin/BackupPC_Admin (+1/-1) conf/BackupPC_stnd.css (+1/-1) conf/BackupPC_stnd_orig.css (+1/-1) configure.pl (+6/-6) debian/changelog (+29/-0) debian/control (+1/-1) doc/BackupPC.html (+19/-17) doc/BackupPC.pod (+19/-17) init.d/src/debian-backuppc (+1/-1) init.d/src/gentoo-backuppc (+1/-1) init.d/src/linux-backuppc (+1/-1) init.d/src/slackware-backuppc (+1/-1) init.d/src/solaris-backuppc (+1/-1) init.d/src/suse-backuppc (+1/-1) lib/BackupPC/Attrib.pm (+10/-5) lib/BackupPC/CGI/AdminOptions.pm (+1/-1) lib/BackupPC/CGI/Archive.pm (+1/-1) lib/BackupPC/CGI/ArchiveInfo.pm (+1/-1) lib/BackupPC/CGI/Browse.pm (+3/-3) lib/BackupPC/CGI/DirHistory.pm (+1/-1) lib/BackupPC/CGI/EditConfig.pm (+1/-1) lib/BackupPC/CGI/EmailSummary.pm (+1/-1) lib/BackupPC/CGI/GeneralInfo.pm (+1/-1) lib/BackupPC/CGI/HostInfo.pm (+1/-1) lib/BackupPC/CGI/LOGlist.pm (+1/-1) lib/BackupPC/CGI/Lib.pm (+1/-1) lib/BackupPC/CGI/Queue.pm (+1/-1) lib/BackupPC/CGI/RSS.pm (+1/-1) lib/BackupPC/CGI/ReloadServer.pm (+1/-1) lib/BackupPC/CGI/Restore.pm (+1/-1) lib/BackupPC/CGI/RestoreFile.pm (+1/-1) lib/BackupPC/CGI/RestoreInfo.pm (+1/-1) lib/BackupPC/CGI/StartServer.pm (+1/-1) lib/BackupPC/CGI/StartStopBackup.pm (+1/-1) lib/BackupPC/CGI/StopServer.pm (+1/-1) lib/BackupPC/CGI/Summary.pm (+1/-1) lib/BackupPC/CGI/View.pm (+1/-1) lib/BackupPC/Config/Meta.pm (+1/-1) lib/BackupPC/FileZIO.pm (+1/-1) lib/BackupPC/Lib.pm (+2/-2) lib/BackupPC/PoolWrite.pm (+1/-1) lib/BackupPC/Storage.pm (+1/-1) lib/BackupPC/Storage/Text.pm (+1/-1) lib/BackupPC/View.pm (+1/-1) lib/BackupPC/Xfer.pm (+1/-1) lib/BackupPC/Xfer/Archive.pm (+1/-1) lib/BackupPC/Xfer/Ftp.pm (+1/-1) lib/BackupPC/Xfer/Protocol.pm (+9/-12) lib/BackupPC/Xfer/Rsync.pm (+5/-4) lib/BackupPC/Xfer/RsyncDigest.pm (+1/-1) lib/BackupPC/Xfer/RsyncFileIO.pm (+1/-1) lib/BackupPC/Xfer/Smb.pm (+1/-1) lib/BackupPC/Xfer/Tar.pm (+5/-4) lib/BackupPC/Zip/FileMember.pm (+1/-1) |
To merge this branch: | bzr merge lp:~allison/ubuntu/oneiric/backuppc/bug-852484 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+75973@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote : | # |
Revision history for this message
James Page (james-page) wrote : | # |
However I can't upload - but still LGTM!
review:
Approve
Revision history for this message
Dave Walker (davewalker) wrote : | # |
Uploading thanks to ~james-page's review.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' | |||
2 | --- ChangeLog 2010-11-21 14:59:53 +0000 | |||
3 | +++ ChangeLog 2011-09-19 08:47:26 +0000 | |||
4 | @@ -11,13 +11,36 @@ | |||
5 | 11 | # | 11 | # |
6 | 12 | #======================================================================== | 12 | #======================================================================== |
7 | 13 | # | 13 | # |
9 | 14 | # Version 3.2.0, released 31 Jul 2010. | 14 | # Version 3.2.1, released 24 Apr 2011. |
10 | 15 | # | 15 | # |
11 | 16 | # See http://backuppc.sourceforge.net. | 16 | # See http://backuppc.sourceforge.net. |
12 | 17 | # | 17 | # |
13 | 18 | #======================================================================== | 18 | #======================================================================== |
14 | 19 | 19 | ||
15 | 20 | #------------------------------------------------------------------------ | 20 | #------------------------------------------------------------------------ |
16 | 21 | # Version 3.2.1, 24 Apr 2011 | ||
17 | 22 | #------------------------------------------------------------------------ | ||
18 | 23 | |||
19 | 24 | * Ensure $num is numeric in lib/BackupPC/CGI/Browse.pm to avoid XSS | ||
20 | 25 | attack. Report and patch by Adam E. | ||
21 | 26 | |||
22 | 27 | * Fixed application of "*" in $Conf{BackupFilesOnly} and | ||
23 | 28 | $Conf{BackupFilesExclud} for 2nd and later shares. Reported | ||
24 | 29 | by Alessandro and Alexander Maringer. | ||
25 | 30 | |||
26 | 31 | * Fixed email status check in lib/BackupPC/CGI/HostInfo.pl so that | ||
27 | 32 | empty email info doesn't appear; reported by Wayne Trevena, | ||
28 | 33 | and based on patch from Tyler Wagner. | ||
29 | 34 | |||
30 | 35 | * Several fixes to FTP xfer mode related to file excludes, from | ||
31 | 36 | Dave Pearce. | ||
32 | 37 | |||
33 | 38 | * Wrapped eval() around unpack() in lib/BackupPC/Attrib.pm to avoid | ||
34 | 39 | failures on corrupted attrib files; patch from Tim Connors. | ||
35 | 40 | |||
36 | 41 | * Applied documention patch from Alexander Moisseev. | ||
37 | 42 | |||
38 | 43 | #------------------------------------------------------------------------ | ||
39 | 21 | # Version 3.2.0, 31 Jul 2010 | 44 | # Version 3.2.0, 31 Jul 2010 |
40 | 22 | #------------------------------------------------------------------------ | 45 | #------------------------------------------------------------------------ |
41 | 23 | 46 | ||
42 | 24 | 47 | ||
43 | === modified file 'README' | |||
44 | --- README 2010-11-21 14:59:53 +0000 | |||
45 | +++ README 2011-09-19 08:47:26 +0000 | |||
46 | @@ -1,11 +1,11 @@ | |||
47 | 1 | 1 | ||
48 | 2 | BackupPC | 2 | BackupPC |
49 | 3 | 3 | ||
55 | 4 | Version 3.2.0 | 4 | Version 3.2.1 |
56 | 5 | 5 | ||
57 | 6 | 31 Jul 2010 | 6 | 24 Apr 2011 |
58 | 7 | 7 | ||
59 | 8 | Copyright (C) 2001-2009 Craig Barratt. All rights reserved. | 8 | Copyright (C) 2001-2010 Craig Barratt. All rights reserved. |
60 | 9 | 9 | ||
61 | 10 | This program is free software; you can redistribute it and/or | 10 | This program is free software; you can redistribute it and/or |
62 | 11 | modify it under the terms of the GNU General Public License. | 11 | modify it under the terms of the GNU General Public License. |
63 | @@ -28,8 +28,8 @@ | |||
64 | 28 | 28 | ||
65 | 29 | To install BackupPC run these commands as root: | 29 | To install BackupPC run these commands as root: |
66 | 30 | 30 | ||
69 | 31 | tar zxf BackupPC-3.2.0.tar.gz | 31 | tar zxf BackupPC-3.2.1.tar.gz |
70 | 32 | cd BackupPC-3.2.0 | 32 | cd BackupPC-3.2.1 |
71 | 33 | perl configure.pl | 33 | perl configure.pl |
72 | 34 | 34 | ||
73 | 35 | This will automatically determine some system information and prompt you | 35 | This will automatically determine some system information and prompt you |
74 | 36 | 36 | ||
75 | === modified file 'bin/BackupPC' | |||
76 | --- bin/BackupPC 2010-11-21 14:59:53 +0000 | |||
77 | +++ bin/BackupPC 2011-09-19 08:47:26 +0000 | |||
78 | @@ -47,7 +47,7 @@ | |||
79 | 47 | # | 47 | # |
80 | 48 | #======================================================================== | 48 | #======================================================================== |
81 | 49 | # | 49 | # |
83 | 50 | # Version 3.2.0, released 31 Jul 2010. | 50 | # Version 3.2.1, released 24 Apr 2011. |
84 | 51 | # | 51 | # |
85 | 52 | # See http://backuppc.sourceforge.net. | 52 | # See http://backuppc.sourceforge.net. |
86 | 53 | # | 53 | # |
87 | 54 | 54 | ||
88 | === modified file 'bin/BackupPC_archive' | |||
89 | --- bin/BackupPC_archive 2010-11-21 14:59:53 +0000 | |||
90 | +++ bin/BackupPC_archive 2011-09-19 08:47:26 +0000 | |||
91 | @@ -29,7 +29,7 @@ | |||
92 | 29 | # | 29 | # |
93 | 30 | #======================================================================== | 30 | #======================================================================== |
94 | 31 | # | 31 | # |
96 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
97 | 33 | # | 33 | # |
98 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
99 | 35 | # | 35 | # |
100 | 36 | 36 | ||
101 | === modified file 'bin/BackupPC_archiveHost' | |||
102 | --- bin/BackupPC_archiveHost 2010-11-21 14:59:53 +0000 | |||
103 | +++ bin/BackupPC_archiveHost 2011-09-19 08:47:26 +0000 | |||
104 | @@ -38,7 +38,7 @@ | |||
105 | 38 | # | 38 | # |
106 | 39 | #======================================================================== | 39 | #======================================================================== |
107 | 40 | # | 40 | # |
109 | 41 | # Version 3.2.0, released 31 Jul 2010. | 41 | # Version 3.2.1, released 24 Apr 2011. |
110 | 42 | # | 42 | # |
111 | 43 | # See http://backuppc.sourceforge.net. | 43 | # See http://backuppc.sourceforge.net. |
112 | 44 | # | 44 | # |
113 | 45 | 45 | ||
114 | === modified file 'bin/BackupPC_archiveStart' | |||
115 | --- bin/BackupPC_archiveStart 2010-11-21 14:59:53 +0000 | |||
116 | +++ bin/BackupPC_archiveStart 2011-09-19 08:47:26 +0000 | |||
117 | @@ -35,7 +35,7 @@ | |||
118 | 35 | # | 35 | # |
119 | 36 | #======================================================================== | 36 | #======================================================================== |
120 | 37 | # | 37 | # |
122 | 38 | # Version 3.2.0, released 31 Jul 2010. | 38 | # Version 3.2.1, released 24 Apr 2011. |
123 | 39 | # | 39 | # |
124 | 40 | # See http://backuppc.sourceforge.net. | 40 | # See http://backuppc.sourceforge.net. |
125 | 41 | # | 41 | # |
126 | 42 | 42 | ||
127 | === modified file 'bin/BackupPC_attribPrint' | |||
128 | --- bin/BackupPC_attribPrint 2010-11-21 14:59:53 +0000 | |||
129 | +++ bin/BackupPC_attribPrint 2011-09-19 08:47:26 +0000 | |||
130 | @@ -31,7 +31,7 @@ | |||
131 | 31 | # | 31 | # |
132 | 32 | #======================================================================== | 32 | #======================================================================== |
133 | 33 | # | 33 | # |
135 | 34 | # Version 3.2.0, released 31 Jul 2010. | 34 | # Version 3.2.1, released 24 Apr 2011. |
136 | 35 | # | 35 | # |
137 | 36 | # See http://backuppc.sourceforge.net. | 36 | # See http://backuppc.sourceforge.net. |
138 | 37 | # | 37 | # |
139 | 38 | 38 | ||
140 | === modified file 'bin/BackupPC_dump' | |||
141 | --- bin/BackupPC_dump 2011-03-07 11:35:50 +0000 | |||
142 | +++ bin/BackupPC_dump 2011-09-19 08:47:26 +0000 | |||
143 | @@ -77,7 +77,7 @@ | |||
144 | 77 | # | 77 | # |
145 | 78 | #======================================================================== | 78 | #======================================================================== |
146 | 79 | # | 79 | # |
148 | 80 | # Version 3.2.0, released 31 Jul 2010. | 80 | # Version 3.2.1, released 24 Apr 2011. |
149 | 81 | # | 81 | # |
150 | 82 | # See http://backuppc.sourceforge.net. | 82 | # See http://backuppc.sourceforge.net. |
151 | 83 | # | 83 | # |
152 | 84 | 84 | ||
153 | === modified file 'bin/BackupPC_fixupBackupSummary' | |||
154 | --- bin/BackupPC_fixupBackupSummary 2010-11-21 14:59:53 +0000 | |||
155 | +++ bin/BackupPC_fixupBackupSummary 2011-09-19 08:47:26 +0000 | |||
156 | @@ -30,7 +30,7 @@ | |||
157 | 30 | # | 30 | # |
158 | 31 | #======================================================================== | 31 | #======================================================================== |
159 | 32 | # | 32 | # |
161 | 33 | # Version 3.2.0, released 31 Jul 2010. | 33 | # Version 3.2.1, released 24 Apr 2011. |
162 | 34 | # | 34 | # |
163 | 35 | # See http://backuppc.sourceforge.net. | 35 | # See http://backuppc.sourceforge.net. |
164 | 36 | # | 36 | # |
165 | 37 | 37 | ||
166 | === modified file 'bin/BackupPC_link' | |||
167 | --- bin/BackupPC_link 2010-11-21 14:59:53 +0000 | |||
168 | +++ bin/BackupPC_link 2011-09-19 08:47:26 +0000 | |||
169 | @@ -39,7 +39,7 @@ | |||
170 | 39 | # | 39 | # |
171 | 40 | #======================================================================== | 40 | #======================================================================== |
172 | 41 | # | 41 | # |
174 | 42 | # Version 3.2.0, released 31 Jul 2010. | 42 | # Version 3.2.1, released 24 Apr 2011. |
175 | 43 | # | 43 | # |
176 | 44 | # See http://backuppc.sourceforge.net. | 44 | # See http://backuppc.sourceforge.net. |
177 | 45 | # | 45 | # |
178 | 46 | 46 | ||
179 | === modified file 'bin/BackupPC_nightly' | |||
180 | --- bin/BackupPC_nightly 2010-11-21 14:59:53 +0000 | |||
181 | +++ bin/BackupPC_nightly 2011-09-19 08:47:26 +0000 | |||
182 | @@ -55,7 +55,7 @@ | |||
183 | 55 | # | 55 | # |
184 | 56 | #======================================================================== | 56 | #======================================================================== |
185 | 57 | # | 57 | # |
187 | 58 | # Version 3.2.0, released 31 Jul 2010. | 58 | # Version 3.2.1, released 24 Apr 2011. |
188 | 59 | # | 59 | # |
189 | 60 | # See http://backuppc.sourceforge.net. | 60 | # See http://backuppc.sourceforge.net. |
190 | 61 | # | 61 | # |
191 | 62 | 62 | ||
192 | === modified file 'bin/BackupPC_restore' | |||
193 | --- bin/BackupPC_restore 2011-03-07 11:35:50 +0000 | |||
194 | +++ bin/BackupPC_restore 2011-09-19 08:47:26 +0000 | |||
195 | @@ -29,7 +29,7 @@ | |||
196 | 29 | # | 29 | # |
197 | 30 | #======================================================================== | 30 | #======================================================================== |
198 | 31 | # | 31 | # |
200 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
201 | 33 | # | 33 | # |
202 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
203 | 35 | # | 35 | # |
204 | 36 | 36 | ||
205 | === modified file 'bin/BackupPC_sendEmail' | |||
206 | --- bin/BackupPC_sendEmail 2010-11-21 14:59:53 +0000 | |||
207 | +++ bin/BackupPC_sendEmail 2011-09-19 08:47:26 +0000 | |||
208 | @@ -31,7 +31,7 @@ | |||
209 | 31 | # | 31 | # |
210 | 32 | #======================================================================== | 32 | #======================================================================== |
211 | 33 | # | 33 | # |
213 | 34 | # Version 3.2.0, released 31 Jul 2010. | 34 | # Version 3.2.1, released 24 Apr 2011. |
214 | 35 | # | 35 | # |
215 | 36 | # See http://backuppc.sourceforge.net. | 36 | # See http://backuppc.sourceforge.net. |
216 | 37 | # | 37 | # |
217 | 38 | 38 | ||
218 | === modified file 'bin/BackupPC_serverMesg' | |||
219 | --- bin/BackupPC_serverMesg 2010-11-21 14:59:53 +0000 | |||
220 | +++ bin/BackupPC_serverMesg 2011-09-19 08:47:26 +0000 | |||
221 | @@ -43,7 +43,7 @@ | |||
222 | 43 | # | 43 | # |
223 | 44 | #======================================================================== | 44 | #======================================================================== |
224 | 45 | # | 45 | # |
226 | 46 | # Version 3.2.0, released 31 Jul 2010. | 46 | # Version 3.2.1, released 24 Apr 2011. |
227 | 47 | # | 47 | # |
228 | 48 | # See http://backuppc.sourceforge.net. | 48 | # See http://backuppc.sourceforge.net. |
229 | 49 | # | 49 | # |
230 | 50 | 50 | ||
231 | === modified file 'bin/BackupPC_tarCreate' | |||
232 | --- bin/BackupPC_tarCreate 2010-11-21 14:59:53 +0000 | |||
233 | +++ bin/BackupPC_tarCreate 2011-09-19 08:47:26 +0000 | |||
234 | @@ -55,7 +55,7 @@ | |||
235 | 55 | # | 55 | # |
236 | 56 | #======================================================================== | 56 | #======================================================================== |
237 | 57 | # | 57 | # |
239 | 58 | # Version 3.2.0, released 31 Jul 2010. | 58 | # Version 3.2.1, released 24 Apr 2011. |
240 | 59 | # | 59 | # |
241 | 60 | # See http://backuppc.sourceforge.net. | 60 | # See http://backuppc.sourceforge.net. |
242 | 61 | # | 61 | # |
243 | 62 | 62 | ||
244 | === modified file 'bin/BackupPC_tarExtract' | |||
245 | --- bin/BackupPC_tarExtract 2010-11-21 14:59:53 +0000 | |||
246 | +++ bin/BackupPC_tarExtract 2011-09-19 08:47:26 +0000 | |||
247 | @@ -27,7 +27,7 @@ | |||
248 | 27 | # | 27 | # |
249 | 28 | #======================================================================== | 28 | #======================================================================== |
250 | 29 | # | 29 | # |
252 | 30 | # Version 3.2.0, released 31 Jul 2010. | 30 | # Version 3.2.1, released 24 Apr 2011. |
253 | 31 | # | 31 | # |
254 | 32 | # See http://backuppc.sourceforge.net. | 32 | # See http://backuppc.sourceforge.net. |
255 | 33 | # | 33 | # |
256 | 34 | 34 | ||
257 | === modified file 'bin/BackupPC_tarPCCopy' | |||
258 | --- bin/BackupPC_tarPCCopy 2010-11-21 14:59:53 +0000 | |||
259 | +++ bin/BackupPC_tarPCCopy 2011-09-19 08:47:26 +0000 | |||
260 | @@ -38,7 +38,7 @@ | |||
261 | 38 | # | 38 | # |
262 | 39 | #======================================================================== | 39 | #======================================================================== |
263 | 40 | # | 40 | # |
265 | 41 | # Version 3.2.0, released 31 Jul 2010. | 41 | # Version 3.2.1, released 24 Apr 2011. |
266 | 42 | # | 42 | # |
267 | 43 | # See http://backuppc.sourceforge.net. | 43 | # See http://backuppc.sourceforge.net. |
268 | 44 | # | 44 | # |
269 | 45 | 45 | ||
270 | === modified file 'bin/BackupPC_trashClean' | |||
271 | --- bin/BackupPC_trashClean 2010-11-21 14:59:53 +0000 | |||
272 | +++ bin/BackupPC_trashClean 2011-09-19 08:47:26 +0000 | |||
273 | @@ -29,7 +29,7 @@ | |||
274 | 29 | # | 29 | # |
275 | 30 | #======================================================================== | 30 | #======================================================================== |
276 | 31 | # | 31 | # |
278 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
279 | 33 | # | 33 | # |
280 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
281 | 35 | # | 35 | # |
282 | 36 | 36 | ||
283 | === modified file 'bin/BackupPC_zcat' | |||
284 | --- bin/BackupPC_zcat 2010-11-21 14:59:53 +0000 | |||
285 | +++ bin/BackupPC_zcat 2011-09-19 08:47:26 +0000 | |||
286 | @@ -32,7 +32,7 @@ | |||
287 | 32 | # | 32 | # |
288 | 33 | #======================================================================== | 33 | #======================================================================== |
289 | 34 | # | 34 | # |
291 | 35 | # Version 3.2.0, released 31 Jul 2010. | 35 | # Version 3.2.1, released 24 Apr 2011. |
292 | 36 | # | 36 | # |
293 | 37 | # See http://backuppc.sourceforge.net. | 37 | # See http://backuppc.sourceforge.net. |
294 | 38 | # | 38 | # |
295 | 39 | 39 | ||
296 | === modified file 'bin/BackupPC_zipCreate' | |||
297 | --- bin/BackupPC_zipCreate 2010-11-21 14:59:53 +0000 | |||
298 | +++ bin/BackupPC_zipCreate 2011-09-19 08:47:26 +0000 | |||
299 | @@ -51,7 +51,7 @@ | |||
300 | 51 | # | 51 | # |
301 | 52 | #======================================================================== | 52 | #======================================================================== |
302 | 53 | # | 53 | # |
304 | 54 | # Version 3.2.0, released 31 Jul 2010. | 54 | # Version 3.2.1, released 24 Apr 2011. |
305 | 55 | # | 55 | # |
306 | 56 | # See http://backuppc.sourceforge.net. | 56 | # See http://backuppc.sourceforge.net. |
307 | 57 | # | 57 | # |
308 | 58 | 58 | ||
309 | === modified file 'cgi-bin/BackupPC_Admin' | |||
310 | --- cgi-bin/BackupPC_Admin 2010-11-21 14:59:53 +0000 | |||
311 | +++ cgi-bin/BackupPC_Admin 2011-09-19 08:47:26 +0000 | |||
312 | @@ -39,7 +39,7 @@ | |||
313 | 39 | # | 39 | # |
314 | 40 | #======================================================================== | 40 | #======================================================================== |
315 | 41 | # | 41 | # |
317 | 42 | # Version 3.2.0, released 31 Jul 2010. | 42 | # Version 3.2.1, released 24 Apr 2011. |
318 | 43 | # | 43 | # |
319 | 44 | # See http://backuppc.sourceforge.net. | 44 | # See http://backuppc.sourceforge.net. |
320 | 45 | # | 45 | # |
321 | 46 | 46 | ||
322 | === modified file 'conf/BackupPC_stnd.css' | |||
323 | --- conf/BackupPC_stnd.css 2010-11-21 14:59:53 +0000 | |||
324 | +++ conf/BackupPC_stnd.css 2011-09-19 08:47:26 +0000 | |||
325 | @@ -1,7 +1,7 @@ | |||
326 | 1 | /* | 1 | /* |
327 | 2 | * BackupPC standard CSS definitions | 2 | * BackupPC standard CSS definitions |
328 | 3 | * | 3 | * |
330 | 4 | * Version 3.2.0, released 31 Jul 2010. | 4 | * Version 3.2.1, released 24 Apr 2011. |
331 | 5 | * | 5 | * |
332 | 6 | * See http://backuppc.sourceforge.net. | 6 | * See http://backuppc.sourceforge.net. |
333 | 7 | * | 7 | * |
334 | 8 | 8 | ||
335 | === modified file 'conf/BackupPC_stnd_orig.css' | |||
336 | --- conf/BackupPC_stnd_orig.css 2010-11-21 14:59:53 +0000 | |||
337 | +++ conf/BackupPC_stnd_orig.css 2011-09-19 08:47:26 +0000 | |||
338 | @@ -1,7 +1,7 @@ | |||
339 | 1 | /* | 1 | /* |
340 | 2 | * BackupPC standard CSS definitions | 2 | * BackupPC standard CSS definitions |
341 | 3 | * | 3 | * |
343 | 4 | * Version 3.2.0, released 31 Jul 2010. | 4 | * Version 3.2.1, released 24 Apr 2011. |
344 | 5 | * | 5 | * |
345 | 6 | * See http://backuppc.sourceforge.net. | 6 | * See http://backuppc.sourceforge.net. |
346 | 7 | * | 7 | * |
347 | 8 | 8 | ||
348 | === modified file 'configure.pl' | |||
349 | --- configure.pl 2011-03-07 11:35:50 +0000 | |||
350 | +++ configure.pl 2011-09-19 08:47:26 +0000 | |||
351 | @@ -19,7 +19,7 @@ | |||
352 | 19 | # Craig Barratt <cbarratt@users.sourceforge.net> | 19 | # Craig Barratt <cbarratt@users.sourceforge.net> |
353 | 20 | # | 20 | # |
354 | 21 | # COPYRIGHT | 21 | # COPYRIGHT |
356 | 22 | # Copyright (C) 2001-2009 Craig Barratt | 22 | # Copyright (C) 2001-2010 Craig Barratt |
357 | 23 | # | 23 | # |
358 | 24 | # This program is free software; you can redistribute it and/or modify | 24 | # This program is free software; you can redistribute it and/or modify |
359 | 25 | # it under the terms of the GNU General Public License as published by | 25 | # it under the terms of the GNU General Public License as published by |
360 | @@ -37,7 +37,7 @@ | |||
361 | 37 | # | 37 | # |
362 | 38 | #======================================================================== | 38 | #======================================================================== |
363 | 39 | # | 39 | # |
365 | 40 | # Version 3.2.0, released 31 Jul 2010. | 40 | # Version 3.2.1, released 24 Apr 2011. |
366 | 41 | # | 41 | # |
367 | 42 | # See http://backuppc.sourceforge.net. | 42 | # See http://backuppc.sourceforge.net. |
368 | 43 | # | 43 | # |
369 | @@ -72,7 +72,7 @@ | |||
370 | 72 | BackupPC distribution. This probably means you did not cd to the | 72 | BackupPC distribution. This probably means you did not cd to the |
371 | 73 | unpacked BackupPC distribution before running configure.pl, eg: | 73 | unpacked BackupPC distribution before running configure.pl, eg: |
372 | 74 | 74 | ||
374 | 75 | cd BackupPC-3.2.0 | 75 | cd BackupPC-3.2.1 |
375 | 76 | ./configure.pl | 76 | ./configure.pl |
376 | 77 | 77 | ||
377 | 78 | Please try again. | 78 | Please try again. |
378 | @@ -673,7 +673,7 @@ | |||
379 | 673 | # | 673 | # |
380 | 674 | # Install new CSS file, making a backup copy if necessary | 674 | # Install new CSS file, making a backup copy if necessary |
381 | 675 | # | 675 | # |
383 | 676 | my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.2.0"; | 676 | my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.2.1"; |
384 | 677 | if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) { | 677 | if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) { |
385 | 678 | rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup); | 678 | rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup); |
386 | 679 | } | 679 | } |
387 | @@ -893,7 +893,7 @@ | |||
388 | 893 | # | 893 | # |
389 | 894 | # Now backup and write the config file | 894 | # Now backup and write the config file |
390 | 895 | # | 895 | # |
392 | 896 | my $confCopy = "$dest.pre-3.2.0"; | 896 | my $confCopy = "$dest.pre-3.2.1"; |
393 | 897 | if ( -f $dest && !-f $confCopy ) { | 897 | if ( -f $dest && !-f $confCopy ) { |
394 | 898 | # | 898 | # |
395 | 899 | # Make copy of config file, preserving ownership and modes | 899 | # Make copy of config file, preserving ownership and modes |
396 | @@ -1386,7 +1386,7 @@ | |||
397 | 1386 | 1386 | ||
398 | 1387 | =head1 COPYRIGHT | 1387 | =head1 COPYRIGHT |
399 | 1388 | 1388 | ||
401 | 1389 | Copyright (C) 2001-2009 Craig Barratt. | 1389 | Copyright (C) 2001-2010 Craig Barratt. |
402 | 1390 | 1390 | ||
403 | 1391 | This program is free software; you can redistribute it and/or modify | 1391 | This program is free software; you can redistribute it and/or modify |
404 | 1392 | it under the terms of the GNU General Public License as published by | 1392 | it under the terms of the GNU General Public License as published by |
405 | 1393 | 1393 | ||
406 | === modified file 'debian/changelog' | |||
407 | --- debian/changelog 2011-06-15 16:28:41 +0000 | |||
408 | +++ debian/changelog 2011-09-19 08:47:26 +0000 | |||
409 | @@ -1,3 +1,32 @@ | |||
410 | 1 | backuppc (3.2.1-1ubuntu1) oneiric; urgency=high | ||
411 | 2 | |||
412 | 3 | * Merge from debian unstable. (LP: #852484) Remaining changes: | ||
413 | 4 | - debian/backup.init, debian/rules, debian/postinst: Do not call init | ||
414 | 5 | script on shutdown and reboot (TearDown) (Debian #488660) | ||
415 | 6 | - debian/control: Add dependency for libsocket6-perl. | ||
416 | 7 | - debian/control: Drop build dependency to 'par2', it's in universe. | ||
417 | 8 | - configure.pl: Do not test for par2 being available at build time | ||
418 | 9 | - debian/control: depend on default-mta | mail-transport-agent, instead of | ||
419 | 10 | enumerating a long list of alternative MTAs. | ||
420 | 11 | - debian/rules: installing setuid wrapper with setuid bit set, and no | ||
421 | 12 | permissions granted to other (mode 4750) | ||
422 | 13 | |||
423 | 14 | -- Allison Randal <allison@canonical.com> Sun, 18 Sep 2011 17:37:55 -0700 | ||
424 | 15 | |||
425 | 16 | backuppc (3.2.1-1) unstable; urgency=high | ||
426 | 17 | |||
427 | 18 | * New upstream release. Closes: #641450 | ||
428 | 19 | * urgency set to high because of a security fix | ||
429 | 20 | |||
430 | 21 | -- Ludovic Drolez <ldrolez@debian.org> Tue, 13 Sep 2011 20:38:00 +0200 | ||
431 | 22 | |||
432 | 23 | backuppc (3.2.0-4.1) unstable; urgency=low | ||
433 | 24 | |||
434 | 25 | * Non-maintainer upload. | ||
435 | 26 | * Use inetutils-ping as an alternative to iputils-ping. Closes: #630777 | ||
436 | 27 | |||
437 | 28 | -- Bernd Zeimetz <bzed@debian.org> Tue, 28 Jun 2011 22:31:10 +0200 | ||
438 | 29 | |||
439 | 1 | backuppc (3.2.0-4ubuntu1) oneiric; urgency=low | 30 | backuppc (3.2.0-4ubuntu1) oneiric; urgency=low |
440 | 2 | 31 | ||
441 | 3 | * Merge from debian unstable. Remaining changes: | 32 | * Merge from debian unstable. Remaining changes: |
442 | 4 | 33 | ||
443 | === modified file 'debian/control' | |||
444 | --- debian/control 2011-06-15 16:28:41 +0000 | |||
445 | +++ debian/control 2011-09-19 08:47:26 +0000 | |||
446 | @@ -8,7 +8,7 @@ | |||
447 | 8 | 8 | ||
448 | 9 | Package: backuppc | 9 | Package: backuppc |
449 | 10 | Architecture: any | 10 | Architecture: any |
451 | 11 | Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl | 11 | Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl |
452 | 12 | Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, rrdtool, libio-dirent-perl | 12 | Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, rrdtool, libio-dirent-perl |
453 | 13 | Suggests: w3m | www-browser, par2 | 13 | Suggests: w3m | www-browser, par2 |
454 | 14 | Conflicts: libfile-rsyncp-perl (<< 0.68) | 14 | Conflicts: libfile-rsyncp-perl (<< 0.68) |
455 | 15 | 15 | ||
456 | === modified file 'doc/BackupPC.html' | |||
457 | --- doc/BackupPC.html 2010-11-21 14:59:53 +0000 | |||
458 | +++ doc/BackupPC.html 2011-09-19 08:47:26 +0000 | |||
459 | @@ -124,8 +124,8 @@ | |||
460 | 124 | <p> | 124 | <p> |
461 | 125 | </p> | 125 | </p> |
462 | 126 | <h1><a name="backuppc_introduction">BackupPC Introduction</a></h1> | 126 | <h1><a name="backuppc_introduction">BackupPC Introduction</a></h1> |
465 | 127 | <p>This documentation describes BackupPC version 3.2.0, | 127 | <p>This documentation describes BackupPC version 3.2.1, |
466 | 128 | released on 31 Jul 2010.</p> | 128 | released on 24 Apr 2011.</p> |
467 | 129 | <p> | 129 | <p> |
468 | 130 | </p> | 130 | </p> |
469 | 131 | <h2><a name="overview">Overview</a></h2> | 131 | <h2><a name="overview">Overview</a></h2> |
470 | @@ -591,7 +591,7 @@ | |||
471 | 591 | and install BackupPC yourself. If you use a package provided by a | 591 | and install BackupPC yourself. If you use a package provided by a |
472 | 592 | distribution, the package management system should take of installing | 592 | distribution, the package management system should take of installing |
473 | 593 | any needed dependencies.</p> | 593 | any needed dependencies.</p> |
475 | 594 | <p>First off, there are three perl modules you should install. | 594 | <p>First off, there are five perl modules you should install. |
476 | 595 | These are all optional, but highly recommended:</p> | 595 | These are all optional, but highly recommended:</p> |
477 | 596 | <dl> | 596 | <dl> |
478 | 597 | <dt><strong><a name="compress_zlib" class="item">Compress::Zlib</a></strong></dt> | 597 | <dt><strong><a name="compress_zlib" class="item">Compress::Zlib</a></strong></dt> |
479 | @@ -624,12 +624,14 @@ | |||
480 | 624 | File::RsyncP is available from <a href="http://perlrsync.sourceforge.net">http://perlrsync.sourceforge.net</a>. | 624 | File::RsyncP is available from <a href="http://perlrsync.sourceforge.net">http://perlrsync.sourceforge.net</a>. |
481 | 625 | Version 0.68 or later is required.</p> | 625 | Version 0.68 or later is required.</p> |
482 | 626 | </dd> | 626 | </dd> |
484 | 627 | <dt><strong><a name="file_rsyncp2" class="item">File::RsyncP</a></strong></dt> | 627 | <dt><strong><a name="file_listing_net_ftp_net_ftp_retrhandle_net_ftp_autoreconnect" class="item">File::Listing, Net::FTP, Net::FTP::RetrHandle, Net::FTP::AutoReconnect</a></strong></dt> |
485 | 628 | 628 | ||
486 | 629 | <dd> | 629 | <dd> |
490 | 630 | <p>To use ftp with BackupPC you will need to install three libraries: | 630 | <p>To use ftp with BackupPC you will need four libraries, but actually |
491 | 631 | Net::FTP, Net::FTP::RetrHandle and Net::FTP::AutoReconnect. You can | 631 | need to install only File::Listing from <a href="http://www.cpan.org">http://www.cpan.org</a>. |
492 | 632 | run "perldoc Net::FTP" to see if a particular module is installed.</p> | 632 | You can run "perldoc File::Listing" to see if this module is installed. |
493 | 633 | Net::FTP is a standard module. Net::FTP::RetrHandle and | ||
494 | 634 | Net::FTP::AutoReconnect included in BackupPC distribution.</p> | ||
495 | 633 | </dd> | 635 | </dd> |
496 | 634 | </dl> | 636 | </dl> |
497 | 635 | <p>To build and install these packages you should use the cpan program. | 637 | <p>To build and install these packages you should use the cpan program. |
498 | @@ -644,27 +646,27 @@ | |||
499 | 644 | make install</pre> | 646 | make install</pre> |
500 | 645 | <p>The same sequence of commands can be used for each module.</p> | 647 | <p>The same sequence of commands can be used for each module.</p> |
501 | 646 | <p>Now let's move onto BackupPC itself. After fetching | 648 | <p>Now let's move onto BackupPC itself. After fetching |
503 | 647 | BackupPC-3.2.0.tar.gz, run these commands as root:</p> | 649 | BackupPC-3.2.1.tar.gz, run these commands as root:</p> |
504 | 648 | <pre> | 650 | <pre> |
507 | 649 | tar zxf BackupPC-3.2.0.tar.gz | 651 | tar zxf BackupPC-3.2.1.tar.gz |
508 | 650 | cd BackupPC-3.2.0 | 652 | cd BackupPC-3.2.1 |
509 | 651 | perl configure.pl</pre> | 653 | perl configure.pl</pre> |
510 | 652 | <p>In the future this release might also have patches available on the | 654 | <p>In the future this release might also have patches available on the |
511 | 653 | SourceForge site. These patch files are text files, with a name of | 655 | SourceForge site. These patch files are text files, with a name of |
512 | 654 | the form</p> | 656 | the form</p> |
513 | 655 | <pre> | 657 | <pre> |
515 | 656 | BackupPC-3.2.0plN.diff</pre> | 658 | BackupPC-3.2.1plN.diff</pre> |
516 | 657 | <p>where N is the patch level, eg: pl2 is patch-level 2. These | 659 | <p>where N is the patch level, eg: pl2 is patch-level 2. These |
517 | 658 | patch files are cumulative: you only need apply the last patch | 660 | patch files are cumulative: you only need apply the last patch |
518 | 659 | file, not all the earlier patch files. If a patch file is | 661 | file, not all the earlier patch files. If a patch file is |
520 | 660 | available, eg: BackupPC-3.2.0pl2.diff, you should apply | 662 | available, eg: BackupPC-3.2.1pl2.diff, you should apply |
521 | 661 | the patch after extracting the tar file:</p> | 663 | the patch after extracting the tar file:</p> |
522 | 662 | <pre> | 664 | <pre> |
528 | 663 | # fetch BackupPC-3.2.0.tar.gz | 665 | # fetch BackupPC-3.2.1.tar.gz |
529 | 664 | # fetch BackupPC-3.2.0pl2.diff | 666 | # fetch BackupPC-3.2.1pl2.diff |
530 | 665 | tar zxf BackupPC-3.2.0.tar.gz | 667 | tar zxf BackupPC-3.2.1.tar.gz |
531 | 666 | cd BackupPC-3.2.0 | 668 | cd BackupPC-3.2.1 |
532 | 667 | patch -p0 < ../BackupPC-3.2.0pl2.diff | 669 | patch -p0 < ../BackupPC-3.2.1pl2.diff |
533 | 668 | perl configure.pl</pre> | 670 | perl configure.pl</pre> |
534 | 669 | <p>A patch file includes comments that describe that bug fixes | 671 | <p>A patch file includes comments that describe that bug fixes |
535 | 670 | and changes. Feel free to review it before you apply the patch.</p> | 672 | and changes. Feel free to review it before you apply the patch.</p> |
536 | 671 | 673 | ||
537 | === modified file 'doc/BackupPC.pod' | |||
538 | --- doc/BackupPC.pod 2010-11-21 14:59:53 +0000 | |||
539 | +++ doc/BackupPC.pod 2011-09-19 08:47:26 +0000 | |||
540 | @@ -1,7 +1,7 @@ | |||
541 | 1 | =head1 BackupPC Introduction | 1 | =head1 BackupPC Introduction |
542 | 2 | 2 | ||
545 | 3 | This documentation describes BackupPC version 3.2.0, | 3 | This documentation describes BackupPC version 3.2.1, |
546 | 4 | released on 31 Jul 2010. | 4 | released on 24 Apr 2011. |
547 | 5 | 5 | ||
548 | 6 | =head2 Overview | 6 | =head2 Overview |
549 | 7 | 7 | ||
550 | @@ -522,7 +522,7 @@ | |||
551 | 522 | distribution, the package management system should take of installing | 522 | distribution, the package management system should take of installing |
552 | 523 | any needed dependencies. | 523 | any needed dependencies. |
553 | 524 | 524 | ||
555 | 525 | First off, there are three perl modules you should install. | 525 | First off, there are five perl modules you should install. |
556 | 526 | These are all optional, but highly recommended: | 526 | These are all optional, but highly recommended: |
557 | 527 | 527 | ||
558 | 528 | =over 4 | 528 | =over 4 |
559 | @@ -553,11 +553,13 @@ | |||
560 | 553 | File::RsyncP is available from L<http://perlrsync.sourceforge.net>. | 553 | File::RsyncP is available from L<http://perlrsync.sourceforge.net>. |
561 | 554 | Version 0.68 or later is required. | 554 | Version 0.68 or later is required. |
562 | 555 | 555 | ||
564 | 556 | =item File::RsyncP | 556 | =item File::Listing, Net::FTP, Net::FTP::RetrHandle, Net::FTP::AutoReconnect |
565 | 557 | 557 | ||
569 | 558 | To use ftp with BackupPC you will need to install three libraries: | 558 | To use ftp with BackupPC you will need four libraries, but actually |
570 | 559 | Net::FTP, Net::FTP::RetrHandle and Net::FTP::AutoReconnect. You can | 559 | need to install only File::Listing from L<http://www.cpan.org>. |
571 | 560 | run "perldoc Net::FTP" to see if a particular module is installed. | 560 | You can run "perldoc File::Listing" to see if this module is installed. |
572 | 561 | Net::FTP is a standard module. Net::FTP::RetrHandle and | ||
573 | 562 | Net::FTP::AutoReconnect included in BackupPC distribution. | ||
574 | 561 | 563 | ||
575 | 562 | =back | 564 | =back |
576 | 563 | 565 | ||
577 | @@ -575,29 +577,29 @@ | |||
578 | 575 | The same sequence of commands can be used for each module. | 577 | The same sequence of commands can be used for each module. |
579 | 576 | 578 | ||
580 | 577 | Now let's move onto BackupPC itself. After fetching | 579 | Now let's move onto BackupPC itself. After fetching |
582 | 578 | BackupPC-3.2.0.tar.gz, run these commands as root: | 580 | BackupPC-3.2.1.tar.gz, run these commands as root: |
583 | 579 | 581 | ||
586 | 580 | tar zxf BackupPC-3.2.0.tar.gz | 582 | tar zxf BackupPC-3.2.1.tar.gz |
587 | 581 | cd BackupPC-3.2.0 | 583 | cd BackupPC-3.2.1 |
588 | 582 | perl configure.pl | 584 | perl configure.pl |
589 | 583 | 585 | ||
590 | 584 | In the future this release might also have patches available on the | 586 | In the future this release might also have patches available on the |
591 | 585 | SourceForge site. These patch files are text files, with a name of | 587 | SourceForge site. These patch files are text files, with a name of |
592 | 586 | the form | 588 | the form |
593 | 587 | 589 | ||
595 | 588 | BackupPC-3.2.0plN.diff | 590 | BackupPC-3.2.1plN.diff |
596 | 589 | 591 | ||
597 | 590 | where N is the patch level, eg: pl2 is patch-level 2. These | 592 | where N is the patch level, eg: pl2 is patch-level 2. These |
598 | 591 | patch files are cumulative: you only need apply the last patch | 593 | patch files are cumulative: you only need apply the last patch |
599 | 592 | file, not all the earlier patch files. If a patch file is | 594 | file, not all the earlier patch files. If a patch file is |
601 | 593 | available, eg: BackupPC-3.2.0pl2.diff, you should apply | 595 | available, eg: BackupPC-3.2.1pl2.diff, you should apply |
602 | 594 | the patch after extracting the tar file: | 596 | the patch after extracting the tar file: |
603 | 595 | 597 | ||
609 | 596 | # fetch BackupPC-3.2.0.tar.gz | 598 | # fetch BackupPC-3.2.1.tar.gz |
610 | 597 | # fetch BackupPC-3.2.0pl2.diff | 599 | # fetch BackupPC-3.2.1pl2.diff |
611 | 598 | tar zxf BackupPC-3.2.0.tar.gz | 600 | tar zxf BackupPC-3.2.1.tar.gz |
612 | 599 | cd BackupPC-3.2.0 | 601 | cd BackupPC-3.2.1 |
613 | 600 | patch -p0 < ../BackupPC-3.2.0pl2.diff | 602 | patch -p0 < ../BackupPC-3.2.1pl2.diff |
614 | 601 | perl configure.pl | 603 | perl configure.pl |
615 | 602 | 604 | ||
616 | 603 | A patch file includes comments that describe that bug fixes | 605 | A patch file includes comments that describe that bug fixes |
617 | 604 | 606 | ||
618 | === modified file 'init.d/src/debian-backuppc' | |||
619 | --- init.d/src/debian-backuppc 2010-11-21 14:59:53 +0000 | |||
620 | +++ init.d/src/debian-backuppc 2011-09-19 08:47:26 +0000 | |||
621 | @@ -4,7 +4,7 @@ | |||
622 | 4 | # | 4 | # |
623 | 5 | # Startup init script for BackupPC on Debian. | 5 | # Startup init script for BackupPC on Debian. |
624 | 6 | # | 6 | # |
626 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
627 | 8 | # | 8 | # |
628 | 9 | 9 | ||
629 | 10 | set -e | 10 | set -e |
630 | 11 | 11 | ||
631 | === modified file 'init.d/src/gentoo-backuppc' | |||
632 | --- init.d/src/gentoo-backuppc 2010-11-21 14:59:53 +0000 | |||
633 | +++ init.d/src/gentoo-backuppc 2011-09-19 08:47:26 +0000 | |||
634 | @@ -4,7 +4,7 @@ | |||
635 | 4 | # | 4 | # |
636 | 5 | # Startup init script for BackupPC on Gentoo` linux. | 5 | # Startup init script for BackupPC on Gentoo` linux. |
637 | 6 | # | 6 | # |
639 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
640 | 8 | # | 8 | # |
641 | 9 | # description: Starts and stops the BackupPC server | 9 | # description: Starts and stops the BackupPC server |
642 | 10 | # Copy to /etc/init.d and run 'rc-update add backuppc default' | 10 | # Copy to /etc/init.d and run 'rc-update add backuppc default' |
643 | 11 | 11 | ||
644 | === modified file 'init.d/src/linux-backuppc' | |||
645 | --- init.d/src/linux-backuppc 2010-11-21 14:59:53 +0000 | |||
646 | +++ init.d/src/linux-backuppc 2011-09-19 08:47:26 +0000 | |||
647 | @@ -4,7 +4,7 @@ | |||
648 | 4 | # | 4 | # |
649 | 5 | # Startup init script for BackupPC on Redhat linux. | 5 | # Startup init script for BackupPC on Redhat linux. |
650 | 6 | # | 6 | # |
652 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
653 | 8 | # | 8 | # |
654 | 9 | # chkconfig: - 91 35 | 9 | # chkconfig: - 91 35 |
655 | 10 | # description: Starts and stops the BackupPC server | 10 | # description: Starts and stops the BackupPC server |
656 | 11 | 11 | ||
657 | === modified file 'init.d/src/slackware-backuppc' | |||
658 | --- init.d/src/slackware-backuppc 2010-11-21 14:59:53 +0000 | |||
659 | +++ init.d/src/slackware-backuppc 2011-09-19 08:47:26 +0000 | |||
660 | @@ -4,7 +4,7 @@ | |||
661 | 4 | # | 4 | # |
662 | 5 | # Startup init script for BackupPC for Slackware. | 5 | # Startup init script for BackupPC for Slackware. |
663 | 6 | # | 6 | # |
665 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
666 | 8 | # | 8 | # |
667 | 9 | # Provided by Tony Nelson. | 9 | # Provided by Tony Nelson. |
668 | 10 | # | 10 | # |
669 | 11 | 11 | ||
670 | === modified file 'init.d/src/solaris-backuppc' | |||
671 | --- init.d/src/solaris-backuppc 2010-11-21 14:59:53 +0000 | |||
672 | +++ init.d/src/solaris-backuppc 2011-09-19 08:47:26 +0000 | |||
673 | @@ -4,7 +4,7 @@ | |||
674 | 4 | # | 4 | # |
675 | 5 | # Startup init script for BackupPC for solaris. | 5 | # Startup init script for BackupPC for solaris. |
676 | 6 | # | 6 | # |
678 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
679 | 8 | # | 8 | # |
680 | 9 | # Not tested... | 9 | # Not tested... |
681 | 10 | # | 10 | # |
682 | 11 | 11 | ||
683 | === modified file 'init.d/src/suse-backuppc' | |||
684 | --- init.d/src/suse-backuppc 2010-11-21 14:59:53 +0000 | |||
685 | +++ init.d/src/suse-backuppc 2011-09-19 08:47:26 +0000 | |||
686 | @@ -4,7 +4,7 @@ | |||
687 | 4 | # | 4 | # |
688 | 5 | # Startup init script for BackupPC on suse linux. | 5 | # Startup init script for BackupPC on suse linux. |
689 | 6 | # | 6 | # |
691 | 7 | # Distributed with BackupPC version 3.2.0, released 31 Jul 2010. | 7 | # Distributed with BackupPC version 3.2.1, released 24 Apr 2011. |
692 | 8 | # | 8 | # |
693 | 9 | 9 | ||
694 | 10 | set -e | 10 | set -e |
695 | 11 | 11 | ||
696 | === modified file 'lib/BackupPC/Attrib.pm' (properties changed: +x to -x) | |||
697 | --- lib/BackupPC/Attrib.pm 2010-11-21 14:59:53 +0000 | |||
698 | +++ lib/BackupPC/Attrib.pm 2011-09-19 08:47:26 +0000 | |||
699 | @@ -30,7 +30,7 @@ | |||
700 | 30 | # | 30 | # |
701 | 31 | #======================================================================== | 31 | #======================================================================== |
702 | 32 | # | 32 | # |
704 | 33 | # Version 3.2.0, released 31 Jul 2010. | 33 | # Version 3.2.1, released 24 Apr 2011. |
705 | 34 | # | 34 | # |
706 | 35 | # See http://backuppc.sourceforge.net. | 35 | # See http://backuppc.sourceforge.net. |
707 | 36 | # | 36 | # |
708 | @@ -297,10 +297,15 @@ | |||
709 | 297 | = $a->{files}{$file}{size} % (4096 * 1024 * 1024); | 297 | = $a->{files}{$file}{size} % (4096 * 1024 * 1024); |
710 | 298 | $a->{files}{$file}{sizeDiv4GB} | 298 | $a->{files}{$file}{sizeDiv4GB} |
711 | 299 | = int($a->{files}{$file}{size} / (4096 * 1024 * 1024)); | 299 | = int($a->{files}{$file}{size} / (4096 * 1024 * 1024)); |
716 | 300 | $data .= pack("w a* w$nFldsW N$nFldsN", length($file), $file, | 300 | eval { |
717 | 301 | @{$a->{files}{$file}}{@FldsUnixW}, | 301 | $data .= pack("w a* w$nFldsW N$nFldsN", length($file), $file, |
718 | 302 | @{$a->{files}{$file}}{@FldsUnixN}, | 302 | @{$a->{files}{$file}}{@FldsUnixW}, |
719 | 303 | ); | 303 | @{$a->{files}{$file}}{@FldsUnixN}, |
720 | 304 | ); | ||
721 | 305 | }; | ||
722 | 306 | if ( $@ ) { | ||
723 | 307 | $a->{_errStr} = "Can't pack attr for $file: " . Dumper($a->{files}{$file}); | ||
724 | 308 | } | ||
725 | 304 | } | 309 | } |
726 | 305 | return $data; | 310 | return $data; |
727 | 306 | } | 311 | } |
728 | 307 | 312 | ||
729 | === modified file 'lib/BackupPC/CGI/AdminOptions.pm' (properties changed: +x to -x) | |||
730 | --- lib/BackupPC/CGI/AdminOptions.pm 2010-11-21 14:59:53 +0000 | |||
731 | +++ lib/BackupPC/CGI/AdminOptions.pm 2011-09-19 08:47:26 +0000 | |||
732 | @@ -28,7 +28,7 @@ | |||
733 | 28 | # | 28 | # |
734 | 29 | #======================================================================== | 29 | #======================================================================== |
735 | 30 | # | 30 | # |
737 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
738 | 32 | # | 32 | # |
739 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
740 | 34 | # | 34 | # |
741 | 35 | 35 | ||
742 | === modified file 'lib/BackupPC/CGI/Archive.pm' (properties changed: +x to -x) | |||
743 | --- lib/BackupPC/CGI/Archive.pm 2010-11-21 14:59:53 +0000 | |||
744 | +++ lib/BackupPC/CGI/Archive.pm 2011-09-19 08:47:26 +0000 | |||
745 | @@ -28,7 +28,7 @@ | |||
746 | 28 | # | 28 | # |
747 | 29 | #======================================================================== | 29 | #======================================================================== |
748 | 30 | # | 30 | # |
750 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
751 | 32 | # | 32 | # |
752 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
753 | 34 | # | 34 | # |
754 | 35 | 35 | ||
755 | === modified file 'lib/BackupPC/CGI/ArchiveInfo.pm' (properties changed: +x to -x) | |||
756 | --- lib/BackupPC/CGI/ArchiveInfo.pm 2010-11-21 14:59:53 +0000 | |||
757 | +++ lib/BackupPC/CGI/ArchiveInfo.pm 2011-09-19 08:47:26 +0000 | |||
758 | @@ -28,7 +28,7 @@ | |||
759 | 28 | # | 28 | # |
760 | 29 | #======================================================================== | 29 | #======================================================================== |
761 | 30 | # | 30 | # |
763 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
764 | 32 | # | 32 | # |
765 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
766 | 34 | # | 34 | # |
767 | 35 | 35 | ||
768 | === modified file 'lib/BackupPC/CGI/Browse.pm' (properties changed: +x to -x) | |||
769 | --- lib/BackupPC/CGI/Browse.pm 2010-11-21 14:59:53 +0000 | |||
770 | +++ lib/BackupPC/CGI/Browse.pm 2011-09-19 08:47:26 +0000 | |||
771 | @@ -28,7 +28,7 @@ | |||
772 | 28 | # | 28 | # |
773 | 29 | #======================================================================== | 29 | #======================================================================== |
774 | 30 | # | 30 | # |
776 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
777 | 32 | # | 32 | # |
778 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
779 | 34 | # | 34 | # |
780 | @@ -73,8 +73,8 @@ | |||
781 | 73 | for ( $i = 0 ; $i < @Backups ; $i++ ) { | 73 | for ( $i = 0 ; $i < @Backups ; $i++ ) { |
782 | 74 | last if ( $Backups[$i]{num} == $num ); | 74 | last if ( $Backups[$i]{num} == $num ); |
783 | 75 | } | 75 | } |
786 | 76 | if ( $i >= @Backups ) { | 76 | if ( $i >= @Backups || $num !~ /^\d+$/ ) { |
787 | 77 | ErrorExit("Backup number $num for host ${EscHTML($host)} does" | 77 | ErrorExit("Backup number ${EscHTML($num)} for host ${EscHTML($host)} does" |
788 | 78 | . " not exist."); | 78 | . " not exist."); |
789 | 79 | } | 79 | } |
790 | 80 | my $backupTime = timeStamp2($Backups[$i]{startTime}); | 80 | my $backupTime = timeStamp2($Backups[$i]{startTime}); |
791 | 81 | 81 | ||
792 | === modified file 'lib/BackupPC/CGI/DirHistory.pm' (properties changed: +x to -x) | |||
793 | --- lib/BackupPC/CGI/DirHistory.pm 2010-11-21 14:59:53 +0000 | |||
794 | +++ lib/BackupPC/CGI/DirHistory.pm 2011-09-19 08:47:26 +0000 | |||
795 | @@ -28,7 +28,7 @@ | |||
796 | 28 | # | 28 | # |
797 | 29 | #======================================================================== | 29 | #======================================================================== |
798 | 30 | # | 30 | # |
800 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
801 | 32 | # | 32 | # |
802 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
803 | 34 | # | 34 | # |
804 | 35 | 35 | ||
805 | === modified file 'lib/BackupPC/CGI/EditConfig.pm' (properties changed: +x to -x) | |||
806 | --- lib/BackupPC/CGI/EditConfig.pm 2010-11-21 14:59:53 +0000 | |||
807 | +++ lib/BackupPC/CGI/EditConfig.pm 2011-09-19 08:47:26 +0000 | |||
808 | @@ -28,7 +28,7 @@ | |||
809 | 28 | # | 28 | # |
810 | 29 | #======================================================================== | 29 | #======================================================================== |
811 | 30 | # | 30 | # |
813 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
814 | 32 | # | 32 | # |
815 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
816 | 34 | # | 34 | # |
817 | 35 | 35 | ||
818 | === modified file 'lib/BackupPC/CGI/EmailSummary.pm' (properties changed: +x to -x) | |||
819 | --- lib/BackupPC/CGI/EmailSummary.pm 2010-11-21 14:59:53 +0000 | |||
820 | +++ lib/BackupPC/CGI/EmailSummary.pm 2011-09-19 08:47:26 +0000 | |||
821 | @@ -28,7 +28,7 @@ | |||
822 | 28 | # | 28 | # |
823 | 29 | #======================================================================== | 29 | #======================================================================== |
824 | 30 | # | 30 | # |
826 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
827 | 32 | # | 32 | # |
828 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
829 | 34 | # | 34 | # |
830 | 35 | 35 | ||
831 | === modified file 'lib/BackupPC/CGI/GeneralInfo.pm' (properties changed: +x to -x) | |||
832 | --- lib/BackupPC/CGI/GeneralInfo.pm 2010-11-21 14:59:53 +0000 | |||
833 | +++ lib/BackupPC/CGI/GeneralInfo.pm 2011-09-19 08:47:26 +0000 | |||
834 | @@ -28,7 +28,7 @@ | |||
835 | 28 | # | 28 | # |
836 | 29 | #======================================================================== | 29 | #======================================================================== |
837 | 30 | # | 30 | # |
839 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
840 | 32 | # | 32 | # |
841 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
842 | 34 | # | 34 | # |
843 | 35 | 35 | ||
844 | === modified file 'lib/BackupPC/CGI/HostInfo.pm' (properties changed: +x to -x) | |||
845 | --- lib/BackupPC/CGI/HostInfo.pm 2010-11-21 14:59:53 +0000 | |||
846 | +++ lib/BackupPC/CGI/HostInfo.pm 2011-09-19 08:47:26 +0000 | |||
847 | @@ -28,7 +28,7 @@ | |||
848 | 28 | # | 28 | # |
849 | 29 | #======================================================================== | 29 | #======================================================================== |
850 | 30 | # | 30 | # |
852 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
853 | 32 | # | 32 | # |
854 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
855 | 34 | # | 34 | # |
856 | 35 | 35 | ||
857 | === modified file 'lib/BackupPC/CGI/LOGlist.pm' (properties changed: +x to -x) | |||
858 | --- lib/BackupPC/CGI/LOGlist.pm 2010-11-21 14:59:53 +0000 | |||
859 | +++ lib/BackupPC/CGI/LOGlist.pm 2011-09-19 08:47:26 +0000 | |||
860 | @@ -28,7 +28,7 @@ | |||
861 | 28 | # | 28 | # |
862 | 29 | #======================================================================== | 29 | #======================================================================== |
863 | 30 | # | 30 | # |
865 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
866 | 32 | # | 32 | # |
867 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
868 | 34 | # | 34 | # |
869 | 35 | 35 | ||
870 | === modified file 'lib/BackupPC/CGI/Lib.pm' (properties changed: +x to -x) | |||
871 | --- lib/BackupPC/CGI/Lib.pm 2010-11-21 14:59:53 +0000 | |||
872 | +++ lib/BackupPC/CGI/Lib.pm 2011-09-19 08:47:26 +0000 | |||
873 | @@ -29,7 +29,7 @@ | |||
874 | 29 | # | 29 | # |
875 | 30 | #======================================================================== | 30 | #======================================================================== |
876 | 31 | # | 31 | # |
878 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
879 | 33 | # | 33 | # |
880 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
881 | 35 | # | 35 | # |
882 | 36 | 36 | ||
883 | === modified file 'lib/BackupPC/CGI/Queue.pm' (properties changed: +x to -x) | |||
884 | --- lib/BackupPC/CGI/Queue.pm 2010-11-21 14:59:53 +0000 | |||
885 | +++ lib/BackupPC/CGI/Queue.pm 2011-09-19 08:47:26 +0000 | |||
886 | @@ -28,7 +28,7 @@ | |||
887 | 28 | # | 28 | # |
888 | 29 | #======================================================================== | 29 | #======================================================================== |
889 | 30 | # | 30 | # |
891 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
892 | 32 | # | 32 | # |
893 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
894 | 34 | # | 34 | # |
895 | 35 | 35 | ||
896 | === modified file 'lib/BackupPC/CGI/RSS.pm' (properties changed: +x to -x) | |||
897 | --- lib/BackupPC/CGI/RSS.pm 2010-11-21 14:59:53 +0000 | |||
898 | +++ lib/BackupPC/CGI/RSS.pm 2011-09-19 08:47:26 +0000 | |||
899 | @@ -28,7 +28,7 @@ | |||
900 | 28 | # | 28 | # |
901 | 29 | #======================================================================== | 29 | #======================================================================== |
902 | 30 | # | 30 | # |
904 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
905 | 32 | # | 32 | # |
906 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
907 | 34 | # | 34 | # |
908 | 35 | 35 | ||
909 | === modified file 'lib/BackupPC/CGI/ReloadServer.pm' (properties changed: +x to -x) | |||
910 | --- lib/BackupPC/CGI/ReloadServer.pm 2010-11-21 14:59:53 +0000 | |||
911 | +++ lib/BackupPC/CGI/ReloadServer.pm 2011-09-19 08:47:26 +0000 | |||
912 | @@ -28,7 +28,7 @@ | |||
913 | 28 | # | 28 | # |
914 | 29 | #======================================================================== | 29 | #======================================================================== |
915 | 30 | # | 30 | # |
917 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
918 | 32 | # | 32 | # |
919 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
920 | 34 | # | 34 | # |
921 | 35 | 35 | ||
922 | === modified file 'lib/BackupPC/CGI/Restore.pm' (properties changed: +x to -x) | |||
923 | --- lib/BackupPC/CGI/Restore.pm 2010-11-21 14:59:53 +0000 | |||
924 | +++ lib/BackupPC/CGI/Restore.pm 2011-09-19 08:47:26 +0000 | |||
925 | @@ -28,7 +28,7 @@ | |||
926 | 28 | # | 28 | # |
927 | 29 | #======================================================================== | 29 | #======================================================================== |
928 | 30 | # | 30 | # |
930 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
931 | 32 | # | 32 | # |
932 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
933 | 34 | # | 34 | # |
934 | 35 | 35 | ||
935 | === modified file 'lib/BackupPC/CGI/RestoreFile.pm' (properties changed: +x to -x) | |||
936 | --- lib/BackupPC/CGI/RestoreFile.pm 2010-11-21 14:59:53 +0000 | |||
937 | +++ lib/BackupPC/CGI/RestoreFile.pm 2011-09-19 08:47:26 +0000 | |||
938 | @@ -28,7 +28,7 @@ | |||
939 | 28 | # | 28 | # |
940 | 29 | #======================================================================== | 29 | #======================================================================== |
941 | 30 | # | 30 | # |
943 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
944 | 32 | # | 32 | # |
945 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
946 | 34 | # | 34 | # |
947 | 35 | 35 | ||
948 | === modified file 'lib/BackupPC/CGI/RestoreInfo.pm' (properties changed: +x to -x) | |||
949 | --- lib/BackupPC/CGI/RestoreInfo.pm 2010-11-21 14:59:53 +0000 | |||
950 | +++ lib/BackupPC/CGI/RestoreInfo.pm 2011-09-19 08:47:26 +0000 | |||
951 | @@ -28,7 +28,7 @@ | |||
952 | 28 | # | 28 | # |
953 | 29 | #======================================================================== | 29 | #======================================================================== |
954 | 30 | # | 30 | # |
956 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
957 | 32 | # | 32 | # |
958 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
959 | 34 | # | 34 | # |
960 | 35 | 35 | ||
961 | === modified file 'lib/BackupPC/CGI/StartServer.pm' (properties changed: +x to -x) | |||
962 | --- lib/BackupPC/CGI/StartServer.pm 2010-11-21 14:59:53 +0000 | |||
963 | +++ lib/BackupPC/CGI/StartServer.pm 2011-09-19 08:47:26 +0000 | |||
964 | @@ -28,7 +28,7 @@ | |||
965 | 28 | # | 28 | # |
966 | 29 | #======================================================================== | 29 | #======================================================================== |
967 | 30 | # | 30 | # |
969 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
970 | 32 | # | 32 | # |
971 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
972 | 34 | # | 34 | # |
973 | 35 | 35 | ||
974 | === modified file 'lib/BackupPC/CGI/StartStopBackup.pm' (properties changed: +x to -x) | |||
975 | --- lib/BackupPC/CGI/StartStopBackup.pm 2010-11-21 14:59:53 +0000 | |||
976 | +++ lib/BackupPC/CGI/StartStopBackup.pm 2011-09-19 08:47:26 +0000 | |||
977 | @@ -28,7 +28,7 @@ | |||
978 | 28 | # | 28 | # |
979 | 29 | #======================================================================== | 29 | #======================================================================== |
980 | 30 | # | 30 | # |
982 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
983 | 32 | # | 32 | # |
984 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
985 | 34 | # | 34 | # |
986 | 35 | 35 | ||
987 | === modified file 'lib/BackupPC/CGI/StopServer.pm' (properties changed: +x to -x) | |||
988 | --- lib/BackupPC/CGI/StopServer.pm 2010-11-21 14:59:53 +0000 | |||
989 | +++ lib/BackupPC/CGI/StopServer.pm 2011-09-19 08:47:26 +0000 | |||
990 | @@ -28,7 +28,7 @@ | |||
991 | 28 | # | 28 | # |
992 | 29 | #======================================================================== | 29 | #======================================================================== |
993 | 30 | # | 30 | # |
995 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
996 | 32 | # | 32 | # |
997 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
998 | 34 | # | 34 | # |
999 | 35 | 35 | ||
1000 | === modified file 'lib/BackupPC/CGI/Summary.pm' (properties changed: +x to -x) | |||
1001 | --- lib/BackupPC/CGI/Summary.pm 2010-11-21 14:59:53 +0000 | |||
1002 | +++ lib/BackupPC/CGI/Summary.pm 2011-09-19 08:47:26 +0000 | |||
1003 | @@ -28,7 +28,7 @@ | |||
1004 | 28 | # | 28 | # |
1005 | 29 | #======================================================================== | 29 | #======================================================================== |
1006 | 30 | # | 30 | # |
1008 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
1009 | 32 | # | 32 | # |
1010 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
1011 | 34 | # | 34 | # |
1012 | 35 | 35 | ||
1013 | === modified file 'lib/BackupPC/CGI/View.pm' (properties changed: +x to -x) | |||
1014 | --- lib/BackupPC/CGI/View.pm 2010-11-21 14:59:53 +0000 | |||
1015 | +++ lib/BackupPC/CGI/View.pm 2011-09-19 08:47:26 +0000 | |||
1016 | @@ -28,7 +28,7 @@ | |||
1017 | 28 | # | 28 | # |
1018 | 29 | #======================================================================== | 29 | #======================================================================== |
1019 | 30 | # | 30 | # |
1021 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
1022 | 32 | # | 32 | # |
1023 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
1024 | 34 | # | 34 | # |
1025 | 35 | 35 | ||
1026 | === modified file 'lib/BackupPC/Config.pm' (properties changed: +x to -x) | |||
1027 | === modified file 'lib/BackupPC/Config/Meta.pm' (properties changed: +x to -x) | |||
1028 | --- lib/BackupPC/Config/Meta.pm 2011-03-07 11:35:50 +0000 | |||
1029 | +++ lib/BackupPC/Config/Meta.pm 2011-09-19 08:47:26 +0000 | |||
1030 | @@ -28,7 +28,7 @@ | |||
1031 | 28 | # | 28 | # |
1032 | 29 | #======================================================================== | 29 | #======================================================================== |
1033 | 30 | # | 30 | # |
1035 | 31 | # Version 3.2.0, released 31 Jul 2010. | 31 | # Version 3.2.1, released 24 Apr 2011. |
1036 | 32 | # | 32 | # |
1037 | 33 | # See http://backuppc.sourceforge.net. | 33 | # See http://backuppc.sourceforge.net. |
1038 | 34 | # | 34 | # |
1039 | 35 | 35 | ||
1040 | === modified file 'lib/BackupPC/FileZIO.pm' (properties changed: +x to -x) | |||
1041 | --- lib/BackupPC/FileZIO.pm 2010-11-21 14:59:53 +0000 | |||
1042 | +++ lib/BackupPC/FileZIO.pm 2011-09-19 08:47:26 +0000 | |||
1043 | @@ -29,7 +29,7 @@ | |||
1044 | 29 | # | 29 | # |
1045 | 30 | #======================================================================== | 30 | #======================================================================== |
1046 | 31 | # | 31 | # |
1048 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1049 | 33 | # | 33 | # |
1050 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1051 | 35 | # | 35 | # |
1052 | 36 | 36 | ||
1053 | === modified file 'lib/BackupPC/Lang/de.pm' (properties changed: +x to -x) | |||
1054 | === modified file 'lib/BackupPC/Lang/en.pm' (properties changed: +x to -x) | |||
1055 | === modified file 'lib/BackupPC/Lang/es.pm' (properties changed: +x to -x) | |||
1056 | === modified file 'lib/BackupPC/Lang/fr.pm' (properties changed: +x to -x) | |||
1057 | === modified file 'lib/BackupPC/Lang/it.pm' (properties changed: +x to -x) | |||
1058 | === modified file 'lib/BackupPC/Lang/nl.pm' (properties changed: +x to -x) | |||
1059 | === modified file 'lib/BackupPC/Lang/pl.pm' (properties changed: +x to -x) | |||
1060 | === modified file 'lib/BackupPC/Lang/pt_br.pm' (properties changed: +x to -x) | |||
1061 | === modified file 'lib/BackupPC/Lang/zh_CN.pm' (properties changed: +x to -x) | |||
1062 | === modified file 'lib/BackupPC/Lib.pm' (properties changed: +x to -x) | |||
1063 | --- lib/BackupPC/Lib.pm 2011-03-07 11:35:50 +0000 | |||
1064 | +++ lib/BackupPC/Lib.pm 2011-09-19 08:47:26 +0000 | |||
1065 | @@ -29,7 +29,7 @@ | |||
1066 | 29 | # | 29 | # |
1067 | 30 | #======================================================================== | 30 | #======================================================================== |
1068 | 31 | # | 31 | # |
1070 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1071 | 33 | # | 33 | # |
1072 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1073 | 35 | # | 35 | # |
1074 | @@ -131,7 +131,7 @@ | |||
1075 | 131 | 131 | ||
1076 | 132 | my $bpc = bless { | 132 | my $bpc = bless { |
1077 | 133 | %$paths, | 133 | %$paths, |
1079 | 134 | Version => '3.2.0', | 134 | Version => '3.2.1', |
1080 | 135 | }, $class; | 135 | }, $class; |
1081 | 136 | 136 | ||
1082 | 137 | $bpc->{storage} = BackupPC::Storage->new($paths); | 137 | $bpc->{storage} = BackupPC::Storage->new($paths); |
1083 | 138 | 138 | ||
1084 | === modified file 'lib/BackupPC/PoolWrite.pm' (properties changed: +x to -x) | |||
1085 | --- lib/BackupPC/PoolWrite.pm 2010-11-21 14:59:53 +0000 | |||
1086 | +++ lib/BackupPC/PoolWrite.pm 2011-09-19 08:47:26 +0000 | |||
1087 | @@ -56,7 +56,7 @@ | |||
1088 | 56 | # | 56 | # |
1089 | 57 | #======================================================================== | 57 | #======================================================================== |
1090 | 58 | # | 58 | # |
1092 | 59 | # Version 3.2.0, released 31 Jul 2010. | 59 | # Version 3.2.1, released 24 Apr 2011. |
1093 | 60 | # | 60 | # |
1094 | 61 | # See http://backuppc.sourceforge.net. | 61 | # See http://backuppc.sourceforge.net. |
1095 | 62 | # | 62 | # |
1096 | 63 | 63 | ||
1097 | === modified file 'lib/BackupPC/Storage.pm' (properties changed: +x to -x) | |||
1098 | --- lib/BackupPC/Storage.pm 2010-11-21 14:59:53 +0000 | |||
1099 | +++ lib/BackupPC/Storage.pm 2011-09-19 08:47:26 +0000 | |||
1100 | @@ -29,7 +29,7 @@ | |||
1101 | 29 | # | 29 | # |
1102 | 30 | #======================================================================== | 30 | #======================================================================== |
1103 | 31 | # | 31 | # |
1105 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1106 | 33 | # | 33 | # |
1107 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1108 | 35 | # | 35 | # |
1109 | 36 | 36 | ||
1110 | === modified file 'lib/BackupPC/Storage/Text.pm' (properties changed: +x to -x) | |||
1111 | --- lib/BackupPC/Storage/Text.pm 2010-11-21 14:59:53 +0000 | |||
1112 | +++ lib/BackupPC/Storage/Text.pm 2011-09-19 08:47:26 +0000 | |||
1113 | @@ -30,7 +30,7 @@ | |||
1114 | 30 | # | 30 | # |
1115 | 31 | #======================================================================== | 31 | #======================================================================== |
1116 | 32 | # | 32 | # |
1118 | 33 | # Version 3.2.0, released 31 Jul 2010. | 33 | # Version 3.2.1, released 24 Apr 2011. |
1119 | 34 | # | 34 | # |
1120 | 35 | # See http://backuppc.sourceforge.net. | 35 | # See http://backuppc.sourceforge.net. |
1121 | 36 | # | 36 | # |
1122 | 37 | 37 | ||
1123 | === modified file 'lib/BackupPC/View.pm' (properties changed: +x to -x) | |||
1124 | --- lib/BackupPC/View.pm 2010-11-21 14:59:53 +0000 | |||
1125 | +++ lib/BackupPC/View.pm 2011-09-19 08:47:26 +0000 | |||
1126 | @@ -31,7 +31,7 @@ | |||
1127 | 31 | # | 31 | # |
1128 | 32 | #======================================================================== | 32 | #======================================================================== |
1129 | 33 | # | 33 | # |
1131 | 34 | # Version 3.2.0, released 31 Jul 2010. | 34 | # Version 3.2.1, released 24 Apr 2011. |
1132 | 35 | # | 35 | # |
1133 | 36 | # See http://backuppc.sourceforge.net. | 36 | # See http://backuppc.sourceforge.net. |
1134 | 37 | # | 37 | # |
1135 | 38 | 38 | ||
1136 | === modified file 'lib/BackupPC/Xfer.pm' (properties changed: +x to -x) | |||
1137 | --- lib/BackupPC/Xfer.pm 2010-10-06 20:57:45 +0000 | |||
1138 | +++ lib/BackupPC/Xfer.pm 2011-09-19 08:47:26 +0000 | |||
1139 | @@ -30,7 +30,7 @@ | |||
1140 | 30 | # | 30 | # |
1141 | 31 | #======================================================================== | 31 | #======================================================================== |
1142 | 32 | # | 32 | # |
1144 | 33 | # Version 3.2.0, released 31 Jul 2010. | 33 | # Version 3.2.1, released 24 Apr 2011. |
1145 | 34 | # | 34 | # |
1146 | 35 | # See http://backuppc.sourceforge.net. | 35 | # See http://backuppc.sourceforge.net. |
1147 | 36 | # | 36 | # |
1148 | 37 | 37 | ||
1149 | === modified file 'lib/BackupPC/Xfer/Archive.pm' (properties changed: +x to -x) | |||
1150 | --- lib/BackupPC/Xfer/Archive.pm 2010-11-21 14:59:53 +0000 | |||
1151 | +++ lib/BackupPC/Xfer/Archive.pm 2011-09-19 08:47:26 +0000 | |||
1152 | @@ -29,7 +29,7 @@ | |||
1153 | 29 | # | 29 | # |
1154 | 30 | #======================================================================== | 30 | #======================================================================== |
1155 | 31 | # | 31 | # |
1157 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1158 | 33 | # | 33 | # |
1159 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1160 | 35 | # | 35 | # |
1161 | 36 | 36 | ||
1162 | === modified file 'lib/BackupPC/Xfer/Ftp.pm' (properties changed: +x to -x) | |||
1163 | --- lib/BackupPC/Xfer/Ftp.pm 2010-10-06 20:57:45 +0000 | |||
1164 | +++ lib/BackupPC/Xfer/Ftp.pm 2011-09-19 08:47:26 +0000 | |||
1165 | @@ -31,7 +31,7 @@ | |||
1166 | 31 | # | 31 | # |
1167 | 32 | #======================================================================== | 32 | #======================================================================== |
1168 | 33 | # | 33 | # |
1170 | 34 | # Version 3.2.0, released 31 Jul 2010. | 34 | # Version 3.2.1, released 24 Apr 2011. |
1171 | 35 | # | 35 | # |
1172 | 36 | # See http://backuppc.sourceforge.net. | 36 | # See http://backuppc.sourceforge.net. |
1173 | 37 | # | 37 | # |
1174 | 38 | 38 | ||
1175 | === modified file 'lib/BackupPC/Xfer/Protocol.pm' (properties changed: +x to -x) | |||
1176 | --- lib/BackupPC/Xfer/Protocol.pm 2010-10-06 20:57:45 +0000 | |||
1177 | +++ lib/BackupPC/Xfer/Protocol.pm 2011-09-19 08:47:26 +0000 | |||
1178 | @@ -29,7 +29,7 @@ | |||
1179 | 29 | # | 29 | # |
1180 | 30 | #======================================================================== | 30 | #======================================================================== |
1181 | 31 | # | 31 | # |
1183 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1184 | 33 | # | 33 | # |
1185 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1186 | 35 | # | 35 | # |
1187 | @@ -288,12 +288,9 @@ | |||
1188 | 288 | my @BackupFilesExclude = (); | 288 | my @BackupFilesExclude = (); |
1189 | 289 | my ($shareName, $shareNameRE); | 289 | my ($shareName, $shareNameRE); |
1190 | 290 | 290 | ||
1196 | 291 | # | 291 | $shareName = $t->{shareName}; |
1192 | 292 | # $conf->{$shareType} shold be a reference to an array with one | ||
1193 | 293 | # element, thanks to BackupFileConfFix(). | ||
1194 | 294 | # | ||
1195 | 295 | $shareName = @{ $conf->{$shareType} }[0]; | ||
1197 | 296 | $shareName =~ s/\/*$//; # remove trailing slashes | 292 | $shareName =~ s/\/*$//; # remove trailing slashes |
1198 | 293 | $shareName = "/" if ( $shareName eq "" ); | ||
1199 | 297 | 294 | ||
1200 | 298 | $t->{shareName} = $shareName; | 295 | $t->{shareName} = $shareName; |
1201 | 299 | $t->{shareNameRE} = $bpc->glob2re($shareName); | 296 | $t->{shareNameRE} = $bpc->glob2re($shareName); |
1202 | @@ -422,18 +419,18 @@ | |||
1203 | 422 | my ($t, $file) = @_; | 419 | my ($t, $file) = @_; |
1204 | 423 | 420 | ||
1205 | 424 | my $shareName = $t->{shareName}; | 421 | my $shareName = $t->{shareName}; |
1207 | 425 | my $includes = $t->{BackupFilesOnly} || return 0; | 422 | my $excludes = $t->{BackupFilesExclude} || return 0; |
1208 | 426 | my $match = ""; | 423 | my $match = ""; |
1209 | 427 | 424 | ||
1211 | 428 | foreach my $include ( @{$includes} ) { | 425 | foreach my $exclude ( @{$excludes} ) { |
1212 | 429 | 426 | ||
1213 | 430 | # | 427 | # |
1214 | 431 | # construct regexp elsewhere to avoid syntactical evil | 428 | # construct regexp elsewhere to avoid syntactical evil |
1215 | 432 | # | 429 | # |
1217 | 433 | $match = '^' . quotemeta( $shareName . $include ) . '(?=\/.*)?'; | 430 | $match = '^' . quotemeta( $shareName . $exclude ) . '(?=\/.*)?'; |
1218 | 434 | 431 | ||
1219 | 435 | # | 432 | # |
1221 | 436 | # return true if the include folder is a parent of the file, | 433 | # return true if the exclude folder is a parent of the file, |
1222 | 437 | # or the folder itself. | 434 | # or the folder itself. |
1223 | 438 | # | 435 | # |
1224 | 439 | return 1 if ( $file =~ /$match/ ); | 436 | return 1 if ( $file =~ /$match/ ); |
1225 | @@ -441,10 +438,10 @@ | |||
1226 | 441 | $match = '^' . quotemeta($file) . '(?=\/.*)?'; | 438 | $match = '^' . quotemeta($file) . '(?=\/.*)?'; |
1227 | 442 | 439 | ||
1228 | 443 | # | 440 | # |
1230 | 444 | # return true if the file is a parent of the include folder, | 441 | # return true if the file is a parent of the exclude folder, |
1231 | 445 | # or the folder itself. | 442 | # or the folder itself. |
1232 | 446 | # | 443 | # |
1234 | 447 | return 1 if ( "$shareName$include" =~ /$match/ ); | 444 | return 1 if ( "$shareName$exclude" =~ /$match/ ); |
1235 | 448 | } | 445 | } |
1236 | 449 | return 0; | 446 | return 0; |
1237 | 450 | } | 447 | } |
1238 | 451 | 448 | ||
1239 | === modified file 'lib/BackupPC/Xfer/Rsync.pm' (properties changed: +x to -x) | |||
1240 | --- lib/BackupPC/Xfer/Rsync.pm 2010-11-21 14:59:53 +0000 | |||
1241 | +++ lib/BackupPC/Xfer/Rsync.pm 2011-09-19 08:47:26 +0000 | |||
1242 | @@ -29,7 +29,7 @@ | |||
1243 | 29 | # | 29 | # |
1244 | 30 | #======================================================================== | 30 | #======================================================================== |
1245 | 31 | # | 31 | # |
1247 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1248 | 33 | # | 33 | # |
1249 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1250 | 35 | # | 35 | # |
1251 | @@ -126,7 +126,7 @@ | |||
1252 | 126 | 126 | ||
1253 | 127 | if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) { | 127 | if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) { |
1254 | 128 | my(@inc, @exc, %incDone, %excDone); | 128 | my(@inc, @exc, %incDone, %excDone); |
1256 | 129 | foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) { | 129 | foreach my $file2 ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) { |
1257 | 130 | # | 130 | # |
1258 | 131 | # If the user wants to just include /home/craig, then | 131 | # If the user wants to just include /home/craig, then |
1259 | 132 | # we need to do create include/exclude pairs at | 132 | # we need to do create include/exclude pairs at |
1260 | @@ -144,6 +144,7 @@ | |||
1261 | 144 | # To make this easier we do all the includes first and all | 144 | # To make this easier we do all the includes first and all |
1262 | 145 | # of the excludes at the end (hopefully they commute). | 145 | # of the excludes at the end (hopefully they commute). |
1263 | 146 | # | 146 | # |
1264 | 147 | my $file = $file2; | ||
1265 | 147 | $file =~ s{/$}{}; | 148 | $file =~ s{/$}{}; |
1266 | 148 | $file = "/$file"; | 149 | $file = "/$file"; |
1267 | 149 | $file =~ s{//+}{/}g; | 150 | $file =~ s{//+}{/}g; |
1268 | @@ -185,11 +186,11 @@ | |||
1269 | 185 | } | 186 | } |
1270 | 186 | } | 187 | } |
1271 | 187 | if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) { | 188 | if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) { |
1274 | 188 | foreach my $file ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) | 189 | foreach my $file2 ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) { |
1273 | 189 | { | ||
1275 | 190 | # | 190 | # |
1276 | 191 | # just append additional exclude lists onto the end | 191 | # just append additional exclude lists onto the end |
1277 | 192 | # | 192 | # |
1278 | 193 | my $file = $file2; | ||
1279 | 193 | $file = encode($conf->{ClientCharset}, $file) | 194 | $file = encode($conf->{ClientCharset}, $file) |
1280 | 194 | if ( $conf->{ClientCharset} ne "" ); | 195 | if ( $conf->{ClientCharset} ne "" ); |
1281 | 195 | push(@fileList, "--exclude=$file"); | 196 | push(@fileList, "--exclude=$file"); |
1282 | 196 | 197 | ||
1283 | === modified file 'lib/BackupPC/Xfer/RsyncDigest.pm' (properties changed: +x to -x) | |||
1284 | --- lib/BackupPC/Xfer/RsyncDigest.pm 2010-11-21 14:59:53 +0000 | |||
1285 | +++ lib/BackupPC/Xfer/RsyncDigest.pm 2011-09-19 08:47:26 +0000 | |||
1286 | @@ -29,7 +29,7 @@ | |||
1287 | 29 | # | 29 | # |
1288 | 30 | #======================================================================== | 30 | #======================================================================== |
1289 | 31 | # | 31 | # |
1291 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1292 | 33 | # | 33 | # |
1293 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1294 | 35 | # | 35 | # |
1295 | 36 | 36 | ||
1296 | === modified file 'lib/BackupPC/Xfer/RsyncFileIO.pm' (properties changed: +x to -x) | |||
1297 | --- lib/BackupPC/Xfer/RsyncFileIO.pm 2010-11-21 14:59:53 +0000 | |||
1298 | +++ lib/BackupPC/Xfer/RsyncFileIO.pm 2011-09-19 08:47:26 +0000 | |||
1299 | @@ -26,7 +26,7 @@ | |||
1300 | 26 | # | 26 | # |
1301 | 27 | #======================================================================== | 27 | #======================================================================== |
1302 | 28 | # | 28 | # |
1304 | 29 | # Version 3.2.0, released 31 Jul 2010. | 29 | # Version 3.2.1, released 24 Apr 2011. |
1305 | 30 | # | 30 | # |
1306 | 31 | # See http://backuppc.sourceforge.net. | 31 | # See http://backuppc.sourceforge.net. |
1307 | 32 | # | 32 | # |
1308 | 33 | 33 | ||
1309 | === modified file 'lib/BackupPC/Xfer/Smb.pm' (properties changed: +x to -x) | |||
1310 | --- lib/BackupPC/Xfer/Smb.pm 2010-11-21 14:59:53 +0000 | |||
1311 | +++ lib/BackupPC/Xfer/Smb.pm 2011-09-19 08:47:26 +0000 | |||
1312 | @@ -29,7 +29,7 @@ | |||
1313 | 29 | # | 29 | # |
1314 | 30 | #======================================================================== | 30 | #======================================================================== |
1315 | 31 | # | 31 | # |
1317 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1318 | 33 | # | 33 | # |
1319 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1320 | 35 | # | 35 | # |
1321 | 36 | 36 | ||
1322 | === modified file 'lib/BackupPC/Xfer/Tar.pm' (properties changed: +x to -x) | |||
1323 | --- lib/BackupPC/Xfer/Tar.pm 2010-11-21 14:59:53 +0000 | |||
1324 | +++ lib/BackupPC/Xfer/Tar.pm 2011-09-19 08:47:26 +0000 | |||
1325 | @@ -29,7 +29,7 @@ | |||
1326 | 29 | # | 29 | # |
1327 | 30 | #======================================================================== | 30 | #======================================================================== |
1328 | 31 | # | 31 | # |
1330 | 32 | # Version 3.2.0, released 31 Jul 2010. | 32 | # Version 3.2.1, released 24 Apr 2011. |
1331 | 33 | # | 33 | # |
1332 | 34 | # See http://backuppc.sourceforge.net. | 34 | # See http://backuppc.sourceforge.net. |
1333 | 35 | # | 35 | # |
1334 | @@ -71,8 +71,8 @@ | |||
1335 | 71 | $bpc->backupFileConfFix($conf, "TarShareName"); | 71 | $bpc->backupFileConfFix($conf, "TarShareName"); |
1336 | 72 | 72 | ||
1337 | 73 | if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) { | 73 | if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) { |
1340 | 74 | foreach my $file ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) | 74 | foreach my $file2 ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) { |
1341 | 75 | { | 75 | my $file = $file2; |
1342 | 76 | $file = "./$2" if ( $file =~ m{^(\./+|/+)(.*)}s ); | 76 | $file = "./$2" if ( $file =~ m{^(\./+|/+)(.*)}s ); |
1343 | 77 | $file = encode($conf->{ClientCharset}, $file) | 77 | $file = encode($conf->{ClientCharset}, $file) |
1344 | 78 | if ( $conf->{ClientCharset} ne "" ); | 78 | if ( $conf->{ClientCharset} ne "" ); |
1345 | @@ -80,7 +80,8 @@ | |||
1346 | 80 | } | 80 | } |
1347 | 81 | } | 81 | } |
1348 | 82 | if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) { | 82 | if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) { |
1350 | 83 | foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) { | 83 | foreach my $file2 ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) { |
1351 | 84 | my $file = $file2; | ||
1352 | 84 | $file = $2 if ( $file =~ m{^(\./+|/+)(.*)}s ); | 85 | $file = $2 if ( $file =~ m{^(\./+|/+)(.*)}s ); |
1353 | 85 | $file = "./$file"; | 86 | $file = "./$file"; |
1354 | 86 | $file = encode($conf->{ClientCharset}, $file) | 87 | $file = encode($conf->{ClientCharset}, $file) |
1355 | 87 | 88 | ||
1356 | === modified file 'lib/BackupPC/Zip/FileMember.pm' (properties changed: +x to -x) | |||
1357 | --- lib/BackupPC/Zip/FileMember.pm 2010-11-21 14:59:53 +0000 | |||
1358 | +++ lib/BackupPC/Zip/FileMember.pm 2011-09-19 08:47:26 +0000 | |||
1359 | @@ -33,7 +33,7 @@ | |||
1360 | 33 | # | 33 | # |
1361 | 34 | #======================================================================== | 34 | #======================================================================== |
1362 | 35 | # | 35 | # |
1364 | 36 | # Version 3.2.0, released 31 Jul 2010. | 36 | # Version 3.2.1, released 24 Apr 2011. |
1365 | 37 | # | 37 | # |
1366 | 38 | # See http://backuppc.sourceforge.net. | 38 | # See http://backuppc.sourceforge.net. |
1367 | 39 | # | 39 | # |
LGTM