Published a few hours ago.

  https://github.com/mobile-shell/mosh/releases/tag/mosh-1.3.0

The fix for pledge(2) has been pushed upstream.  The diff also adds
local patches to allow regress tests to pass (one test fails, but it
doesn't matter much).

I haven't received negative feedback so this may end up in 6.1.
Reports welcome.


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/net/mosh/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    14 Mar 2017 06:27:23 -0000      1.10
+++ Makefile    27 Mar 2017 03:57:06 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =              mobile shell
 
-DISTNAME =             mosh-1.2.6
-REVISION =             1
+DISTNAME =             mosh-1.3.0
 
 CATEGORIES =           net
 
@@ -14,6 +13,7 @@ MAINTAINER =          Jeremie Courreges-Anglas <
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
+# uses pledge()
 WANTLIB +=             c crypto m ncursesw protobuf pthread ssl stdc++ util
 WANTLIB +=             z
 
@@ -21,7 +21,6 @@ MASTER_SITES =                ${HOMEPAGE}
 
 LIB_DEPENDS =          devel/protobuf
 
-SEPARATE_BUILD =       Yes
 CONFIGURE_STYLE =      gnu
 # don't force PIE which doesn't work on all arches
 CONFIGURE_ENV =                ax_cv_check_cflags__Werror___fPIE=no \
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/net/mosh/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo    20 Aug 2016 19:05:25 -0000      1.4
+++ distinfo    27 Mar 2017 03:38:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (mosh-1.2.6.tar.gz) = foK3+/zGmMcPWEO7lg2tuOe9esHU0hUcnZeTcuqFDoU=
-SIZE (mosh-1.2.6.tar.gz) = 347185
+SHA256 (mosh-1.3.0.tar.gz) = Mg4S9GHlXXFWZZeXa9lEC6bFJl+mj79hTG8chAH5M3Y=
+SIZE (mosh-1.3.0.tar.gz) = 356220
Index: patches/patch-src_tests_e2e-test
===================================================================
RCS file: patches/patch-src_tests_e2e-test
diff -N patches/patch-src_tests_e2e-test
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tests_e2e-test    27 Mar 2017 04:13:33 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/tests/e2e-test.orig    Sun Mar 26 21:04:29 2017
++++ src/tests/e2e-test Mon Mar 27 05:57:13 2017
+@@ -60,20 +60,6 @@ test_exitstatus()
+ # Tmux check.
+ tmux_check()
+ {
+-    version=$(tmux -V)
+-    if [ $? != 0 ]; then
+-      error "tmux unavailable\n"
+-      return 1
+-    fi
+-    version=${version##tmux }
+-    version_major=${version%%.*}
+-    version_minor=${version##*.}
+-    # need version 1.8 for capture-pane
+-    if [ "$version_major" -lt 1 ] ||
+-      { [ "$version_major" -eq 1 ] && [ "$version_minor" -lt 8 ]; }; then
+-      error "tmux version %s too old\n" "$version"
+-      return 1
+-    fi
+     return 0
+ }
+ 
Index: patches/patch-src_tests_e2e-test-subrs
===================================================================
RCS file: patches/patch-src_tests_e2e-test-subrs
diff -N patches/patch-src_tests_e2e-test-subrs
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tests_e2e-test-subrs      27 Mar 2017 04:12:59 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- src/tests/e2e-test-subrs.orig      Sun Mar 26 21:04:29 2017
++++ src/tests/e2e-test-subrs   Mon Mar 27 05:57:13 2017
+@@ -59,19 +59,6 @@ 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
++    export LANG=en_US.UTF-8
++    return 0
+ }


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to