aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2013-12-06 13:55:22 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2013-12-06 13:55:22 +0000
commit7a63f93f4ed538d69edaa283b9f5047d817802d3 (patch)
treef132cb10009a379fa3e041d86efa4882f2da1118 /testing
parenta0487e87e4fc36321c248b128d4ec15606a402c7 (diff)
downloadaports-7a63f93f4ed538d69edaa283b9f5047d817802d3.tar.bz2
aports-7a63f93f4ed538d69edaa283b9f5047d817802d3.tar.xz
testing/mosh: get rid of locale and utf8
Diffstat (limited to 'testing')
-rw-r--r--testing/mosh/APKBUILD6
-rw-r--r--testing/mosh/disable-utf8-check.patch153
2 files changed, 19 insertions, 140 deletions
diff --git a/testing/mosh/APKBUILD b/testing/mosh/APKBUILD
index 7c5495e6d1..b9aa682f0c 100644
--- a/testing/mosh/APKBUILD
+++ b/testing/mosh/APKBUILD
@@ -39,8 +39,8 @@ package() {
}
md5sums="c2d918f4d91fdc32546e2e089f9281b2 mosh-1.2.4.tar.gz
-521b99f8ed402bceb7b600bc01e71383 disable-utf8-check.patch"
+f9e6a14dc7a300d95625265ab5e847d7 disable-utf8-check.patch"
sha256sums="e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46 mosh-1.2.4.tar.gz
-732239ba535072466d997fd09e365d4d86639ac327fc820eaf21ef5a31c37aae disable-utf8-check.patch"
+60416de55be97a3c80d3b89e44b8602a8b4dcca6de8e70cb15d2c96e30a7de42 disable-utf8-check.patch"
sha512sums="f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc mosh-1.2.4.tar.gz
-e20d876d8355a872d9f311ce6390996b7473ea4215b55c292735fd294eca0b66393cbec3d8c9c387403875b6b6456f026669bd320ba991d6358df1e9508ec437 disable-utf8-check.patch"
+3c3b60b9aa837d76e53855907c59c3b1648e3a2e166b3ec902aec117e4e56d850553a089401a3bb9901412c125d30d4dac76d204721a17286a0ddc922508f6fc disable-utf8-check.patch"
diff --git a/testing/mosh/disable-utf8-check.patch b/testing/mosh/disable-utf8-check.patch
index 61aff2f681..3d8716aa15 100644
--- a/testing/mosh/disable-utf8-check.patch
+++ b/testing/mosh/disable-utf8-check.patch
@@ -1,137 +1,16 @@
-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;
-+ }
+--- 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;
+ }