import mosh-1.2.2 into the packages collection.

	Mosh is a Remote terminal application that allows roaming, supports
	intermittent connectivity, and provides intelligent local echo and
	line editing of user keystrokes.

	Mosh is a replacement for SSH.  It's more robust and responsive,
	especially over Wi-Fi, cellular, and long-distance links.

7 files changed, 129 insertions, 0 deletions

diff --git a/net/mosh/DESCR b/net/mosh/DESCR
new file mode 100644
index 00000000000..66196acdc47
--- /dev/null
+++ b/net/mosh/DESCR
@@ -0,0 +1,6 @@
+Mosh is a Remote terminal application that allows roaming, supports
+intermittent connectivity, and provides intelligent local echo and
+line editing of user keystrokes.
+
+Mosh is a replacement for SSH.  It's more robust and responsive,
+especially over Wi-Fi, cellular, and long-distance links.
diff --git a/net/mosh/MESSAGE b/net/mosh/MESSAGE
new file mode 100644
index 00000000000..1e33b2ebc86
--- /dev/null
+++ b/net/mosh/MESSAGE
@@ -0,0 +1,19 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+===========================================================================
+
+To invoke the server, you need to use a UTF-8 character set, and
+a hard-coded string of "new" (to make mosh-server use getopt). e.g.
+
+	% env LC_CTYPE="en_US.UTF-8" mosh-server new -i 192.168.98.130
+	MOSH CONNECT 60001 2zDOoujUVJ1AW4YFYw36sg
+	%
+
+and to connect to that server, the invocation is
+
+	% env LC_CTYPE="en_US.UTF-8" MOSH_KEY=2zDOoujUVJ1AW4YFYw36sg \
+		mosh-client 192.168.98.130 60001
+
+Please note that this package uses UDP, and so packets may be filtered
+in certain environments.
+===========================================================================
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
new file mode 100644
index 00000000000..eb2c112bda8
--- /dev/null
+++ b/net/mosh/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+
+DISTNAME=	mosh-1.2.2
+CATEGORIES=	net
+MASTER_SITES=	https://github.com/downloads/keithw/mosh/
+
+MAINTAINER=	agc@NetBSD.org
+HOMEPAGE=	http://mosh.mit.edu/
+COMMENT=	Remote terminal application which allows roaming
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=       p5-IO-tty>=1.08:../../devel/p5-IO-Tty
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES+=	c c++
+
+REPLACE_PERL+=	scripts/mosh
+
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
+BUILDLINK_API_DEPENDS.zlib+=    zlib>=1.2.0.4
+.include "../../devel/zlib/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/mosh/PLIST b/net/mosh/PLIST
new file mode 100644
index 00000000000..4f44a9996a6
--- /dev/null
+++ b/net/mosh/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+bin/mosh
+bin/mosh-client
+bin/mosh-server
+man/man1/mosh-client.1
+man/man1/mosh-server.1
+man/man1/mosh.1
diff --git a/net/mosh/distinfo b/net/mosh/distinfo
new file mode 100644
index 00000000000..fa81e667ac1
--- /dev/null
+++ b/net/mosh/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+
+SHA1 (mosh-1.2.2.tar.gz) = f0227800298d80e9f1353db3b29a807de833d7d2
+RMD160 (mosh-1.2.2.tar.gz) = e04d4ade101418351ad57710419accc6c0a040a6
+Size (mosh-1.2.2.tar.gz) = 282734 bytes
+SHA1 (patch-aa) = e3a612ed02127797aa27e5418b8fe4d6e61cab0a
+SHA1 (patch-ab) = 2fda1837d43aa54a903ab72de226ff0f5c5350cd
diff --git a/net/mosh/patches/patch-aa b/net/mosh/patches/patch-aa
new file mode 100644
index 00000000000..375a3982f88
--- /dev/null
+++ b/net/mosh/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1.1.1 2012/07/20 03:15:29 agc 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 @@
+ / Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
+ /------------------------------------------------------------------------- */
+ 
++#include "config.h"
++
+ /* ----------------------------------------------------------------------- */
+ /* Usage notes                                                             */
+ /* ----------------------------------------------------------------------- */
+@@ -97,6 +99,7 @@
+ 	#define restrict __restrict__      /* No "restrict" in GCC ansi C mode */
+ #endif
+ 
++#ifndef bswap64
+ #if _MSC_VER
+ 	#define bswap64(x) _byteswap_uint64(x)
+ #elif HAVE_DECL___BUILTIN_BSWAP64
+@@ -114,6 +117,7 @@
+ 		return out.u64;
+ 	}
+ #endif
++#endif
+ 
+ #if _MSC_VER
+ 	static inline unsigned ntz(unsigned x) {_BitScanForward(&x,x);return x;}
diff --git a/net/mosh/patches/patch-ab b/net/mosh/patches/patch-ab
new file mode 100644
index 00000000000..3e2abb286f1
--- /dev/null
+++ b/net/mosh/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1.1.1 2012/07/20 03:15:29 agc Exp $
+
+don't attempt to do weird things to stdio
+
+--- src/frontend/mosh-server.cc	2012/07/13 15:41:19	1.1
++++ src/frontend/mosh-server.cc	2012/07/13 15:44:09
+@@ -361,9 +361,11 @@
+   /* close file descriptors */
+   if ( !verbose ) {
+     /* Necessary to properly detach on old versions of sshd (e.g. RHEL/CentOS 5.0). */
++#if 0
+     fclose( stdin );
+     fclose( stdout );
+     fclose( stderr );
++#endif
+   }
+ 
+   /* Fork child process */
+@@ -378,9 +380,11 @@
+     /* child */
+ 
+     /* reopen stdio */
++#if 0
+     stdin = fdopen( STDIN_FILENO, "r" );
+     stdout = fdopen( STDOUT_FILENO, "w" );
+     stderr = fdopen( STDERR_FILENO, "w" );
++#endif
+ 
+     /* reenable signals */
+     struct sigaction sa;