BackupPC-users

Re: [BackupPC-users] restore .tar / .zip files empty #128

2017-07-30 18:27:11
Subject: Re: [BackupPC-users] restore .tar / .zip files empty #128
From: Craig Barratt via BackupPC-users <backuppc-users AT lists.sourceforge DOT net>
To: "General list for user discussion, questions and support" <backuppc-users AT lists.sourceforge DOT net>
Date: Sun, 30 Jul 2017 15:26:21 -0700
Doug,

Here's a simplified combined patch.  After you gunzip it, it should work cleanly on 4.1.2, 4.1.3 etc.

Craig


On Sun, Jul 30, 2017 at 3:10 PM, Doug Lytle via BackupPC-users <backuppc-users AT lists.sourceforge DOT net> wrote:
On 07/30/2017 05:42 PM, Doug Lytle via BackupPC-users wrote:
On 07/30/2017 05:01 PM, Alexander Moisseev via BackupPC-users wrote:
Doug, you can just add ".diff" or ".patch" at the end of the commits URIs like this:
https://github.com/backuppc/backuppc/commit/6f01264005310cffe55d5258436d38609a1ac99d.diff
https://github.com/backuppc/backuppc/commit/0439411cc17757e5f15ebfbff902aacc3d4510b6.diff

Or do the same with "compare" to get a patch that includes both commits:
https://github.com/backuppc/backuppc/compare/2c09f85...0439411.diff

I guess I need to start with a fresh 4.1.3 copy, I'll do that shortly.

None of the patches will apply to a freshly downloaded 4.1.3

And, I don't want to take up your Sunday, this isn't a must have at this time.

Doug


-rw-r--r-- 1 root root 318 Jul 30 18:04 BackupPC_tarCreate.rej
-rw-r--r-- 1 root root 279 Jul 30 18:04 BackupPC_zipCreate.rej


cat *.rej

--- bin/BackupPC_tarCreate
+++ bin/BackupPC_tarCreate
@@ -101,8 +101,8 @@
 }

 my $Host;
-if ( $opts{h} =~ /^([\w@.\s-]+)$/ ) {
-    $Host = $opts{h};
+if ( $opts{h} !~ m{(^|/)\.\.(/|$)} && $opts{h} =~ /^([\w@.\s-]+)$/ ) {
+    $Host = $1;
 } else {
     print(STDERR "$0: bad host name '$opts{h}'\n");
     exit(1);
--- bin/BackupPC_zipCreate
+++ bin/BackupPC_zipCreate
@@ -97,7 +97,7 @@
 }

 my $Host;
-if ( $opts{h} =~ /^([\w@.\s-]+)$/ ) {
+if ( $opts{h} !~ m{(^|/)\.\.(/|$)} && $opts{h} =~ /^([\w@.\s-]+)$/ ) {
     $Host = $1;
 } else {
     print(STDERR "$0: bad host name '$opts{h}'\n");




------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BackupPC-users mailing list
[email protected]ge.net
List:    https://lists.sourceforge.net/lists/listinfo/backuppc-users
Wiki:    http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/

Attachment: patch.gz
Description: GNU Zip compressed data

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BackupPC-users mailing list
BackupPC-users AT lists.sourceforge DOT net
List:    https://lists.sourceforge.net/lists/listinfo/backuppc-users
Wiki:    http://backuppc.wiki.sourceforge.net
Project: http://backuppc.sourceforge.net/
<Prev in Thread] Current Thread [Next in Thread>

ADSM.ORG Privacy and Data Security by KimLaw, PLLC