From c9968aadb959aeee1e999880089a9b6d923a6f26 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 10 Sep 2018 17:44:23 -0400 Subject: [PATCH] Install man page in chroot --- Makefile | 18 +++++++++--------- README | 1 + man.sh | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 man.sh diff --git a/Makefile b/Makefile index 18aa828..f0dcebf 100644 --- a/Makefile +++ b/Makefile @@ -42,19 +42,17 @@ uninstall: rm -f $(PREFIX)/bin/chatte rm -f $(MANPATH)/man1/chatte.1 -chroot.tar: chatte - mkdir -p root +chroot.tar: chatte chatte.1 install -d -o root -g wheel \ + root \ root/bin \ root/etc \ root/home \ root/lib \ root/libexec \ - root/usr \ - root/usr/local \ - root/usr/local/etc \ + root/usr/bin \ root/usr/local/etc/ssl \ - root/usr/share \ + root/usr/share/man \ root/usr/share/misc install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER) cp -p -f /libexec/ld-elf.so.1 root/libexec @@ -63,6 +61,7 @@ chroot.tar: chatte /lib/libedit.so.7 \ /lib/libncursesw.so.8 \ /lib/libthr.so.3 \ + /lib/libz.so.6 \ /usr/local/lib/libcrypto.so.43 \ /usr/local/lib/libssl.so.45 \ /usr/local/lib/libtls.so.17 \ @@ -71,9 +70,10 @@ chroot.tar: chatte cp -p -f /usr/local/etc/ssl/cert.pem root/usr/local/etc/ssl cp -a -f /usr/share/locale root/usr/share cp -p -f /usr/share/misc/termcap.db root/usr/share/misc - cp -p -f /bin/sh root/bin - install -o root -g wheel -m 555 chatte root/bin + cp -p -f /bin/sh /usr/bin/mandoc /usr/bin/less root/bin + $(MAKE) install PREFIX=root/usr + install man.sh root/usr/bin/man tar -c -f chroot.tar -C root bin etc home lib libexec usr clean: - rm -f tags chatte $(OBJS) chroot.tar + rm -rf tags chatte $(OBJS) root chroot.tar diff --git a/README b/README index 9c86694..a50bf31 100644 --- a/README +++ b/README @@ -17,3 +17,4 @@ This software requires LibreSSL and targets FreeBSD and Darwin. pls.c Functions which should not have to be written sshd_config Sample anonymous SSH configuration + man.sh man(1) implementation for chroot diff --git a/man.sh b/man.sh new file mode 100644 index 0000000..b079c90 --- /dev/null +++ b/man.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec mandoc /usr/share/man/man1/chatte.1 | less