From 7b04f2e8480fc9a9bb0ab66fa568a197c62528d2 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Tue, 7 Feb 2017 14:39:36 +0000
Subject: - Update sysutils/backuppc to 3.3.2 - Initialize options helpers

PR:		216875
Submitted by:	moiseev@mezonplus.ru
Approved by:	mat (mentor)
Differential Revision:	https://reviews.freebsd.org/D9472
---
 .../backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm  | 39 +++++-----------------
 1 file changed, 9 insertions(+), 30 deletions(-)

(limited to 'sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm')

diff --git a/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm b/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm
index f12b03731c64..8edc96e23364 100644
--- a/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm
+++ b/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm
@@ -1,33 +1,12 @@
---- lib/BackupPC/Xfer/Smb.pm.orig	2016-06-04 10:42:02 UTC
+--- lib/BackupPC/Xfer/Smb.pm.orig	2017-02-06 08:40:41 UTC
 +++ lib/BackupPC/Xfer/Smb.pm
-@@ -217,7 +217,7 @@ 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/ ) {
+@@ -242,7 +242,8 @@ sub readOutput
              $t->{xferOK} = 1;
+             $t->{byteCnt} = $1;
              $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
-         } elsif ( /^\s*tar: restored \d+ files/ ) {
-@@ -270,6 +272,10 @@ sub readOutput
-         } elsif ( /^\s*directory \\/i ) {
-             $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
-         } elsif ( /smb: \\>/
-+                || /^tar:\d+\s/
-+                || /^  NTLMSSP_/
-+                || /^GENSEC backend /
-+                || /^doing parameter /
-                 || /^\s*added interface/i
-                 || /^\s*tarmode is now/i
-                 || /^\s*Total bytes written/i
+-        } 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 ) {
-- 
cgit v1.2.3