pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/backuppc backuppc: update to 4.3.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/11f795fc9ee3
branches: trunk
changeset: 417354:11f795fc9ee3
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Nov 08 17:11:12 2019 +0000
description:
backuppc: update to 4.3.1
BackupPC 4.0.0 is a significant improvement over 3.x in terms of
performance and storage efficiency. It is backward compatible with
3.x pool storage, so it can be used to upgrade an existing installation
as well as for brand new installs.
diffstat:
sysutils/backuppc/MESSAGE | 6 +-
sysutils/backuppc/Makefile | 38 +++++++++----
sysutils/backuppc/PLIST | 33 +++++++----
sysutils/backuppc/distinfo | 19 ++++--
sysutils/backuppc/files/backuppc.conf | 5 +-
sysutils/backuppc/files/cgiwrapper.c | 2 +-
sysutils/backuppc/patches/patch-configure.pl | 10 +-
sysutils/backuppc/patches/patch-lib_BackupPC_CGI_Browse.pm | 15 -----
sysutils/backuppc/patches/patch-lib_BackupPC_Lib.pm | 24 --------
sysutils/backuppc/patches/patch-rsync-bpc_lib_sysacls.c | 21 +++++++
10 files changed, 90 insertions(+), 83 deletions(-)
diffs (truncated from 360 to 300 lines):
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/MESSAGE
--- a/sysutils/backuppc/MESSAGE Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/MESSAGE Fri Nov 08 17:11:12 2019 +0000
@@ -1,15 +1,15 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1 2015/02/13 17:57:36 tnn Exp $
+$NetBSD: MESSAGE,v 1.2 2019/11/08 17:11:12 tnn Exp $
Please refer to the documentation in
- ${PREFIX}/share/BackupPC/doc/BackupPC.html
+ ${PREFIX}/share/BackupPC/share/doc/BackupPC/BackupPC.html
for detailed installation instructions.
If you are running Apache, then you can add the following line to httpd.conf:
- Include ${PKG_SYSCONFDIR}/backuppc.conf
+ Include ${PKG_SYSCONFDIR}/BackupPC/backuppc.conf
Follow the instructions in the above file, restart Apache and start
the BackupPC daemon with the supplied rc.d script.
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/Makefile
--- a/sysutils/backuppc/Makefile Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/Makefile Fri Nov 08 17:11:12 2019 +0000
@@ -1,28 +1,39 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:41 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/08 17:11:12 tnn Exp $
-DISTNAME= BackupPC-3.3.1
+DISTNAME= BackupPC-4.3.1
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 8
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=backuppc/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=backuppc/}
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
MAINTAINER= tnn%NetBSD.org@localhost
HOMEPAGE= http://backuppc.sourceforge.net/
COMMENT= Fast, agentless backup system supporting *NIX, Windows and OSX clients
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v3
+
+RSYNC_BPC= rsync-bpc-3.1.2.1
+RSYNC_BPC_TGZ= ${RSYNC_BPC}.tar.gz
+DISTFILES= ${DEFAULT_DISTFILES}
+DISTFILES+= ${RSYNC_BPC_TGZ}
+SITES.${RSYNC_BPC_TGZ}= ${MASTER_SITE_GITHUB:=backuppc/}rsync-bpc/releases/download/${RSYNC_BPC:S/rsync-bpc-//}/
DEPENDS+= rsync-[0-9]*:../../net/rsync
DEPENDS+= samba-[0-9]*:../../net/samba
DEPENDS+= par2-[0-9]*:../../archivers/par2
-DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+#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-File-RsyncP-[0-9]*:../../net/p5-File-RsyncP
+DEPENDS+= p5-BackupPC-XS-[0-9]*:../../sysutils/p5-BackupPC-XS
HAS_CONFIGURE= yes
-USE_LANGUAGES= # none
+USE_LANGUAGES= c
USE_TOOLS+= bzip2:run cat:run tar:run perl:run hostname:run gzip:run pax
+OVERRIDE_GNU_CONFIG_SCRIPTS= yes
+CONFIG_GUESS_OVERRIDE= ../${RSYNC_BPC}/config.guess
+CONFIG_SUB_OVERRIDE= ../${RSYNC_BPC}/config.sub
+BUILD_DIRS= ../${RSYNC_BPC}
+
CONFIG_SHELL= ${PERL5}
CONFIGURE_SCRIPT= configure.pl
CONFIGURE_ARGS+= --batch
@@ -50,6 +61,7 @@
CONFIGURE_ARGS+= --bin-path nmblookup=${PREFIX}/bin/nmblookup
CONFIGURE_ARGS+= --bin-path smbclient=${PREFIX}/bin/smbclient
CONFIGURE_ARGS+= --bin-path par2=${PREFIX}/bin/par2
+CONFIGURE_ARGS+= --bin-path rsync_bpc=${PREFIX}/bin/rsync_bpc
.if exists(/usr/bin/ssh)
CONFIGURE_ARGS+= --bin-path ssh=/usr/bin/ssh
@@ -72,7 +84,7 @@
SUBST_STAGE.fix-paths= post-configure
SUBST_MESSAGE.fix-paths= Substituting paths and usernames.
SUBST_FILES.fix-paths= ${WRKSRC}/build/${PREFIX}/share/examples/BackupPC/config.pl
-SUBST_FILES.fix-paths+= ${WRKSRC}/build/${PREFIX}/share/BackupPC/doc/*
+SUBST_FILES.fix-paths+= ${WRKSRC}/build/${PREFIX}/share/BackupPC/share/doc/BackupPC/*
SUBST_FILES.fix-paths+= ${WRKSRC}/build/${PREFIX}/share/BackupPC/lib/BackupPC/Lib.pm
SUBST_FILES.fix-paths+= ${WRKSRC}/backuppc.conf
SUBST_FILES.fix-paths+= ${WRKSRC}/cgiwrapper.c
@@ -106,13 +118,17 @@
cp ${FILESDIR}/backuppc.conf ${WRKSRC}/backuppc.conf
cp ${FILESDIR}/cgiwrapper.c ${WRKSRC}/cgiwrapper.c
-do-build:
+post-configure:
+ cd ${WRKDIR}/${RSYNC_BPC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure --prefix=${PREFIX} --with-included-popt
+
+post-build:
rm -rf ${WRKSRC}/build/${VARBASE}
-do-install:
+post-install:
cd ${WRKSRC}/build && pax -rw . ${DESTDIR}/
chmod +x ${DESTDIR}${PREFIX}/share/BackupPC/bin/*
${INSTALL_DATA} ${WRKSRC}/backuppc.conf ${DESTDIR}${PREFIX}/share/examples/BackupPC/backuppc.conf
${INSTALL_DATA} ${WRKSRC}/cgiwrapper.c ${DESTDIR}${PREFIX}/share/examples/BackupPC/cgiwrapper.c
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/PLIST
--- a/sysutils/backuppc/PLIST Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/PLIST Fri Nov 08 17:11:12 2019 +0000
@@ -1,25 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/13 17:57:36 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/11/08 17:11:12 tnn Exp $
+bin/rsync_bpc
share/BackupPC/bin/BackupPC
+share/BackupPC/bin/BackupPC_Admin_SCGI
share/BackupPC/bin/BackupPC_archive
share/BackupPC/bin/BackupPC_archiveHost
share/BackupPC/bin/BackupPC_archiveStart
share/BackupPC/bin/BackupPC_attribPrint
+share/BackupPC/bin/BackupPC_backupDelete
+share/BackupPC/bin/BackupPC_backupDuplicate
share/BackupPC/bin/BackupPC_dump
share/BackupPC/bin/BackupPC_fixupBackupSummary
-share/BackupPC/bin/BackupPC_link
+share/BackupPC/bin/BackupPC_fsck
+share/BackupPC/bin/BackupPC_ls
+share/BackupPC/bin/BackupPC_migrateV3toV4
share/BackupPC/bin/BackupPC_nightly
+share/BackupPC/bin/BackupPC_poolCntPrint
+share/BackupPC/bin/BackupPC_refCountUpdate
share/BackupPC/bin/BackupPC_restore
+share/BackupPC/bin/BackupPC_rrdUpdate
share/BackupPC/bin/BackupPC_sendEmail
share/BackupPC/bin/BackupPC_serverMesg
share/BackupPC/bin/BackupPC_tarCreate
share/BackupPC/bin/BackupPC_tarExtract
-share/BackupPC/bin/BackupPC_tarPCCopy
-share/BackupPC/bin/BackupPC_trashClean
share/BackupPC/bin/BackupPC_zcat
share/BackupPC/bin/BackupPC_zipCreate
share/BackupPC/cgi-bin/BackupPC_Admin
-share/BackupPC/doc/BackupPC.html
-share/BackupPC/doc/BackupPC.pod
share/BackupPC/htdocs/0000000.gif
share/BackupPC/htdocs/0000011.gif
share/BackupPC/htdocs/0001000.gif
@@ -56,20 +61,22 @@
share/BackupPC/htdocs/1111101.gif
share/BackupPC/htdocs/1111110.gif
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/BackupPC_stnd_orig.css
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/sorttable.js
-share/BackupPC/lib/BackupPC/Attrib.pm
share/BackupPC/lib/BackupPC/CGI/AdminOptions.pm
share/BackupPC/lib/BackupPC/CGI/Archive.pm
share/BackupPC/lib/BackupPC/CGI/ArchiveInfo.pm
share/BackupPC/lib/BackupPC/CGI/Browse.pm
+share/BackupPC/lib/BackupPC/CGI/DeleteBackup.pm
share/BackupPC/lib/BackupPC/CGI/DirHistory.pm
share/BackupPC/lib/BackupPC/CGI/EditConfig.pm
share/BackupPC/lib/BackupPC/CGI/EmailSummary.pm
@@ -88,9 +95,8 @@
share/BackupPC/lib/BackupPC/CGI/StopServer.pm
share/BackupPC/lib/BackupPC/CGI/Summary.pm
share/BackupPC/lib/BackupPC/CGI/View.pm
-share/BackupPC/lib/BackupPC/Config.pm
share/BackupPC/lib/BackupPC/Config/Meta.pm
-share/BackupPC/lib/BackupPC/FileZIO.pm
+share/BackupPC/lib/BackupPC/DirOps.pm
share/BackupPC/lib/BackupPC/Lang/cz.pm
share/BackupPC/lib/BackupPC/Lang/de.pm
share/BackupPC/lib/BackupPC/Lang/en.pm
@@ -105,7 +111,6 @@
share/BackupPC/lib/BackupPC/Lang/uk.pm
share/BackupPC/lib/BackupPC/Lang/zh_CN.pm
share/BackupPC/lib/BackupPC/Lib.pm
-share/BackupPC/lib/BackupPC/PoolWrite.pm
share/BackupPC/lib/BackupPC/Storage.pm
share/BackupPC/lib/BackupPC/Storage/Text.pm
share/BackupPC/lib/BackupPC/View.pm
@@ -114,14 +119,16 @@
share/BackupPC/lib/BackupPC/Xfer/Ftp.pm
share/BackupPC/lib/BackupPC/Xfer/Protocol.pm
share/BackupPC/lib/BackupPC/Xfer/Rsync.pm
-share/BackupPC/lib/BackupPC/Xfer/RsyncDigest.pm
-share/BackupPC/lib/BackupPC/Xfer/RsyncFileIO.pm
share/BackupPC/lib/BackupPC/Xfer/Smb.pm
share/BackupPC/lib/BackupPC/Xfer/Tar.pm
share/BackupPC/lib/BackupPC/Zip/FileMember.pm
share/BackupPC/lib/Net/FTP/AutoReconnect.pm
share/BackupPC/lib/Net/FTP/RetrHandle.pm
+share/BackupPC/share/doc/BackupPC/BackupPC.html
+share/BackupPC/share/doc/BackupPC/BackupPC.pod
share/examples/BackupPC/backuppc.conf
share/examples/BackupPC/cgiwrapper.c
share/examples/BackupPC/config.pl
+share/examples/BackupPC/config.pl.sample
share/examples/BackupPC/hosts
+share/examples/BackupPC/hosts.sample
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/distinfo
--- a/sysutils/backuppc/distinfo Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/distinfo Fri Nov 08 17:11:12 2019 +0000
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.4 2016/03/13 01:02:44 tnn Exp $
+$NetBSD: distinfo,v 1.5 2019/11/08 17:11:12 tnn Exp $
-SHA1 (BackupPC-3.3.1.tar.gz) = b579d64ff2486395e8ca0a93ac964bd9d9e1a232
-RMD160 (BackupPC-3.3.1.tar.gz) = 3db4d6a54c9cde61fa434292b53f18ded73dbb83
-SHA512 (BackupPC-3.3.1.tar.gz) = b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
-Size (BackupPC-3.3.1.tar.gz) = 556461 bytes
-SHA1 (patch-configure.pl) = 4935ca9916b52918869adaac063768713c7e055b
-SHA1 (patch-lib_BackupPC_CGI_Browse.pm) = 8c6823712b9853ba424f23b871ccbd2b6124b6a3
-SHA1 (patch-lib_BackupPC_Lib.pm) = 39125a98486c2a9f8f53b26f2ac753ddbad566b9
+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
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/files/backuppc.conf
--- a/sysutils/backuppc/files/backuppc.conf Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/files/backuppc.conf Fri Nov 08 17:11:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: backuppc.conf,v 1.1 2015/02/13 17:57:36 tnn Exp $
+# $NetBSD: backuppc.conf,v 1.2 2019/11/08 17:11:12 tnn Exp $
#
# BackupPC sample configuration file fragment for Apache.
#
@@ -32,7 +32,6 @@
AuthUserFile @PKG_SYSCONFDIR@/htpasswd
AuthType basic
AuthName "BackupPC login"
+ require all granted
require valid-user
- Order allow,deny
- Allow from all
</Directory>
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/files/cgiwrapper.c
--- a/sysutils/backuppc/files/cgiwrapper.c Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/files/cgiwrapper.c Fri Nov 08 17:11:12 2019 +0000
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <unistd.h>
int main(int argc, char **argv, char **envp) {
char *newargs[] = {"@PERL5@", "@PREFIX@/share/BackupPC/cgi-bin/BackupPC_Admin", NULL };
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/patches/patch-configure.pl
--- a/sysutils/backuppc/patches/patch-configure.pl Fri Nov 08 17:03:55 2019 +0000
+++ b/sysutils/backuppc/patches/patch-configure.pl Fri Nov 08 17:11:12 2019 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure.pl,v 1.1 2015/02/13 17:57:36 tnn Exp $
+$NetBSD: patch-configure.pl,v 1.2 2019/11/08 17:11:12 tnn Exp $
Prevent previous installation from altering build results.
---- configure.pl.orig 2015-01-12 00:19:53.000000000 +0000
+--- configure.pl.orig 2018-05-07 17:14:29.000000000 +0000
+++ configure.pl
-@@ -158,7 +158,7 @@ EOF
- # config file to get all the defaults.
+@@ -266,7 +266,7 @@ EOF
#
+ my $ConfigDir = $opts{"config-dir"} || "/etc/BackupPC";
my $ConfigPath = "";
-my $ConfigFileOK = 1;
+my $ConfigFileOK = 0;
while ( 1 ) {
- if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl"
+ if ( $ConfigFileOK && -f "$DestDir$ConfigDir/config.pl"
&& (!defined($opts{fhs}) || $opts{fhs}) && !defined($opts{"config-path"}) ) {
diff -r cabd4678f9a2 -r 11f795fc9ee3 sysutils/backuppc/patches/patch-lib_BackupPC_CGI_Browse.pm
--- a/sysutils/backuppc/patches/patch-lib_BackupPC_CGI_Browse.pm Fri Nov 08 17:03:55 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_BackupPC_CGI_Browse.pm,v 1.1 2016/02/28 03:44:05 tnn Exp $
-
-defined(@array) is deprecated
-
---- lib/BackupPC/CGI/Browse.pm.orig 2015-01-12 00:19:53.000000000 +0000
-+++ lib/BackupPC/CGI/Browse.pm
-@@ -65,7 +65,7 @@ sub action
- #
Home |
Main Index |
Thread Index |
Old Index