Minor update to BackupPC 3.3.2, fixing issues with modern Perl

(unescaped left curly brace in BackupPC/Lib.pm:1228).

Samba 4.2-specific patch is no longer needed.
This commit is contained in:
zhuk
2017-07-12 08:00:17 +00:00
parent 53e378358c
commit 0021154eff
3 changed files with 4 additions and 33 deletions
+2 -3
View File
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2016/06/27 19:36:50 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2017/07/12 08:00:17 zhuk Exp $
COMMENT = remote backup software system
DISTNAME = BackupPC-3.3.1
REVISION = 2
DISTNAME = BackupPC-3.3.2
PKGNAME = ${DISTNAME:L}
CATEGORIES = sysutils
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (BackupPC-3.3.1.tar.gz) = ycxK7CinR0po1A9LxGD/FRQOBclpAMf5j/PvBsT2rkw=
SIZE (BackupPC-3.3.1.tar.gz) = 556461
SHA256 (BackupPC-3.3.2.tar.gz) = +63iyNgDkpfoJqddLDnVrJpvZuDITAz4xM7wvPZNIVI=
SIZE (BackupPC-3.3.2.tar.gz) = 557300
@@ -1,28 +0,0 @@
$OpenBSD: patch-lib_BackupPC_Xfer_Smb_pm,v 1.1 2016/05/18 08:05:11 landry Exp $
Fix errors with smb >= 4.2
https://bugzilla.redhat.com/show_bug.cgi?id=1294761
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820963
--- lib/BackupPC/Xfer/Smb.pm.orig Mon Jan 12 01:19:53 2015
+++ lib/BackupPC/Xfer/Smb.pm Wed May 18 10:01:30 2016
@@ -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
+ ) {
$t->{xferOK} = 1;
$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
} elsif ( /^\s*tar: restored \d+ files/ ) {
@@ -270,6 +272,7 @@ sub readOutput
} elsif ( /^\s*directory \\/i ) {
$t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
} elsif ( /smb: \\>/
+ || /^tar:\d+/
|| /^\s*added interface/i
|| /^\s*tarmode is now/i
|| /^\s*Total bytes written/i