X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7674128223355556f5e97d25ed9ed2e7bb2ab612..a142471328d21c8f95b51e022af580831c4659f4:/packages/mosh/build.sh

diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh
index 1df59307..86a3abdb 100644
--- a/packages/mosh/build.sh
+++ b/packages/mosh/build.sh
@@ -1,23 +1,25 @@
-TERMUX_PKG_HOMEPAGE=http://mosh.mit.edu/
+TERMUX_PKG_HOMEPAGE=https://mosh.org
 TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-TERMUX_PKG_VERSION=1.2.5.20160402
-TERMUX_PKG_SRCURL=http://mosh.mit.edu/mosh-${TERMUX_PKG_VERSION}.tar.gz
-_COMMIT=f30738e3256e90850e945c08624fce90b1ba78a1
-TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/archive/${_COMMIT}.zip
-TERMUX_PKG_FOLDERNAME=mosh-${_COMMIT}
-
-TERMUX_PKG_DEPENDS="libandroid-support, protobuf, ncurses, openssl, libutil, perl, libgnustl"
-
-export PROTOC=$TERMUX_TOPDIR/protobuf/host-build/src/protoc
-
-LDFLAGS+=" -lgnustl_shared"
+TERMUX_PKG_VERSION=1.3.0~rc2
+TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-1.3.0-rc2/mosh-1.3.0-rc2.tar.gz
+TERMUX_PKG_SHA256=8b6bff33c469ccea0438877c68774a6b2ded6fccd99b1db180222da82f0654ae
+TERMUX_PKG_FOLDERNAME=mosh-1.3.0-rc2
+TERMUX_PKG_DEPENDS="libandroid-support, libprotobuf, ncurses, openssl, openssh, libutil"
 
 termux_step_pre_configure () {
+	export PROTOC=$TERMUX_TOPDIR/libprotobuf/host-build/src/protoc
+
 	cd $TERMUX_PKG_SRCDIR
 	./autogen.sh
 }
 
 termux_step_post_make_install () {
-	# Avoid env and specify perl directly:
-	sed -i'' '1 s|^.*$|#! /bin/perl|' $TERMUX_PREFIX/bin/mosh
+	cd $TERMUX_PREFIX/bin
+	mv mosh mosh.pl
+	$CXX $CXXFLAGS $LDFLAGS \
+		-isystem $TERMUX_PREFIX/include \
+		-lutil \
+		-DPACKAGE_VERSION=\"$TERMUX_PKG_VERSION\" \
+		-std=c++11 -Wall -Wextra -Werror \
+		$TERMUX_PKG_BUILDER_DIR/mosh.cc -o mosh
 }