Update 1.0.4 --> 1.0.7.

3 files changed, 4 insertions, 59 deletions

diff --git a/sysutils/zetaback/Makefile b/sysutils/zetaback/Makefile
index 6905cf32a69a..5e5d4d7dd0d3 100644
--- a/sysutils/zetaback/Makefile
+++ b/sysutils/zetaback/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	zetaback
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils
-MASTER_SITES=	https://labs.omniti.com/zetaback/tags/1.0/
+MASTER_SITES=	http://mirrors.omniti.com/zetaback/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Zetaback ZFS backup and recovery management system
diff --git a/sysutils/zetaback/distinfo b/sysutils/zetaback/distinfo
index 87da54a1b212..c67ac58119e3 100644
--- a/sysutils/zetaback/distinfo
+++ b/sysutils/zetaback/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zetaback-1.0.4.tar.gz) = 95bf1722462749de8f41fbc86ac329952eb9910b0508cc1e9b9d14d014748bc6
-SIZE (zetaback-1.0.4.tar.gz) = 39667
+SHA256 (zetaback-1.0.7.tar.gz) = e4bad4bb4a0149d44e5ae6022519b2927e4c0b5a0da465d47b4e66d707270270
+SIZE (zetaback-1.0.7.tar.gz) = 49934
diff --git a/sysutils/zetaback/files/patch-zetaback.in b/sysutils/zetaback/files/patch-zetaback.in
deleted file mode 100644
index 059c37b16f6c..000000000000
--- a/sysutils/zetaback/files/patch-zetaback.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- zetaback.in.orig	2008-12-16 13:23:27.000000000 -0800
-+++ zetaback.in	2009-02-21 21:08:58.542895399 -0800
-@@ -319,11 +319,15 @@
- The retention time (in seconds) for backups.  Defaults to (14 * 86400), or two
- weeks.
- 
-+=item compressionprogram
-+
-+Compress files using gzip or bzip2. Defaults to gzip.
-+
- =item compressionlevel
- 
--Compress files using gzip at the specified compression level. 0 means no
--compression. Accepted values are 1-9. Defaults to 1 (fastest/minimal
--compression.)
-+Compress files using gzip or bzip2 at the specified compression level.
-+0 means no compression. Accepted values are 1-9. Defaults to 1
-+(fastest/minimal compression.)
- 
- =item ssh_config
- 
-@@ -525,9 +529,18 @@
-   print "Using custom ssh config file: $ssh_config\n" if($DEBUG);
- 
-   # Do it. yeah.
-+  my $cp = config_get($host, 'compressionprogram');
-+  if ($cp ne "bzip2" && $cp ne "gzip" && $cp ne "") {
-+      die "zfs_full_backup: unsupported compression program specified\n";
-+  } elsif ($cp eq "") {
-+      $cp = "gzip";
-+      my $cl = 1;
-+  } else {
-+      my $cl = 1;
-+  }
-   my $cl = config_get($host, 'compressionlevel');
-   if ($cl >= 1 && $cl <= 9) {
--    open(LBACKUP, "|gzip -$cl >$store/.$dumpfile") ||
-+    open(LBACKUP, "|$cp -$cl >$store/.$dumpfile") ||
-       die "zfs_full_backup: cannot create dump\n";
-   } else {
-     open(LBACKUP, ">$store/.$dumpfile") ||
-@@ -799,10 +812,10 @@
-   }
-   print " => piping $file to $command\n" if($DEBUG);
-   if($NEUTERED) {
--    print "gzip -dfc $file | ssh $ssh_config $host $command\n" if ($DEBUG);
-+    print "bzip2 -dfc $file | gzip -dfc | ssh $ssh_config $host $command\n" if ($DEBUG);
-   }
-   else {
--    open(DUMP, "gzip -dfc $file |");
-+    open(DUMP, "bzip2 -dfc $file | gzip -dfc |");
-     eval {
-       open(RECEIVER, "| ssh $ssh_config $host $command");
-       my $buffer;