From 9af53955dc09a9c7c510cd0ade758dd0af5bcabb Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 1 Oct 2021 23:29:16 +0000
Subject: Replace filter shell scripts with C program

Eliminates the need for a shell inside the chroot, along with cat,
mktemp and rm. It's likely a bit faster too.
---
 www/git.causal.agency/Makefile | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'www/git.causal.agency/Makefile')

diff --git a/www/git.causal.agency/Makefile b/www/git.causal.agency/Makefile
index 76c93d3a..f05d4a4a 100644
--- a/www/git.causal.agency/Makefile
+++ b/www/git.causal.agency/Makefile
@@ -3,46 +3,44 @@ CONFDIR = ${PREFIX}/conf
 DATADIR = ${PREFIX}/cgit
 BINDIR = ${PREFIX}/bin
 
+CFLAGS += -Wall -Wextra
+LDFLAGS = -static -pie
+
 BINS += about-filter
-BINS += cat
-BINS += compress
 BINS += ctags
 BINS += email-filter
 BINS += gzip
 BINS += hilex
 BINS += htagml
 BINS += mandoc
-BINS += mktemp
 BINS += mtags
 BINS += owner-filter
-BINS += rm
-BINS += sh
 BINS += source-filter
 
 all: ${BINS}
 
-cat rm sh:
-	cp /bin/$@ $@
-
-compress ctags mandoc mktemp:
-	${MAKE} -C /usr/src/usr.bin/$@ LDFLAGS='-static -pie'
+compress ctags mandoc:
+	${MAKE} -C /usr/src/usr.bin/$@ LDFLAGS='${LDFLAGS}'
 	mv /usr/src/usr.bin/$@/$@ $@
 	${MAKE} -C /usr/src/usr.bin/$@ clean
 
 gzip: compress
-	cp compress $@
+	ln -f compress $@
 
 hilex htagml mtags:
 	rm -f ../../bin/$@
-	${MAKE} -C ../../bin $@ LDFLAGS='-static -pie'
+	${MAKE} -C ../../bin $@ LDFLAGS='${LDFLAGS}'
 	mv ../../bin/$@ $@
 
+about-filter email-filter owner-filter source-filter: filter
+	ln -f filter $@
+
 install: cgitrc custom.css ${BINS}
 	install -m 644 cgitrc ${CONFDIR}
 	install -m 644 custom.css ${DATADIR}
 	install -d -o www -g daemon ${PREFIX}/cache/cgit
 	install -d -m 1700 -o www -g daemon ${PREFIX}/tmp
-	install ${BINS} ${BINDIR}
+	install -s ${BINS} ${BINDIR}
 
 clean:
-	rm -f ${BINS}
+	rm -f compress filter ${BINS}
-- 
cgit 1.4.1

e='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/bin?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1&amp;follow=1'>bin</a>/<a href='/src/log/bin/dash?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1&amp;follow=1'>dash</a>/<a href='/src/log/bin/dash/src?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1&amp;follow=1'>src</a>/<a href='/src/log/bin/dash/src/mail.h?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1&amp;follow=1'>mail.h</a> (<a href='/src/log/bin/dash/src/mail.h?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/dash/src/mail.h?id=b29e2c22710b965ec942dcc33f0b26e08ad76b50&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-09-08 23:32:51 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/git-comment.pl?id=8e569858ece13fedeeae88645a9e5776c28bedc4&amp;follow=1'>Defer printing comment if line is blank or closing brace</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This fixes badly indented comments.


</td></tr>
<tr class='logheader'><td><span title='2021-09-08 22:17:13 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/man1/git-comment.1?id=cfebb8be00fab25065fc0578a33835aa421d224e&amp;follow=1'>Up default min-repeat to 30 lines</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-09-08 22:11:15 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/git-comment.pl?id=f59aaf2177a8cc097254990ff5d5a8be9aa5faa5&amp;follow=1'>Handle dirty lines in git-comment</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-09-08 21:59:30 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/man1/git-comment.1?id=ffa33879383147e41eca708448ffac4727054e1e&amp;follow=1'>Document and install git-comment</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-09-08 21:05:33 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/git-comment.pl?id=9ee84006e78a59631bf889bdd7631e73da480614&amp;follow=1'>Add repeat and all options to git-comment</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-09-08 19:05:36 -0400'>2021-09-08</span></td><td class='logsubject'><a href='/src/commit/bin/git-comment.pl?id=47fde0f16d620dbf8670133ef32db6e65565914c&amp;follow=1'>Add group threshold to git-comment</a></td><td>June McEnroe