pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/shellinabox: use wip/ttyd which is actively maintained
Module Name: pkgsrc-wip
Committed By: Adrian Steinmann <ast%NetBSD.org@localhost>
Pushed By: ast
Date: Mon Sep 1 10:28:37 2025 +0200
Changeset: 469f210d198b54923cc0464d7de30f041ea83a59
Removed Files:
shellinabox/DESCR
shellinabox/Makefile
shellinabox/PLIST
shellinabox/distinfo
shellinabox/files/shellinaboxd.in
shellinabox/patches/patch-configure-ptsname_r
shellinabox/patches/patch-configure-shell-syntax
shellinabox/patches/patch-libhttp-url-broken-multipart-form-data
shellinabox/patches/patch-service-ssh-rm-rsa-options
Log Message:
wip/shellinabox: use wip/ttyd which is actively maintained
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=469f210d198b54923cc0464d7de30f041ea83a59
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
shellinabox/DESCR | 4 --
shellinabox/Makefile | 58 ----------------------
shellinabox/PLIST | 8 ---
shellinabox/distinfo | 9 ----
shellinabox/files/shellinaboxd.in | 43 ----------------
shellinabox/patches/patch-configure-ptsname_r | 14 ------
shellinabox/patches/patch-configure-shell-syntax | 15 ------
.../patch-libhttp-url-broken-multipart-form-data | 18 -------
.../patches/patch-service-ssh-rm-rsa-options | 21 --------
9 files changed, 190 deletions(-)
diffs:
diff --git a/shellinabox/DESCR b/shellinabox/DESCR
deleted file mode 100644
index 4da7285e1a..0000000000
--- a/shellinabox/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Shell In A Box instruments a web server to export arbitrary
-command line tools as a web-based terminal emulator. This
-emulator is accessible to any JavaScript and CSS enabled web
-browser and does not require any additional browser plugins.
diff --git a/shellinabox/Makefile b/shellinabox/Makefile
deleted file mode 100644
index 3727245bb2..0000000000
--- a/shellinabox/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD$
-
-PKGBASE= shellinabox
-SIB_VER= v2.20
-DISTNAME= ${PKGBASE}-${SIB_VER}
-PKGREVISION= 3
-CATEGORIES= www
-
-MASTER_SITES= ${MASTER_SITE_GITHUB:=shellinabox/}
-GITHUB_PROJECT= ${PKGBASE}
-GITHUB_TAG= ${SIB_VER}
-
-MAINTAINER= ast%NetBSD.org@localhost
-HOMEPAGE= https://github.com/shellinabox/shellinabox
-COMMENT= JavaScript/CSS web server instrumentation for terminal emulation
-LICENSE= gnu-gpl-v2
-
-EXTRACT_USING= bsdtar
-
-USE_TOOLS+= gtar aclocal automake autoconf gm4 gmake autoheader
-USE_LANGUAGES= c
-USE_LIBTOOL= yes
-
-GNU_CONFIGURE= yes
-
-# see patches/patch-service-ssh-rm-rsa-options
-CFLAGS+= -DOMIT_RSA_OPTIONS_FROM_SSH_SERVICE
-
-SIB_USER?= shellinabox
-SIB_GROUP?= shellinabox
-PKG_GROUPS= ${SIB_GROUP}
-PKG_USERS= ${SIB_USER}:${SIB_GROUP}
-PKG_GROUPS_VARS= SIB_USER
-PKG_USERS_VARS= SIB_GROUP
-
-RCD_SCRIPTS+= shellinaboxd
-RCD_SCRIPT_SRC.shellinaboxd= ${WRKSRC}/shellinaboxd.in
-
-SUBST_CLASSES+= sib
-SUBST_STAGE.sib= pre-configure
-SUBST_MESSAGE.sib= Crafting a shellinaboxd rc.d script with sane defaults
-SUBST_FILES.sib+= ${WRKSRC}/shellinaboxd.in
-SUBST_VARS.sib+= PREFIX SIB_USER SIB_GROUP
-
-INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1
-
-post-extract:
- ${CP} ${FILESDIR}/shellinaboxd.in ${WRKSRC}
-
-pre-configure:
- ${RUN} cd ${WRKSRC} && \
- aclocal && \
- libtoolize --copy --automake && \
- autoheader && \
- autoconf && \
- automake --copy --add-missing --foreign
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/shellinabox/PLIST b/shellinabox/PLIST
deleted file mode 100644
index 6c96c827cf..0000000000
--- a/shellinabox/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD$
-bin/shellinaboxd
-man/man1/shellinaboxd.1
-share/doc/shellinabox/AUTHORS
-share/doc/shellinabox/COPYING
-share/doc/shellinabox/GPL-2
-share/doc/shellinabox/NEWS
-share/examples/rc.d/shellinaboxd
diff --git a/shellinabox/distinfo b/shellinabox/distinfo
deleted file mode 100644
index 3ee68ee0b2..0000000000
--- a/shellinabox/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-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-ptsname_r) = 40c44f37afb09b99b40ee5b4faf470d95add10b7
-SHA1 (patch-configure-shell-syntax) = f6341418e5cc7538935c4c8ee8b2fa812512d579
-SHA1 (patch-libhttp-url-broken-multipart-form-data) = 6bf678d939880bd029548aa85246aacb188fce5a
-SHA1 (patch-service-ssh-rm-rsa-options) = 7e085d515d63dfd4fa3c3975a93a8e0434795e73
diff --git a/shellinabox/files/shellinaboxd.in b/shellinabox/files/shellinaboxd.in
deleted file mode 100644
index a9956d41e4..0000000000
--- a/shellinabox/files/shellinaboxd.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# $NetBSD$
-#
-# Shell in a Box Daemon startup script
-#
-# PROVIDE: shellinaboxd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following to /etc/rc.conf to enable this service
-#
-# shellinaboxd="YES"
-#
-# You can fine tune others variables too:
-# shellinaboxd_pidfile="/var/run/shellinabox.pid"
-# shellinaboxd_user="@SIB_USER@"
-# shellinaboxd_group="@SIB_GROUP@"
-# shellinaboxd_port="4200"
-# shellinaboxd_flags="--disable-ssl --localhost-only --linkify=normal --service=/shell:SSH:127.0.0.1"
-
-. /etc/rc.subr
-
-name="shellinaboxd"
-rcvar=${name}
-
-command="@PREFIX@/bin/${name}"
-
-shellinaboxd=${shellinaboxd:-"NO"}
-shellinaboxd_user=${shellinaboxd_user:-"@SIB_USER@"}
-shellinaboxd_group=${shellinaboxd_group:-"@SIB_GROUP@"}
-shellinaboxd_port=${shellinaboxd_port:-"4200"}
-
-pidfile=${shellinaboxd_pidfile:-"/var/run/shellinaboxd.pid"}
-
-command_args="--user=${shellinaboxd_user} --group=${shellinaboxd_group} --port=${shellinaboxd_port} --background=${pidfile}"
-
-# avoid unnecessary su(1) initiated by rc.subr
-unset shellinaboxd_user shellinaboxd_group
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/shellinabox/patches/patch-configure-ptsname_r b/shellinabox/patches/patch-configure-ptsname_r
deleted file mode 100644
index 488a9a5e47..0000000000
--- a/shellinabox/patches/patch-configure-ptsname_r
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index a6a4c9444d..0000000000
--- a/shellinabox/patches/patch-configure-shell-syntax
+++ /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,
diff --git a/shellinabox/patches/patch-libhttp-url-broken-multipart-form-data b/shellinabox/patches/patch-libhttp-url-broken-multipart-form-data
deleted file mode 100644
index 144cc49860..0000000000
--- a/shellinabox/patches/patch-libhttp-url-broken-multipart-form-data
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Merge https://github.com/shellinabox/shellinabox/pull/446/commits
-commit 7f47efe for CVE-2018-16789: fix for broken multipart/form-data
-to mitigate DoS attack.
-
---- libhttp/url.c.orig 2019-04-07 08:39:04.352921385 +0200
-+++ libhttp/url.c 2019-04-07 08:42:30.746080956 +0200
-@@ -312,6 +312,9 @@
- }
- }
- }
-+ } else {
-+ warn("[http] broken multipart/form-data!");
-+ break;
- }
- }
- if (lastPart) {
diff --git a/shellinabox/patches/patch-service-ssh-rm-rsa-options b/shellinabox/patches/patch-service-ssh-rm-rsa-options
deleted file mode 100644
index 766fc2c915..0000000000
--- a/shellinabox/patches/patch-service-ssh-rm-rsa-options
+++ /dev/null
@@ -1,21 +0,0 @@
-$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
Home |
Main Index |
Thread Index |
Old Index