Attachment #179697 for bug #216875

View | Details | Raw Unified | Return to bug 216875
Collapse All | Expand All

Lines 1-2 Link Here

(-)backuppc/distinfo (-2 / +3 lines)
1	SHA256 (BackupPC-3.3.1.tar.gz) = c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c	1	TIMESTAMP = 1486366929
2	SIZE (BackupPC-3.3.1.tar.gz) = 556461	2	SHA256 (BackupPC-3.3.2.tar.gz) = fbade2c8d8039297e826a75d2c39d5ac9a6f66e0c84c0cf8c4cef0bcf64d2152
		3	SIZE (BackupPC-3.3.2.tar.gz) = 557300

Lines 1-8 Link Here

(-)backuppc/files/patch-doc-BackupPC.pod (-8 lines)
1	--- doc/BackupPC.pod.orig 2014-05-13 17:40:09.000000000 +0400
2	+++ doc/BackupPC.pod 2014-05-13 17:40:27.000000000 +0400
3	@@ -1,3 +1,5 @@
4	+=encoding ISO8859-1
5	+
6	=head1 BackupPC Introduction
7
8	This documentation describes BackupPC version 3.3.0,

Lines 9-22 Link Here

(-)backuppc/files/patch-lib__BackupPC__CGI__View.pm (-11 lines)
9	} elsif ( $host ne "" ) {	9	} elsif ( $host ne "" ) {
10	if ( !defined($In{num}) ) {	10	if ( !defined($In{num}) ) {
11	# get the latest LOG file	11	# get the latest LOG file
12	@@ -136,6 +136,10 @@ sub action
13	}
14	$s =~ s/[\n\r]+//g;
15	if ( $s =~ /smb: \\>/
16	+ \|\| $s =~ /^tar:\d+\s/
17	+ \|\| $s =~ /^ NTLMSSP_/
18	+ \|\| $s =~ /^GENSEC backend /
19	+ \|\| $s =~ /^doing parameter /
20	\|\| $s =~ /^\s(\d+) $\s\d+\.\d kb\/s$ (.*)$/
21	\|\| $s =~ /^tar: dumped \d+ files/
22	\|\| $s =~ /^\s*added interface/i

Lines 1-11 Link Here

(-)backuppc/files/patch-lib_BackupPC_CGI_Browse.pm (-11 lines)
1	--- lib/BackupPC/CGI/Browse.pm.orig 2016-05-14 07:28:52 UTC
2	+++ lib/BackupPC/CGI/Browse.pm
3	@@ -65,7 +65,7 @@ sub action
4	#
5	# default to the newest backup
6	#
7	- if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) {
8	+ if ( !defined($In{num}) && @Backups > 0 ) {
9	$i = @Backups - 1;
10	$num = $Backups[$i]{num};
11	}

Lines 1-20 Link Here

(-)backuppc/files/patch-lib_BackupPC_Lib.pm (-20 lines)
1	--- lib/BackupPC/Lib.pm.orig 2016-11-08 08:08:02 UTC
2	+++ lib/BackupPC/Lib.pm
3	@@ -1261,7 +1261,7 @@ sub cmdVarSubstitute
4	#
5	# Replace scalar variables first
6	#
7	- $arg =~ s[\${(\w+)}(\+?)]{
8	+ $arg =~ s[\$\{(\w+)}(\+?)]{
9	exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY"
10	? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
11	: "\${$1}$2"
12	@@ -1270,7 +1270,7 @@ sub cmdVarSubstitute
13	# Now replicate any array arguments; this just works for just one
14	# array var in each argument.
15	#
16	- if ( $arg =~ m[(.)\${(\w+)}(\+?)(.)] && ref($vars->{$2}) eq "ARRAY" ) {
17	+ if ( $arg =~ m[(.)\$\{(\w+)}(\+?)(.)] && ref($vars->{$2}) eq "ARRAY" ) {
18	my $pre = $1;
19	my $var = $2;
20	my $esc = $3;




--- lib/BackupPC/Xfer/Smb.pm.orig	2017-02-06 08:40:41 UTC
+++ lib/BackupPC/Xfer/Smb.pm
@@ -242,7 +242,8 @@ sub readOutput
         # This section is highly dependent on the version of smbclient.
         # If you upgrade Samba, make sure that these regexp are still valid.
         #
-        if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ ) {
+        if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ || /^tar:(\d+)\s+\+\+\+ (.*)$/ ) {
             my $sambaFileSize = $1;
             my $pcFileName    = $2;
             (my $fileName = $pcFileName) =~ s/\\/\//g;
@@ -230,7 +230,9 @@ sub readOutput
             $t->{byteCnt} += $2;
             $t->{fileCnt}++;
             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
-        } elsif ( /^\s*tar: dumped \d+ files/ ) {
+        } elsif ( /^\s*tar: dumped \d+ files/
+                    || /Total bytes received: \d+/i
+                    || /tar_process done, err = 0/ ) {
             $t->{xferOK} = 1;
             $t->{byteCnt} = $1;
             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
-        } elsif ( /^\s*tar: restored \d+ files/ ) {
+        } elsif ( /^\s*tar: restored \d+ files/
+                    || /^\s*tar:\d+\s*tar_process done, err = 0/ ) {
             $t->{xferOK} = 1;
             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
         } elsif ( /^\s*read_socket_with_timeout: timeout read. /i ) {
+                || /^  NTLMSSP_/
+                || /^GENSEC backend /
+                || /^doing parameter /
                 || /^\s*added interface/i
                 || /^\s*tarmode is now/i
                 || /^\s*Total bytes written/i

Lines 177-183 Link Here

(-)backuppc/files/patch-update.pl (-1 / +1 lines)
177	- #	177	- #
178	- # Install new CSS file, making a backup copy if necessary	178	- # Install new CSS file, making a backup copy if necessary
179	- #	179	- #
180	- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.1";	180	- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.2";
181	- if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {	181	- if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
182	- rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);	182	- rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
183	- }	183	- }

Lines 18-25 Link Here

(-)backuppc/files/pkg-message.in (-4 lines)
18	restore command to 5 ('-d 5') in the main configuration, for instance	18	restore command to 5 ('-d 5') in the main configuration, for instance
19		19
20	$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';	20	$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -';
21
22	and set in the each host's configuration
23
24	$Conf{BackupZeroFilesIsFatal} = '0';
25	==========================================================================	21	==========================================================================

Lines 2-9 Link Here

(-)backuppc/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/sysutils/backuppc/Makefile 429367 2016-12-24 15:56:20Z matthew $	2	# $FreeBSD: head/sysutils/backuppc/Makefile 429367 2016-12-24 15:56:20Z matthew $
3		3
4	PORTNAME= backuppc	4	PORTNAME= backuppc
5	PORTVERSION= 3.3.1	5	PORTVERSION= 3.3.2
6	PORTREVISION= 4
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	DISTNAME= BackupPC-${PORTVERSION}	8	DISTNAME= BackupPC-${PORTVERSION}

Return to bug 216875

Lines 1-33 Link Here

(-)backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm (-30 / +9 lines)
1	--- lib/BackupPC/Xfer/Smb.pm.orig 2016-06-04 10:42:02 UTC	1	--- lib/BackupPC/Xfer/Smb.pm.orig 2017-02-06 08:40:41 UTC
2	+++ lib/BackupPC/Xfer/Smb.pm	2	+++ lib/BackupPC/Xfer/Smb.pm
3	@@ -217,7 +217,7 @@ sub readOutput	3	@@ -242,7 +242,8 @@ sub readOutput
4	# This section is highly dependent on the version of smbclient.
5	# If you upgrade Samba, make sure that these regexp are still valid.
6	#
7	- if ( /^\s(-?\d+) \(\s\d+[.,]\d kb\/s\) (.*)$/ ) {
8	+ if ( /^\s(-?\d+) \(\s\d+[.,]\d kb\/s\) (.)$/ \|\| /^tar:(\d+)\s+\+\+\+ (.)$/ ) {
9	my $sambaFileSize = $1;
10	my $pcFileName = $2;
11	(my $fileName = $pcFileName) =~ s/\\/\//g;
12	@@ -230,7 +230,9 @@ sub readOutput
13	$t->{byteCnt} += $2;
14	$t->{fileCnt}++;
15	$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
16	- } elsif ( /^\s*tar: dumped \d+ files/ ) {
17	+ } elsif ( /^\s*tar: dumped \d+ files/
18	+ \|\| /Total bytes received: \d+/i
19	+ \|\| /tar_process done, err = 0/ ) {
20	$t->{xferOK} = 1;	4	$t->{xferOK} = 1;
		5	$t->{byteCnt} = $1;
21	$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );	6	$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
22	} elsif ( /^\s*tar: restored \d+ files/ ) {	7	- } elsif ( /^\s*tar: restored \d+ files/ ) {
23	@@ -270,6 +272,10 @@ sub readOutput	8	+ } elsif ( /^\s*tar: restored \d+ files/
24	} elsif ( /^\s*directory \\/i ) {	9	+ \|\| /^\star:\d+\star_process done, err = 0/ ) {
25	$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );	10	$t->{xferOK} = 1;
26	} elsif ( /smb: \\>/	11	$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
27	+ \|\| /^tar:\d+\s/	12	} elsif ( /^\s*read_socket_with_timeout: timeout read. /i ) {
28	+ \|\| /^ NTLMSSP_/
29	+ \|\| /^GENSEC backend /
30	+ \|\| /^doing parameter /
31	\|\| /^\s*added interface/i
32	\|\| /^\s*tarmode is now/i
33	\|\| /^\s*Total bytes written/i