FreeBSD Bugzilla – Attachment 179697 Details for
Bug 216875
sysutils/backuppc: update to 3.3.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
backuppc-3.3.2.patch (text/plain), 7.52 KB, created by
Alexander Moisseev
on 2017-02-07 08:15:28 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Alexander Moisseev
Created:
2017-02-07 08:15:28 UTC
Size:
7.52 KB
patch
obsolete
>diff -ruN backuppc.orig/distinfo backuppc/distinfo >--- backuppc.orig/distinfo 2015-01-25 07:48:01.000000000 +0300 >+++ backuppc/distinfo 2017-02-07 10:38:20.716778000 +0300 >@@ -1,2 +1,3 @@ >-SHA256 (BackupPC-3.3.1.tar.gz) = c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c >-SIZE (BackupPC-3.3.1.tar.gz) = 556461 >+TIMESTAMP = 1486366929 >+SHA256 (BackupPC-3.3.2.tar.gz) = fbade2c8d8039297e826a75d2c39d5ac9a6f66e0c84c0cf8c4cef0bcf64d2152 >+SIZE (BackupPC-3.3.2.tar.gz) = 557300 >diff -ruN backuppc.orig/files/patch-doc-BackupPC.pod backuppc/files/patch-doc-BackupPC.pod >--- backuppc.orig/files/patch-doc-BackupPC.pod 2014-07-14 05:29:26.000000000 +0400 >+++ backuppc/files/patch-doc-BackupPC.pod 1970-01-01 03:00:00.000000000 +0300 >@@ -1,8 +0,0 @@ >---- doc/BackupPC.pod.orig 2014-05-13 17:40:09.000000000 +0400 >-+++ doc/BackupPC.pod 2014-05-13 17:40:27.000000000 +0400 >-@@ -1,3 +1,5 @@ >-+=encoding ISO8859-1 >-+ >- =head1 BackupPC Introduction >- >- This documentation describes BackupPC version 3.3.0, >diff -ruN backuppc.orig/files/patch-lib__BackupPC__CGI__View.pm backuppc/files/patch-lib__BackupPC__CGI__View.pm >--- backuppc.orig/files/patch-lib__BackupPC__CGI__View.pm 2016-06-21 23:39:00.000000000 +0300 >+++ backuppc/files/patch-lib__BackupPC__CGI__View.pm 2017-02-07 10:38:20.717013000 +0300 >@@ -9,14 +9,3 @@ > } elsif ( $host ne "" ) { > if ( !defined($In{num}) ) { > # get the latest LOG file >-@@ -136,6 +136,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 >diff -ruN backuppc.orig/files/patch-lib_BackupPC_CGI_Browse.pm backuppc/files/patch-lib_BackupPC_CGI_Browse.pm >--- backuppc.orig/files/patch-lib_BackupPC_CGI_Browse.pm 2016-05-24 10:07:01.000000000 +0300 >+++ backuppc/files/patch-lib_BackupPC_CGI_Browse.pm 1970-01-01 03:00:00.000000000 +0300 >@@ -1,11 +0,0 @@ >---- lib/BackupPC/CGI/Browse.pm.orig 2016-05-14 07:28:52 UTC >-+++ lib/BackupPC/CGI/Browse.pm >-@@ -65,7 +65,7 @@ sub action >- # >- # default to the newest backup >- # >-- if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) { >-+ if ( !defined($In{num}) && @Backups > 0 ) { >- $i = @Backups - 1; >- $num = $Backups[$i]{num}; >- } >diff -ruN backuppc.orig/files/patch-lib_BackupPC_Lib.pm backuppc/files/patch-lib_BackupPC_Lib.pm >--- backuppc.orig/files/patch-lib_BackupPC_Lib.pm 2016-12-24 18:56:20.000000000 +0300 >+++ backuppc/files/patch-lib_BackupPC_Lib.pm 1970-01-01 03:00:00.000000000 +0300 >@@ -1,20 +0,0 @@ >---- lib/BackupPC/Lib.pm.orig 2016-11-08 08:08:02 UTC >-+++ lib/BackupPC/Lib.pm >-@@ -1261,7 +1261,7 @@ sub cmdVarSubstitute >- # >- # Replace scalar variables first >- # >-- $arg =~ s[\${(\w+)}(\+?)]{ >-+ $arg =~ s[\$\{(\w+)}(\+?)]{ >- exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY" >- ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1}) >- : "\${$1}$2" >-@@ -1270,7 +1270,7 @@ sub cmdVarSubstitute >- # Now replicate any array arguments; this just works for just one >- # array var in each argument. >- # >-- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { >-+ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { >- my $pre = $1; >- my $var = $2; >- my $esc = $3; >diff -ruN backuppc.orig/files/patch-lib_BackupPC_Xfer_Smb.pm backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm >--- backuppc.orig/files/patch-lib_BackupPC_Xfer_Smb.pm 2016-06-21 23:39:00.000000000 +0300 >+++ backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm 2017-02-07 10:38:20.716978000 +0300 >@@ -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 ) { >diff -ruN backuppc.orig/files/patch-update.pl backuppc/files/patch-update.pl >--- backuppc.orig/files/patch-update.pl 2015-01-25 07:48:01.000000000 +0300 >+++ backuppc/files/patch-update.pl 2017-02-07 10:38:20.717055000 +0300 >@@ -177,7 +177,7 @@ > - # > - # Install new CSS file, making a backup copy if necessary > - # >-- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.1"; >+- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.2"; > - if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) { > - rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup); > - } >diff -ruN backuppc.orig/files/pkg-message.in backuppc/files/pkg-message.in >--- backuppc.orig/files/pkg-message.in 2016-06-21 23:39:00.000000000 +0300 >+++ backuppc/files/pkg-message.in 2017-02-07 10:39:27.054986000 +0300 >@@ -18,8 +18,4 @@ > 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'; > ========================================================================== >diff -ruN backuppc.orig/Makefile backuppc/Makefile >--- backuppc.orig/Makefile 2016-12-24 18:56:20.000000000 +0300 >+++ backuppc/Makefile 2017-02-07 10:38:20.716740000 +0300 >@@ -2,8 +2,7 @@ > # $FreeBSD: head/sysutils/backuppc/Makefile 429367 2016-12-24 15:56:20Z matthew $ > > PORTNAME= backuppc >-PORTVERSION= 3.3.1 >-PORTREVISION= 4 >+PORTVERSION= 3.3.2 > CATEGORIES= sysutils > MASTER_SITES= SF > DISTNAME= BackupPC-${PORTVERSION}
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=179697">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
moiseev
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 216875
: 179697