Gigantor Merge!

Conflicts:
	cholerab/news/Candidate - add Ante scriptum
	cholerab/shirts/bestellliste - merged as theirs
	oncology/dpfhack_display - now a submodule

add bug-fixing for adv_graphgen, as well as a Makefile

97 files changed, 184 insertions, 68049 deletions

diff --git a/.gitmodules b/.gitmodules
index ed0cb4ed..cbc61522 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,9 @@
 [submodule "submodules/github/tautologistics/node-htmlparser"]
 	path = submodules/github/tautologistics/node-htmlparser
 	url = https://github.com/tautologistics/node-htmlparser
+[submodule "krebsbeam/c-beam"]
+	path = krebsbeam/c-beam
+	url = git://dev.c-base.org/c-beam/c-beam.git
+[submodule "submodules/github/makefu/dpfhack_display"]
+	path = submodules/github/makefu/dpfhack_display
+	url = https://github.com/makefu/dpfhack_pearl
diff --git a/Refactory/Makefile b/Refactory/Makefile
new file mode 100644
index 00000000..57b983df
--- /dev/null
+++ b/Refactory/Makefile
@@ -0,0 +1,2 @@
+install:
+	ln -snf $$PWD/bin/git-clone-into ../bin/
diff --git a/cholerab/AGENDA.cccamp11 b/cholerab/AGENDA
index 7bdf02a3..8c80be0d 100644
--- a/cholerab/AGENDA.cccamp11
+++ b/cholerab/AGENDA
@@ -16,8 +16,6 @@
     - make-based installer for voice-symlinks
 
   - ttycnser
-    - server component
-      - JSON-RPC [spec and implementation]
     - client component
       - ttycnser (makefu)
       DONE - Python Notification (makefu)
@@ -99,3 +97,13 @@
     - cping, cpong
 
   - recursiv make
+
+  - exedirs
+
+  - //-integration
+    - libc?
+    - sh?
+
+  - //Schnabeltasse
+
+  - wgrep
diff --git a/cholerab/cockbook/git/remove-submodule b/cholerab/cockbook/git/remove-submodule
new file mode 100644
index 00000000..da8a1b00
--- /dev/null
+++ b/cholerab/cockbook/git/remove-submodule
@@ -0,0 +1,5 @@
+Delete the relevant line from the .gitmodules file.
+Delete the relevant section from .git/config.
+Run git rm --cached path_to_submodule (no trailing slash).
+Commit and delete the now untracked submodule files.
+
diff --git a/cholerab/knut/clients/cnot/index b/cholerab/knut/clients/cnot/index
index f276dd25..fcbef73e 100755
--- a/cholerab/knut/clients/cnot/index
+++ b/cholerab/knut/clients/cnot/index
@@ -11,7 +11,7 @@ port=42101
 
 params="$*"
 
-flags=-sS
+flags=${curl_flags--fsS}
 
 if test "${verbose-no}" != no; then
   flags="${flags+$flags }-v"
diff --git a/cholerab/knut/index.js b/cholerab/knut/index.js
index 9c536006..b8951f1d 100755
--- a/cholerab/knut/index.js
+++ b/cholerab/knut/index.js
@@ -12,6 +12,16 @@ var spawn = require('child_process').spawn;
 
 var plugs = process.argv.slice(2);
 
+if (plugs.length === 0) {
+  console.error('Error 1: You are made of stupid!'
+      + '\nPro-Tip: '
+      + require('path').basename(process.argv[1]) + ' PLUG'
+      + ' # PLUG ∈ {'
+      + require('fs').readdirSync(__dirname + '/plugs').join(',')
+      + '}^n, n ≥ 1');
+  process.exit(23);
+};
+
 http.createServer(function (req, res) {
   return slurp(req, function (data) {
     try {
diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate
index 8307cbee..8abc0b00 100644
--- a/cholerab/news/Candidate
+++ b/cholerab/news/Candidate
@@ -1,4 +1,11 @@
 # Krebs News Issue #1 (2011-08-24)
+## Ante Scriptum
+Wer noch kein Krebs hat kann es ganz einfach mit git aus github[-1.1]
+auschecken.
+
+Alle Pfade in den Krebs News beginnend mit `//` bezeichnen das root 
+verzeichnis des ausgecheckten krebs ordners ( optimaler weise in `/krebs`).
+
 ## 0. godmode im shack
 Der Urkrebs steuert ab heute die Photonenwerfer im shack. 
 [`//god/licht`][0.1] ist hierfür verantwortlich.
@@ -16,4 +23,27 @@ verfuegung gestellt hat.
 
 [0.1]: https://github.com/krebscode/painload/tree/master/god
 
-## 1. more to come
+## 1. Tinc Retiolum updates
+Das retiolum Darknet ueber tinc als vermaschtes VPN ist ein integraler 
+Bestandteil der Krebs Infrastruktur. Umso wichtiger ist es, dass die 
+installation ueberall imer genau das richtige macht. 
+
+KM Pfleidi hat sich gestern (26.08.2011) Retiolum angenommen um es 
+sauber auf OSX (und ggf. weiteren Unixartigen OSen) zum laufen zu
+bringen. Ziel ist es die Installation auf ein einfaches 
+  $ make -C //retiolum install
+zu beschraenken.
+
+Die Host-Dateien, welche von tinc verwendet werden koennen mit
+  $ make -C //retiolum update
+geupdatet werden. Alle update skripte muessen auf das neue updateverfahren 
+ggf. umgestellt werden.
+
+In diesem Kontext sind unter anderem Skript fuer das erraten des richtigen 
+Tinc-Konfigurationsordners [1.1] entstanden. Eine aehnliche funktionalitaet
+kann nun fuer verschiedenste weitere module, welche Plattformunabhaengigkeit
+gewaehrleisten sollen verwendet werden.
+
+[1.1] : https://github.com/krebscode/painload/tree/master/retiolum/bin/get-tinc-dir
+
+## 2. KNUT - Die Krebs Notification Utility Toolchain
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste
index 08bd72dc..f1f423e1 100644
--- a/cholerab/shirts/bestellliste
+++ b/cholerab/shirts/bestellliste
@@ -1,19 +1,19 @@
           # S G∃  Feedback
-tv        2 M j-
+tv        2 M jj  Superdick aufgetragenes Gummifetisch Logo; Farbe: genial
           1 S j-
 ulrich    1 M ?j  gut
-felix     2 M jj
+felix     2 M jj  super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht
           1 S jj
 Lassulus  2 M jj
-Pfleidi   1 L --
+Pfleidi   1 L -j
 Tensai    1 L jj
 Momo      1 2 jj  Der Siebdruck sieht echt gut aus, kein bisschen verschmiert.
 hadez     1 L jj
           1 M jj
-Phil      1 S --
+Phil      1 S jj
 Lukas     1 M ?j
-Jan       1 2 --
-Ronny     1 M --
+Jan       1 2 jj /* bezahlt an makefu */ Zitrone waere leckerer gewesen 
+Ronny     1 M jj /* bezahlt an pfleidi */
 Marc      1 L --
 Lotho     1 X --
 Sascha    1 X --
diff --git a/infest/skel/etc/profile b/infest/skel/etc/profile
index 2812c86c..6c0dc852 100755
--- a/infest/skel/etc/profile
+++ b/infest/skel/etc/profile
@@ -2,6 +2,8 @@
 
 export EDITOR=vi
 
+# from original debian /etc/profile
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 set -u
 alias bc='bc -q'
 alias df='df -h'
diff --git a/krebsbeam/c-beam b/krebsbeam/c-beam
new file mode 160000
+Subproject 0072bf8f0cd3a6d0fe022c15c8957373cebef29
diff --git a/node/Makefile b/node/Makefile
index 0b7775ed..cbfa1e4a 100644
--- a/node/Makefile
+++ b/node/Makefile
@@ -1,46 +1,8 @@
 
-ifndef version
-	version := $(shell \
-		curl -sS http://nodejs.org/ | \
-			../util/bin/hrefs | \
-			sed -rn 's:.*node-(v[0-9.]+)\.tar\.gz:\1:p' | \
-			sort | \
-			tail -n 1)
-endif
-
-export CPPFLAGS := -Wno-unused-but-set-variable
-
-.PHONY: all build install
+.PHONY: all install
 
 all:
 	@echo "You are made of stupid!"; exit 23
 
-build: out/node-$(version)
-
-install: out/node-$(version)
-	ln -vsnf ../node/$</bin/node ../bin/node
-
-out/node-%: src/node-%
-	cd $< && ./configure --prefix=$(PWD)/$@
-	make -C $<
-	make -C $< install
-
-../bin/node: out/
-
-src/node-git: src
-	cd src && \
-		git clone https://github.com/joyent/node node-git
-
-src/node-%: src/node-%.tar.gz
-	cd src && tar xf node-$*.tar.gz
-
-.PRECIOUS: src/node-%.tar.gz
-src/node-%.tar.gz: /usr/bin/curl src
-	{ curl -o $@ http://nodejs.org/dist/node-$*.tar.gz && gzip -t $@; } || \
-		{ curl -o $@ http://nodejs.org/dist/$*/node-$*.tar.gz && gzip -t $@; }
-
-/usr/bin/curl:
-	apt-get install --yes curl
-
-src:
-	mkdir -v -p $@
+install:
+	./install
diff --git a/node/install b/node/install
new file mode 100755
index 00000000..1284a73a
--- /dev/null
+++ b/node/install
@@ -0,0 +1,79 @@
+#! /bin/sh
+#
+# //node/install
+#
+# export version=X.Y.Z to install a specific version
+# otherwise the latest upstream version will be determined and used
+#
+# export force=true to install even though it already seems to be installed
+#
+# export clean=true to first wipe any generated files
+#
+set -xeuf
+
+# cd //node
+cd $(readlink -f $(dirname $0))
+
+# PATH prepend //node/tools //util/bin
+export PATH="$PWD/tools:$PWD/../util/bin${PATH+:$PATH}"
+
+if test "${force-false}" = true; then
+  : # skip check if it is already installed
+else
+  if test -e ../bin/node; then
+    : '//bin/node # is already installed'
+    exit
+  fi
+fi
+
+if test "${clean-false}" = true; then
+  rm -fR src out
+fi
+
+test -d src || mkdir -v src
+cd src
+
+version=${version-`latest-version`}
+
+target=node-v$version
+
+distfile=$target.tar.gz
+
+download() {
+  curl -C - -so $distfile http://nodejs.org/dist/v$version/$distfile ||
+  curl -C - -so $distfile http://nodejs.org/dist/$distfile || :
+}
+is_downloaded() {
+  gzip -t $distfile 2>/dev/null
+}
+if ! is_downloaded; then
+  download
+  if ! is_downloaded; then
+    rm -f $distfile
+    download
+  fi
+  if ! is_downloaded; then
+    rm -f $distfile
+    echo failed to download distfile
+    exit 1
+  fi
+fi
+
+if ! zcat $distfile | tar -x --keep-newer-files 2>/dev/null; then
+  rm -fR $target
+  zcat $distfile | tar -x
+fi
+
+cd ..
+
+prefix=out/$target
+mkdir -p $prefix
+prefix=`readlink -f $prefix`
+
+cd src/$target
+./configure --prefix=$prefix
+CPPFLAGS=-Wno-unused-but-set-variable make
+make install
+cd ../..
+
+ln -snf ../node/out/$target/bin/node ../bin/node
diff --git a/oncology/dpfhack_display b/oncology/dpfhack_display
new file mode 120000
index 00000000..9666b7bc
--- /dev/null
+++ b/oncology/dpfhack_display
@@ -0,0 +1