Updated mosh to 1.2.6.

2016-08-10 Keith Winstein <mosh-devel@mit.edu>

	* Version 1.2.6 released.

	* New features:
		* Add Travis CI builds for Linux and Mac.  (Anders Kaseorg, others)
		* Add a --local option to run without ssh.  (John Hood)
		* Mosh now returns exitstatus reflecting connection success.
		  (John Hood)
		* Add a end-to-end test suite and many tests.  (John Hood)
		* Implement timeouts and signals to help address orphaned sessions.
		  (John Hood)
		* Major rework of Mosh's display differencing/rendering
		  code with much improved performance for slow machines.  (John Hood)
		* Implement ANSI back/forward tab (CSI CBT, CSI CHT).
		  (John Hood)
		* Do not start user shell until network session starts.
		  (John Hood)
		* Add options for more flexible specification of IPv4/IPv6
		  hostname resolution.  (John Hood)
		* Improved bash completion.  (Steve Dignam, HIGUCHI Yuta)
		* Add options for different methods of resolving the remote host
		  address, allowing operation without SshProxyCommand.  (John Hood)

	* Platform support:
		* Add configurable support for Apple Common Crypto and
		  Nettle, in place of OpenSSL.  Implement base64 locally.
		  (John Hood)
		* Workaround Cygwin select() bug.  (John Hood)
		* Updates to Debian packaging.  (Anders Kaseorg, Keith Winstein)
		* Workaround a glibc-2.22 issue causing segfaults on Debian Sid.
		  (John Hood with help from many others)
		* Prefer c++ to g++, for systems like FreeBSD where g++ is not usable.
		  (John Hood)
		* Fixes for Illumos Hipster 20151003.  (John Hood)
		* Disable -Werror for protobuf code, to resolve a new gcc6 warning.
		  (John Hood)
		* Link test for -fstack-protector-all on an embedded platform.
		  (Baruch Siach)
		* Resolve issue with bswap64() on FreeBSD-CURRENT with libc++-3.8.0.
		  (John Hood)
		* Fix issue with RECVTOS error message on client on FreeBSD.
		  (John Hood)

	* Bug fixes:
		* Remove an assertion causing aborts on Unicode fallback found by
		  fuzzing with afl.  (Keith Winstein)
		* Fix a server hang with XON/XOFF on BSD systems.  (John Hood)
		* Fix a typeahead-prediction bug that caused display corruption on
		  urxvt.  (John Hood)

3 files changed, 16 insertions, 17 deletions

diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 2c15e7b53a4..5b4ec19ccca 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/24 10:34:10 wiz Exp $
 
-DISTNAME=	mosh-1.2.5
-PKGREVISION=	3
+DISTNAME=	mosh-1.2.6
 CATEGORIES=	net
 MASTER_SITES=	http://mosh.mit.edu/
 
diff --git a/net/mosh/distinfo b/net/mosh/distinfo
index e47153901e2..2d36fb3bd83 100644
--- a/net/mosh/distinfo
+++ b/net/mosh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 00:35:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/08/24 10:34:10 wiz Exp $
 
-SHA1 (mosh-1.2.5.tar.gz) = 4f73698ebc14efb163fcb9cb0c9e4c3ed3623bb3
-RMD160 (mosh-1.2.5.tar.gz) = 3abb76e2adeb6a9e7d69b35621dfa7e172b1ce99
-SHA512 (mosh-1.2.5.tar.gz) = 6a5a42e5ed3f265bc8bee045340a59f604ab8f08b041573264f5679c29678e84d101537aa2d856923eee8d0a0f9c052dc81cfbfa50ce12bd0eeddc5c8f1fc3ae
-Size (mosh-1.2.5.tar.gz) = 308857 bytes
-SHA1 (patch-aa) = e3a612ed02127797aa27e5418b8fe4d6e61cab0a
+SHA1 (mosh-1.2.6.tar.gz) = 421c28210b9e8834c91589421a1a686575258afa
+RMD160 (mosh-1.2.6.tar.gz) = 4e06957083f9fcdd4c85b8f3b3b3407f734eed0d
+SHA512 (mosh-1.2.6.tar.gz) = fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403
+Size (mosh-1.2.6.tar.gz) = 347185 bytes
+SHA1 (patch-aa) = 3ff5f586641dede161ba91018cfbae6f2413b78c
diff --git a/net/mosh/patches/patch-aa b/net/mosh/patches/patch-aa
index 375a3982f88..e31a36b7076 100644
--- a/net/mosh/patches/patch-aa
+++ b/net/mosh/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+$NetBSD: patch-aa,v 1.2 2016/08/24 10:34:10 wiz Exp $
 
 make sure we get the defs in place before checking for them
 
---- src/crypto/ocb.cc	2012/07/13 15:38:18	1.1
-+++ src/crypto/ocb.cc	2012/07/13 15:39:01
-@@ -21,6 +21,8 @@
+--- src/crypto/ocb.cc.orig	2016-08-10 10:58:28.000000000 +0000
++++ src/crypto/ocb.cc
+@@ -23,6 +23,8 @@
  / Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
  /------------------------------------------------------------------------- */
  
@@ -13,15 +13,15 @@ make sure we get the defs in place before checking for them
  /* ----------------------------------------------------------------------- */
  /* Usage notes                                                             */
  /* ----------------------------------------------------------------------- */
-@@ -97,6 +99,7 @@
- 	#define restrict __restrict__      /* No "restrict" in GCC ansi C mode */
+@@ -117,6 +119,7 @@
+ 	#endif
  #endif
  
 +#ifndef bswap64
  #if _MSC_VER
  	#define bswap64(x) _byteswap_uint64(x)
- #elif HAVE_DECL___BUILTIN_BSWAP64
-@@ -114,6 +117,7 @@
+ #elif HAVE_DECL_BSWAP64
+@@ -136,6 +139,7 @@
  		return out.u64;
  	}
  #endif