Date: Tue, 21 Jun 2016 21:01:27 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417289 - in head/sysutils/backuppc-devel: . files Message-ID: <201606212101.u5LL1RpG053434@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Jun 21 21:01:27 2016 New Revision: 417289 URL: https://svnweb.freebsd.org/changeset/ports/417289 Log: sysutils/backuppc-devel: add a workaround for users of Samba 4. Using Samba 3.6 is still reccommended PR: 209875 Submitted by: myself, patch by maintainer Added: head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm (contents, props changed) Modified: head/sysutils/backuppc-devel/Makefile head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm head/sysutils/backuppc-devel/files/pkg-message.in Modified: head/sysutils/backuppc-devel/Makefile ============================================================================== --- head/sysutils/backuppc-devel/Makefile Tue Jun 21 20:39:00 2016 (r417288) +++ head/sysutils/backuppc-devel/Makefile Tue Jun 21 21:01:27 2016 (r417289) @@ -3,7 +3,7 @@ PORTNAME= backuppc DISTVERSION= 4.0.0alpha3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION} PKGNAMESUFFIX= -devel Added: head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm Tue Jun 21 21:01:27 2016 (r417289) @@ -0,0 +1,33 @@ +--- lib/BackupPC/Xfer/Smb.pm.orig 2013-12-01 20:58:20 UTC ++++ lib/BackupPC/Xfer/Smb.pm +@@ -216,7 +216,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; +@@ -229,7 +229,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->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 ); + } elsif ( /^\s*tar: restored \d+ files/ ) { +@@ -269,6 +271,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 Modified: head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm ============================================================================== --- head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm Tue Jun 21 20:39:00 2016 (r417288) +++ head/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm Tue Jun 21 21:01:27 2016 (r417289) @@ -1,6 +1,6 @@ ---- ./lib/BackupPC/CGI/View.pm.orig 2014-09-03 14:15:03.000000000 +0400 -+++ ./lib/BackupPC/CGI/View.pm 2014-09-03 14:15:20.000000000 +0400 -@@ -102,7 +102,7 @@ +--- lib/BackupPC/CGI/View.pm.orig 2013-12-01 20:58:20 UTC ++++ lib/BackupPC/CGI/View.pm +@@ -102,7 +102,7 @@ sub action $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; } elsif ( $type eq "docs" ) { @@ -9,3 +9,14 @@ } elsif ( $host ne "" ) { if ( !defined($In{num}) ) { # get the latest LOG file +@@ -148,6 +148,10 @@ sub action + } + $s =~ s/[\n\r]+//g; + if ( $s =~ /smb: \\>/ ++ || $s =~ /^tar:\d+\s/ ++ || $s =~ /^ NTLMSSP_/ ++ || $s =~ /^GENSEC backend / ++ || $s =~ /^doing parameter / + || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/ + || $s =~ /^tar: dumped \d+ files/ + || $s =~ /^\s*added interface/i Modified: head/sysutils/backuppc-devel/files/pkg-message.in ============================================================================== --- head/sysutils/backuppc-devel/files/pkg-message.in Tue Jun 21 20:39:00 2016 (r417288) +++ head/sysutils/backuppc-devel/files/pkg-message.in Tue Jun 21 21:01:27 2016 (r417289) @@ -13,4 +13,13 @@ This is where all the backup data is stored. This file system needs to be big enough to accommodate all the PCs you expect to backup. + + - Users of Samba 4 smbclient should change debug level for smbclient + restore command to 5 ('-d 5') in the main configuration, for instance + + $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -'; + + and set in the each host's configuration + + $Conf{BackupZeroFilesIsFatal} = '0'; ==========================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606212101.u5LL1RpG053434>