Hi Hi ports@

Attached, and inline is a simple update to mosh 1.2.5 upstream have incorporated some fixes so the patches are no longer required.

Tested on amd64, i386, and macppc.

Thanks

Fred
--
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mosh/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile    17 Oct 2013 20:58:28 -0000      1.5
+++ Makefile    1 Sep 2015 12:30:00 -0000
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
+# $OpenBSD$

 BROKEN-arm =           erratic runtime behaviour

 COMMENT =              mobile shell

-DISTNAME =             mosh-1.2.4
-
-REVISION =             1
+DISTNAME =             mosh-1.2.5

 CATEGORIES =           net

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/mosh/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo    21 Apr 2013 19:46:37 -0000      1.1.1.1
+++ distinfo    1 Sep 2015 12:30:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.2.4.tar.gz) = 500NMjImBG5ALdRpoXYHX8IBO2mw5nzqSXYslXF130Y=
-SIZE (mosh-1.2.4.tar.gz) = 283047
+SHA256 (mosh-1.2.5.tar.gz) = GvgJ5ddHwzOoUvv3rNv001TcS7woOeOv5c95gZAHS+M=
+SIZE (mosh-1.2.5.tar.gz) = 308857
Index: patches/patch-src_crypto_ocb_cc
===================================================================
RCS file: patches/patch-src_crypto_ocb_cc
diff -N patches/patch-src_crypto_ocb_cc
--- patches/patch-src_crypto_ocb_cc     9 Oct 2013 07:33:41 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_crypto_ocb_cc,v 1.1 2013/10/09 07:33:41 jca Exp $
-Use generic code on ARM instead of asm because of some unsupported
-instructions.
-Introduced by https://github.com/keithw/mosh/issues/86
---- src/crypto/ocb.cc.orig     Tue Oct  8 11:57:42 2013
-+++ src/crypto/ocb.cc  Tue Oct  8 11:58:01 2013
-@@ -298,7 +298,7 @@
-         return swap_if_le(rval);
-       }
-
--      #if __GNUC__ && __arm__
-+      #if 0
-       static inline block double_block(block b) {
-               __asm__ ("adds %1,%1,%1\n\t"
-                                "adcs %H1,%H1,%H1\n\t"
Index: patches/patch-src_network_transportfragment_cc
===================================================================
RCS file: patches/patch-src_network_transportfragment_cc
diff -N patches/patch-src_network_transportfragment_cc
--- patches/patch-src_network_transportfragment_cc 21 Apr 2013 19:46:37 -0000 1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_network_transportfragment_cc,v 1.1.1.1 2013/04/21 19:46:37 sthen Exp $
---- src/network/transportfragment.cc.orig      Fri Feb 15 04:18:44 2013
-+++ src/network/transportfragment.cc   Fri Feb 15 04:18:59 2013
-@@ -30,6 +30,7 @@
-     also delete it here.
- */
-
-+#include <sys/types.h>
- #include <assert.h>
-
- #include "byteorder.h"
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mosh/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile	17 Oct 2013 20:58:28 -0000	1.5
+++ Makefile	1 Sep 2015 12:30:00 -0000
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $
+# $OpenBSD$
 
 BROKEN-arm =		erratic runtime behaviour
 
 COMMENT =		mobile shell
 
-DISTNAME =		mosh-1.2.4
-
-REVISION =		1
+DISTNAME =		mosh-1.2.5
 
 CATEGORIES =		net
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/mosh/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo	21 Apr 2013 19:46:37 -0000	1.1.1.1
+++ distinfo	1 Sep 2015 12:30:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.2.4.tar.gz) = 500NMjImBG5ALdRpoXYHX8IBO2mw5nzqSXYslXF130Y=
-SIZE (mosh-1.2.4.tar.gz) = 283047
+SHA256 (mosh-1.2.5.tar.gz) = GvgJ5ddHwzOoUvv3rNv001TcS7woOeOv5c95gZAHS+M=
+SIZE (mosh-1.2.5.tar.gz) = 308857
Index: patches/patch-src_crypto_ocb_cc
===================================================================
RCS file: patches/patch-src_crypto_ocb_cc
diff -N patches/patch-src_crypto_ocb_cc
--- patches/patch-src_crypto_ocb_cc	9 Oct 2013 07:33:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_crypto_ocb_cc,v 1.1 2013/10/09 07:33:41 jca Exp $
-Use generic code on ARM instead of asm because of some unsupported
-instructions.
-Introduced by https://github.com/keithw/mosh/issues/86
---- src/crypto/ocb.cc.orig	Tue Oct  8 11:57:42 2013
-+++ src/crypto/ocb.cc	Tue Oct  8 11:58:01 2013
-@@ -298,7 +298,7 @@
-         return swap_if_le(rval);
- 	}
- 
--	#if __GNUC__ && __arm__
-+	#if 0
- 	static inline block double_block(block b) {
- 		__asm__ ("adds %1,%1,%1\n\t"
- 				 "adcs %H1,%H1,%H1\n\t"
Index: patches/patch-src_network_transportfragment_cc
===================================================================
RCS file: patches/patch-src_network_transportfragment_cc
diff -N patches/patch-src_network_transportfragment_cc
--- patches/patch-src_network_transportfragment_cc	21 Apr 2013 19:46:37 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_network_transportfragment_cc,v 1.1.1.1 2013/04/21 19:46:37 sthen Exp $
---- src/network/transportfragment.cc.orig	Fri Feb 15 04:18:44 2013
-+++ src/network/transportfragment.cc	Fri Feb 15 04:18:59 2013
-@@ -30,6 +30,7 @@
-     also delete it here.
- */
- 
-+#include <sys/types.h>
- #include <assert.h>
- 
- #include "byteorder.h"

Reply via email to