about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2017-08-26 16:47:57 -0400
committerJune McEnroe <june@causal.agency>2017-08-26 16:47:57 -0400
commit592d0fbdc59c19c89bf4fd5498591d07b0d9c132 (patch)
tree4d4b47d34aee0fc4b2e7ce574bdabc838d644c8a
parentAdd Makefile (diff)
downloadtorus-592d0fbdc59c19c89bf4fd5498591d07b0d9c132.tar.gz
torus-592d0fbdc59c19c89bf4fd5498591d07b0d9c132.zip
Use Makefile
-rw-r--r--README3
-rwxr-xr-xchroot.sh41
-rw-r--r--[-rwxr-xr-x]client.c4
-rw-r--r--[-rwxr-xr-x]help.c4
-rw-r--r--[-rwxr-xr-x]meta.c4
-rw-r--r--[-rwxr-xr-x]server.c4
6 files changed, 0 insertions, 60 deletions
diff --git a/README b/README
index 50a642d..e4d52e8 100644
--- a/README
+++ b/README
@@ -2,15 +2,12 @@ Welcome to ascii.town!
 
 This software targets FreeBSD and Darwin.
 
-C source files are self-compiling, e.g. ./server.c.
-
     torus.h        Shared structures and message protocol.
     server.c       Maps torus.dat and listens on torus.sock.
     client.c       Curses client.
     help.c         Automated client which redraws a helpful banner.
     snapshot.sh    Snapshots data file, appropriate for cron.
 
-    chroot.sh      Creates chroot tarball.
     sshd_config    Anonymous login to chrooted client.
     termcap.diff   Patch for bright colors in xterm and rxvt.
     index.html     Friendly directions.
diff --git a/chroot.sh b/chroot.sh
deleted file mode 100755
index 856a0c3..0000000
--- a/chroot.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e -u -x
-
-./server.c -O3 -g
-./client.c -O3 -g
-./help.c -O3 -g
-
-if [ ! -f termcap.db ]; then
-    patch -p0 -o termcap < termcap.diff
-    cap_mkdb termcap
-fi
-
-user=torus
-ownflags='-o root -g wheel'
-dirflags="-d $ownflags"
-binflags="$ownflags -m 555"
-libflags="$ownflags -m 444"
-
-mkdir -p root
-
-for dir in bin home lib libexec usr; do
-    sudo install $dirflags root/$dir
-done
-sudo install $dirflags root/usr/share
-sudo install $dirflags root/usr/share/misc
-sudo install -d -o $user -g $user root/home/$user
-
-sudo install $binflags /libexec/ld-elf.so.1 root/libexec
-
-for lib in libc.so.7 libedit.so.7 libncurses.so.8 libncursesw.so.8; do
-    sudo install $libflags /lib/$lib root/lib
-done
-
-for bin in server client help; do
-    sudo install $binflags $bin root/bin
-done
-sudo install $binflags /bin/sh root/bin
-
-sudo install $libflags termcap.db root/usr/share/misc
-
-tar -c -f chroot.tar -C root bin home lib libexec usr
diff --git a/client.c b/client.c
index fb97490..f6fc9a9 100755..100644
--- a/client.c
+++ b/client.c
@@ -1,7 +1,3 @@
-#if 0
-exec cc -Wall -Wextra -pedantic $@ -lcurses -o client $0
-#endif
-
 /*
  * Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
diff --git a/help.c b/help.c
index 5ec2c11..1d4c6ce 100755..100644
--- a/help.c
+++ b/help.c
@@ -1,7 +1,3 @@
-#if 0
-exec cc -Wall -Wextra -pedantic $@ -o help $0
-#endif
-
 /*
  * Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
diff --git a/meta.c b/meta.c
index e31d4e7..4c60819 100755..100644
--- a/meta.c
+++ b/meta.c
@@ -1,7 +1,3 @@
-#if 0
-exec cc -Wall -Wextra -pedantic $@ -o meta $0
-#endif
-
 /*
  * Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
diff --git a/server.c b/server.c
index db51564..d2797c9 100755..100644
--- a/server.c
+++ b/server.c
@@ -1,7 +1,3 @@
-#if 0
-exec cc -Wall -Wextra -pedantic $@ -o server $0
-#endif
-
 /*
  * Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
018-November/004254.html Signed-off-by: Christian Hesse <mail@eworm.de> 2018-10-12git: update to v2.19.1Christian Hesse Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-shared: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 To avoid compiler warnings from gcc 8.1.x we get the hard way. Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-patch: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strcpy()Christian Hesse Git upstream bans strcpy() with commit: automatically ban strcpy() c8af66ab8ad7cd78557f0f9f5ef6a52fd46ee6dd Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-08-28filters: generate anchor links from markdownChristian Hesse This makes the markdown filter generate anchor links for headings. Signed-off-by: Christian Hesse <mail@eworm.de> Tested-by: jean-christophe manciot <actionmystique@gmail.com> 2018-08-03Bump version.Jason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-08-03clone: fix directory traversalJason A. Donenfeld This was introduced in the initial version of this code, way back when in 2008. $ curl http://127.0.0.1/cgit/repo/objects/?path=../../../../../../../../../etc/passwd root:x:0:0:root:/root:/bin/sh ... Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Jann Horn <jannh@google.com> 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev