| Message ID | 1437844972-11261-1-git-send-email-christian@paral.in |
|---|---|
| State | Superseded |
| Headers | show |
Christian, All, On 2015-07-25 10:22 -0700, Christian Stewart spake thusly: > Adding mosh, the mobile shell. Mosh uses ssh or dropbear as an initial transport to > start mosh-server which uses UDP to communicate with the client. > Supports a predictive model to enhance performance on weak connections > and compensate for general lag. Also supports disconnections and > reconnections seamlessly. > > Signed-off-by: Christian Stewart <christian@paral.in> [--SNIP--] > diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash > new file mode 100644 > index 0000000..a78cb33 > --- /dev/null > +++ b/package/mosh/mosh.hash > @@ -0,0 +1 @@ > +sha256 637adb7f67406447e9264d30468fe69a6d5e8f97518ef133d794cdc65483fa54 mosh-1.2.5.tar.gz We usually identify where that hash comes from. Sicne upstream actually did publish that hash, we can refer to it: # From: http://mailman.mit.edu/pipermail/mosh-users/2015-July/000283.html sha256 637adb7f67406447e9264d30468fe69a6d5e8f97518ef133d794cdc65483fa54 mosh-1.2.5.tar.gz > diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk > new file mode 100644 > index 0000000..142e08e > --- /dev/null > +++ b/package/mosh/mosh.mk > @@ -0,0 +1,13 @@ > +################################################################################ > +# > +# mosh > +# > +################################################################################ > + > +MOSH_VERSION = 1.2.5 > +MOSH_SITE = https://mosh.mit.edu/mosh-$(MOSH_VERSION).tar.gz Eh, how could I miss that on the previous review? The _SITE variables is just the "directory part" of the URL, like: MOSH_SITE = https://mosh.mit.edu/ Then Buildroot appends the archive filename to that, and the archive filename can be specified with: MOSH_SOURCE = mosh-$(MOSH_VERSION).tar.gz But since that's the default, there's no need to specify it; so only keep the _SITE variable. Sorry for asking an Nth iteration... :-/ Regards, Yann E. MORIN. > +MOSH_DEPENDENCIES = zlib ncurses protobuf openssl > +MOSH_LICENSE = GPLv3+ with exception > +MOSH_LICENSE_FILES = COPYING COPYING.iOS > + > +$(eval $(autotools-package)) > -- > 2.1.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Christian, All, On 2015-07-25 10:22 -0700, Christian Stewart spake thusly: > Adding mosh, the mobile shell. Mosh uses ssh or dropbear as an initial transport to > start mosh-server which uses UDP to communicate with the client. > Supports a predictive model to enhance performance on weak connections > and compensate for general lag. Also supports disconnections and > reconnections seamlessly. > > Signed-off-by: Christian Stewart <christian@paral.in> [--SNIP--] > diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash > new file mode 100644 > index 0000000..a78cb33 > --- /dev/null > +++ b/package/mosh/mosh.hash > @@ -0,0 +1 @@ > +sha256 637adb7f67406447e9264d30468fe69a6d5e8f97518ef133d794cdc65483fa54 mosh-1.2.5.tar.gz BTEW, this hash is incorrect, when you compare to what was published by upstream. And when I do check here, I get the same hash as publushed, not yours. Regards, Yann E. MORIN.
All, The correct hash is: # From: http://mailman.mit.edu/pipermail/mosh-users/2015-July/000283.html sha256 1af809e5d747c333a852fbf7acdbf4d354dc4bbc2839e3afe5cf798190074be3 mosh-1.2.5.tar.gz Oh well. I've respun this so many times in the last couple days I'll wait a bit before sending it again. :) Christian On Sat, Jul 25, 2015 at 10:57 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Christian, All, > > On 2015-07-25 10:22 -0700, Christian Stewart spake thusly: > > Adding mosh, the mobile shell. Mosh uses ssh or dropbear as an initial > transport to > > start mosh-server which uses UDP to communicate with the client. > > Supports a predictive model to enhance performance on weak connections > > and compensate for general lag. Also supports disconnections and > > reconnections seamlessly. > > > > Signed-off-by: Christian Stewart <christian@paral.in> > [--SNIP--] > > diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash > > new file mode 100644 > > index 0000000..a78cb33 > > --- /dev/null > > +++ b/package/mosh/mosh.hash > > @@ -0,0 +1 @@ > > +sha256 637adb7f67406447e9264d30468fe69a6d5e8f97518ef133d794cdc65483fa54 > mosh-1.2.5.tar.gz > > BTEW, this hash is incorrect, when you compare to what was published by > upstream. And when I do check here, I get the same hash as publushed, > not yours. > > Regards, > Yann E. MORIN. > > -- > > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is > no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > > '------------------------------^-------^------------------^--------------------' >
diff --git a/package/Config.in b/package/Config.in index cfa7512..d1e6640 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1250,6 +1250,7 @@ endif source "package/mongoose/Config.in" source "package/mongrel2/Config.in" source "package/monkey/Config.in" + source "package/mosh/Config.in" source "package/mosquitto/Config.in" source "package/mrouted/Config.in" source "package/mtr/Config.in" diff --git a/package/mosh/0001-remove-system-locale-calls.patch b/package/mosh/0001-remove-system-locale-calls.patch new file mode 100644 index 0000000..114e6ed --- /dev/null +++ b/package/mosh/0001-remove-system-locale-calls.patch @@ -0,0 +1,46 @@ +The locale command is not available on many systems. As this variable +is unused and appears to have been written with the intent of +displaying the locale settings to the user, it's not really necessary. +As this breaks Mosh on a lot of systems, it's best to remove the calls. + +Upstream status: refused, see: https://github.com/keithw/mosh/issues/650 + +Signed-off-by: Christian Stewart <christian@paral.in> +--- + src/frontend/mosh-server.cc | 4 +++- + src/frontend/stmclient.cc | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc +index 76ed2ed..0d2f222 100644 +--- a/src/frontend/mosh-server.cc ++++ b/src/frontend/mosh-server.cc +@@ -313,7 +313,9 @@ int main( int argc, char *argv[] ) + fprintf( stderr, "mosh-server needs a UTF-8 native locale to run.\n\n" ); + fprintf( stderr, "Unfortunately, the local environment (%s) specifies\nthe character set \"%s\",\n\n", native_ctype.str().c_str(), native_charset.c_str() ); + fprintf( stderr, "The client-supplied environment (%s) specifies\nthe character set \"%s\".\n\n", client_ctype.str().c_str(), client_charset.c_str() ); +- int unused __attribute((unused)) = system( "locale" ); ++ ++ fprintf( stderr, "This is a buildroot system, 'locale' debug output has been removed." ); ++ + exit( 1 ); + } + } +diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc +index 9e4d916..06fac8b 100644 +--- a/src/frontend/stmclient.cc ++++ b/src/frontend/stmclient.cc +@@ -85,7 +85,9 @@ void STMClient::init( void ) + + fprintf( stderr, "mosh-client needs a UTF-8 native locale to run.\n\n" ); + fprintf( stderr, "Unfortunately, the client's environment (%s) specifies\nthe character set \"%s\".\n\n", native_ctype.str().c_str(), native_charset.c_str() ); +- int unused __attribute((unused)) = system( "locale" ); ++ ++ fprintf( stderr, "This is a buildroot system, 'locale' debug output has been removed." ); ++ + exit( 1 ); + } + +-- +2.1.4 + diff --git a/package/mosh/Config.in b/package/mosh/Config.in new file mode 100644 index 0000000..632a190 --- /dev/null +++ b/package/mosh/Config.in @@ -0,0 +1,23 @@ +comment "mosh needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "mosh needs a host architecture of x64 or x86" + depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 + depends on !(BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86") + +config BR2_PACKAGE_MOSH + bool "mosh" + depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS #protobuf + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT + select BR2_PACKAGE_ZLIB + help + Remote terminal application that supports intermittent connectivity, + allows roaming, and provides speculative local echo and line editing + of user keystrokes. + + https://mosh.mit.edu diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash new file mode 100644 index 0000000..a78cb33 --- /dev/null +++ b/package/mosh/mosh.hash @@ -0,0 +1 @@ +sha256 637adb7f67406447e9264d30468fe69a6d5e8f97518ef133d794cdc65483fa54 mosh-1.2.5.tar.gz diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk new file mode 100644 index 0000000..142e08e --- /dev/null +++ b/package/mosh/mosh.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# mosh +# +################################################################################ + +MOSH_VERSION = 1.2.5 +MOSH_SITE = https://mosh.mit.edu/mosh-$(MOSH_VERSION).tar.gz +MOSH_DEPENDENCIES = zlib ncurses protobuf openssl +MOSH_LICENSE = GPLv3+ with exception +MOSH_LICENSE_FILES = COPYING COPYING.iOS + +$(eval $(autotools-package))
Adding mosh, the mobile shell. Mosh uses ssh or dropbear as an initial transport to start mosh-server which uses UDP to communicate with the client. Supports a predictive model to enhance performance on weak connections and compensate for general lag. Also supports disconnections and reconnections seamlessly. Signed-off-by: Christian Stewart <christian@paral.in> --- [All: - Fixed licensing issues - Fixed dependencies - Added note about upstream logging rejection] package/Config.in | 1 + package/mosh/0001-remove-system-locale-calls.patch | 46 ++++++++++++++++++++++ package/mosh/Config.in | 23 +++++++++++ package/mosh/mosh.hash | 1 + package/mosh/mosh.mk | 13 ++++++ 5 files changed, 84 insertions(+) create mode 100644 package/mosh/0001-remove-system-locale-calls.patch create mode 100644 package/mosh/Config.in create mode 100644 package/mosh/mosh.hash create mode 100644 package/mosh/mosh.mk