From patchwork Sat Jul 25 17:22:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Stewart X-Patchwork-Id: 499989 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 642F61402C7 for ; Sun, 26 Jul 2015 03:23:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 83E3F8C607; Sat, 25 Jul 2015 17:23:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NoqyhgA05DM7; Sat, 25 Jul 2015 17:22:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E11808C40B; Sat, 25 Jul 2015 17:22:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C22191C1059 for ; Sat, 25 Jul 2015 17:22:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD9AE9A3A8 for ; Sat, 25 Jul 2015 17:22:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o6Ayw2Oa6VOd for ; Sat, 25 Jul 2015 17:22:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ob0-f177.google.com (mail-ob0-f177.google.com [209.85.214.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C8C778BF84 for ; Sat, 25 Jul 2015 17:22:56 +0000 (UTC) Received: by obre1 with SMTP id e1so34540831obr.1 for ; Sat, 25 Jul 2015 10:22:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DKe20KZSZ/vcfWFf9M7o7UHKSMEyTTyhRu9XPFVoDnE=; b=nIb1H1W7GkKcEsa/goZAXzjil8MjBPZvTFVbX8hEeBq1mq6Dre8YulTsBneM+I/jYW xq6XrFaMqBWx+VTR/5dH2DJ/Ql6jNBrDSbXOHn8wHZcp41W3sc3bsIZbfJBqryh1TzdI JIFHRYqAdjUhOIGGgEPWPCYw0B4AlxnNcd3dp7QCc+ydUpbz3dCkcQ22JQJNrIiqbp9u yQGRo/Mc+xOcfU7pidHyDeQIhoLFtvEdbW+a9G42A9dFYOcgklNdu7vqSccLnoozS8BQ JBtP080v62e/8vT9rTZkRY0C/pGUNYWrwchpkIKRUEO2PD0dqHHO9BPeAOmsdnjr3xHK LX7A== X-Gm-Message-State: ALoCoQn88+xwFLhDgiCk2XUigfsF+DWBbjmLa6xcYjQ8FZYu7oBLI3ooysd36FQJPKJgrbvHB0UW X-Received: by 10.60.82.67 with SMTP id g3mr20151778oey.29.1437844975987; Sat, 25 Jul 2015 10:22:55 -0700 (PDT) Received: from localhost.localdomain ([64.145.76.193]) by smtp.gmail.com with ESMTPSA id mu5sm7185568obc.4.2015.07.25.10.22.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jul 2015 10:22:55 -0700 (PDT) From: Christian Stewart To: buildroot@buildroot.org Date: Sat, 25 Jul 2015 10:22:52 -0700 Message-Id: <1437844972-11261-1-git-send-email-christian@paral.in> X-Mailer: git-send-email 2.1.4 Cc: Christian Stewart Subject: [Buildroot] [PATCH v6 1/1] mosh: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- [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 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 +--- + 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))