Merge branch 'master' of ssh://github.com/krebscode/painload

6 files changed, 62 insertions, 46 deletions

diff --git a/cholerab/thesauron b/cholerab/thesauron
index e8ce358a..2d879147 100644
--- a/cholerab/thesauron
+++ b/cholerab/thesauron
@@ -50,6 +50,21 @@ Punching Lemma n.
 - Sozialer Druck zur Aufrechterhaltung der Ordnung in dem sozialen Geflaecht 
   von Krebs
 
+ref, n.
+[en]
+- A reference like an URI, ISBN, name of a person, etc.
+
+reftrace, n.
+[en]
+- A stacktrace-like representation of refs that lead to some (any kind of)
+  conclusion.  Usually generated by a human.  The conclusion can be either on
+  the top or on the bottom of the stack.  If the order is ambiguous, then it
+  should be communicated explicitly.
+  - Example: (conclusion first)
+    - http://en.wikipedia.org/wiki/Stack_trace
+    - google "stacktrace" (first entry / 2014-12-05T12:13:58Z)
+    - think about some example [this could be omitted, as it's obvious...]
+
 Retiolum n.
 [en]
 - The official darknet of Krebs which utilizes the Retiolum Prefix to
diff --git a/retiolum/hosts/ach b/retiolum/hosts/ach
index 700ad7ae..7774f17c 100644
--- a/retiolum/hosts/ach
+++ b/retiolum/hosts/ach
@@ -1,11 +1,11 @@
-Subnet = 10.243.0.100
-Subnet = 42:335b:5e83:d8ef:fdf0:d921:22c8:b15d/128
+Subnet = 10.243.32.89
+Subnet = 42:6bb3:0a07:6777:9aa5:e39c:e140:cb68
 
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAxvRxan/8TtgkqsGCZ26jd+Nuv5tL0Nab2jbKVZa0iwtjIyBlF4cF
-wR2H1ypdzqT5hHGVzE2T1QjBqYO1cIJ4cu0wfCbJSp9YtmK9Tm+TK/bz9LNj/RYj
-e27ixFVoeYFU7fF2kNG5g66u/xspGnulRFzqNXXqh6Jy0X6eJJmvo8wniSHxcMoc
-gyS7kpwDTcoYlnej6+tsGILVuZ6bSWuVr+kbdHp0rUGDXtNDAHW4WDtXRARFLmub
-QdyxtBGQXB8n4XmdIlpuVbvyceBAId4SAcky6pIC4VCbvSJ5pDrL9+u07r24JkIz
-MAs1gTh4riA3e3IbII8l8iUJ2x9Zlf6+vQIDAQAB
+MIIBCgKCAQEAsTyjNQ5aO2aIKXgkgZSiUb0POtEVoAPFrIkSv5Ci+7AYv+CLXsIr
+TKBfFIg474KZ4MCrX0oA3Z66s9d2UW6mcH5JufW8siRPJvdydqaANyF6Fvk++59R
++GMKR0MGdPGfcxjaw64ChemOZx1T6ODHF7KTgaWRI+Aiz+jWsvVCSKutSwVDJTgJ
+4lub95/gbWckRY6fchkh7rSTfNXXYevbysQYdZaAR/qgquUNt23/ewlagF7uqgZt
+CQx7MHMU2quEdvIfZuUPFWe0yHBb1bZCHYxKXo6XG8I7WdUAFRuwFLTjqgSYPD1j
+EpUyU0+xxfyXB3vWrM/jcw8XKzi04wWHuQIDAQAB
 -----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/mako b/retiolum/hosts/mako
new file mode 100644
index 00000000..0488bcaa
--- /dev/null
+++ b/retiolum/hosts/mako
@@ -0,0 +1,11 @@
+Subnet = 10.243.7.19
+Subnet = 42:4522:2222:2222:2222:2222:fefe:fefe
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0FQq5EDxcRUfquoDottz1urpT72PB7pReCSZ1fLGqK5z8+DLW4m9
+YB36xW4jJ8pct9iD6kKnX1JCNt11h19QZvc8GI/9pELV3nNaliz+PI1SQNhOrwM+
+Lza/lnddpmvQmJvF6TTLtuGqTANEZcJ7MUpLJ5x/XEFwIcZb9L30EDIaQQNeRyIs
+xJbuAxHquKrb2Wpanm4hWNYqknV1W7lNbcvmONZ/GupQ411XBhXs4EIAA7fqBEcp
+7FAgjgHIxiAT07Z1hBclv6CPDjFT4ieJAq6giCR/gc484x0UNwSpHBkalK558m4e
+icDuVgajrCZ0ShIAQXgtrSpSM3Y53GUhnwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/mu b/retiolum/hosts/mu
new file mode 100644
index 00000000..90bca775
--- /dev/null
+++ b/retiolum/hosts/mu
@@ -0,0 +1,10 @@
+Subnet = 10.243.20.01/32
+Subnet = 42:0:0:0:0:0:0:2001/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEApXErmPSn2CO4V25lqxanCGCFgxEAjdzFUiTCCu0IvELEuCc3PqVA
+g4ecf8gGwPCbzMW/1txjlgbsQcm87U5enaCwzSv/pa7P9/memV74OhqEVOypFlDE
+XeZczqQfNbjoLYl4cKZpTsSZmOgASXaMDrH2N37f50q35C0MQw0HRzaQM5VLrzb4
+o87MClS+yPqpvp34QjW+1lqnOKvMkr6mDrmtcAjCOs9Ma16txyfjGVFi8KmYqIs1
+QEJmyC9Uocz5zuoSLUghgVRn9yl4+MEw6++akFDwKt/eMkcSq0GPB+3Rz/WLDiBs
+FK6BsssQWdwiEWpv6xIl1Fi+s7F0riq2cwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/tpsw b/retiolum/hosts/tpsw
new file mode 100644
index 00000000..4e7b2a89
--- /dev/null
+++ b/retiolum/hosts/tpsw
@@ -0,0 +1,11 @@
+Subnet = 10.243.183.236
+Subnet = 42:8ca8:d2e4:adf6:5c0f:38cb:e9ef:eb3c
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvwYPFAINwV0EH0myFpNzRjVbqXdAmJP616C5JvODklhZWJxFxlKJ
+Poczl57j2Z+4bonkTrJmsNtSaQLPKYH4H1qfo/lwz7nqEpPi3Xp4Fgts23w36eML
+WBvbw0fQO9R8zZJIIdRkJ2qqlhZiTlor1Gtlm8Z1RmpKkhL9O6Yzj94VhGLhABVl
+OsaF2M3PgXJMiLry67jzbAs3+mVaT3iBTzWOaOyREjKQEUg9B9IDxrmZMSWqdXZM
+0wfzaCjS40jD73m7tqi7W3tXzAUP4mEeUqkC+NC2Zgm/lJ5B1KPx7AyNqtRLsBLd
+pIdJs6ng63WV1fyHYUWMYqZk9zB/tQ0b0wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/util/bin/translate.google b/util/bin/translate.google
index 45da6463..2418dc37 100755
--- a/util/bin/translate.google
+++ b/util/bin/translate.google
@@ -1,44 +1,13 @@
 #! /bin/sh
 set -euf
 
-A=Mozilla
-url=http://translate.google.com/
+sl=${SL:="auto"}
+tl=${TL:="en"}
 
-pwd="$(dirname "$(readlink -f "$0")")"
+text=$*
 
-for x in \
-    "$pwd/../../submodules/github/tmpvar" \
-    "$pwd/../../submodules/github/mikeal" \
-    "$pwd/../../submodules/github/NV" \
-    "$pwd/../../submodules/github/tautologistics" \
-; do
-  export NODE_PATH="`readlink -f "$x"`${NODE_PATH+:$NODE_PATH}"
-done
+url="http://translate.google.com/translate_a/t?client=t&sl=$sl&tl=$tl"
 
-# ensure query is ready
-(cd "$pwd/../.." && git submodule update --init)
-
-{
-  for arg; do echo "$arg"; done | sed -n '
-    s/^--\(.*=.*\)/\1/p;t
-    s/.*/text="${text+$text }&"/p;t
-  '
-  cat<<EOF
-  query() {
-    node "$(readlink -f "$pwd/../../submodules/github/visionmedia/query")" "\$@"
-  }
-  curl -sS -A "\${A-Mozilla}"  \\
-      -d "js=\${js-n}"         \\
-      -d "prev=\${prev-_t}"    \\
-      -d "hl=\${hl-en}"        \\
-      -d "layout=\${layout-2}" \\
-      -d "eotf=\${eotf-1}"     \\
-      -d "ie=UTF-8"            \\
-      -d "oe=UTF-8"            \\
-      -d "sl=\${sl-auto}"      \\
-      -d "tl=\${tl-en}"        \\
-      -d "text=\$text"         \\
-      "$url" |
-    query '#result_box' text
-EOF
-} | sh
+curl -A "Mozilla/5.0" -Ss "$url" --data-urlencode "text=$text" |
+  sed 's/\[\[\[\"//' |
+  cut -d \" -f 1