shellinabox: don't enable coredumps; enable login option; fix ptsname_r prototyping

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

Module Name:	pkgsrc-wip
Committed By:	ast <ast%NetBSD.org@localhost>
Pushed By:	ast
Date:		Sun Feb 11 10:08:32 2018 +0100
Changeset:	22c30c84efb9a995c36a3a564fb527d43c182fc2

Modified Files:
	shellinabox/Makefile
	shellinabox/distinfo
Added Files:
	shellinabox/patches/patch-configure-ptsname_r
	shellinabox/patches/patch-configure-shell-syntax
Removed Files:
	shellinabox/options.mk
	shellinabox/patches/patch-configure.ac

Log Message:
shellinabox: don't enable coredumps; enable login option; fix ptsname_r prototyping

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

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

diffstat:
 shellinabox/Makefile                             |  4 +---
 shellinabox/distinfo                             |  3 ++-
 shellinabox/options.mk                           | 22 ----------------------
 shellinabox/patches/patch-configure-ptsname_r    | 14 ++++++++++++++
 shellinabox/patches/patch-configure-shell-syntax | 15 +++++++++++++++
 shellinabox/patches/patch-configure.ac           | 15 ---------------
 6 files changed, 32 insertions(+), 41 deletions(-)

diffs:
diff --git a/shellinabox/Makefile b/shellinabox/Makefile
index 80d3012519..52c355736e 100644
--- a/shellinabox/Makefile
+++ b/shellinabox/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+=	gtar aclocal automake autoconf gm4 gmake autoheader
 USE_LANGUAGES=	c
 USE_LIBTOOL=	yes
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 SIB_USER?=              shellinabox
@@ -53,6 +53,4 @@ pre-configure:
 		autoconf && \
 		automake --copy --add-missing --foreign
 
-.include "options.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/shellinabox/distinfo b/shellinabox/distinfo
index 149dc694ba..0f49f2d850 100644
--- a/shellinabox/distinfo
+++ b/shellinabox/distinfo
@@ -4,4 +4,5 @@ SHA1 (shellinabox-v2.20.tar.gz) = 2369fcfd42a3666237480f150370f90a5a7693ed
 RMD160 (shellinabox-v2.20.tar.gz) = 1e8b832b9febbc581289ec9b067f85157758c3e5
 SHA512 (shellinabox-v2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237
 Size (shellinabox-v2.20.tar.gz) = 745920 bytes
-SHA1 (patch-configure.ac) = f6341418e5cc7538935c4c8ee8b2fa812512d579
+SHA1 (patch-configure-ptsname_r) = 40c44f37afb09b99b40ee5b4faf470d95add10b7
+SHA1 (patch-configure-shell-syntax) = f6341418e5cc7538935c4c8ee8b2fa812512d579
diff --git a/shellinabox/options.mk b/shellinabox/options.mk
deleted file mode 100644
index 71f2e87e99..0000000000
--- a/shellinabox/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-
-# cores: patches shellinaboxd to enable core dumps
-# nologin: disable it and do login through ssh
-PKG_OPTIONS_VAR=	PKG_OPTIONS.shellinabox
-PKG_SUPPORTED_OPTIONS=	cores nologin
-PKG_SUGGESTED_OPTIONS=	cores nologin
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mnologin)
-CONFIGURE_ARGS+=	--disable-login
-.endif
-
-.if !empty(PKG_OPTIONS:Mcores)
-SUBST_CLASSES+=		cores
-SUBST_STAGE.cores=	pre-patch
-SUBST_MESSAGE.cores=	Enabling core files in shellinabox/shellinaboxd.c
-SUBST_FILES.cores=	shellinabox/shellinaboxd.c
-SUBST_SED.cores+=	-e 's|prctl(PR_SET_DUMPABLE,|// &|'
-SUBST_SED.cores+=	-e 's|setrlimit(RLIMIT_CORE,|// &|'
-.endif
diff --git a/shellinabox/patches/patch-configure-ptsname_r b/shellinabox/patches/patch-configure-ptsname_r
new file mode 100644
index 0000000000..488a9a5e47
--- /dev/null
+++ b/shellinabox/patches/patch-configure-ptsname_r
@@ -0,0 +1,14 @@
+$NetBSD$
+
+On NetBSD, expose ptsname_r prototype from stdlib.h
+
+--- configure.ac.orig	2016-11-09 20:40:33.000000000 +0100
++++ configure.ac	2018-02-11 09:24:29.454059400 +0100
+@@ -57,6 +57,7 @@
+              #ifndef _GNU_SOURCE
+              #define _GNU_SOURCE
+              #endif
++             #define _NETBSD_SOURCE
+              #include <stdlib.h>],
+             [char buf[10]; ptsname_r(0, buf, sizeof(buf));],
+             [AC_DEFINE(HAVE_PTSNAME_R, 1,
diff --git a/shellinabox/patches/patch-configure-shell-syntax b/shellinabox/patches/patch-configure-shell-syntax
new file mode 100644
index 0000000000..a6a4c9444d
--- /dev/null
+++ b/shellinabox/patches/patch-configure-shell-syntax
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Replace invalid shell conditional "==" with "=" in configure
+
+--- configure.ac.orig	2017-05-03 09:11:09.000000000 +0200
++++ configure.ac	2017-05-03 09:11:14.000000000 +0200
+@@ -184,7 +184,7 @@
+ 
+ dnl If runtime loading has been disabled, add OpenSSL and PAM as hard
+ dnl dependencies.
+-if test "x$enable_runtime_loading" == xno; then
++if test "x$enable_runtime_loading" = xno; then
+   dnl Link against OpenSSL libraries, unless SSL support has been disabled
+   if test "x$enable_ssl" != xno; then
+     AC_CHECK_HEADER(openssl/bio.h,
diff --git a/shellinabox/patches/patch-configure.ac b/shellinabox/patches/patch-configure.ac
deleted file mode 100644
index a6a4c9444d..0000000000
--- a/shellinabox/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Replace invalid shell conditional "==" with "=" in configure
-
---- configure.ac.orig	2017-05-03 09:11:09.000000000 +0200
-+++ configure.ac	2017-05-03 09:11:14.000000000 +0200
-@@ -184,7 +184,7 @@
- 
- dnl If runtime loading has been disabled, add OpenSSL and PAM as hard
- dnl dependencies.
--if test "x$enable_runtime_loading" == xno; then
-+if test "x$enable_runtime_loading" = xno; then
-   dnl Link against OpenSSL libraries, unless SSL support has been disabled
-   if test "x$enable_ssl" != xno; then
-     AC_CHECK_HEADER(openssl/bio.h,