testing/mosh: disable utf-8 support

2 files changed, 158 insertions, 5 deletions

diff --git a/testing/mosh/APKBUILD b/testing/mosh/APKBUILD
index fe56728edb..7c5495e6d1 100644
--- a/testing/mosh/APKBUILD
+++ b/testing/mosh/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=mosh
 pkgver=1.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Mobile shell (mosh) surviving disconnects with local echo and line editing"
 url="http://mosh.mit.edu"
 arch="all"
@@ -10,9 +10,22 @@ license="GPL3+"
 depends="perl-io-tty"
 makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty protobuf-dev"
 subpackages="$pkgname-doc"
-source="http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz"
+source="http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz
+	disable-utf8-check.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+        local i
+        cd "$_builddir"
+        for i in $source; do
+                case $i in
+                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+                esac
+        done
+}
+
+
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
@@ -25,6 +38,9 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="c2d918f4d91fdc32546e2e089f9281b2  mosh-1.2.4.tar.gz"
-sha256sums="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46  mosh-1.2.4.tar.gz"
-sha512sums="f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc  mosh-1.2.4.tar.gz"
+md5sums="c2d918f4d91fdc32546e2e089f9281b2  mosh-1.2.4.tar.gz
+521b99f8ed402bceb7b600bc01e71383  disable-utf8-check.patch"
+sha256sums="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46  mosh-1.2.4.tar.gz
+732239ba535072466d997fd09e365d4d86639ac327fc820eaf21ef5a31c37aae  disable-utf8-check.patch"
+sha512sums="f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc  mosh-1.2.4.tar.gz
+e20d876d8355a872d9f311ce6390996b7473ea4215b55c292735fd294eca0b66393cbec3d8c9c387403875b6b6456f026669bd320ba991d6358df1e9508ec437  disable-utf8-check.patch"
diff --git a/testing/mosh/disable-utf8-check.patch b/testing/mosh/disable-utf8-check.patch
new file mode 100644
index 0000000000..61aff2f681
--- /dev/null
+++ b/testing/mosh/disable-utf8-check.patch
@@ -0,0 +1,137 @@
+Index: utils/mosh/Makefile
+===================================================================
+--- utils/mosh/Makefile	(revision 0)
++++ utils/mosh/Makefile	(working copy)
+@@ -0,0 +1,111 @@
++#
++# Copyright (C) 2011-2013 Entware
++#
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++
++PKG_NAME:=mosh
++PKG_VERSION:=1.2.4a-20130327
++PKG_REV:=1b9915fcaf6205f718433b904618e1e5a4602c66
++PKG_RELEASE:=1
++
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
++PKG_SOURCE_URL:=git://github.com/keithw/mosh.git
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_VERSION:=$(PKG_REV)
++
++PKG_FIXUP:=autoreconf
++PKG_INSTALL:=1
++
++include $(INCLUDE_DIR)/package.mk
++
++define Package/mosh/Default
++	SECTION:=utils
++	CATEGORY:=Utilities
++	TITLE:=Mosh mobile shell
++	DEPENDS:=+libncursesw +libopenssl +protobuf
++	URL:=http://mosh.mit.edu/
++	MAINTAINER:=Entware team, wl500g-repo.googlecode.com
++endef
++
++define Package/mosh-client
++$(call Package/mosh/Default)
++ TITLE+= (client)
++endef
++
++define Package/mosh-server
++$(call Package/mosh/Default)
++ TITLE+= (client)
++endef
++
++define Package/mosh-full
++$(call Package/mosh/Default)
++ TITLE+= (client)
++ DEPENDS:= \
++    +mosh-client \
++    +mosh-server \
++    +perlbase-essential \
++    +perlbase-socket \
++    +perlbase-xsloader \
++    +perlbase-getopt \
++    +perlbase-errno \
++    +perlbase-config \
++    +perlbase-io \
++    +perlbase-symbol \
++    +perlbase-selectsaver \
++    +perlbase-posix \
++    +perlbase-autoloader \
++    +perlbase-fcntl \
++    +perlbase-tie
++endef
++
++
++define Package/mosh/Default/description
++ Mosh is a remote terminal application that allows roaming, supports
++ intermittent connectivity, and provides intelligent local echo and line
++ editing of user keystrokes.
++endef
++
++define Package/mosh-client/description
++$(call Package/mosh/Default/description)
++ This is a mosh client.
++endef
++
++define Package/mosh-server/description
++$(call Package/mosh/Default/description)
++ This is a mosh server.
++endef
++
++define Package/mosh-full/description
++$(call Package/mosh/Default/description)
++ This is a full package with perl wrapper script
++endef
++
++
++CONFIGURE_ARGS += \
++	--with-curses=$(STAGING_DIR)/usr \
++	--disable-hardening \
++	--without-utempter \
++
++define Package/mosh-client/install
++	$(INSTALL_DIR) $(1)/usr/bin
++	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh-client $(1)/usr/bin/
++endef
++
++define Package/mosh-server/install
++	$(INSTALL_DIR) $(1)/usr/bin
++	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh-server $(1)/usr/bin/
++endef
++
++define Package/mosh-full/install
++	$(INSTALL_DIR) $(1)/usr/bin
++	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh $(1)/usr/bin/
++endef
++
++$(eval $(call BuildPackage,mosh-client))
++$(eval $(call BuildPackage,mosh-server))
++$(eval $(call BuildPackage,mosh-full))
+Index: utils/mosh/patches/disable-utf8-check.patch
+===================================================================
+--- utils/mosh/patches/disable-utf8-check.patch	(revision 0)
++++ utils/mosh/patches/disable-utf8-check.patch	(working copy)
+@@ -0,0 +1,16 @@
++--- a/src/util/locale_utils.cc
+++++ b/src/util/locale_utils.cc
++@@ -86,10 +86,10 @@ const char *locale_charset( void )
++
++ bool is_utf8_locale( void ) {
++   /* Verify locale calls for UTF-8 */
++-  if ( strcmp( locale_charset(), "UTF-8" ) != 0 &&
++-       strcmp( locale_charset(), "utf-8" ) != 0 ) {
++-    return 0;
++-  }
+++  //if ( strcmp( locale_charset(), "UTF-8" ) != 0 &&
+++  //    strcmp( locale_charset(), "utf-8" ) != 0 ) {
+++  // return 0;
+++  //}
++   return 1;
++ }