From owner-svn-ports-all@freebsd.org Tue Feb 7 14:39:38 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 433D5CD5FEA; Tue, 7 Feb 2017 14:39:38 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 018641423; Tue, 7 Feb 2017 14:39:37 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v17EdbLH010154; Tue, 7 Feb 2017 14:39:37 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17EdaHU010148; Tue, 7 Feb 2017 14:39:36 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201702071439.v17EdaHU010148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarew Date: Tue, 7 Feb 2017 14:39:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433557 - in head/sysutils/backuppc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2017 14:39:38 -0000 Author: krion Date: Tue Feb 7 14:39:36 2017 New Revision: 433557 URL: https://svnweb.freebsd.org/changeset/ports/433557 Log: - 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 Deleted: head/sysutils/backuppc/files/patch-doc-BackupPC.pod head/sysutils/backuppc/files/patch-lib_BackupPC_CGI_Browse.pm head/sysutils/backuppc/files/patch-lib_BackupPC_Lib.pm Modified: head/sysutils/backuppc/Makefile head/sysutils/backuppc/distinfo head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm head/sysutils/backuppc/files/patch-update.pl head/sysutils/backuppc/files/pkg-message.in Modified: head/sysutils/backuppc/Makefile ============================================================================== --- head/sysutils/backuppc/Makefile Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/Makefile Tue Feb 7 14:39:36 2017 (r433557) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= backuppc -PORTVERSION= 3.3.1 -PORTREVISION= 4 +PORTVERSION= 3.3.2 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= BackupPC-${PORTVERSION} @@ -54,33 +53,17 @@ RRDTOOL_DESC= Use RRDTool to generate p SMBCLIENT_DESC= Samba client XML_RSS_DESC= Perl extension to manage RSS files -.include - -.if ${PORT_OPTIONS:MARCHIVE_ZIP} -RUN_DEPENDS+= p5-Archive-Zip>=0:archivers/p5-Archive-Zip -.endif -.if ${PORT_OPTIONS:MCOMPRESS_ZLIB} -RUN_DEPENDS+= p5-IO-Compress>=0:archivers/p5-IO-Compress -.endif -.if ${PORT_OPTIONS:MFILE_RSYNCP} -RUN_DEPENDS+= p5-File-RsyncP>=0:net/p5-File-RsyncP -.endif -.if ${PORT_OPTIONS:MNMBLOOKUP} -RUN_DEPENDS+= nmblookup:net/samba-nmblookup -.endif -.if ${PORT_OPTIONS:MRRDTOOL} -RUN_DEPENDS+= rrdtool:databases/rrdtool -.endif -.if ${PORT_OPTIONS:MRRD_GRAPHS} || ${PORT_OPTIONS:MRRDTOOL} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bin-BackupPC \ - ${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm -.endif -.if ${PORT_OPTIONS:MSMBCLIENT} -RUN_DEPENDS+= smbclient:net/samba-smbclient -.endif -.if ${PORT_OPTIONS:MXML_RSS} -RUN_DEPENDS+= p5-XML-RSS>=0:textproc/p5-XML-RSS -.endif +ARCHIVE_ZIP_RUN_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip +COMPRESS_ZLIB_RUN_DEPENDS= p5-IO-Compress>=0:archivers/p5-IO-Compress +FILE_RSYNCP_RUN_DEPENDS= p5-File-RsyncP>=0:net/p5-File-RsyncP +NMBLOOKUP_RUN_DEPENDS= nmblookup:net/samba-nmblookup +RRDTOOL_RUN_DEPENDS= rrdtool:databases/rrdtool +SMBCLIENT_RUN_DEPENDS= smbclient:net/samba-smbclient +XML_RSS_RUN_DEPENDS= p5-XML-RSS>=0:textproc/p5-XML-RSS +RRD_GRAPHS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-bin-BackupPC \ + ${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm +RRDTOOL_EXTRA_PATCHES= ${FILESDIR}/extra-patch-bin-BackupPC \ + ${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm pre-patch: @${CP} ${WRKSRC}/configure.pl ${WRKSRC}/update.pl Modified: head/sysutils/backuppc/distinfo ============================================================================== --- head/sysutils/backuppc/distinfo Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/distinfo Tue Feb 7 14:39:36 2017 (r433557) @@ -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 Modified: head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm ============================================================================== --- head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm Tue Feb 7 14:39:36 2017 (r433557) @@ -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 ) { Modified: head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm ============================================================================== --- head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm Tue Feb 7 14:39:36 2017 (r433557) @@ -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 Modified: head/sysutils/backuppc/files/patch-update.pl ============================================================================== --- head/sysutils/backuppc/files/patch-update.pl Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/files/patch-update.pl Tue Feb 7 14:39:36 2017 (r433557) @@ -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); - } Modified: head/sysutils/backuppc/files/pkg-message.in ============================================================================== --- head/sysutils/backuppc/files/pkg-message.in Tue Feb 7 14:36:58 2017 (r433556) +++ head/sysutils/backuppc/files/pkg-message.in Tue Feb 7 14:39:36 2017 (r433557) @@ -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'; ==========================================================================