about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rw-r--r--README.715
-rw-r--r--scripts/build-chroot.sh74
-rw-r--r--scripts/chroot-man.sh2
-rw-r--r--scripts/chroot-prompt.sh7
-rw-r--r--scripts/sshd_config9
6 files changed, 1 insertions, 119 deletions
diff --git a/Makefile b/Makefile
index 66fb408..e08e8e3 100644
--- a/Makefile
+++ b/Makefile
@@ -72,16 +72,3 @@ install: ${BINS} ${MANS}
 uninstall:
 	rm -f ${BINS:%=${DESTDIR}${BINDIR}/%}
 	rm -f ${MANS:%=${DESTDIR}${MANDIR}/man1/%}
-
-CHROOT_USER = chat
-CHROOT_GROUP = ${CHROOT_USER}
-
-chroot.tar: catgirl catgirl.1 scripts/chroot-prompt.sh scripts/chroot-man.sh
-chroot.tar: scripts/build-chroot.sh
-	sh scripts/build-chroot.sh ${CHROOT_USER} ${CHROOT_GROUP}
-
-install-chroot: chroot.tar
-	tar -px -f chroot.tar -C /home/${CHROOT_USER}
-
-clean-chroot:
-	rm -fr chroot.tar root
diff --git a/README.7 b/README.7
index a26d270..70ba7c8 100644
--- a/README.7
+++ b/README.7
@@ -1,5 +1,5 @@
 .\" To view this file: $ man ./README.7
-.Dd July  9, 2023
+.Dd May 22, 2024
 .Dt README 7
 .Os "Causal Agency"
 .
@@ -227,19 +227,6 @@ and automatic reconnects
 .It Pa scripts/notify-send.scpt
 .Xr notify-send 1
 in AppleScript
-.It Pa scripts/build-chroot.sh
-chroot builder for
-.Ox
-and
-.Fx
-.It Pa scripts/chroot-prompt.sh
-name prompt wrapper for chroot
-.It Pa scripts/chroot-man.sh
-.Xr man 1
-implementation for chroot
-.It Pa scripts/sshd_config
-.Xr sshd 8
-configuration for public chroot
 .El
 .
 .Sh CONTRIBUTING
diff --git a/scripts/build-chroot.sh b/scripts/build-chroot.sh
deleted file mode 100644
index a0fcf32..0000000
--- a/scripts/build-chroot.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-set -eux
-
-CHROOT_USER=$1
-CHROOT_GROUP=$2
-
-if [ "$(uname)" = 'OpenBSD' ]; then
-	install -d -o root -g wheel \
-		root \
-		root/bin \
-		root/etc/ssl \
-		root/home \
-		root/usr/bin \
-		root/usr/lib \
-		root/usr/libexec \
-		root/usr/share/man
-	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} \
-		root/home/${CHROOT_USER} \
-		root/home/${CHROOT_USER}/.local/share
-
-	cp -fp /bin/sh root/bin
-	cp -fp /usr/libexec/ld.so root/usr/libexec
-	export LD_TRACE_LOADED_OBJECTS_FMT1='%p\n'
-	export LD_TRACE_LOADED_OBJECTS_FMT2=''
-	for bin in ./catgirl /usr/bin/mandoc /usr/bin/less; do
-		LD_TRACE_LOADED_OBJECTS=1 $bin | xargs -t -J % cp -fp % root/usr/lib
-	done
-	cp -fp /usr/bin/printf /usr/bin/mandoc /usr/bin/less root/usr/bin
-	make install DESTDIR=root PREFIX=/usr MANDIR=/usr/share/man
-	install scripts/chroot-prompt.sh root/usr/bin/catgirl-prompt
-	install scripts/chroot-man.sh root/usr/bin/man
-
-	cp -fp /etc/hosts /etc/resolv.conf root/etc
-	cp -fp /etc/ssl/cert.pem root/etc/ssl
-	cp -af /usr/share/locale /usr/share/terminfo root/usr/share
-
-	tar -c -f chroot.tar -C root bin etc home usr
-
-elif [ "$(uname)" = 'FreeBSD' ]; then
-	install -d -o root -g wheel \
-		root \
-		root/bin \
-		root/etc \
-		root/home \
-		root/lib \
-		root/libexec \
-		root/usr/bin \
-		root/usr/local/etc/ssl \
-		root/usr/share/man \
-		root/usr/share/misc
-	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} \
-		root/home/${CHROOT_USER} \
-		root/home/${CHROOT_USER}/.local/share
-
-	cp -fp /libexec/ld-elf.so.1 root/libexec
-	ldd -f '%p\n' catgirl /usr/bin/mandoc /usr/bin/less \
-		| sort -u | xargs -t -J % cp -fp % root/lib
-	chflags noschg root/libexec/* root/lib/*
-	cp -fp /rescue/sh /usr/bin/mandoc /usr/bin/less root/bin
-	make install DESTDIR=root PREFIX=/usr MANDIR=/usr/share/man
-	install scripts/chroot-prompt.sh root/usr/bin/catgirl-prompt
-	install scripts/chroot-man.sh root/usr/bin/man
-
-	cp -fp /etc/hosts /etc/resolv.conf root/etc
-	cp -fp /usr/local/etc/ssl/cert.pem root/usr/local/etc/ssl
-	cp -af /usr/share/locale root/usr/share
-	cp -fp /usr/share/misc/termcap.db root/usr/share/misc
-
-	tar -c -f chroot.tar -C root bin etc home lib libexec usr
-
-else
-	echo "Don't know how to build chroot on $(uname)" >&2
-	exit 1
-fi
diff --git a/scripts/chroot-man.sh b/scripts/chroot-man.sh
deleted file mode 100644
index 9d686f9..0000000
--- a/scripts/chroot-man.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec mandoc /usr/share/man/man1/catgirl.1 | LESSSECURE=1 less
diff --git a/scripts/chroot-prompt.sh b/scripts/chroot-prompt.sh
deleted file mode 100644
index 2b34426..0000000
--- a/scripts/chroot-prompt.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-
-printf 'Name: '
-read -r nick rest
-printf '%s %s\n' "$nick" "$SSH_CLIENT" >>nicks.log
-exec catgirl -K -n "$nick" -s "${nick##*/}" -u "${SSH_CLIENT%% *}" "$@"
diff --git a/scripts/sshd_config b/scripts/sshd_config
deleted file mode 100644
index c7e99ec..0000000
--- a/scripts/sshd_config
+++ /dev/null
@@ -1,9 +0,0 @@
-UsePAM no
-
-Match User chat
-	PasswordAuthentication yes
-	PermitEmptyPasswords yes
-	ChrootDirectory /home/chat
-	ForceCommand catgirl-prompt
-	DisableForwarding yes
-	MaxSessions 1