aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2013-12-06 10:59:59 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2013-12-06 11:00:05 +0000
commit6a438c7e95970b29c025cdef602045080d2ec15a (patch)
treec0197ecbe6a2e406525a384587cb5a50332b3fae
parent43e198d889b922bf63b7826f0efe16b298998eca (diff)
downloadalpine_aports-6a438c7e95970b29c025cdef602045080d2ec15a.tar.bz2
alpine_aports-6a438c7e95970b29c025cdef602045080d2ec15a.tar.xz
alpine_aports-6a438c7e95970b29c025cdef602045080d2ec15a.zip
testing/mosh: disable utf-8 support
Diffstat
-rw-r--r--testing/mosh/APKBUILD26
-rw-r--r--testing/mosh/disable-utf8-check.patch137
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 @@
2# Maintainer: Francesco Colista <francesco.colista@gmail.com> 2# Maintainer: Francesco Colista <francesco.colista@gmail.com>
3pkgname=mosh 3pkgname=mosh
4pkgver=1.2.4 4pkgver=1.2.4
5pkgrel=0 5pkgrel=1
6pkgdesc="Mobile shell (mosh) surviving disconnects with local echo and line editing" 6pkgdesc="Mobile shell (mosh) surviving disconnects with local echo and line editing"
7url="http://mosh.mit.edu" 7url="http://mosh.mit.edu"
8arch="all" 8arch="all"
@@ -10,9 +10,22 @@ license="GPL3+"
10depends="perl-io-tty" 10depends="perl-io-tty"
11makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty protobuf-dev" 11makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty protobuf-dev"
12subpackages="$pkgname-doc" 12subpackages="$pkgname-doc"
13source="http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz" 13source="http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz
14 disable-utf8-check.patch"
14 15
15_builddir="$srcdir"/$pkgname-$pkgver 16_builddir="$srcdir"/$pkgname-$pkgver
17
18prepare() {
19 local i
20 cd "$_builddir"
21 for i in $source; do
22 case $i in
23 *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
24 esac
25 done
26}
27
28
16build() { 29build() {
17 cd "$_builddir" 30 cd "$_builddir"
18 ./configure --prefix=/usr \ 31 ./configure --prefix=/usr \
@@ -25,6 +38,9 @@ package() {
25 make DESTDIR="$pkgdir" install || return 1 38 make DESTDIR="$pkgdir" install || return 1
26} 39}
27 40
28md5sums="c2d918f4d91fdc32546e2e089f9281b2 mosh-1.2.4.tar.gz" 41md5sums="c2d918f4d91fdc32546e2e089f9281b2 mosh-1.2.4.tar.gz
29sha256sums="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46 mosh-1.2.4.tar.gz" 42521b99f8ed402bceb7b600bc01e71383 disable-utf8-check.patch"
30sha512sums="f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc mosh-1.2.4.tar.gz" 43sha256sums="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46 mosh-1.2.4.tar.gz
44732239ba535072466d997fd09e365d4d86639ac327fc820eaf21ef5a31c37aae disable-utf8-check.patch"
45sha512sums="f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc mosh-1.2.4.tar.gz
46e20d876d8355a872d9f311ce6390996b7473ea4215b55c292735fd294eca0b66393cbec3d8c9c387403875b6b6456f026669bd320ba991d6358df1e9508ec437 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 @@
1Index: utils/mosh/Makefile
2===================================================================
3--- utils/mosh/Makefile (revision 0)
4+++ utils/mosh/Makefile (working copy)
5@@ -0,0 +1,111 @@
6+#
7+# Copyright (C) 2011-2013 Entware
8+#
9+# This is free software, licensed under the GNU General Public License v2.
10+# See /LICENSE for more information.
11+#
12+
13+include $(TOPDIR)/rules.mk
14+
15+PKG_NAME:=mosh
16+PKG_VERSION:=1.2.4a-20130327
17+PKG_REV:=1b9915fcaf6205f718433b904618e1e5a4602c66
18+PKG_RELEASE:=1
19+
20+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
21+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
22+PKG_SOURCE_URL:=git://github.com/keithw/mosh.git
23+PKG_SOURCE_PROTO:=git
24+PKG_SOURCE_VERSION:=$(PKG_REV)
25+
26+PKG_FIXUP:=autoreconf
27+PKG_INSTALL:=1
28+
29+include $(INCLUDE_DIR)/package.mk
30+
31+define Package/mosh/Default
32+ SECTION:=utils
33+ CATEGORY:=Utilities
34+ TITLE:=Mosh mobile shell
35+ DEPENDS:=+libncursesw +libopenssl +protobuf
36+ URL:=http://mosh.mit.edu/
37+ MAINTAINER:=Entware team, wl500g-repo.googlecode.com
38+endef
39+
40+define Package/mosh-client
41+$(call Package/mosh/Default)
42+ TITLE+= (client)
43+endef
44+
45+define Package/mosh-server
46+$(call Package/mosh/Default)
47+ TITLE+= (client)
48+endef
49+
50+define Package/mosh-full
51+$(call Package/mosh/Default)
52+ TITLE+= (client)
53+ DEPENDS:= \
54+ +mosh-client \
55+ +mosh-server \
56+ +perlbase-essential \
57+ +perlbase-socket \
58+ +perlbase-xsloader \
59+ +perlbase-getopt \
60+ +perlbase-errno \
61+ +perlbase-config \
62+ +perlbase-io \
63+ +perlbase-symbol \
64+ +perlbase-selectsaver \
65+ +perlbase-posix \
66+ +perlbase-autoloader \
67+ +perlbase-fcntl \
68+ +perlbase-tie
69+endef
70+
71+
72+define Package/mosh/Default/description
73+ Mosh is a remote terminal application that allows roaming, supports
74+ intermittent connectivity, and provides intelligent local echo and line
75+ editing of user keystrokes.
76+endef
77+
78+define Package/mosh-client/description
79+$(call Package/mosh/Default/description)
80+ This is a mosh client.
81+endef
82+
83+define Package/mosh-server/description
84+$(call Package/mosh/Default/description)
85+ This is a mosh server.
86+endef
87+
88+define Package/mosh-full/description
89+$(call Package/mosh/Default/description)
90+ This is a full package with perl wrapper script
91+endef
92+
93+
94+CONFIGURE_ARGS += \
95+ --with-curses=$(STAGING_DIR)/usr \
96+ --disable-hardening \
97+ --without-utempter \
98+
99+define Package/mosh-client/install
100+ $(INSTALL_DIR) $(1)/usr/bin
101+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh-client $(1)/usr/bin/
102+endef
103+
104+define Package/mosh-server/install
105+ $(INSTALL_DIR) $(1)/usr/bin
106+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh-server $(1)/usr/bin/
107+endef
108+
109+define Package/mosh-full/install
110+ $(INSTALL_DIR) $(1)/usr/bin
111+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mosh $(1)/usr/bin/
112+endef
113+
114+$(eval $(call BuildPackage,mosh-client))
115+$(eval $(call BuildPackage,mosh-server))
116+$(eval $(call BuildPackage,mosh-full))
117Index: utils/mosh/patches/disable-utf8-check.patch
118===================================================================
119--- utils/mosh/patches/disable-utf8-check.patch (revision 0)
120+++ utils/mosh/patches/disable-utf8-check.patch (working copy)
121@@ -0,0 +1,16 @@
122+--- a/src/util/locale_utils.cc
123++++ b/src/util/locale_utils.cc
124+@@ -86,10 +86,10 @@ const char *locale_charset( void )
125+
126+ bool is_utf8_locale( void ) {
127+ /* Verify locale calls for UTF-8 */
128+- if ( strcmp( locale_charset(), "UTF-8" ) != 0 &&
129+- strcmp( locale_charset(), "utf-8" ) != 0 ) {
130+- return 0;
131+- }
132++ //if ( strcmp( locale_charset(), "UTF-8" ) != 0 &&
133++ // strcmp( locale_charset(), "utf-8" ) != 0 ) {
134++ // return 0;
135++ //}
136+ return 1;
137+ }
© 2015 Mike Crute