Jeremie Courreges-Anglas <[email protected]> writes:

> Upstream published an RC.  Among other things, mosh now uses pledge(2).
> The client seems to still work fine against an old (1.2.4) mosh-server,
> but I haven't done much tests.  Feedback welcome.

This pretest release is affected by the removal of the "ioctl" pledge
promise.  Here's an updated version that fixes the pledge(2) calls.


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    15 Mar 2017 06:51:51 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =              mobile shell
 
-DISTNAME =             mosh-1.2.6
-REVISION =             1
+DISTNAME =             mosh-1.3.0-rc2
 
 CATEGORIES =           net
 
@@ -14,10 +13,11 @@ MAINTAINER =                Jeremie Courreges-Anglas <
 # GPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
+# uses pledge()
 WANTLIB +=             c crypto m ncursesw protobuf pthread ssl stdc++ util
 WANTLIB +=             z
 
-MASTER_SITES =         ${HOMEPAGE}
+MASTER_SITES =         
https://github.com/mobile-shell/mosh/releases/download/${DISTNAME}/
 
 LIB_DEPENDS =          devel/protobuf
 
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    10 Mar 2017 17:00:55 -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-rc2.tar.gz) = i2v/M8RpzOoEOId8aHdKay3tb8zZmx2xgCItqC8GVK4=
+SIZE (mosh-1.3.0-rc2.tar.gz) = 361100
Index: patches/patch-src_frontend_mosh-server_cc
===================================================================
RCS file: patches/patch-src_frontend_mosh-server_cc
diff -N patches/patch-src_frontend_mosh-server_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_frontend_mosh-server_cc   20 Mar 2017 13:22:59 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/frontend/mosh-server.cc.orig   Mon Mar 20 10:32:09 2017
++++ src/frontend/mosh-server.cc        Mon Mar 20 10:32:16 2017
+@@ -577,7 +577,7 @@ static int run_server( const char *desired_ip, const c
+     /* Drop unnecessary privileges */
+ #ifdef HAVE_PLEDGE
+     /* OpenBSD pledge() syscall */
+-    if ( pledge( "stdio inet ioctl tty", NULL )) {
++    if ( pledge( "stdio inet tty", NULL )) {
+       perror( "pledge() failed" );
+       exit( 1 );
+     }
Index: patches/patch-src_frontend_stmclient_cc
===================================================================
RCS file: patches/patch-src_frontend_stmclient_cc
diff -N patches/patch-src_frontend_stmclient_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_frontend_stmclient_cc     20 Mar 2017 13:22:59 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/frontend/stmclient.cc.orig     Mon Mar 20 10:32:22 2017
++++ src/frontend/stmclient.cc  Mon Mar 20 10:32:27 2017
+@@ -415,7 +415,7 @@ bool STMClient::main( void )
+   /* Drop unnecessary privileges */
+ #ifdef HAVE_PLEDGE
+   /* OpenBSD pledge() syscall */
+-  if ( pledge( "stdio inet ioctl tty", NULL )) {
++  if ( pledge( "stdio inet tty", NULL )) {
+     perror( "pledge() failed" );
+     exit( 1 );
+   }


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

Reply via email to