CVS commit: pkgsrc/sysutils/backuppc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct 20 22:16:17 UTC 2020

Modified Files:
        pkgsrc/sysutils/backuppc: MESSAGE Makefile PLIST distinfo
        pkgsrc/sysutils/backuppc/files: backuppc.conf
        pkgsrc/sysutils/backuppc/patches: patch-configure.pl
            patch-rsync-bpc_lib_sysacls.c

Log Message:
backuppc: update to 4.4.0

This release contains several new features and some bug fixes.
New features include:
- any full/filled backup can be marked for keeping, which prevents any
  expiry or deletion
- any backup can be annotated with a comment (eg, "prior to upgrade of xyz")
- added metrics CGI that replaces RSS and adds Prometheus support
- tar XferMethod now supports xattrs and acls
- rsync XferMethod now correctly supports xattrs on directories and symlinks
- nightly pool scanning now verifies the md5 digests of a configurable
  fraction of pool files
- code runs through perltidy so format is now uniform


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/backuppc/MESSAGE \
    pkgsrc/sysutils/backuppc/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/backuppc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/backuppc/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/backuppc/files/backuppc.conf
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/backuppc/patches/patch-configure.pl
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/backuppc/MESSAGE
diff -u pkgsrc/sysutils/backuppc/MESSAGE:1.2 pkgsrc/sysutils/backuppc/MESSAGE:1.3
--- pkgsrc/sysutils/backuppc/MESSAGE:1.2        Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/MESSAGE    Tue Oct 20 22:16:16 2020
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2019/11/08 17:11:12 tnn Exp $
+$NetBSD: MESSAGE,v 1.3 2020/10/20 22:16:16 tnn Exp $
 
 Please refer to the documentation in
 
@@ -9,7 +9,7 @@ for detailed installation instructions.
 
 If you are running Apache, then you can add the following line to httpd.conf:
 
-       Include ${PKG_SYSCONFDIR}/BackupPC/backuppc.conf
+       Include ${PKG_SYSCONFDIR}/backuppc.conf
 
 Follow the instructions in the above file, restart Apache and start
 the BackupPC daemon with the supplied rc.d script.
Index: pkgsrc/sysutils/backuppc/PLIST
diff -u pkgsrc/sysutils/backuppc/PLIST:1.2 pkgsrc/sysutils/backuppc/PLIST:1.3
--- pkgsrc/sysutils/backuppc/PLIST:1.2  Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/PLIST      Tue Oct 20 22:16:16 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/11/08 17:11:12 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/10/20 22:16:16 tnn Exp $
 bin/rsync_bpc
 share/BackupPC/bin/BackupPC
 share/BackupPC/bin/BackupPC_Admin_SCGI
@@ -64,13 +64,16 @@ share/BackupPC/htdocs/1111111.gif
 share/BackupPC/htdocs/BackupPC_retro_v2.css
 share/BackupPC/htdocs/BackupPC_retro_v3.css
 share/BackupPC/htdocs/BackupPC_stnd.css
+share/BackupPC/htdocs/apple-touch-icon.png
+share/BackupPC/htdocs/favicon-16x16.png
+share/BackupPC/htdocs/favicon-32x32.png
 share/BackupPC/htdocs/favicon.ico
 share/BackupPC/htdocs/icon-dir.png
 share/BackupPC/htdocs/icon-file.png
 share/BackupPC/htdocs/icon-hardlink.png
 share/BackupPC/htdocs/icon-symlink.png
-share/BackupPC/htdocs/logo.gif
 share/BackupPC/htdocs/logo320.png
+share/BackupPC/htdocs/safari-pinned-tab.svg
 share/BackupPC/htdocs/sorttable.js
 share/BackupPC/lib/BackupPC/CGI/AdminOptions.pm
 share/BackupPC/lib/BackupPC/CGI/Archive.pm
@@ -84,8 +87,8 @@ share/BackupPC/lib/BackupPC/CGI/GeneralI
 share/BackupPC/lib/BackupPC/CGI/HostInfo.pm
 share/BackupPC/lib/BackupPC/CGI/LOGlist.pm
 share/BackupPC/lib/BackupPC/CGI/Lib.pm
+share/BackupPC/lib/BackupPC/CGI/Metrics.pm
 share/BackupPC/lib/BackupPC/CGI/Queue.pm
-share/BackupPC/lib/BackupPC/CGI/RSS.pm
 share/BackupPC/lib/BackupPC/CGI/ReloadServer.pm
 share/BackupPC/lib/BackupPC/CGI/Restore.pm
 share/BackupPC/lib/BackupPC/CGI/RestoreFile.pm

Index: pkgsrc/sysutils/backuppc/Makefile
diff -u pkgsrc/sysutils/backuppc/Makefile:1.13 pkgsrc/sysutils/backuppc/Makefile:1.14
--- pkgsrc/sysutils/backuppc/Makefile:1.13      Mon Aug 31 18:11:23 2020
+++ pkgsrc/sysutils/backuppc/Makefile   Tue Oct 20 22:16:16 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/08/31 18:11:23 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/10/20 22:16:16 tnn Exp $
 
-DISTNAME=      BackupPC-4.3.1
+DISTNAME=      BackupPC-4.4.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=backuppc/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -12,7 +11,7 @@ HOMEPAGE=     http://backuppc.sourceforge.ne
 COMMENT=       Fast, agentless backup system supporting *NIX, Windows and OSX clients
 LICENSE=       gnu-gpl-v3
 
-RSYNC_BPC=     rsync-bpc-3.1.2.1
+RSYNC_BPC=     rsync-bpc-3.1.3.0
 RSYNC_BPC_TGZ= ${RSYNC_BPC}.tar.gz
 DISTFILES=     ${DEFAULT_DISTFILES}
 DISTFILES+=    ${RSYNC_BPC_TGZ}
@@ -24,7 +23,7 @@ DEPENDS+=     par2-[0-9]*:../../archivers/pa
 #DEPENDS+=     p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 DEPENDS+=      p5-CGI-[0-9]*:../../www/p5-CGI
 DEPENDS+=      p5-File-Listing-[0-9]*:../../devel/p5-File-Listing
-DEPENDS+=      p5-BackupPC-XS-[0-9]*:../../sysutils/p5-BackupPC-XS
+DEPENDS+=      p5-BackupPC-XS>=0.62:../../sysutils/p5-BackupPC-XS
 
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c
@@ -109,6 +108,7 @@ OWN_DIRS_PERMS+=    ${VARBASE}/BackupPC ${B
 OWN_DIRS_PERMS+=       ${VARBASE}/BackupPC/${d} ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0750
 .endfor
 OWN_DIRS_PERMS+=       ${VARBASE}/log/BackupPC ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0750
+OWN_DIRS_PERMS+=       ${VARBASE}/run/BackupPC ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0750
 
 EGDIR=                 ${PREFIX}/share/examples/BackupPC
 CONF_FILES_PERMS+=     ${EGDIR}/config.pl ${PKG_SYSCONFDIR}/config.pl ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0640

Index: pkgsrc/sysutils/backuppc/distinfo
diff -u pkgsrc/sysutils/backuppc/distinfo:1.5 pkgsrc/sysutils/backuppc/distinfo:1.6
--- pkgsrc/sysutils/backuppc/distinfo:1.5       Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/distinfo   Tue Oct 20 22:16:16 2020
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2019/11/08 17:11:12 tnn Exp $
+$NetBSD: distinfo,v 1.6 2020/10/20 22:16:16 tnn Exp $
 
-SHA1 (BackupPC-4.3.1.tar.gz) = ff27af8622701a4be367b9fd8223c32ebf86d3d0
-RMD160 (BackupPC-4.3.1.tar.gz) = 9285231af956d20d288cc3c22bdec69b6ecd7b60
-SHA512 (BackupPC-4.3.1.tar.gz) = acabc8d79779bfa599192af88938dbdbf7bf12e82564f3c25398cc4bc04207ea21494974bec20779433f0207fd82b17107c538437309950d619ca3a9856e721f
-Size (BackupPC-4.3.1.tar.gz) = 638366 bytes
-SHA1 (rsync-bpc-3.1.2.1.tar.gz) = 771005e68f1205e495f08c6d53d7965e39c611da
-RMD160 (rsync-bpc-3.1.2.1.tar.gz) = 7329f040e0f5a3e4b5409ca7ceeb1d610df81090
-SHA512 (rsync-bpc-3.1.2.1.tar.gz) = 347513b24582486281fd8a2e1c7dd621a0e912a76aa2d8d4d614ca6c1052148c3bbbfe4452d389e670e7da0aa7059202a28a3c76413503e59da660ff7b172128
-Size (rsync-bpc-3.1.2.1.tar.gz) = 867946 bytes
-SHA1 (patch-configure.pl) = 1c00cb8f87bbcfaf720ccead39e2050ba95db64d
-SHA1 (patch-rsync-bpc_lib_sysacls.c) = bae4f643e36e82b54e59049135028a8ecc992e7a
+SHA1 (BackupPC-4.4.0.tar.gz) = 49952907267df93060456c8ef0fefc266f58a4d7
+RMD160 (BackupPC-4.4.0.tar.gz) = 8bb40d0fc07305df5765bac7ae6962815d5756fd
+SHA512 (BackupPC-4.4.0.tar.gz) = 0c88447ab000c4a452034d5d8a074cd56801c7b38b0886e686e446c73ecfd0a40f0aa08703f76d16c31b24aec85c10c4ed1815d0cb67be5a1d66e5caeb3de418
+Size (BackupPC-4.4.0.tar.gz) = 657309 bytes
+SHA1 (rsync-bpc-3.1.3.0.tar.gz) = 132db2fdcf181806bdefc931426ac465d333b21d
+RMD160 (rsync-bpc-3.1.3.0.tar.gz) = 18e1376564b3b01deb92d075dda40838931a51e2
+SHA512 (rsync-bpc-3.1.3.0.tar.gz) = 24ae86c6108720d7f0ba6d144053ccba6499623018bc2bcff8f1d8e289f9c015f80e73244e965a7fcdccb5f9b2a876f1a54ceed42a19a80fd7c87c6b05c7701d
+Size (rsync-bpc-3.1.3.0.tar.gz) = 883808 bytes
+SHA1 (patch-configure.pl) = 7d0d778a02cb02c8699e2daf31c17e9ab43ec262
+SHA1 (patch-rsync-bpc_lib_sysacls.c) = c8260733c25caab524aba30c7c913c4bde14d25a

Index: pkgsrc/sysutils/backuppc/files/backuppc.conf
diff -u pkgsrc/sysutils/backuppc/files/backuppc.conf:1.2 pkgsrc/sysutils/backuppc/files/backuppc.conf:1.3
--- pkgsrc/sysutils/backuppc/files/backuppc.conf:1.2    Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/files/backuppc.conf        Tue Oct 20 22:16:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: backuppc.conf,v 1.2 2019/11/08 17:11:12 tnn Exp $
+# $NetBSD: backuppc.conf,v 1.3 2020/10/20 22:16:16 tnn Exp $
 #
 # BackupPC sample configuration file fragment for Apache.
 #
@@ -32,6 +32,8 @@
   AuthUserFile @PKG_SYSCONFDIR@/htpasswd
   AuthType basic
   AuthName "BackupPC login"
-  require all granted
-  require valid-user
+  <RequireAll>
+    require all granted
+    require valid-user
+  </RequireAll>
 </Directory>

Index: pkgsrc/sysutils/backuppc/patches/patch-configure.pl
diff -u pkgsrc/sysutils/backuppc/patches/patch-configure.pl:1.2 pkgsrc/sysutils/backuppc/patches/patch-configure.pl:1.3
--- pkgsrc/sysutils/backuppc/patches/patch-configure.pl:1.2     Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/patches/patch-configure.pl Tue Oct 20 22:16:16 2020
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure.pl,v 1.2 2019/11/08 17:11:12 tnn Exp $
+$NetBSD: patch-configure.pl,v 1.3 2020/10/20 22:16:16 tnn Exp $
 
 Prevent previous installation from altering build results.
 
---- configure.pl.orig  2018-05-07 17:14:29.000000000 +0000
+--- configure.pl.orig  2020-06-20 22:55:58.000000000 +0000
 +++ configure.pl
-@@ -266,7 +266,7 @@ EOF
+@@ -250,7 +250,7 @@ EOF
  #
- my $ConfigDir = $opts{"config-dir"} || "/etc/BackupPC";
- my $ConfigPath = "";
+ my $ConfigDir    = $opts{"config-dir"} || "/etc/BackupPC";
+ my $ConfigPath   = "";
 -my $ConfigFileOK = 1;
 +my $ConfigFileOK = 0;
  while ( 1 ) {
-     if ( $ConfigFileOK && -f "$DestDir$ConfigDir/config.pl"
-             && (!defined($opts{fhs}) || $opts{fhs}) && !defined($opts{"config-path"}) ) {
+     if (   $ConfigFileOK
+         && -f "$DestDir$ConfigDir/config.pl"

Index: pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c
diff -u pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c:1.1 pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c:1.2
--- pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c:1.1  Fri Nov  8 17:11:12 2019
+++ pkgsrc/sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c      Tue Oct 20 22:16:16 2020
@@ -1,9 +1,9 @@
-$NetBSD: patch-rsync-bpc_lib_sysacls.c,v 1.1 2019/11/08 17:11:12 tnn Exp $
+$NetBSD: patch-rsync-bpc_lib_sysacls.c,v 1.2 2020/10/20 22:16:16 tnn Exp $
 
 No ACL support on NetBSD and probably other platforms
 
---- ../rsync-bpc-3.1.2.1/lib/sysacls.c.orig    2018-12-01 22:25:23.000000000 +0000
-+++ ../rsync-bpc-3.1.2.1/lib/sysacls.c
+--- ../rsync-bpc-3.1.3.0/lib/sysacls.c.orig    2018-12-01 22:25:23.000000000 +0000
++++ ../rsync-bpc-3.1.3.0/lib/sysacls.c
 @@ -24,6 +24,8 @@
  #include "rsync.h"
  #include "sysacls.h"