shellinabox: avoid unsightly warnings in SSH service; bump package revision

[ast <ast%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	ast <ast%NetBSD.org@localhost>
Pushed By:	ast
Date:		Sun Feb 11 12:29:49 2018 +0100
Changeset:	6a4cba393c4decc701db0b6223fd30e56e356172

Modified Files:
	shellinabox/Makefile
	shellinabox/distinfo
Added Files:
	shellinabox/patches/patch-service-ssh-rm-rsa-options

Log Message:
shellinabox: avoid unsightly warnings in SSH service; bump package revision

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6a4cba393c4decc701db0b6223fd30e56e356172

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 shellinabox/Makefile                                |  7 +++++--
 shellinabox/distinfo                                |  1 +
 .../patches/patch-service-ssh-rm-rsa-options        | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs:
diff --git a/shellinabox/Makefile b/shellinabox/Makefile
index 52c355736e..06bfc681bb 100644
--- a/shellinabox/Makefile
+++ b/shellinabox/Makefile
@@ -3,7 +3,7 @@
 PKGBASE=	shellinabox
 SIB_VER=	v2.20
 DISTNAME=	${PKGBASE}-${SIB_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 
 MASTER_SITES=	${MASTER_SITE_GITHUB:=shellinabox/}
@@ -21,7 +21,10 @@ USE_TOOLS+=	gtar aclocal automake autoconf gm4 gmake autoheader
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
+
+# see patches/patch-service-ssh-rm-rsa-options
+CFLAGS+=	-DOMIT_RSA_OPTIONS_FROM_SSH_SERVICE
 
 .include "../../mk/bsd.prefs.mk"
 SIB_USER?=              shellinabox
diff --git a/shellinabox/distinfo b/shellinabox/distinfo
index 0f49f2d850..613749b6e8 100644
--- a/shellinabox/distinfo
+++ b/shellinabox/distinfo
@@ -6,3 +6,4 @@ SHA512 (shellinabox-v2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf16644
 Size (shellinabox-v2.20.tar.gz) = 745920 bytes
 SHA1 (patch-configure-ptsname_r) = 40c44f37afb09b99b40ee5b4faf470d95add10b7
 SHA1 (patch-configure-shell-syntax) = f6341418e5cc7538935c4c8ee8b2fa812512d579
+SHA1 (patch-service-ssh-rm-rsa-options) = 7e085d515d63dfd4fa3c3975a93a8e0434795e73
diff --git a/shellinabox/patches/patch-service-ssh-rm-rsa-options b/shellinabox/patches/patch-service-ssh-rm-rsa-options
new file mode 100644
index 0000000000..766fc2c915
--- /dev/null
+++ b/shellinabox/patches/patch-service-ssh-rm-rsa-options
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Support OMIT_RSA_OPTIONS_FROM_SSH_SERVICE for SSH service
+
+--- shellinabox/service.c.orig  2018-02-11 11:55:47.286232266 +0100
++++ shellinabox/service.c       2018-02-11 11:56:36.378209088 +0100
+@@ -175,8 +175,14 @@
+           "-oHostbasedAuthentication=no -oIdentitiesOnly=yes "
+           "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes "
+           "-oPreferredAuthentications=keyboard-interactive,password "
++#if defined(OMIT_RSA_OPTIONS_FROM_SSH_SERVICE)
++          "-oPubkeyAuthentication=no "
++          "-oStrictHostKeyChecking=no -oTunnel=no "
++#else
+           "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no "
+           "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
++#endif
++          "-oStrictHostKeyChecking=no -oTunnel=no "
+           "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no "
+ // beewoolie-2012.03.30: while it would be nice to disable this
+ //          feature, we cannot be sure that it is available on the