From 2d17425f020dd1efabdd11c9d10e1166c294eff9 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Mon, 24 Jul 2017 07:21:55 +0000
Subject: main/mosh: upgrade to 1.3.2

---
 main/mosh/APKBUILD                 | 10 ++++------
 main/mosh/disable-utf8-check.patch | 39 --------------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 main/mosh/disable-utf8-check.patch

diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD
index 066d5ea85c..ce3a186cbd 100644
--- a/main/mosh/APKBUILD
+++ b/main/mosh/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=mosh
-pkgver=1.3.0
-pkgrel=4
+pkgver=1.3.2
+pkgrel=0
 pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
 url="https://mosh.org"
 arch="all"
@@ -10,11 +10,10 @@ license="GPL3+"
 depends="$pkgname-client $pkgname-server"
 checkdepends="tmux perl"
 makedepends="ncurses-dev zlib-dev libressl-dev perl-dev perl-io-tty
-	protobuf-dev automake autoconf libtool"
+	protobuf-dev automake autoconf libtool gzip"
 subpackages="$pkgname-doc $pkgname-client $pkgname-server
 	$pkgname-bash-completion:bashcomp:noarch"
 source="https://mosh.org/$pkgname-$pkgver.tar.gz
-	disable-utf8-check.patch
 	fix-ppc64le-build-with-musl.patch"
 
 builddir="$srcdir"/$pkgname-$pkgver
@@ -78,6 +77,5 @@ client() {
 		"$subpkgdir"/usr/bin/
 }
 
-sha512sums="2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b  mosh-1.3.0.tar.gz
-802afc138a31155352e403e61204c552107c624cd4f1da3141a956ea68a4c652df9b02baf72397e97af032c70feb5396a4262a80d5d3762cba9afd9acf9da660  disable-utf8-check.patch
+sha512sums="f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769  mosh-1.3.2.tar.gz
 a276dde98a2dab63ad9c9c05468c55983a95f482878c5694713810b561eae1ea5618efc72431a17ee5b5014b12ee9709c6a8cbf582620294e7888cc837cd073c  fix-ppc64le-build-with-musl.patch"
diff --git a/main/mosh/disable-utf8-check.patch b/main/mosh/disable-utf8-check.patch
deleted file mode 100644
index 4cac6582cf..0000000000
--- a/main/mosh/disable-utf8-check.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -upr mosh-1.3.0.orig/src/tests/e2e-test-subrs mosh-1.3.0/src/tests/e2e-test-subrs
---- mosh-1.3.0.orig/src/tests/e2e-test-subrs	2017-04-02 13:48:55.002568475 +0200
-+++ mosh-1.3.0/src/tests/e2e-test-subrs	2017-04-02 13:50:03.839053154 +0200
-@@ -59,19 +59,5 @@ chr()
- # or C.UTF-8.
- set_locale()
- {
--    # Test for a usable locale.
--    map=$(locale charmap 2>/dev/null)
--    if [ "$map" = "utf-8" ] || [ "$map" = "UTF-8" ]; then
--	return 0
--    fi
--    # Attempt to find/set a usable locale.
--    for i in en_US.UTF-8 en_US.utf8 C.UTF-8; do
--	map="$(env LANG=$i locale charmap 2>/dev/null)"
--	if [ "$map" = "utf-8" ] || [ "$map" = "UTF-8" ]; then
--	    export LANG=$i LC_ALL=''
--	    return 0
--	fi
--    done
--    # Fail.
--    return 1
-+    return 0
- }
-diff -upr mosh-1.3.0.orig/src/util/locale_utils.cc mosh-1.3.0/src/util/locale_utils.cc
---- mosh-1.3.0.orig/src/util/locale_utils.cc	2017-04-02 13:48:54.989235240 +0200
-+++ mosh-1.3.0/src/util/locale_utils.cc	2017-04-02 13:49:26.675805170 +0200
-@@ -85,11 +85,6 @@ 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;
--  }
-   return 1;
- }
- 
-- 
cgit v1.2.3