From b3229fb50091ad77b96800578aa7876423fefcaf Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 7 Apr 2017 08:05:10 +0300
Subject: [PATCH] mosh: bump version

---
 .../{mosh-1.2.4.recipe => mosh-1.3.0.recipe}  | 14 ++---
 net-misc/mosh/patches/mosh-1.2.4.patchset     | 57 -------------------
 net-misc/mosh/patches/mosh-1.3.0.patchset     | 32 +++++++++++
 3 files changed, 39 insertions(+), 64 deletions(-)
 rename net-misc/mosh/{mosh-1.2.4.recipe => mosh-1.3.0.recipe} (82%)
 delete mode 100644 net-misc/mosh/patches/mosh-1.2.4.patchset
 create mode 100644 net-misc/mosh/patches/mosh-1.3.0.patchset

diff --git a/net-misc/mosh/mosh-1.2.4.recipe b/net-misc/mosh/mosh-1.3.0.recipe
similarity index 82%
rename from net-misc/mosh/mosh-1.2.4.recipe
rename to net-misc/mosh/mosh-1.3.0.recipe
index 21a4a00a1..cefff89b5 100644
--- a/net-misc/mosh/mosh-1.2.4.recipe
+++ b/net-misc/mosh/mosh-1.3.0.recipe
@@ -8,15 +8,15 @@ over Wi-Fi, cellular, and long-distance links.
 
 Mosh is free software, available for GNU/Linux, FreeBSD, Solaris, Mac OS X, \
 and Android."
-HOMEPAGE="https://mosh.mit.edu/"
-COPYRIGHT="2012-2013 Keith Winstein"
+HOMEPAGE="https://mosh.org/"
+COPYRIGHT="2012-2017 Keith Winstein"
 LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="https://mosh.mit.edu/mosh-$portVersion.tar.gz"
-CHECKSUM_SHA256="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46"
-PATCHES="mosh-1.2.4.patchset"
+REVISION="1"
+SOURCE_URI="https://mosh.org/mosh-$portVersion.tar.gz"
+CHECKSUM_SHA256="320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376"
+PATCHES="mosh-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/net-misc/mosh/patches/mosh-1.2.4.patchset b/net-misc/mosh/patches/mosh-1.2.4.patchset
deleted file mode 100644
index 47063bdfe..000000000
--- a/net-misc/mosh/patches/mosh-1.2.4.patchset
+++ /dev/null
@@ -1,57 +0,0 @@
-From e5eb0d16eefdede24baf2ebd76090d85e594f774 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Sun, 26 Oct 2014 22:05:31 +0100
-Subject: Fix build on Haiku.
-
-
-diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
-index a0345ae..f401017 100644
---- a/src/frontend/Makefile.am
-+++ b/src/frontend/Makefile.am
-@@ -1,7 +1,7 @@
- AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(OPENSSL_CFLAGS)
- AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
- AM_LDFLAGS  = $(HARDEN_LDFLAGS)
--LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(OPENSSL_LIBS)
-+LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(TINFO_LIBS) $(protobuf_LIBS) $(OPENSSL_LIBS)
- 
- mosh_server_LDADD = $(LDADD) $(LIBUTIL)
- 
-diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
-index ae2505f..f809cc0 100644
---- a/src/frontend/mosh-server.cc
-+++ b/src/frontend/mosh-server.cc
-@@ -41,6 +41,7 @@
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <strings.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <pwd.h>
-diff --git a/src/util/pty_compat.cc b/src/util/pty_compat.cc
-index 98fa22a..3bb1c52 100644
---- a/src/util/pty_compat.cc
-+++ b/src/util/pty_compat.cc
-@@ -39,7 +39,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#ifndef __HAIKU__
- #include <sys/stropts.h>
-+#endif
- #include <termios.h>
- 
- #include "pty_compat.h"
-@@ -92,7 +94,7 @@ pid_t my_forkpty( int *amaster, char *name,
-     return -1;
-   }
- 
--#ifndef _AIX
-+#if !defined(_AIX) && !defined(__HAIKU__)
-   if ( ioctl(slave, I_PUSH, "ptem") < 0 ||
-        ioctl(slave, I_PUSH, "ldterm") < 0 ) {
-     perror( "ioctl(I_PUSH)" );
--- 
-1.8.3.4
-
diff --git a/net-misc/mosh/patches/mosh-1.3.0.patchset b/net-misc/mosh/patches/mosh-1.3.0.patchset
new file mode 100644
index 000000000..9b5225d8c
--- /dev/null
+++ b/net-misc/mosh/patches/mosh-1.3.0.patchset
@@ -0,0 +1,32 @@
+From 81cecc46972ee3a10fe7c46bdee66d16cf5fa176 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sun, 26 Oct 2014 22:05:31 +0100
+Subject: Fix build on Haiku.
+
+
+diff --git a/src/util/pty_compat.cc b/src/util/pty_compat.cc
+index c723326..e3288fd 100644
+--- a/src/util/pty_compat.cc
++++ b/src/util/pty_compat.cc
+@@ -39,7 +39,9 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#ifndef __HAIKU__
+ #include <sys/stropts.h>
++#endif
+ #include <termios.h>
+ 
+ #include "pty_compat.h"
+@@ -92,7 +94,7 @@ pid_t my_forkpty( int *amaster, char *name,
+     return -1;
+   }
+ 
+-#ifndef _AIX
++#if !defined(_AIX) && !defined(__HAIKU__)
+   if ( ioctl(slave, I_PUSH, "ptem") < 0 ||
+        ioctl(slave, I_PUSH, "ldterm") < 0 ) {
+     perror( "ioctl(I_PUSH)" );
+-- 
+2.11.0
+