Fred <open...@crowsons.com> writes: > Hi Hi ports@
Hi Fred, > Attached, and inline is a simple update to mosh 1.2.5 I think you missed my previous mail about mosh-1.2.5: http://marc.info/?l=openbsd-ports&m=143767943718038&w=2 Please find the original diff at the end of this mail. > upstream have > incorporated some fixes so the patches are no longer required. Well, there are some things that can go, and some that should be kept. > Tested on amd64, i386, and macppc. > > Thanks Thanks for your work. An IPv6-related problem was reported by Stuart Henderson when I published the 1.2.5 update. It was also reported upstream by a FreeBSD user. https://github.com/mobile-shell/mosh/issues/657 I'm not yet sure how to address that problem. > 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 This was probably due to a buggy stack protector / PIE problem. I'll remove this line. > 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 If we want to try to support arm, this patch should be updated. > ---- 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 -r1.5 Makefile --- Makefile 17 Oct 2013 20:58:28 -0000 1.5 +++ Makefile 23 Jul 2015 19:16:15 -0000 @@ -1,12 +1,8 @@ # $OpenBSD: Makefile,v 1.5 2013/10/17 20:58:28 jca Exp $ -BROKEN-arm = erratic runtime behaviour - COMMENT = mobile shell -DISTNAME = mosh-1.2.4 - -REVISION = 1 +DISTNAME = mosh-1.2.5 CATEGORIES = net @@ -24,13 +20,11 @@ MASTER_SITES = ${HOMEPAGE} LIB_DEPENDS = devel/protobuf -MAKE_FLAGS = CPPFLAGS='-Dbe16toh=betoh16 -Dbe64toh=betoh64' - SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu # --enable-hardening forces PIE on, which doesn't work on all arches # pick only ld(1) -z now to match upstream CONFIGURE_ARGS = --disable-hardening -CONFIGURE_ENV = ac_cv_have_decl_htobe64=yes LDFLAGS="-Wl,-z,now" +CONFIGURE_ENV = LDFLAGS="-Wl,-z,now" .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/mosh/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 21 Apr 2013 19:46:37 -0000 1.1.1.1 +++ distinfo 23 Jul 2015 18:22:58 -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: /cvs/ports/net/mosh/patches/patch-src_crypto_ocb_cc,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_crypto_ocb_cc --- patches/patch-src_crypto_ocb_cc 9 Oct 2013 07:33:41 -0000 1.1 +++ patches/patch-src_crypto_ocb_cc 23 Jul 2015 18:26:43 -0000 @@ -2,13 +2,13 @@ $OpenBSD: patch-src_crypto_ocb_cc,v 1.1 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 +--- src/crypto/ocb.cc.orig Thu Jul 23 12:26:21 2015 ++++ src/crypto/ocb.cc Thu Jul 23 12:26:37 2015 @@ -298,7 +298,7 @@ return swap_if_le(rval); } -- #if __GNUC__ && __arm__ +- #if __GNUC__ && !__clang__ && __arm__ + #if 0 static inline block double_block(block b) { __asm__ ("adds %1,%1,%1\n\t" Index: patches/patch-src_network_transportfragment_cc =================================================================== RCS file: /cvs/ports/net/mosh/patches/patch-src_network_transportfragment_cc,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_network_transportfragment_cc --- patches/patch-src_network_transportfragment_cc 21 Apr 2013 19:46:37 -0000 1.1.1.1 +++ patches/patch-src_network_transportfragment_cc 23 Jul 2015 18:26:55 -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" -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
