Index: head/sysutils/backuppc/Makefile =================================================================== --- head/sysutils/backuppc/Makefile (revision 377861) +++ head/sysutils/backuppc/Makefile (revision 377862) @@ -1,136 +1,136 @@ # Created by: Alexander Moisseev # $FreeBSD$ PORTNAME= backuppc -PORTVERSION= 3.3.0 -PORTREVISION= 8 +PORTVERSION= 3.3.1 CATEGORIES= sysutils MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION} DISTNAME= BackupPC-${PORTVERSION} MAINTAINER= moiseev@mezonplus.ru COMMENT= Multi-platform backup to disk-based storage LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing CONFLICTS= backuppc-devel-[0-9]* USE_RC_SUBR= backuppc USES= perl5 NO_BUILD= yes USERS= backuppc GROUPS= backuppc CGIDIR?= ${PREFIX}/www/cgi-bin SUB_FILES= pkg-deinstall pkg-message update.sh SUB_LIST= CGIDIR=${CGIDIR} PLIST_SUB+= CGIDIR=${CGIDIR:S,^${PREFIX}/,,} \ DISTVERSION=${DISTVERSION} PORTDOCS= ChangeLog LICENSE README OPTIONS_DEFINE= ARCHIVE_ZIP COMPRESS_ZLIB DOCS FILE_RSYNCP NMBLOOKUP \ SMBCLIENT XML_RSS OPTIONS_RADIO= GRAPHS OPTIONS_RADIO_GRAPHS= RRD_GRAPHS RRDTOOL OPTIONS_DEFAULT= ARCHIVE_ZIP COMPRESS_ZLIB RRD_GRAPHS ARCHIVE_ZIP_DESC= Perl module for Zip archive files COMPRESS_ZLIB_DESC= Perl5 interface to zlib compression library FILE_RSYNCP_DESC= Perl Rsync client NMBLOOKUP_DESC= NetBIOS Name lookup tool RRD_GRAPHS_DESC= Apply graphs patch (but not install RRDTool) RRDTOOL_DESC= Use RRDTool to generate pool statistic graphs 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:${PORTSDIR}/archivers/p5-Archive-Zip .endif .if ${PORT_OPTIONS:MCOMPRESS_ZLIB} RUN_DEPENDS+= p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress .endif .if ${PORT_OPTIONS:MFILE_RSYNCP} RUN_DEPENDS+= p5-File-RsyncP>=0:${PORTSDIR}/net/p5-File-RsyncP .endif .if ${PORT_OPTIONS:MNMBLOOKUP} RUN_DEPENDS+= nmblookup:${PORTSDIR}/net/samba-nmblookup .endif .if ${PORT_OPTIONS:MRRDTOOL} RUN_DEPENDS+= rrdtool:${PORTSDIR}/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:${PORTSDIR}/net/samba-smbclient .endif .if ${PORT_OPTIONS:MXML_RSS} RUN_DEPENDS+= p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS .endif pre-patch: @${CP} ${WRKSRC}/configure.pl ${WRKSRC}/update.pl post-patch: @${REINPLACE_CMD} \ -e 's|/etc/BackupPC\(/config.pl\)|${ETCDIR}\1|' \ -e 's|^\(foreach my $$dir ( qw(bin \)doc$$|\1${DOCSDIR_REL}|' \ -e 's|\($$DestDir$$Conf{InstallDir}/\)doc|\1${DOCSDIR_REL}|' \ ${WRKSRC}/configure.pl ${WRKSRC}/update.pl @${REINPLACE_CMD} -E \ -e 's|^(use lib ")\.(/lib";)$$|\1${PREFIX}\2|' \ ${WRKSRC}/update.pl @${REINPLACE_CMD} \ -e 's|STDERR "Please su |STDERR "Please su [-m] |' \ ${WRKSRC}/lib/BackupPC/Lib.pm @${REINPLACE_CMD} \ -e 's| you can use the -s| you can use the -m|' \ -e 's|option to su to explicitly run|option to su to run|' \ -e 's|su -s /bin/bash __BACKUPPCUSER__|su -m __BACKUPPCUSER__|' \ ${WRKSRC}/doc/BackupPC.html ${WRKSRC}/doc/BackupPC.pod do-install: cd ${WRKSRC} && ${PERL} configure.pl \ --batch \ --backuppc-user ${USERS} \ + --bin-path perl=${PERL} \ --config-dir ${ETCDIR} \ --cgi-dir ${CGIDIR} \ --data-dir /var/db/BackupPC \ --dest-dir ${STAGEDIR} \ --fhs \ --html-dir ${WWWDIR} \ --html-dir-url /${PORTNAME} \ --install-dir ${PREFIX} \ --log-dir /var/log/BackupPC \ --no-set-perms \ --uid-ignore pod2man --section=1 --release=${PORTVERSION} \ --name=BackupPC --center="BackupPC user guide" \ ${WRKSRC}/doc/BackupPC.pod ${WRKSRC}/${PORTNAME}.1 ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} ${CP} ${WRKSRC}/doc/BackupPC.html ${STAGEDIR}${WWWDIR} ${RM} ${STAGEDIR}${ETCDIR}/config.pl ${RM} ${STAGEDIR}${ETCDIR}/hosts ${CP} ${WRKSRC}/conf/config.pl ${STAGEDIR}${ETCDIR}/config.pl.sample ${CP} ${WRKSRC}/conf/hosts ${STAGEDIR}${ETCDIR}/hosts.sample ${CP} ${WRKDIR}/update.sh ${STAGEDIR}${ETCDIR}/update.sh ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/backuppc ${CP} ${WRKSRC}/update.pl ${STAGEDIR}${PREFIX}/libexec/backuppc/update.pl .include Index: head/sysutils/backuppc/distinfo =================================================================== --- head/sysutils/backuppc/distinfo (revision 377861) +++ head/sysutils/backuppc/distinfo (revision 377862) @@ -1,2 +1,2 @@ -SHA256 (BackupPC-3.3.0.tar.gz) = 8a9c1b6faa4502b4c40617be97e806813815d9e22544854d99983c3da7c1f69b -SIZE (BackupPC-3.3.0.tar.gz) = 554155 +SHA256 (BackupPC-3.3.1.tar.gz) = c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c +SIZE (BackupPC-3.3.1.tar.gz) = 556461 Index: head/sysutils/backuppc/files/patch-update.pl =================================================================== --- head/sysutils/backuppc/files/patch-update.pl (revision 377861) +++ head/sysutils/backuppc/files/patch-update.pl (revision 377862) @@ -1,235 +1,235 @@ --- ./update.pl.orig 2014-08-19 15:02:15.000000000 +0400 +++ ./update.pl 2014-08-19 15:03:11.000000000 +0400 @@ -204,7 +204,7 @@ if ( $ConfigPath ne "" && -r $ConfigPath ) { (my $confDir = $ConfigPath) =~ s{/[^/]+$}{}; die("BackupPC::Lib->new failed\n") - if ( !($bpc = BackupPC::Lib->new(".", ".", $confDir, 1)) ); + if ( !($bpc = BackupPC::Lib->new(".", $opts{"install-dir"}, $confDir, 1)) ); %Conf = $bpc->Conf(); %OrigConf = %Conf; if ( !$opts{fhs} ) { @@ -507,198 +507,14 @@ print < Do you want to continue?", "y") =~ /y/i; -# -# Create install directories -# -foreach my $dir ( qw(bin doc - lib/BackupPC/CGI - lib/BackupPC/Config - lib/BackupPC/Lang - lib/BackupPC/Storage - lib/BackupPC/Xfer - lib/BackupPC/Zip - lib/Net/FTP - ) ) { - next if ( -d "$DestDir$Conf{InstallDir}/$dir" ); - mkpath("$DestDir$Conf{InstallDir}/$dir", 0, 0755); - if ( !-d "$DestDir$Conf{InstallDir}/$dir" - || !my_chown($Uid, $Gid, "$DestDir$Conf{InstallDir}/$dir") ) { - die("Failed to create or chown $DestDir$Conf{InstallDir}/$dir\n"); - } else { - print("Created $DestDir$Conf{InstallDir}/$dir\n"); - } -} - -# -# Create CGI image directory -# -foreach my $dir ( ($Conf{CgiImageDir}) ) { - next if ( $dir eq "" || -d "$DestDir$dir" ); - mkpath("$DestDir$dir", 0, 0755); - if ( !-d "$DestDir$dir" || !my_chown($Uid, $Gid, "$DestDir$dir") ) { - die("Failed to create or chown $DestDir$dir"); - } else { - print("Created $DestDir$dir\n"); - } -} - -# -# Create other directories -# -foreach my $dir ( ( - "$Conf{TopDir}", - "$Conf{TopDir}/pool", - "$Conf{TopDir}/cpool", - "$Conf{TopDir}/pc", - "$Conf{TopDir}/trash", - "$Conf{ConfDir}", - "$Conf{LogDir}", - ) ) { - mkpath("$DestDir$dir", 0, 0750) if ( !-d "$DestDir$dir" ); - if ( !-d "$DestDir$dir" - || !my_chown($Uid, $Gid, "$DestDir$dir") ) { - die("Failed to create or chown $DestDir$dir\n"); - } else { - print("Created $DestDir$dir\n"); - } -} - -printf("Installing binaries in $DestDir$Conf{InstallDir}/bin\n"); -foreach my $prog ( qw( - bin/BackupPC - bin/BackupPC_archive - bin/BackupPC_archiveHost - bin/BackupPC_archiveStart - bin/BackupPC_attribPrint - bin/BackupPC_dump - bin/BackupPC_fixupBackupSummary - bin/BackupPC_link - bin/BackupPC_nightly - bin/BackupPC_restore - bin/BackupPC_sendEmail - bin/BackupPC_serverMesg - bin/BackupPC_trashClean - bin/BackupPC_tarExtract - bin/BackupPC_tarCreate - bin/BackupPC_tarPCCopy - bin/BackupPC_zipCreate - bin/BackupPC_zcat - ) ) { - InstallFile($prog, "$DestDir$Conf{InstallDir}/$prog", 0555); -} - -printf("Installing library in $DestDir$Conf{InstallDir}/lib\n"); -foreach my $lib ( qw( - lib/BackupPC/Attrib.pm - lib/BackupPC/Config.pm - lib/BackupPC/FileZIO.pm - lib/BackupPC/Lib.pm - lib/BackupPC/PoolWrite.pm - lib/BackupPC/Storage.pm - lib/BackupPC/View.pm - lib/BackupPC/CGI/AdminOptions.pm - lib/BackupPC/CGI/Archive.pm - lib/BackupPC/CGI/ArchiveInfo.pm - lib/BackupPC/CGI/Browse.pm - lib/BackupPC/CGI/DirHistory.pm - lib/BackupPC/CGI/EditConfig.pm - lib/BackupPC/CGI/EmailSummary.pm - lib/BackupPC/CGI/GeneralInfo.pm - lib/BackupPC/CGI/HostInfo.pm - lib/BackupPC/CGI/Lib.pm - lib/BackupPC/CGI/LOGlist.pm - lib/BackupPC/CGI/Queue.pm - lib/BackupPC/CGI/ReloadServer.pm - lib/BackupPC/CGI/RestoreFile.pm - lib/BackupPC/CGI/RestoreInfo.pm - lib/BackupPC/CGI/Restore.pm - lib/BackupPC/CGI/RSS.pm - lib/BackupPC/CGI/StartServer.pm - lib/BackupPC/CGI/StartStopBackup.pm - lib/BackupPC/CGI/StopServer.pm - lib/BackupPC/CGI/Summary.pm - lib/BackupPC/CGI/View.pm - lib/BackupPC/Config/Meta.pm - lib/BackupPC/Lang/cz.pm - lib/BackupPC/Lang/de.pm - lib/BackupPC/Lang/en.pm - lib/BackupPC/Lang/es.pm - lib/BackupPC/Lang/fr.pm - lib/BackupPC/Lang/it.pm - lib/BackupPC/Lang/ja.pm - lib/BackupPC/Lang/nl.pm - lib/BackupPC/Lang/pl.pm - lib/BackupPC/Lang/pt_br.pm - lib/BackupPC/Lang/ru.pm - lib/BackupPC/Lang/uk.pm - lib/BackupPC/Lang/zh_CN.pm - lib/BackupPC/Storage/Text.pm - lib/BackupPC/Xfer.pm - lib/BackupPC/Xfer/Archive.pm - lib/BackupPC/Xfer/Ftp.pm - lib/BackupPC/Xfer/Protocol.pm - lib/BackupPC/Xfer/Rsync.pm - lib/BackupPC/Xfer/RsyncDigest.pm - lib/BackupPC/Xfer/RsyncFileIO.pm - lib/BackupPC/Xfer/Smb.pm - lib/BackupPC/Xfer/Tar.pm - lib/BackupPC/Zip/FileMember.pm - lib/Net/FTP/AutoReconnect.pm - lib/Net/FTP/RetrHandle.pm - ) ) { - InstallFile($lib, "$DestDir$Conf{InstallDir}/$lib", 0444); -} - -if ( $Conf{CgiImageDir} ne "" ) { - printf("Installing images in $DestDir$Conf{CgiImageDir}\n"); - foreach my $img ( ) { - (my $destImg = $img) =~ s{^images/}{}; - InstallFile($img, "$DestDir$Conf{CgiImageDir}/$destImg", 0444, 1); - } - - # - # Install new CSS file, making a backup copy if necessary - # -- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.0"; +- my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.3.1"; - if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) { - rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup); - } - InstallFile("conf/BackupPC_stnd.css", - "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", 0444, 0); - InstallFile("conf/BackupPC_stnd_orig.css", - "$DestDir$Conf{CgiImageDir}/BackupPC_stnd_orig.css", 0444, 0); - InstallFile("conf/sorttable.js", - "$DestDir$Conf{CgiImageDir}/sorttable.js", 0444, 0); -} - -printf("Making init.d scripts\n"); -foreach my $init ( qw(gentoo-backuppc gentoo-backuppc.conf linux-backuppc - solaris-backuppc debian-backuppc freebsd-backuppc - freebsd-backuppc2 suse-backuppc slackware-backuppc ) ) { - InstallFile("init.d/src/$init", "init.d/$init", 0444); -} - -printf("Making Apache configuration file for suid-perl\n"); -InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); - -printf("Installing docs in $DestDir$Conf{InstallDir}/doc\n"); -foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) { - InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444); -} - printf("Installing config.pl and hosts in $DestDir$Conf{ConfDir}\n"); -InstallFile("conf/hosts", "$DestDir$Conf{ConfDir}/hosts", 0644) +InstallFile("$DestDir$Conf{ConfDir}/hosts.sample", "$DestDir$Conf{ConfDir}/hosts", 0644) if ( !-f "$DestDir$Conf{ConfDir}/hosts" ); # @@ -707,7 +523,7 @@ # parameters and deleting ones that are no longer needed. # my $dest = "$DestDir$Conf{ConfDir}/config.pl"; -my ($distConf, $distVars) = ConfigParse("conf/config.pl"); +my ($distConf, $distVars) = ConfigParse("$DestDir$Conf{ConfDir}/config.pl.sample"); my ($oldConf, $oldVars); my ($newConf, $newVars) = ($distConf, $distVars); if ( -f $dest ) { @@ -928,13 +744,6 @@ die("can't chown $Uid, $Gid $dest\n") unless my_chown($Uid, $Gid, $dest); } -if ( $Conf{CgiDir} ne "" ) { - printf("Installing cgi script BackupPC_Admin in $DestDir$Conf{CgiDir}\n"); - mkpath("$DestDir$Conf{CgiDir}", 0, 0755); - InstallFile("cgi-bin/BackupPC_Admin", "$DestDir$Conf{CgiDir}/BackupPC_Admin", - 04554); -} - print <