s/sbin/bin/ for fire-ip

2012-06-09 15:50:45 -06:00 · 2012-06-09 15:50:45 -06:00 · 3d32295d0b
parent 651778bee9
commit 3d32295d0b
28 changed files with 54 additions and 68 deletions
--- a/packages/00admin/sbin/fire-ip
+++ b/packages/00admin/sbin/fire-ip
--- a/packages/00common/eris.mk
+++ b/packages/00common/eris.mk
@ -0,0 +1,22 @@
+##
+## This is a non-package, for building eris httpd, which
+## several packages use.  Just depend on $(ERIS_BIN), and
+## copy it wherever you want in your install rule.
+##
+
+ERIS_CACHE = $(CACHE)/eris.git
+ERIS_BUILDDIR = $(BUILD)/eris
+ERIS_URL = http://woozle.org/~neale/projects/eris
+
+ERIS_BIN := $(ERIS_BUILDDIR)/eris
+
+$(ERIS_CACHE):
+	git clone --bare $(ERIS_URL) $@
+
+$(ERIS_BUILDDIR): $(ERIS_CACHE)
+	git clone $< $@
+
+eris: $(ERIS_BIN)
+$(ERIS_BIN): $(ERIS_BUILDDIR)
+	make -C $<
+	
--- a/packages/cowbull/service/cowbull/finish
+++ b/packages/cowbull/service/cowbull/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/cowbull/service/cowbull/run
+++ b/packages/cowbull/service/cowbull/run
@ -2,6 +2,6 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 exec setuidgid nobody /opt/cowbull/bin/cowd < /opt/cowbull/tokens.txt
--- a/packages/fizzbuzz/service/fizzbuzz/finish
+++ b/packages/fizzbuzz/service/fizzbuzz/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/fizzbuzz/service/fizzbuzz/run
+++ b/packages/fizzbuzz/service/fizzbuzz/run
@ -2,6 +2,6 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 exec tcpsvd -u nobody ${IP%/*} 1013 ./go
--- a/packages/inferno/inferno.mk
+++ b/packages/inferno/inferno.mk
@ -1,24 +1,14 @@
 INFERNO_PKGDIR = $(TARGET)/inferno
 INFERNO_BUILDDIR = $(BUILD)/inferno

-INFERNO_ERIS_CACHE = $(CACHE)/eris.git
-INFERNO_ERIS_URL = http://woozle.org/~neale/projects/eris
+inferno-source:

-$(INFERNO_ERIS_CACHE):
-	git clone --bare $(INFERNO_ERIS_URL) $@
+inferno-build: 

-inferno-source: $(INFERNO_BUILDDIR)
-$(INFERNO_BUILDDIR): $(INFERNO_ERIS_CACHE)
-	git clone $< $@
-
-inferno-build: $(INFERNO_BUILDDIR)/build
-$(INFERNO_BUILDDIR)/build: $(INFERNO_BUILDDIR)
-	$(MAKE) -C $(INFERNO_BUILDDIR)
-
-inferno-install: $(INFERNO_BUILDDIR)/build
+inferno-install: eris
 	mkdir -p $(INFERNO_PKGDIR)/bin

-	cp $(INFERNO_BUILDDIR)/eris $(INFERNO_PKGDIR)/bin/
+	cp $(ERIS_BIN) $(INFERNO_PKGDIR)/bin/

 	$(call COPYTREE, packages/inferno/service, $(INFERNO_PKGDIR)/service)

--- a/packages/ircd/service/ircd/finish
+++ b/packages/ircd/service/ircd/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/ircd/service/ircd/run
+++ b/packages/ircd/service/ircd/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 adduser -S -H -u 65534 nobody
 adduser -S -H irc
--- a/packages/mcp/mcp.mk
+++ b/packages/mcp/mcp.mk
@ -1,31 +1,16 @@
 MCP_PKGDIR = $(TARGET)/mcp
 MCP_BUILDDIR = $(BUILD)/mcp

-
-##
-## XXX: clean up eris like router.mk
-##
-
-ERIS_CACHE = $(CACHE)/eris.git
-ERIS_BUILDDIR = $(MCP_BUILDDIR)/eris
-ERIS_URL = http://woozle.org/~neale/projects/eris
-
-$(ERIS_CACHE):
-	git clone --bare $(ERIS_URL) $@
-
 mcp-source: $(MCP_BUILDDIR)/source
-$(MCP_BUILDDIR)/source: $(ERIS_CACHE)
+$(MCP_BUILDDIR)/source:
 	mkdir -p $(@D)
-	git clone $(ERIS_CACHE) $(@D)/eris
 	touch $@

 mcp-build: $(MCP_BUILDDIR)/build
 $(MCP_BUILDDIR)/build: $(MCP_BUILDDIR)/source
 	$(MAKE) -C packages/mcp/src build
-	$(MAKE) -C $(MCP_BUILDDIR)/eris

-
-mcp-install: $(MCP_BUILDDIR)/build
+mcp-install: $(MCP_BUILDDIR)/build eris
 	mkdir -p $(MCP_PKGDIR)

 	$(call COPYTREE, packages/mcp/bin, $(MCP_PKGDIR)/bin)
@ -33,7 +18,7 @@ mcp-install: $(MCP_BUILDDIR)/build
 	cp packages/mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/
 	cp packages/mcp/src/tea $(MCP_PKGDIR)/bin/

-	cp $(MCP_BUILDDIR)/eris/eris $(MCP_PKGDIR)/bin/
+	cp $(ERIS_BIN) $(MCP_PKGDIR)/bin/

 	$(call COPYTREE, packages/mcp/service, $(MCP_PKGDIR)/service)

--- a/packages/mcp/service/httpd/finish
+++ b/packages/mcp/service/httpd/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/mcp/service/httpd/run
+++ b/packages/mcp/service/httpd/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 hostname mcp

--- a/packages/multicaster/service/multicaster/finish
+++ b/packages/multicaster/service/multicaster/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/multicaster/service/multicaster/run
+++ b/packages/multicaster/service/multicaster/run
@ -2,6 +2,6 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 exec setuidgid ctf /opt/multicaster/bin/multicaster ff15::62c 1580 </opt/multicaster/tokens.txt
--- a/packages/octopus/service/octopus-redirect/run
+++ b/packages/octopus/service/octopus-redirect/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip)
+IP=$(/opt/00admin/bin/fire-ip)

 sv s octopus >/dev/null || exit 1
 exec tcpsvd ${IP%/*} 8888 ./octopus-redirect
--- a/packages/octopus/service/octopus/finish
+++ b/packages/octopus/service/octopus/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/octopus/service/octopus/run
+++ b/packages/octopus/service/octopus/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 grep -q ipv4 /proc/cmdline && IP=::ffff:$IP

--- a/packages/p2/src/Makefile
+++ b/packages/p2/src/Makefile
@ -1 +1,4 @@
-modem:
+all: modem tea
+
+clean:
+	rm -f modem tea
--- a/packages/p2/www/p2inv.png
+++ b/packages/p2/www/p2inv.png
--- a/packages/packages.mk
+++ b/packages/packages.mk
@ -5,20 +5,6 @@ define COPYTREE
 	(cd $(1) && find . -not -name "*~" | cpio -o) | (cd $(2) && cpio -i)
 endef

-define STANDARD_PUZZLE
-t=$(strip $1)
-$t-install: $(TARGET)/$t
-$(TARGET)/$t: packages/$t
-	mkdir -p $(TARGET)/$t
-	./mkpuzzles packages/$t $(TARGET)/$t
-
-$t-clean: $t-stdclean
-$t-stdclean:
-	rm -rf $(TARGET)/$t $(BIN)/$t.pkg
-
-PACKAGES += $t
-endef
-
 include packages/*/*.mk

 # Things configure likes to see
--- a/packages/playfair/service/playfair/finish
+++ b/packages/playfair/service/playfair/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/playfair/service/playfair/run
+++ b/packages/playfair/service/playfair/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)
 ip addr add $IP dev eth0 || true

 exec tcpsvd -u nobody ${IP%/*} 1013 /opt/playfair/bin/playfair
--- a/packages/printf/service/printf/finish
+++ b/packages/printf/service/printf/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/printf/service/printf/run
+++ b/packages/printf/service/printf/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 # So I say to him, "Alex, what's a good high port number for a CTF category?"
 # And he says, "6"
--- a/packages/revwords/service/revwords/finish
+++ b/packages/revwords/service/revwords/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/revwords/service/revwords/run
+++ b/packages/revwords/service/revwords/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 exec tcpsvd -u nobody ${IP%/*} 1013 ./go

--- a/packages/rlyeh/service/rlyeh/finish
+++ b/packages/rlyeh/service/rlyeh/finish
@ -1,3 +1,3 @@
 #! /bin/sh

-/opt/00admin/sbin/fire-ip del
+/opt/00admin/bin/fire-ip del
--- a/packages/rlyeh/service/rlyeh/run
+++ b/packages/rlyeh/service/rlyeh/run
@ -2,7 +2,7 @@

 exec 2>&1

-IP=$(/opt/00admin/sbin/fire-ip add)
+IP=$(/opt/00admin/bin/fire-ip add)

 dir=/var/lib/ctf/rlyeh
 install -o nobody -d $dir