diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-29 09:31:38 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-01-29 09:31:38 +0000 |
| commit | 5637116587f0faa58fab7a6d9216b2b7d42c940a (patch) | |
| tree | eb58af9d8d0016f47cc8f25d637eba551eb0f4e2 | |
| parent | 8a8de900775229d491c4ec126a75a33c89503438 (diff) | |
| download | ports-5637116587f0faa58fab7a6d9216b2b7d42c940a.tar.gz ports-5637116587f0faa58fab7a6d9216b2b7d42c940a.zip | |
sysutils/flexbackup: Fix some issues
- flexbackup shows a perl deprecated warning with perl 5.16
- lzma support compression level 0
- compress flags do not work, if you use afio+lzma
PR: 221003
Submitted by: Lars Herschke <lhersch@dssgmbh.de>
Notes
Notes:
svn path=/head/; revision=491550
| -rw-r--r-- | sysutils/flexbackup/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/flexbackup/files/patch-flexbackup | 20 |
2 files changed, 20 insertions, 2 deletions
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile index 683fc210848e..2b8414503144 100644 --- a/sysutils/flexbackup/Makefile +++ b/sysutils/flexbackup/Makefile @@ -3,7 +3,7 @@ PORTNAME= flexbackup PORTVERSION= 1.2.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://www.edwinh.org/flexbackup/tarball/ \ http://www.reynoldsnet.org/flexbackup/tarball/ diff --git a/sysutils/flexbackup/files/patch-flexbackup b/sysutils/flexbackup/files/patch-flexbackup index 8204eecd45be..adf7dc488a49 100644 --- a/sysutils/flexbackup/files/patch-flexbackup +++ b/sysutils/flexbackup/files/patch-flexbackup @@ -158,6 +158,15 @@ $cmd .= "; $::path{cat} $tmpfile $::z"; # Buffer both sides if remote +@@ -2670,7 +2688,7 @@ sub optioncheck { + } + + # Flag old config file +- if (defined(@cfg::filesystems) or defined($cfg::mt_var_blksize)) { ++ if (@cfg::filesystems or defined($cfg::mt_var_blksize)) { + # so strict shuts up + my $junk = @cfg::filesystems; + $junk = $cfg::mt_var_blksize; @@ -2700,7 +2718,7 @@ sub optioncheck { # First check if things are defined in the config file # Checks exist, true/false, or one of options @@ -186,7 +195,7 @@ + } elsif ($cfg::compress eq "lzma") { + $::path{'lzma'} = &checkinpath($cfg::compress); + push(@::remoteprogs, $::path{$cfg::compress}); -+ if ($cfg::compr_level !~ m/^[123456789]$/) { ++ if ($cfg::compr_level !~ m/^[0123456789]$/) { + push(@::errors,"\$compr_level must be set to 1-9"); + } else { + $::z = " | $::path{$cfg::compress} -$cfg::compr_level "; @@ -218,6 +227,15 @@ # If buffering disabled, use dd or cat depending on if blocking turned off on not if ($cfg::blksize eq '0') { $::buffer_cmd = ""; +@@ -3230,7 +3258,7 @@ sub optioncheck { + push(@::remoteprogs, $::path{'afio'}); + + # Compress flag for afio must be handled differently +- if ($cfg::compress =~ m/^(gzip|bzip2|lzop|compress|zip)$/) { ++ if ($cfg::compress =~ m/^(gzip|bzip2|lzop|compress|zip|lzma)$/) { + + if ($cfg::compress eq "gzip") { + $::afio_z_flag = "-P $::path{$cfg::compress} -Q -$cfg::compr_level -Z"; @@ -3252,6 +3280,10 @@ sub optioncheck { $::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z"; $::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z"; |