From 6eaa3033272104b1ac91459cd91c940fcfb2459b Mon Sep 17 00:00:00 2001
From: Jim Salter <github@jrs-s.net>
Date: Fri, 27 May 2016 18:24:27 -0400
Subject: [PATCH] 1.4.6b - updated cipherlist for syncoid to
 chacha20-poly1305@openssh.com,arcfour

---
 CHANGELIST | 5 +++++
 findoid    | 2 +-
 sanoid     | 2 +-
 syncoid    | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELIST b/CHANGELIST
index c32528f..41d6a28 100644
--- a/CHANGELIST
+++ b/CHANGELIST
@@ -1,3 +1,8 @@
+1.4.6b updated default cipherlist for syncoid to 
+       chacha20-poly1305@openssh.com,arcfour - arcfour isn't supported on
+       newer SSH (in Ubuntu Xenial and FreeBSD), chacha20 isn't supported on
+       some older SSH versions (Ubuntu Precise< I think?)
+
 1.4.6a due to bug in ZFS on Linux which frequently causes errors to return from `zfs set readonly`,
        changed ==0 or die in setzfsvalue() to ==0 or [complain] - it's not worth causing replication
        to fail while this ZFS on Linux bug exists.
diff --git a/findoid b/findoid
index b00b81a..d975b29 100755
--- a/findoid
+++ b/findoid
@@ -11,7 +11,7 @@ use warnings;
 my $zfs = '/sbin/zfs';
 my %args = getargs(@ARGV);
 
-my $progversion = '1.4.6a';
+my $progversion = '1.4.6b';
 
 if ($args{'version'}) { print "$progversion\n"; exit 0; }
 
diff --git a/sanoid b/sanoid
index 8c3e013..a803654 100755
--- a/sanoid
+++ b/sanoid
@@ -4,7 +4,7 @@
 # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17.  A copy should also be available in this
 # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
 
-my $version = '1.4.6a';
+my $version = '1.4.6b';
 
 use strict;
 use Config::IniFiles;   # read samba-style conf file
diff --git a/syncoid b/syncoid
index c3892b4..f13b1a7 100755
--- a/syncoid
+++ b/syncoid
@@ -4,7 +4,7 @@
 # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17.  A copy should also be available in this
 # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
 
-my $version = '1.4.6a';
+my $version = '1.4.6b';
 
 use strict;
 use Data::Dumper;
@@ -25,7 +25,7 @@ my $debug = $args{'debug'};
 my $zfscmd = '/sbin/zfs';
 my $sshcmd = '/usr/bin/ssh';
 my $pscmd = '/bin/ps';
-my $sshcipher = '-c arcfour';
+my $sshcipher = '-c chacha20-poly1305@openssh.com,arcfour';
 my $pvcmd = '/usr/bin/pv';
 my $mbuffercmd = '/usr/bin/mbuffer';
 my $sudocmd = '/usr/bin/sudo';