From cb9d60339fcc57b984ca67c4300b4c67573a069d Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Fri, 18 Mar 2022 11:38:26 -0700 Subject: [PATCH] mosh: update to 20220318 Signed-off-by: Joseph Benden --- .../fix-memory-blowup-on-large-paste.patch | 35 ------------------- srcpkgs/mosh/template | 15 +++++--- 2 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch diff --git a/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch b/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch deleted file mode 100644 index efe3fd806969..000000000000 --- a/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 91de8901f5da04bc2abba3242164b0a330764d49 Mon Sep 17 00:00:00 2001 -From: John Hood -Date: Sat, 6 May 2017 23:28:29 -0400 -Subject: [PATCH] Don't do prediction on large pastes into mosh-client. - -Fixes #482, memory use blowup on large pastes. mosh is still pretty slow -about copying pastes through, though. ---- - src/frontend/stmclient.cc | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git src/frontend/stmclient.cc src/frontend/stmclient.cc -index 7eff0af3..450d068a 100644 ---- a/src/frontend/stmclient.cc -+++ b/src/frontend/stmclient.cc -@@ -318,10 +318,18 @@ bool STMClient::process_user_input( int fd ) - if ( !network->shutdown_in_progress() ) { - overlays.get_prediction_engine().set_local_frame_sent( network->get_sent_state_last() ); - -+ /* Don't predict for bulk data. */ -+ bool paste = bytes_read > 100; -+ if ( paste ) { -+ overlays.get_prediction_engine().reset(); -+ } -+ - for ( int i = 0; i < bytes_read; i++ ) { - char the_byte = buf[ i ]; - -- overlays.get_prediction_engine().new_user_byte( the_byte, local_framebuffer ); -+ if ( !paste ) { -+ overlays.get_prediction_engine().new_user_byte( the_byte, local_framebuffer ); -+ } - - if ( quit_sequence_started ) { - if ( the_byte == '.' ) { /* Quit sequence is Ctrl-^ . */ diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index 3ff5d593ea64..f1b9a2fe3f47 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,19 +1,24 @@ # Template file for 'mosh' pkgname=mosh -version=1.3.2 -revision=24 +version=20220318 +revision=1 +_commit=dbe419d0e069df3fedc212d456449f64d0280c76 +_repo="https://github.com/mobile-shell/mosh" +wrksrc="mosh-${_commit}" build_style=gnu-configure -hostmakedepends="pkg-config protobuf" +hostmakedepends="automake pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel" depends="perl-IO-Tty" short_desc="Mobile shell, remote terminal application that allows roaming" maintainer="Nathan Owens " license="GPL-3.0-or-later" homepage="https://mosh.org/" -distfiles="https://mosh.org/mosh-${version}.tar.gz" -checksum=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 +distfiles="${_repo}/archive/${_commit}.tar.gz" +checksum=49268ce1a81b251dffdd117dbc687d86cb80b18e3028019af5fddfa5c04ac1a9 pre_configure() { # make local.test always succeed. It fails due to missing X server in chroot. printf "%s\n" "#!/bin/sh" ":" > src/tests/local.test + + autoreconf -fi }