Commit Graph

193 Commits

Author SHA1 Message Date
Neale Pickett c82d6d9afe Merge branch 'lxc'
Conflicts:
	packages/lxc/lxc.mk
2011-09-26 13:03:43 -06:00
Neale Pickett 5ae8292a98 LXC compiling 2011-09-26 13:00:42 -06:00
Neale Pickett 007c940a9b Reall move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 12:13:50 -06:00
Neale Pickett 1c7f842d12 Move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 11:52:28 -06:00
Neale Pickett fb2b4e13bc Attempt to bring in lxc 2011-09-26 11:51:04 -06:00
Neale Pickett e001d433ab cleanup, add lxc package (broken) 2011-09-23 17:05:14 -06:00
Neale Pickett 2ab905ec9f /service/* stays up 2011-09-23 16:57:26 -06:00
Neale Pickett b1d25138fe remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett 729ecf7393 IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 79caa65faf resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett 5b3aac001b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 9ceebc2a6e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett 13b1de268e Merge remote-tracking branch 'origin/p2'
Conflicts:
	packages/bletchley/300/index.mdwn
	packages/sequence/400/key
2011-09-21 17:04:34 -06:00
Neale Pickett 4c84013c4c Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 7337fea1e1 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 2031016d46 fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett 6a878e5c2c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 774d90c7bd create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 700f871d0f modify a few things 2011-09-16 10:08:07 -06:00
Neale Pickett 0bfd9efdc2 add sshd to inferno 2011-09-13 15:50:40 -06:00
Neale Pickett 8fb5a0eb6a Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett a3b28ca275 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett b35641ad22 Macintosh can't handle non-default routes 2011-08-16 16:23:18 -06:00
Neale Pickett 2203c30ba6 add fish forwarder 2011-07-29 20:19:13 -06:00
Neale Pickett b2cdbfadbe Configure router package for 172.16.0.0/12 2011-07-28 18:07:55 -06:00
Neale Pickett 662ec4f30a Fixes at LLNL interns event 2011-07-20 08:36:02 -06:00
Neale Pickett f7de2f45b8 Get logger working with new token system 2011-03-25 16:22:17 -06:00
Neale Pickett cd16a73827 Move puzzles into their own repo 2011-03-25 16:20:23 -06:00
Neale Pickett 50f6449a36 Start at a portable puzzle format 2011-03-24 17:12:33 -06:00
Neale Pickett 49f104fbee Hackin' on the dillo 2011-03-23 17:47:29 -06:00
Neale Pickett d429727070 Add dillo puzzle 2011-03-22 22:00:50 -06:00
Neale Pickett 557b4cf4ec Rename pwnables to armadillo 2011-03-22 14:07:10 -06:00
Neale Pickett ae3a3c8f25 Merge branch 'master' of fozzie:projects/ctf 2011-03-21 19:35:24 -06:00
Neale Pickett 3ff181ff15 Fix IHL bug in net-re 7 2011-03-21 17:06:43 -06:00
Neale Pickett c90e24f955 Start moving pwnables to new token encryption 2011-03-18 21:57:12 -06:00
Neale Pickett 7b5a4e58b3 Add TEA back in. 2011-03-17 17:11:53 -06:00
Neale Pickett c3b94fda84 Rewrite octopus to not use tokend 2011-03-15 17:09:43 -06:00
Neale Pickett b87c1f6f35 Begin unhooking in.tokend 2011-03-14 17:13:25 -06:00
Neale Pickett 89e30f39ff Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-03-14 11:57:00 -06:00
Neale Pickett e0e556fbb9 A few patches for TF3 2011-03-14 10:52:25 -06:00
Neale Pickett 4960ed293c New color scheme 2011-03-13 21:46:56 -06:00
Neale Pickett c55b26b4e6 Some fixes during TF3 2011-03-08 23:06:21 -07:00
Neale Pickett 0c040c66fd Fix for answers containing '\', fix port number for ssh 2011-03-05 11:57:41 -07:00
Neale Pickett c6ba71cc65 Add Danny's stuff 2011-03-04 19:43:02 -07:00
Neale Pickett fd4a3f978e Add pflarr's new net-re puzzles 2011-03-04 13:57:22 -07:00
Neale Pickett 486250b252 Switch to thttpd + a few fixes 2011-03-03 20:46:50 -07:00
Neale Pickett 1cb359392f Working router package and more sequence puzzles 2011-03-03 10:41:05 -07:00
Neale Pickett 021e77ffa9 Fix title of wopr page 2011-02-28 08:14:24 -07:00
Neale Pickett 55d6570f49 Make wopr build package 2011-02-25 22:35:29 -07:00
Neale Pickett 6e8e055359 Add wopr files 2011-02-25 22:24:01 -07:00
Neale Pickett a95cf4bb95 Add a few more sequence puzzles 2011-02-23 23:10:38 -07:00
Neale Pickett a1dd6b8804 Fix bugs, add sequence 2000 2011-02-23 17:29:34 -07:00
Neale Pickett 49aa2ccb62 Make sequence 800 fit in better 2011-02-22 21:01:11 -07:00
Neale Pickett 9d2233c34a Add sequence 800 2011-02-22 18:01:51 -07:00
Neale Pickett 6470b30ba7 Refresh sequence category 2011-02-22 14:05:51 -07:00
Neale Pickett 9e6421489d Make SSH basic, add external category token lists 2011-02-22 12:04:08 -07:00
Neale Pickett 38f2cf7abe Start javascript category 2011-02-21 22:28:49 -07:00
Neale Pickett 40323ab098 Document UNM problems, add in new tanks scripts 2011-02-12 20:55:12 -07:00
Neale Pickett 982f0b12ad Add results of 2011-02-UNM 2011-02-12 20:25:34 -07:00
Neale Pickett e25515dc56 A couple of bugfixes and install script 2011-02-10 17:07:48 -07:00
Neale Pickett 59eb9d4689 More rlyeh work, add posters category 2011-02-09 15:31:15 -07:00
Neale Pickett d82e06f413 Pwnables working again, no more syslog 2011-02-08 17:04:08 -07:00
Neale Pickett 3bdcb69e9f Merge remote branch 'fozzie/master' 2011-02-08 14:55:27 -07:00
Neale Pickett a8a1f1f3b2 Clean compile 2011-02-08 14:09:48 -07:00
Neale Pickett 5a812c5068 Clean up rlyeh.mk 2011-02-07 22:58:01 -07:00
Neale Pickett 8d7adc8b5f Add service scripts for rlyeh 2011-02-07 22:38:13 -07:00
Neale Pickett 21c3d79391 Add R'lyeh 2011-02-07 17:12:12 -07:00
Neale Pickett 352ed1639e Packages set their own IPs 2011-02-07 13:10:02 -07:00
Neale Pickett c6456f8a00 I didn't need the team listing code in in.tokend 2011-02-03 21:03:37 -07:00
Neale Pickett c6998920d4 More emergency commit 2011-02-03 07:34:12 -07:00
Neale Pickett c18b41a3fb Emergency checkin-building flooded 2011-02-03 07:31:42 -07:00
Neale Pickett e70f0a0fc4 Finalize tokend changes 2011-01-24 13:09:51 -07:00
Neale Pickett a26ed980b2 Add team listing to tokend 2011-01-24 12:46:18 -07:00
Neale Pickett 8744a4b2f6 Modify wording of puzzle pages; fix ircd service bug 2011-01-06 08:43:40 -07:00
Neale Pickett 563aef3205 Make example token easier to understand 2011-01-04 13:55:33 -07:00
Neale Pickett 8a6c5ff475 Add UNM event and a few fixes 2011-01-04 12:35:15 -07:00
Neale Pickett e4891311c6 Move IRCd to its own package 2010-11-02 16:29:34 -06:00
Neale Pickett 1dd2c4eaa3 Fix a few bugs 2010-11-01 17:05:14 -06:00
Neale Pickett 028d1e3868 Fix a couple critical bugs 2010-10-29 21:47:10 -06:00
Neale Pickett 58b4d081ce Fix fresh bug (don't hack when sleepy) 2010-10-29 00:11:48 -06:00
Neale Pickett 991d80bd86 Remove tag that requires newer exiv2 2010-10-29 00:09:49 -06:00
Neale Pickett 3f0c123528 Fix some last-minute bugs 2010-10-29 00:07:03 -06:00
Neale Pickett c7cc36b058 Clarify a few things 2010-10-27 14:50:16 -06:00
Neale Pickett fb9ffa8b5c Tanks now working (!), scoreboard fixes 2010-10-26 16:43:51 -06:00
Neale Pickett 9c472de526 Possibly working tanks 2010-10-26 13:02:26 -06:00
Neale Pickett b563456fda Start to add in tanks 2010-10-25 17:17:10 -06:00
Neale Pickett 46549af7fd Clean up steg, put summary in puzzle dir 2010-10-25 11:15:12 -06:00
Neale Pickett d6b5689183 Fix more known problems 2010-10-22 17:09:00 -06:00
Neale Pickett 13c16e369b Fix some of the problems found at NSM 2010-10-22 15:03:51 -06:00
Neale Pickett 939514d9f7 Merge branch 'master' from laptop
Conflicts:

	doc/ideas.txt
	pwnables/service/sshd.pwn/run
2010-10-22 11:30:58 -06:00
Neale Pickett 0444d8c541 Add missing keys 2010-10-22 11:04:04 -06:00
Neale Pickett 5a2caae951 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2010-10-22 09:37:02 -06:00
Neale Pickett 637545aa9a Make puzzles first class categories 2010-10-21 22:15:18 -06:00