Attachment 146728 Details for Bug 183241 – patch created against sysutils/backuppc

[patch] patch created against sysutils/backuppc

backuppc-devel.diff (text/plain), 22.29 KB, created by Alexander Moisseev on 2014-09-03 12:52:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Moisseev

Created: 2014-09-03 12:52:59 UTC

Size: 22.29 KB

patch

obsolete

>diff -ruN backuppc/Makefile backuppc-devel/Makefile
>--- backuppc/Makefile	2014-09-03 15:25:26.000000000 +0400
>+++ backuppc-devel/Makefile	2014-09-03 14:17:32.000000000 +0400
>@@ -1,23 +1,26 @@
> # Created by: Alexander Moisseev <moiseev@mezonplus.ru>
>-# $FreeBSD: head/sysutils/backuppc/Makefile 366645 2014-08-30 16:46:17Z wg $
>+# $FreeBSD$
> 
> PORTNAME=	backuppc
>-PORTVERSION=	3.3.0
>-PORTREVISION=	7
>+DISTVERSION=	4.0.0alpha3
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
>-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
>-DISTNAME=	BackupPC-${PORTVERSION}
>+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-beta/${DISTVERSION}
>+PKGNAMESUFFIX=	-devel
>+DISTNAME=	BackupPC-${DISTVERSION}
> 
> MAINTAINER=	moiseev@mezonplus.ru
> COMMENT=	System for backing PCs and laptops to a server
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing
>+LATEST_LINK=	${PORTNAME}-devel
> 
>-CONFLICTS=	backuppc-devel-[0-9]*
>+RUN_DEPENDS=	p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing \
>+		p5-BackupPC-XS>=0.30:${PORTSDIR}/sysutils/p5-BackupPC-XS
>+
>+CONFLICTS=	backuppc-[0-9]*
> 
> USE_RC_SUBR=	backuppc
> 
>@@ -27,6 +30,7 @@
> USERS=		backuppc
> GROUPS=		backuppc
> 
>+DOCSDIR=	${PREFIX}/share/doc/BackupPC
> CGIDIR?=	${PREFIX}/www/cgi-bin
> 
> SUB_FILES=	pkg-deinstall pkg-message update.sh
>@@ -37,20 +41,14 @@
> 
> 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
>+OPTIONS_DEFINE=		ARCHIVE_ZIP DOCS RSYNC_BPC NMBLOOKUP \
>+			RRDTOOL SMBCLIENT XML_RSS
>+OPTIONS_DEFAULT=	ARCHIVE_ZIP
> 
> ARCHIVE_ZIP_DESC=	Perl module for Zip archive files
>-COMPRESS_ZLIB_DESC=	Perl5 interface to zlib compression library
>-FILE_RSYNCP_DESC=	Perl Rsync client
>+RSYNC_BPC_DESC=		Modified rsync that used as part of BackupPC
> 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
>+RRDTOOL_DESC=		Round Robin Database Tools
> SMBCLIENT_DESC=		Samba client
> XML_RSS_DESC=		Perl extension to manage RSS files
> 
>@@ -59,11 +57,8 @@
> .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
>+.if ${PORT_OPTIONS:MRSYNC_BPC}
>+RUN_DEPENDS+=	rsync-bpc>=3.0.9.3:${PORTSDIR}/net/rsync-bpc
> .endif
> .if ${PORT_OPTIONS:MNMBLOOKUP}
> RUN_DEPENDS+=	nmblookup:${PORTSDIR}/net/samba-nmblookup
>@@ -71,10 +66,6 @@
> .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
>@@ -88,8 +79,6 @@
> 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|' \
>diff -ruN backuppc/distinfo backuppc-devel/distinfo
>--- backuppc/distinfo	2013-04-28 13:40:32.000000000 +0400
>+++ backuppc-devel/distinfo	2014-07-15 15:04:50.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (BackupPC-3.3.0.tar.gz) = 8a9c1b6faa4502b4c40617be97e806813815d9e22544854d99983c3da7c1f69b
>-SIZE (BackupPC-3.3.0.tar.gz) = 554155
>+SHA256 (BackupPC-4.0.0alpha3.tar.gz) = 3e63ad375465425f97179152d09e91963cced8b5ca7e400290b81decf83a902e
>+SIZE (BackupPC-4.0.0alpha3.tar.gz) = 583970
>diff -ruN backuppc/files/backuppc.in backuppc-devel/files/backuppc.in
>--- backuppc/files/backuppc.in	2014-01-24 04:14:07.000000000 +0400
>+++ backuppc-devel/files/backuppc.in	2014-07-15 15:04:50.000000000 +0400
>@@ -24,6 +24,6 @@
> command="%%PREFIX%%/bin/BackupPC"
> 
> required_files="${backuppc_config}"
>-pidfile="/var/log/BackupPC/BackupPC.pid"
>+pidfile="/var/run/BackupPC/BackupPC.pid"
> 
> run_rc_command "$1"
>diff -ruN backuppc/files/extra-patch-bin-BackupPC backuppc-devel/files/extra-patch-bin-BackupPC
>--- backuppc/files/extra-patch-bin-BackupPC	2013-04-28 13:40:32.000000000 +0400
>+++ backuppc-devel/files/extra-patch-bin-BackupPC	1970-01-01 03:00:00.000000000 +0300
>@@ -1,50 +0,0 @@
>---- bin/BackupPC.orig	2011-04-25 07:31:54.000000000 +0400
>-+++ bin/BackupPC	2013-02-17 16:51:18.000000000 +0400
>-@@ -1198,6 +1198,47 @@
>- 				     $Info{"${p}FileRepMax"},
>- 				     $Info{"${p}FileLinkMax"}, $Info{"${p}DirCnt"});
>- 			}
>-+
>-+			#
>-+			# RRDTool Graphing stuff
>-+			#
>-+			if ( -x "$BinDir/rrdtool" ) {
>-+			    my $date = time() + (24 * 3600);
>-+			    if ( ! -f "$LogDir/pool.rrd" ) {
>-+				system("$BinDir/rrdtool create $LogDir/pool.rrd"
>-+				  . " --step 86400"
>-+				  . " DS:ckb:GAUGE:172800:0:U"
>-+				  . " DS:tps:GAUGE:172800:0:U"
>-+				  . " RRA:AVERAGE:0.5:1:1400"
>-+				);
>-+			    }
>-+
>-+			    #
>-+			    # Generate size totals prior to poolng and compression
>-+			    #
>-+			    my $sizeTot;
>-+			    foreach my $host ( sort(keys(%{$bpc->HostInfoRead()})) ) {
>-+				my @Backups = $bpc->BackupInfoRead($host);
>-+				for ( my $i = 0 ; $i < @Backups ; $i++ ) {
>-+				    $sizeTot += $Backups[$i]{size};
>-+				}
>-+			    }
>-+
>-+			    $sizeTot = $sizeTot / 1024;
>-+
>-+			    system("$BinDir/rrdtool update $LogDir/pool.rrd"
>-+			      . " $date:"
>-+			      . ( $Info{"cpoolKb"} + $Info{"poolKb"} )
>-+			      . ":$sizeTot"
>-+			    );
>-+
>-+			    printf(LOG "%sRRD Data: %s:%f:%f\n",
>-+			      $bpc->timeStamp,
>-+			      $date,
>-+			      $Info{"cpoolKb"} + $Info{"poolKb"},
>-+			      $sizeTot);
>-+			}
>-+
>-                     }
>-                 } else {
>-                     $CmdJob = "";
>diff -ruN backuppc/files/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm backuppc-devel/files/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
>--- backuppc/files/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm	2013-04-28 13:40:32.000000000 +0400
>+++ backuppc-devel/files/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm	1970-01-01 03:00:00.000000000 +0300
>@@ -1,73 +0,0 @@
>---- lib/BackupPC/CGI/GeneralInfo.pm.orig	2011-04-25 07:31:55.000000000 +0400
>-+++ lib/BackupPC/CGI/GeneralInfo.pm	2013-02-17 16:52:16.000000000 +0400
>-@@ -44,6 +44,47 @@
>-     GetStatusInfo("info jobs hosts queueLen");
>-     my $Privileged = CheckPermission();
>- 
>-+    #
>-+    # Generate pool size RRDtool graph image
>-+    #
>-+    if ( $In{image} ne "" ) {
>-+        $In{image} =~ /([0-9]+)/;
>-+        my $weeks = $1;
>-+        my $real = $<; ### SUID
>-+        $< = $>; ### SUID
>-+
>-+        my $poolSizeGraph = "$BinDir/rrdtool graph -"
>-+          . " --start=end-${weeks}w --end=-300"
>-+          . ' --title="BackupPC Pool Size (' . ${weeks} . ' weeks)"'
>-+          . ' --vertical-label=""'
>-+          . ' --width=600 --height=100 --rigid --alt-autoscale-max'
>-+          . ' --base=1024 --logarithmic --units=si'
>-+          . ' --color BACK#FFFFFF --slope-mode --imgformat=PNG'
>-+          . ' --font TITLE:10: --font AXIS:8: --font LEGEND:8: --font UNIT:8:'
>-+          . ' --font-render-mode mono'
>-+
>-+          . ' DEF:ao="'  . "$LogDir" . '/pool.rrd":ckb:AVERAGE'
>-+          . ' DEF:aob="' . "$LogDir" . '/pool.rrd":tps:AVERAGE'
>-+          . ' CDEF:a=ao,1024,*'
>-+          . ' CDEF:b=aob,1024,*'
>-+
>-+          . ' AREA:a#95B8DB:"CPool in bytes                  "'
>-+          . ' GPRINT:a:LAST:"Current\\:%8.2lf %s"'
>-+          . ' GPRINT:a:AVERAGE:"Average\\:%8.2lf %s"'
>-+          . ' GPRINT:a:MAX:"Maximum\\:%8.2lf %s\n"'
>-+
>-+          . ' LINE1:b#FF0000:"Prior to pooling and compression"'
>-+          . ' GPRINT:b:LAST:"Current\\:%8.2lf %s"'
>-+          . ' GPRINT:b:AVERAGE:"Average\\:%8.2lf %s"'
>-+          . ' GPRINT:b:MAX:"Maximum\\:%8.2lf %s\\n"';
>-+
>-+        print "Content-type: image/png\n\n";
>-+        print `$poolSizeGraph`;
>-+
>-+        $< = $real; ### SUID
>-+        return;
>-+    }
>-+
>-     my($jobStr, $statusStr);
>-     foreach my $host ( sort(keys(%Jobs)) ) {
>-         my $startTime = timeStamp2($Jobs{$host}{startTime});
>-@@ -126,8 +167,20 @@
>-     } elsif ( $Info{cpoolFileCnt} > 0 ) {
>-         $poolInfo = $cpoolInfo;
>-     }
>--    my $generalInfo = eval("qq{$Lang->{BackupPC_Server_Status_General_Info}}")
>--                                if ( $Privileged );
>-+
>-+    my $generalInfo = "";
>-+    if ( $Privileged ) {
>-+        $generalInfo  = eval("qq{$Lang->{BackupPC_Server_Status_General_Info}}");
>-+        $generalInfo .= '
>-+<ul>
>-+    <ul>
>-+        <p><img src="' . $MyURL . '?image=4">
>-+        <p><img src="' . $MyURL . '?image=52">
>-+    </ul>
>-+</ul>'
>-+                                if ( -r "$LogDir/pool.rrd" );
>-+    }
>-+
>-     my $content = eval("qq{$Lang->{BackupPC_Server_Status}}");
>-     Header($Lang->{H_BackupPC_Server_Status}, $content);
>-     Trailer();
>diff -ruN backuppc/files/patch-bin-BackupPC_rrdUpdate backuppc-devel/files/patch-bin-BackupPC_rrdUpdate
>--- backuppc/files/patch-bin-BackupPC_rrdUpdate	1970-01-01 03:00:00.000000000 +0300
>+++ backuppc-devel/files/patch-bin-BackupPC_rrdUpdate	2014-07-15 15:04:50.000000000 +0400
>@@ -0,0 +1,57 @@
>+--- ./bin/BackupPC_rrdUpdate.orig	2013-12-09 17:06:45.000000000 +0400
>++++ ./bin/BackupPC_rrdUpdate	2013-12-10 12:24:41.000000000 +0400
>+@@ -109,7 +109,7 @@
>+     }
>+     $sizeTot = $sizeTot / 1024;
>+ 
>+-    print $bpc->cmdSystemOrEval(
>++    if ( $err = $bpc->cmdSystemOrEval(
>+             [
>+                 $Conf{RrdToolPath},
>+                 "update", $RRDFile,
>+@@ -119,13 +119,17 @@
>+                 . $Info{"poolKb"}  . ":"
>+                 . $Info{"pool4Kb"} . ":"
>+                 . $Info{"cpool4Kb"}
>+-            ]);
>+-     printf("%sRRD updated:"
>++            ]) ) {
>++        print "$err";
>++    }
>++    else {
>++        printf("%sRRD updated:"
>+           . " date %s; cpoolKb %f; total %f;"
>+           . " poolKb %f; pool4Kb %f; cpool4Kb %f\n",
>+                 $bpc->timeStamp,
>+                 $NowRnd1, $Info{"cpoolKb"}, $sizeTot,
>+                 $Info{"poolKb"}, $Info{"pool4Kb"}, $Info{"cpool4Kb"});
>++    }
>+ }
>+ 
>+ #
>+@@ -140,7 +144,7 @@
>+     #
>+     # Get each pool max value from RRD
>+     #
>+-    $bpc->cmdSystemOrEval(
>++    $bpc->cmdSystemOrEvalLong(
>+             [
>+                 $Conf{RrdToolPath},
>+                 "graphv", "-",
>+@@ -158,7 +162,7 @@
>+                 if ( $_[0] =~ /^print\[([0-3])\] = "([.0-9]+)"$/ ) {
>+                     $poolMax[$1] = $2 unless ( $2 == 0 );
>+                 }
>+-            });
>++            }, 1, undef);
>+ 
>+     my $poolSizeGraph = [
>+         "$Conf{RrdToolPath}",
>+@@ -228,6 +232,6 @@
>+         print("Can't open/create $LogDir/poolUsage$weeks.png\n");
>+         return;
>+     }
>+-    $bpc->cmdSystemOrEval($poolSizeGraph, sub { print $fdOut $_[0] });
>++    $bpc->cmdSystemOrEvalLong($poolSizeGraph, sub { print $fdOut $_[0] }, 1, undef);
>+     close($fdOut);
>+ }
>diff -ruN backuppc/files/patch-lib__BackupPC__CGI__View.pm backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm
>--- backuppc/files/patch-lib__BackupPC__CGI__View.pm	2014-09-03 13:13:49.000000000 +0400
>+++ backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm	2014-09-03 14:15:44.000000000 +0400
>@@ -1,10 +1,10 @@
>---- ./lib/BackupPC/CGI/View.pm.orig	2014-08-30 15:21:07.000000000 +0400
>-+++ ./lib/BackupPC/CGI/View.pm	2014-08-30 15:21:18.000000000 +0400
>-@@ -89,7 +89,7 @@
>+--- ./lib/BackupPC/CGI/View.pm.orig	2014-09-03 14:15:03.000000000 +0400
>++++ ./lib/BackupPC/CGI/View.pm	2014-09-03 14:15:20.000000000 +0400
>+@@ -102,7 +102,7 @@
>          $file = $bpc->ConfDir() . "/hosts";
>          $linkHosts = 1;
>      } elsif ( $type eq "docs" ) {
>--        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
>+-        $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html";
> +        $file = "$Conf{CgiImageDir}/BackupPC.html";
>      } elsif ( $host ne "" ) {
>          if ( !defined($In{num}) ) {
>diff -ruN backuppc/files/patch-update.pl backuppc-devel/files/patch-update.pl
>--- backuppc/files/patch-update.pl	2014-08-26 18:42:38.000000000 +0400
>+++ backuppc-devel/files/patch-update.pl	2014-09-03 14:15:44.000000000 +0400
>@@ -1,6 +1,6 @@
>---- ./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 @@
>+--- ./update.pl.orig	2014-09-03 13:36:33.000000000 +0400
>++++ ./update.pl	2014-09-03 13:56:16.000000000 +0400
>+@@ -222,7 +222,7 @@
>  if ( $ConfigPath ne "" && -r $ConfigPath ) {
>      (my $confDir = $ConfigPath) =~ s{/[^/]+$}{};
>      die("BackupPC::Lib->new failed\n")
>@@ -9,7 +9,7 @@
>      %Conf = $bpc->Conf();
>      %OrigConf = %Conf;
>      if ( !$opts{fhs} ) {
>-@@ -507,198 +507,14 @@
>+@@ -494,239 +494,21 @@
>  
>  print <<EOF;
>  
>@@ -25,10 +25,10 @@
>  
>  exit unless prompt("--> Do you want to continue?", "y") =~ /y/i;
>  
>--#
>+ #
> -# Create install directories
> -#
>--foreach my $dir ( qw(bin doc
>+-foreach my $dir ( qw(bin share/doc/BackupPC
> -		     lib/BackupPC/CGI
> -		     lib/BackupPC/Config
> -		     lib/BackupPC/Lang
>@@ -68,9 +68,9 @@
> -            "$Conf{TopDir}/pool",
> -            "$Conf{TopDir}/cpool",
> -            "$Conf{TopDir}/pc",
>--            "$Conf{TopDir}/trash",
> -            "$Conf{ConfDir}",
> -            "$Conf{LogDir}",
>+-            "$Conf{RunDir}",
> -        ) ) {
> -    mkpath("$DestDir$dir", 0, 0750) if ( !-d "$DestDir$dir" );
> -    if ( !-d "$DestDir$dir"
>@@ -84,36 +84,61 @@
> -printf("Installing binaries in $DestDir$Conf{InstallDir}/bin\n");
> -foreach my $prog ( qw(
> -        bin/BackupPC
>+-        bin/BackupPC_Admin_SCGI
> -        bin/BackupPC_archive
> -        bin/BackupPC_archiveHost
> -        bin/BackupPC_archiveStart
> -        bin/BackupPC_attribPrint
>+-        bin/BackupPC_backupDelete
>+-        bin/BackupPC_backupDuplicate
> -        bin/BackupPC_dump
> -        bin/BackupPC_fixupBackupSummary
>--        bin/BackupPC_link
>+-        bin/BackupPC_fsck
>+-        bin/BackupPC_ls
> -        bin/BackupPC_nightly
>+-        bin/BackupPC_poolCntPrint
>+-        bin/BackupPC_refCountUpdate
> -        bin/BackupPC_restore
>+-        bin/BackupPC_rrdUpdate
> -        bin/BackupPC_sendEmail
> -        bin/BackupPC_serverMesg
>--        bin/BackupPC_trashClean
>--        bin/BackupPC_tarExtract
> -        bin/BackupPC_tarCreate
>--        bin/BackupPC_tarPCCopy
>--        bin/BackupPC_zipCreate
>+-        bin/BackupPC_tarExtract
> -        bin/BackupPC_zcat
>+-        bin/BackupPC_zipCreate
> -    ) ) {
> -    InstallFile($prog, "$DestDir$Conf{InstallDir}/$prog", 0555);
> -}
> -
>+-#
>+-# remove old pre-v4 programs
>+-#
>+-foreach my $prog ( qw(
>+-        bin/BackupPC_link
>+-        bin/BackupPC_tarPCCopy
>+-        bin/BackupPC_trashClean
>+-        bin/BackupPC_compressPool
>+-    ) ) {
>+-    unlink("$DestDir$Conf{InstallDir}/$prog");
>+-}
>+-
> -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/Config/Meta.pm
>+-        lib/BackupPC/DirOps.pm
> -        lib/BackupPC/Lib.pm
>--        lib/BackupPC/PoolWrite.pm
> -        lib/BackupPC/Storage.pm
> -        lib/BackupPC/View.pm
>+-        lib/BackupPC/Xfer/Archive.pm
>+-        lib/BackupPC/Xfer/Ftp.pm
>+-        lib/BackupPC/Xfer/Protocol.pm
>+-        lib/BackupPC/Xfer/Rsync.pm
>+-        lib/BackupPC/Xfer/Smb.pm
>+-        lib/BackupPC/Xfer/Tar.pm
>+-        lib/BackupPC/Xfer.pm
>+-        lib/BackupPC/Zip/FileMember.pm
>+-        lib/Net/FTP/AutoReconnect.pm
>+-        lib/Net/FTP/RetrHandle.pm
> -        lib/BackupPC/CGI/AdminOptions.pm
> -        lib/BackupPC/CGI/Archive.pm
> -        lib/BackupPC/CGI/ArchiveInfo.pm
>@@ -127,16 +152,15 @@
> -        lib/BackupPC/CGI/LOGlist.pm
> -        lib/BackupPC/CGI/Queue.pm
> -        lib/BackupPC/CGI/ReloadServer.pm
>+-        lib/BackupPC/CGI/Restore.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
>@@ -151,22 +175,31 @@
> -        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
>+-    ) ) {
>+-    InstallFile($lib, "$DestDir$Conf{InstallDir}/$lib", 0444);
>+-}
>+-
>+-#
>+-# remove old pre-v4 libraries
>+-#
>+-foreach my $lib ( qw(
>+-        lib/BackupPC/Attrib.pm
>+-        lib/BackupPC/Config.pm
>+-        lib/BackupPC/FileZIO.pm
>+-        lib/BackupPC/PoolWrite.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);
>+-    unlink("$DestDir$Conf{InstallDir}/$lib");
> -}
> -
>+-#
>+ # clean pid and sock files from old location (they are now in $Conf{RunDir}, and they
>+ # get re-created each time BackupPC starts, so it's ok if RunDir eq LogDir).
>+ #
>+ unlink("$DestDir$Conf{LogDir}/BackupPC.pid")  if ( -f "$DestDir$Conf{LogDir}/BackupPC.pid" );
>+ unlink("$DestDir$Conf{LogDir}/BackupPC.sock") if ( -e "$DestDir$Conf{LogDir}/BackupPC.sock" );
>+ 
> -if ( $Conf{CgiImageDir} ne "" ) {
> -    printf("Installing images in $DestDir$Conf{CgiImageDir}\n");
> -    foreach my $img ( <images/*> ) {
>@@ -177,7 +210,7 @@
> -    #
> -    # 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-4.0.0alpha3";
> -    if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
> -	rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
> -    }
>@@ -199,10 +232,18 @@
> -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");
>+-printf("Installing docs in $DestDir$Conf{InstallDir}/share/doc/BackupPC\n");
> -foreach my $doc ( qw(BackupPC.pod BackupPC.html) ) {
>--    InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/doc/$doc", 0444);
>+-    InstallFile("doc/$doc", "$DestDir$Conf{InstallDir}/share/doc/BackupPC/$doc", 0444);
>+-    #
>+-    # clean up files from old directory
>+-    #
>+-    unlink("$DestDir$Conf{InstallDir}/doc/$doc") if ( -f "$DestDir$Conf{InstallDir}/doc/$doc" );
> -}
>+-#
>+-# clean up old directory (ok if it quietly fails if there are other files in that directory)
>+-#
>+-rmdir("$DestDir$Conf{InstallDir}/doc") if ( -d "$DestDir$Conf{InstallDir}/doc" );
> -
>  printf("Installing config.pl and hosts in $DestDir$Conf{ConfDir}\n");
> -InstallFile("conf/hosts", "$DestDir$Conf{ConfDir}/hosts", 0644)
>@@ -210,7 +251,7 @@
>                      if ( !-f "$DestDir$Conf{ConfDir}/hosts" );
>  
>  #
>-@@ -707,7 +523,7 @@
>+@@ -735,7 +517,7 @@
>  # parameters and deleting ones that are no longer needed.
>  #
>  my $dest = "$DestDir$Conf{ConfDir}/config.pl";
>@@ -219,7 +260,7 @@
>  my ($oldConf, $oldVars);
>  my ($newConf, $newVars) = ($distConf, $distVars);
>  if ( -f $dest ) {
>-@@ -928,13 +744,6 @@
>+@@ -974,13 +756,6 @@
>      die("can't chown $Uid, $Gid $dest\n") unless my_chown($Uid, $Gid, $dest);
>  }
>  
>diff -ruN backuppc/pkg-plist backuppc-devel/pkg-plist
>--- backuppc/pkg-plist	2014-09-03 13:13:49.000000000 +0400
>+++ backuppc-devel/pkg-plist	2014-09-03 14:54:02.000000000 +0400
>@@ -1,25 +1,29 @@
> @stopdaemon backuppc
> @mode 0555
> bin/BackupPC
>+bin/BackupPC_Admin_SCGI
> bin/BackupPC_archive
> bin/BackupPC_archiveHost
> bin/BackupPC_archiveStart
> bin/BackupPC_attribPrint
>+bin/BackupPC_backupDelete
>+bin/BackupPC_backupDuplicate
> bin/BackupPC_dump
> bin/BackupPC_fixupBackupSummary
>-bin/BackupPC_link
>+bin/BackupPC_fsck
>+bin/BackupPC_ls
> bin/BackupPC_nightly
>+bin/BackupPC_poolCntPrint
>+bin/BackupPC_refCountUpdate
> bin/BackupPC_restore
>+bin/BackupPC_rrdUpdate
> bin/BackupPC_sendEmail
> bin/BackupPC_serverMesg
> bin/BackupPC_tarCreate
> bin/BackupPC_tarExtract
>-bin/BackupPC_tarPCCopy
>-bin/BackupPC_trashClean
> bin/BackupPC_zcat
> bin/BackupPC_zipCreate
> @mode 0444
>-lib/BackupPC/Attrib.pm
> lib/BackupPC/CGI/AdminOptions.pm
> lib/BackupPC/CGI/Archive.pm
> lib/BackupPC/CGI/ArchiveInfo.pm
>@@ -42,9 +46,8 @@
> lib/BackupPC/CGI/StopServer.pm
> lib/BackupPC/CGI/Summary.pm
> lib/BackupPC/CGI/View.pm
>-lib/BackupPC/Config.pm
> lib/BackupPC/Config/Meta.pm
>-lib/BackupPC/FileZIO.pm
>+lib/BackupPC/DirOps.pm
> lib/BackupPC/Lang/cz.pm
> lib/BackupPC/Lang/de.pm
> lib/BackupPC/Lang/en.pm
>@@ -59,7 +62,6 @@
> lib/BackupPC/Lang/uk.pm
> lib/BackupPC/Lang/zh_CN.pm
> lib/BackupPC/Lib.pm
>-lib/BackupPC/PoolWrite.pm
> lib/BackupPC/Storage.pm
> lib/BackupPC/Storage/Text.pm
> lib/BackupPC/View.pm
>@@ -68,8 +70,6 @@
> 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
>@@ -138,21 +138,21 @@
> @dirrm lib/BackupPC/Xfer
> @dirrm lib/BackupPC/Zip
> @dirrm lib/BackupPC
>-@dirrm lib/Net/FTP
>-@dirrm lib/Net
>+@dirrmtry lib/Net/FTP
>+@dirrmtry lib/Net
> @dirrmtry %%WWWDIR%%
> @dirrmtry %%CGIDIR%%
>+@exec install -d -o backuppc -g backuppc -m 0750 /var/run/BackupPC
> @exec install -d -o backuppc -g backuppc -m 0750 /var/log/BackupPC
> @exec install -d -o backuppc -g backuppc -m 0750 /var/db/BackupPC
> @exec install -d -o backuppc -g backuppc -m 0750 /var/db/BackupPC/cpool
> @exec install -d -o backuppc -g backuppc -m 0750 /var/db/BackupPC/pc
> @exec install -d -o backuppc -g backuppc -m 0750 /var/db/BackupPC/pool
>-@exec install -d -o backuppc -g backuppc -m 0750 /var/db/BackupPC/trash
>+@dirrmtry /var/run/BackupPC
> @dirrmtry /var/log/BackupPC
> @dirrmtry /var/db/BackupPC/cpool
> @dirrmtry /var/db/BackupPC/pc
> @dirrmtry /var/db/BackupPC/pool
>-@dirrmtry /var/db/BackupPC/trash
> @dirrmtry /var/db/BackupPC
> @owner backuppc
> @group backuppc

Actions: View | Diff

Attachments on bug 183241: 137620 | 137621 | 143609 | 144722 | 146728