Commit Graph

91 Commits

Author SHA1 Message Date
Neale Pickett 82586986f3 Merge branch 'lxc'
Conflicts:
	packages/lxc/lxc.mk
2011-09-26 13:03:43 -06:00
Neale Pickett bf40023ac6 LXC compiling 2011-09-26 13:00:42 -06:00
Neale Pickett 0df9801976 Reall move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 12:13:50 -06:00
Neale Pickett 3f48e7630a Move CONFIG_XCOMPILE_FLAGS into packages.mk 2011-09-26 11:52:28 -06:00
Neale Pickett 45c52d73f8 Attempt to bring in lxc 2011-09-26 11:51:04 -06:00
Neale Pickett 7fbe6d2650 cleanup, add lxc package (broken) 2011-09-23 17:05:14 -06:00
Neale Pickett c86c2c59b7 /service/* stays up 2011-09-23 16:57:26 -06:00
Neale Pickett 8f009026a7 remove armadillo category 2011-09-23 16:05:17 -06:00
Neale Pickett eeb583b5fb IPv6 for ircd, mcp 2011-09-23 16:04:25 -06:00
Neale Pickett 79b6534204 resolve packages passwd conflicts 2011-09-23 13:42:02 -06:00
Neale Pickett da7a8b2f6b remove dnsmasq from router package 2011-09-22 18:41:28 -06:00
Neale Pickett 17d0544c1e IPv6 router 2011-09-22 18:32:03 -06:00
Neale Pickett ae37e47966 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 01a041c013 Merge remote-tracking branch 'origin/inferno' 2011-09-21 17:03:26 -06:00
Neale Pickett 64b2316860 octopus port to ipv6 2011-09-21 16:19:00 -06:00
Neale Pickett 5c870b3c6f fixes for new buildroot + cleanup from merge 2011-09-21 15:23:09 -06:00
Neale Pickett bdc64d547c Merge remote branch 'fozzie/master'
Conflicts:
	packages/ctfbase/service/ctfd/run
2011-09-20 09:21:49 -06:00
Neale Pickett 6ba995ae2b create passwd file in ctf package 2011-09-20 09:21:11 -06:00
Neale Pickett 9389f79a2e Fix up inferno package, add poster 2011-08-17 14:45:07 -06:00
Neale Pickett 7b7f6ce212 create inferno package 2011-08-16 16:33:38 -06:00
Neale Pickett cabe55e486 Macintosh can't handle non-default routes 2011-08-16 16:23:18 -06:00
Neale Pickett e871b3082c add fish forwarder 2011-07-29 20:19:13 -06:00
Neale Pickett e07f81113c Configure router package for 172.16.0.0/12 2011-07-28 18:07:55 -06:00
Neale Pickett a29ccb9b28 Fixes at LLNL interns event 2011-07-20 08:36:02 -06:00
Neale Pickett 46f831d644 Get logger working with new token system 2011-03-25 16:22:17 -06:00
Neale Pickett d260a2d55a Move puzzles into their own repo 2011-03-25 16:20:23 -06:00
Neale Pickett afc015dcc8 Start at a portable puzzle format 2011-03-24 17:12:33 -06:00
Neale Pickett abe77091e0 Hackin' on the dillo 2011-03-23 17:47:29 -06:00
Neale Pickett 4bc40220b0 Add dillo puzzle 2011-03-22 22:00:50 -06:00
Neale Pickett 31d30ccc04 Rename pwnables to armadillo 2011-03-22 14:07:10 -06:00
Neale Pickett 271ad9a961 Merge branch 'master' of fozzie:projects/ctf 2011-03-21 19:35:24 -06:00
Neale Pickett 36f0b87040 Fix IHL bug in net-re 7 2011-03-21 17:06:43 -06:00
Neale Pickett 8c66e08009 Start moving pwnables to new token encryption 2011-03-18 21:57:12 -06:00
Neale Pickett d8a3e98803 Add TEA back in. 2011-03-17 17:11:53 -06:00
Neale Pickett e4c252ef4e Rewrite octopus to not use tokend 2011-03-15 17:09:43 -06:00
Neale Pickett d14302b199 Begin unhooking in.tokend 2011-03-14 17:13:25 -06:00
Neale Pickett 2bc8ffee3e Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2011-03-14 11:57:00 -06:00
Neale Pickett 49d23e3bc5 A few patches for TF3 2011-03-14 10:52:25 -06:00
Neale Pickett 35f6993645 New color scheme 2011-03-13 21:46:56 -06:00
Neale Pickett 774d58eff6 Some fixes during TF3 2011-03-08 23:06:21 -07:00
Neale Pickett 56d4dcf0d3 Fix for answers containing '\', fix port number for ssh 2011-03-05 11:57:41 -07:00
Neale Pickett bd5cf5af29 Add Danny's stuff 2011-03-04 19:43:02 -07:00
Neale Pickett eab62a29c8 Add pflarr's new net-re puzzles 2011-03-04 13:57:22 -07:00
Neale Pickett 9769a453e9 Switch to thttpd + a few fixes 2011-03-03 20:46:50 -07:00
Neale Pickett 8a43dbb37a Working router package and more sequence puzzles 2011-03-03 10:41:05 -07:00
Neale Pickett 0bdc543ae7 Fix title of wopr page 2011-02-28 08:14:24 -07:00
Neale Pickett 78ad8a7466 Make wopr build package 2011-02-25 22:35:29 -07:00
Neale Pickett 34db82d541 Add wopr files 2011-02-25 22:24:01 -07:00
Neale Pickett 10077e3fe4 Add a few more sequence puzzles 2011-02-23 23:10:38 -07:00
Neale Pickett 7aced93118 Fix bugs, add sequence 2000 2011-02-23 17:29:34 -07:00