Restructure contrib folder.

contrib/pogen.sh -> bin/pogen.sh
bootstrap: Use new pogen location and execute it.
contrib/openvpn-tap32: Move to contrib/3rdparty/Windows/openvpn-tap32.
contrib/gnunet-logo*: Move to contrib/branding/logo/
Delete old patches in contrib, predating git.
Move buildbot data to contrib/ci/buildbot,
move docker data to contrib/ci/docker.
Create contrib/conf and populate it with config files found in contrib and bin.
Move gns related data to contrib/gns.
delete contrib/repeat.sh
Move contrib/log.php into contrib/web/log.php.
Create folder contrib/scripts and use it for most scripts in contrib.
Remove trailing whitespace in doc/Makefile.am

Signed-off-by: Nils Gillmann <ng0@n0.is>

71 files changed, 60 insertions, 434 deletions

diff --git a/.gitignore b/.gitignore
index b7dd58739e..b36fa3b1c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ confdefs.h
 confdefs.c
 confdefs.err
 gnunet-doc.scm
+guix-env-gillmann.scm
 src/namestore/test_namestore_api_zone_to_name
 src/credential/gnunet-credential
 src/credential/gnunet-service-credential
diff --git a/README b/README
index 7819b883a3..f52fca4440 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ These are the direct dependencies for running GNUnet:
 - libogg        >= 1.3.0 (optional for experimental conversation tool)
 - python-zbar   >= 0.10 (optional for gnunet-qr)
 - TeX Live      >= 2012 (optional for gnunet-bcd[*])
-- Texinfo       >= 5.2
+- Texinfo       >= 5.2 [*1]
 - libglpk       >= 4.45 (optional for experimental code)
 
 Recommended autotools for compiling the git version are:
@@ -63,6 +63,10 @@ Recommended autotools for compiling the git version are:
 [*] Mandatory for compiling the info output of the documentation,
 a limited subset ('texlive-tiny' in Guix) is enough.
 
+[*1] The default configuration is to build the info output of the documentation,
+and therefore require texinfo.  You can pass --disable-documentation to
+the configure script to change this.
+
 How to install?
 ===============
 
@@ -262,7 +266,8 @@ $ make check
 
 Some of the testcases require python >= 2.6 and pexpect to be
 installed.  If any testcases fail to pass on your system, run
-"contrib/report.sh" and report the output together with
+"contrib/scripts/report.sh" (in the repository) or "gnunet-bugreport"
+when you already have GNUnet installed and report the output together with
 information about the failing testcase to the Mantis bugtracking
 system at https://gnunet.org/bugs/.
 
diff --git a/contrib/pogen.sh b/bin/pogen.sh
index 87c90adf25..87c90adf25 100755
--- a/contrib/pogen.sh
+++ b/bin/pogen.sh
diff --git a/bootstrap b/bootstrap
index f13919ba8a..a1cdcfa00b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,4 +6,4 @@ which glibtoolize || which libtoolize || which libtool || {
         exit 1
 }
 autoreconf -if
-contrib/pogen.sh
+. "bin/pogen.sh"
diff --git a/contrib/openvpn-tap32/COPYING b/contrib/3rdparty/Windows/openvpn-tap32/COPYING
index 3912109b5c..3912109b5c 100644
--- a/contrib/openvpn-tap32/COPYING
+++ b/contrib/3rdparty/Windows/openvpn-tap32/COPYING
diff --git a/contrib/openvpn-tap32/INSTALL b/contrib/3rdparty/Windows/openvpn-tap32/INSTALL
index 8e02c18902..8e02c18902 100644
--- a/contrib/openvpn-tap32/INSTALL
+++ b/contrib/3rdparty/Windows/openvpn-tap32/INSTALL
diff --git a/contrib/openvpn-tap32/tap32-signed-i386-2.1.zip b/contrib/3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip
index e13473203f..e13473203f 100644
--- a/contrib/openvpn-tap32/tap32-signed-i386-2.1.zip
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip
diff --git a/contrib/openvpn-tap32/tap32-source-2.1.zip b/contrib/3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip
index 9ffc0b4ef7..9ffc0b4ef7 100644
--- a/contrib/openvpn-tap32/tap32-source-2.1.zip
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip
diff --git a/contrib/openvpn-tap32/tapw32/OemWin2k.inf b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf
index 167e30fff4..167e30fff4 100644
--- a/contrib/openvpn-tap32/tapw32/OemWin2k.inf
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf
diff --git a/contrib/openvpn-tap32/tapw32/tap0901.cat b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat
index a6772f9fd8..a6772f9fd8 100644
--- a/contrib/openvpn-tap32/tapw32/tap0901.cat
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat
diff --git a/contrib/openvpn-tap32/tapw32/tap0901.sys b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys
index 3ecf2391b0..3ecf2391b0 100644
--- a/contrib/openvpn-tap32/tapw32/tap0901.sys
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys
diff --git a/contrib/openvpn-tap32/tapw64/OemWin2k.inf b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf
index 9b1676afd3..9b1676afd3 100644
--- a/contrib/openvpn-tap32/tapw64/OemWin2k.inf
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf
diff --git a/contrib/openvpn-tap32/tapw64/tap0901.cat b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat
index 1cac5f5c45..1cac5f5c45 100644
--- a/contrib/openvpn-tap32/tapw64/tap0901.cat
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat
diff --git a/contrib/openvpn-tap32/tapw64/tap0901.sys b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys
index 566e168ead..566e168ead 100644
--- a/contrib/openvpn-tap32/tapw64/tap0901.sys
+++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 40e6d3e92b..8e07a5d8c2 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -17,54 +17,62 @@ timeout_watchdog_SOURCES = \
 endif
 
 noinst_SCRIPTS = \
- terminate.py \
- pydiffer.py \
- removetrailingwhitespace.py \
- gnunet_pyexpect.py \
- gnunet_janitor.py \
- gnunet-chk.py
+ scripts/terminate.py \
+ scripts/pydiffer.py \
+ scripts/removetrailingwhitespace.py \
+ scripts/gnunet_pyexpect.py \
+ scripts/gnunet_janitor.py \
+ scripts/gnunet-chk.py
 
 dist_pkgdata_DATA = \
- gns-bcd.html \
- gns-bcd.tex \
- gnunet-logo.pdf \
- gnunet-logo-color.png \
+ gns/gns-bcd.html \
+ gns/gns-bcd.tex \
+ gns/def.tex \
+ gns/gns-form-fields.xml \
+ gns/gns-form.xslt \
+ branding/logo/gnunet-logo.pdf \
+ branding/logo/gnunet-logo-color.png \
+ scripts/report.sh \
  testing_hostkeys.ecc
 
 if MINGW
 tap32_DATA = \
- openvpn-tap32/tapw32/tap0901.sys \
- openvpn-tap32/tapw32/tap0901.cat \
- openvpn-tap32/tapw32/OemWin2k.inf
+ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
+ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \
+ 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf
 
 tap64_DATA = \
- openvpn-tap32/tapw64/tap0901.sys \
- openvpn-tap32/tapw64/tap0901.cat \
- openvpn-tap32/tapw64/OemWin2k.inf
+ 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys \
+ 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat \
+ 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf
 endif
 
 EXTRA_DIST = \
- no_forcestart.conf \
- no_autostart_above_core.conf \
- coverage.sh \
- nssswitch.conf \
- report.sh \
- terminate.py.in \
- gnunet_pyexpect.py.in \
- gnunet_janitor.py.in \
- gnunet-chk.py.in \
- removetrailingwhitespace.py.in \
- pydiffer.py.in \
- gnunet-gns-import.sh \
- openvpn-tap32/tapw32/tap0901.sys \
- openvpn-tap32/tapw32/tap0901.cat \
- openvpn-tap32/tapw32/OemWin2k.inf \
- openvpn-tap32/tapw64/tap0901.sys \
- openvpn-tap32/tapw64/tap0901.cat \
- openvpn-tap32/tapw64/OemWin2k.inf \
- openvpn-tap32/INSTALL \
- openvpn-tap32/tap32-signed-i386-2.1.zip \
- openvpn-tap32/tap32-source-2.1.zip
+ conf/colorit/colorit.conf \
+ conf/editors/eclipse/gnunet_codingstyle.xml \
+ conf/gnunet/no_forcestart.conf \
+ conf/gnunet/no_autostart_above_core.conf \
+ conf/nss/nssswitch.conf \
+ conf/wireshark/wireshark.lua \
+ scripts/coverage.sh \
+ scripts/terminate.py.in \
+ scripts/gnunet_pyexpect.py.in \
+ scripts/gnunet_janitor.py.in \
+ scripts/gnunet-chk.py.in \
+ scripts/removetrailingwhitespace.py.in \
+ scripts/pydiffer.py.in \
+ scripts/gnunet-gns-import.sh \
+ packages/nix/default.nix \
+ packages/nix/gnunet-dex.nix \
+ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
+ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \
+ 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \
+ 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys \
+ 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat \
+ 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf \
+ 3rdparty/Windows/openvpn-tap32/INSTALL \
+ 3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip \
+ 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip
 
 CLEANFILES = \
   $(noinst_SCRIPTS)
@@ -82,21 +90,13 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 #
 # instead of this:
 
+SUFFIXES =
 SUFFIXES = .py.in .py
 
 .py.in.py:
 	$(do_subst) < $< > $@
 	chmod +x $@
 
-# init_gnunet_redhat \
-# init_gnunet_ubuntu \
-# visualize_stats.sh \
-# gnmessage.sh \
-# junkinsert.sh \
-# junklookup.sh \
-# namespacehelper.sh
-
-
 check_PROGRAMS = \
  test_gnunet_prefix
 
diff --git a/contrib/gnunet-logo-big.png b/contrib/branding/logo/gnunet-logo-big.png
index 54c418f8f3..54c418f8f3 100644
--- a/contrib/gnunet-logo-big.png
+++ b/contrib/branding/logo/gnunet-logo-big.png
diff --git a/contrib/gnunet-logo-color.png b/contrib/branding/logo/gnunet-logo-color.png
index 326822ebd2..326822ebd2 100644
--- a/contrib/gnunet-logo-color.png
+++ b/contrib/branding/logo/gnunet-logo-color.png
diff --git a/contrib/gnunet-logo.pdf b/contrib/branding/logo/gnunet-logo.pdf
index fcc7b10bff..fcc7b10bff 100644
--- a/contrib/gnunet-logo.pdf
+++ b/contrib/branding/logo/gnunet-logo.pdf
diff --git a/contrib/buildslave-0.8.6p1-gnunet-w32.patch b/contrib/buildslave-0.8.6p1-gnunet-w32.patch
deleted file mode 100644
index 265db4d713..0000000000
--- a/contrib/buildslave-0.8.6p1-gnunet-w32.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-diff -urN /src/buildbot-slave-0.8.6p1.orig/buildslave/runprocess.py /src/buildbot-slave-0.8.6p1/buildslave/runprocess.py
---- buildbot-slave-0.8.6p1.orig/buildslave/runprocess.py	2012-03-26 04:09:10 +0400
-+++ buildbot-slave-0.8.6p1/buildslave/runprocess.py	2013-03-31 05:18:55 +0400
-@@ -24,6 +24,7 @@
- import re
- import subprocess
- import traceback
-+import tempfile
- import stat
- from collections import deque
- 
-@@ -36,6 +37,89 @@
- if runtime.platformType == 'posix':
-     from twisted.internet.process import Process
- 
-+if os.name == 'nt':
-+    import win32api
-+    import win32process
-+    import win32event
-+    import pywintypes
-+
-+def safe_terminate_process (proc, code):
-+    if os.name == 'nt':
-+        log.msg ("Obtaining current process handle")
-+        cp = win32api.GetCurrentProcess ()
-+        result = False
-+        log.msg ("Expanding target process handle permissions")
-+        dupproc = win32api.DuplicateHandle (cp, proc._handle, cp, 2 | 1024 | 8 | 32 | 16 | 0x100000, 0, 0)
-+        log.msg ("Expanded.")
-+        try:
-+            log.msg ("Checking exit code of target process")
-+            exitcode = win32process.GetExitCodeProcess (dupproc)
-+            log.msg ("Exit code is %d" % exitcode)
-+            if exitcode == 0x103:
-+                log.msg ("Opening kernel32.dll")
-+                kernel32 = win32api.GetModuleHandle ("kernel32")
-+                log.msg ("Getting ExitProcess() address")
-+                exitprocess = win32api.GetProcAddress (kernel32, "ExitProcess")
-+                try:
-+                    log.msg ("Creating remote thread")
-+                    th = 0
-+                    tid = 0
-+                    failed = False
-+                    th, tid = win32process.CreateRemoteThread (dupproc, None, 0, exitprocess, code, 0)
-+                    log.msg ("Created remote thread %d" % tid)
-+                except pywintypes.error as e:
-+                    if e[0] == 5:
-+                      log.msg ("Access denied. It still might die, so don't fail yet")
-+                      pass
-+                    else:
-+                      log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-+                      failed = True
-+                except Exception as e:
-+                    log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-+                    failed = True
-+                if not failed:
-+                    log.msg ("Wait for 5 seconds or until it dies (usually takes around 1 microsecond)")
-+                    waitresult = win32event.WaitForSingleObject (dupproc, 5)
-+                    log.msg ("Result of waiting: %d" % waitresult)
-+                    win32api.CloseHandle (th)
-+                    if waitresult == 0:
-+                        result = True
-+            else:
-+                result = True
-+        except:
-+            log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-+        finally:
-+            win32api.CloseHandle (dupproc)
-+        return result
-+    else:
-+        return proc.kill ()
-+
-+class Dummy(object):
-+    def SetHandle (self, h):
-+        self._handle = h
-+
-+def safe_terminate_process_by_pid (proc, code):
-+    if os.name == 'nt':
-+        try:
-+            log.msg("Opening process %d" % proc)
-+            openproc = win32api.OpenProcess (2 | 1024 | 8 | 32 | 16 | 0x100000, 0, proc)
-+            log.msg("Opened process %d" % proc)
-+            try:
-+                d = Dummy ()
-+                d.SetHandle (openproc)
-+                log.msg("Terminating it safely")
-+                safe_terminate_process (d, code)
-+                log.msg("Finished terminating")
-+            finally:
-+                log.msg("Closing process handle")
-+                win32api.CloseHandle (openproc)
-+        except:
-+            log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-+            pass
-+    else:
-+        return os.kill (proc, code)
-+
-+	
- def shell_quote(cmd_list):
-     # attempt to quote cmd_list such that a shell will properly re-interpret
-     # it.  The pipes module is only available on UNIX, and Windows "shell"
-@@ -148,6 +232,7 @@
-         self.pending_stdin = ""
-         self.stdin_finished = False
-         self.killed = False
-+        self.scriptfile = ""
- 
-     def setStdin(self, data):
-         assert not self.connected
-@@ -198,6 +283,11 @@
-                 rc = 1
-             else:
-                 rc = -1
-+        if self.scriptfile:
-+            try:
-+                os.remove (self.scriptfile) 
-+            except:
-+                pass
-         self.command.finished(sig, rc)
- 
- 
-@@ -408,9 +498,14 @@
- 
-         if type(self.command) in types.StringTypes:
-             if runtime.platformType  == 'win32':
--                argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args
--                if '/c' not in argv: argv += ['/c']
--                argv += [self.command]
-+                if os.environ['BUILDSLAVE_SHELL']:
-+                    argv = os.environ['BUILDSLAVE_SHELL'].split() # allow %COMSPEC% to have args
-+                    argv += [self.command]
-+                else:
-+                    argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args
-+                    if '/c' not in argv:
-+                        argv += ['/c']
-+                    argv += [self.command]
-             else:
-                 # for posix, use /bin/sh. for other non-posix, well, doesn't
-                 # hurt to try
-@@ -424,9 +519,26 @@
-             # handle path searching, etc.
-             if runtime.platformType == 'win32' and not \
-                     (self.command[0].lower().endswith(".exe") and os.path.isabs(self.command[0])):
--                argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args
--                if '/c' not in argv: argv += ['/c']
--                argv += list(self.command)
-+                if os.environ['BUILDSLAVE_SHELL']:
-+                    argv = os.environ['BUILDSLAVE_SHELL'].split()
-+                    # Create a temporary script file that changes current directory
-+                    # and runs the command we want
-+                    # It will be deleted after command is finished running (see RunProcessPP)
-+                    tf, tf_name = tempfile.mkstemp ()
-+                    f = os.fdopen (tf, 'wb')
-+                    fcontents = '#!/bin/sh\ncd {}\n{}'.format (
-+                        re.sub(r'(?<!\\) ','\\ ', self.workdir.replace('\\','/')),
-+                        ' '.join (self.command))
-+                    f.write (fcontents)
-+                    log.msg("Script: {}".format (fcontents))
-+                    f.close ()
-+                    self.pp.scriptfile = tf_name
-+                    argv += [tf_name.replace('\\','/')]
-+                else:
-+                    argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args
-+                    if '/c' not in argv:
-+                      argv += ['/c']
-+                    argv += list(self.command)
-             else:
-                 argv = self.command
-             # Attempt to format this for use by a shell, although the process isn't perfect
-@@ -439,7 +551,7 @@
-             self.environ['PWD'] = os.path.abspath(self.workdir)
- 
-         # self.stdin is handled in RunProcessPP.connectionMade
--
-+        log.msg("Running {}".format (argv))
-         log.msg(" " + display)
-         self._addToBuffers('header', display+"\n")
- 
-@@ -770,9 +882,7 @@
-             if self.interruptSignal == None:
-                 log.msg("self.interruptSignal==None, only pretending to kill child")
-             else:
--                log.msg("using TASKKILL /F PID /T to kill pid %s" % self.process.pid)
--                subprocess.check_call("TASKKILL /F /PID %s /T" % self.process.pid)
--                log.msg("taskkill'd pid %s" % self.process.pid)
-+                safe_terminate_process_by_pid (self.process.pid, 1)
-                 hit = 1
- 
-         # try signalling the process itself (works on Windows too, sorta)
-@@ -795,10 +905,11 @@
-         if not hit:
-             log.msg("signalProcess/os.kill failed both times")
- 
--        if runtime.platformType == "posix":
-+        if runtime.platformType == "posix" or runtime.platformType == "win32":
-             # we only do this under posix because the win32eventreactor
-             # blocks here until the process has terminated, while closing
-             # stderr. This is weird.
-+            # LRN: Turns out, things don't work without this on W32. At all.
-             self.pp.transport.loseConnection()
- 
-         if self.deferred:
diff --git a/contrib/buildbot-update.sh b/contrib/ci/buildbot/buildbot-update.sh
index 6c9d28b254..6c9d28b254 100755
--- a/contrib/buildbot-update.sh
+++ b/contrib/ci/buildbot/buildbot-update.sh
diff --git a/contrib/ssh-config b/contrib/ci/buildbot/ssh-config
index 857354bf33..857354bf33 100644
--- a/contrib/ssh-config
+++ b/contrib/ci/buildbot/ssh-config
diff --git a/contrib/ssh-keys b/contrib/ci/buildbot/ssh-keys
index 8a786d9cdf..8a786d9cdf 100644
--- a/contrib/ssh-keys
+++ b/contrib/ci/buildbot/ssh-keys
diff --git a/contrib/Dockerfile b/contrib/ci/docker/Dockerfile
index 974e41a5e0..974e41a5e0 100644
--- a/contrib/Dockerfile
+++ b/contrib/ci/docker/Dockerfile
diff --git a/contrib/docker-entrypoint.sh b/contrib/ci/docker/docker-entrypoint.sh
index 807d86d6fd..807d86d6fd 100644
--- a/contrib/docker-entrypoint.sh
+++ b/contrib/ci/docker/docker-entrypoint.sh
diff --git a/contrib/colorit.conf b/contrib/conf/colorit/colorit.conf
index 77d57aa59e..77d57aa59e 100644
--- a/contrib/colorit.conf
+++ b/contrib/conf/colorit/colorit.conf
diff --git a/contrib/gnunet_codingstyle.xml b/contrib/conf/editors/eclipse/gnunet_codingstyle.xml
index a58c2ed0c7..a58c2ed0c7 100644
--- a/contrib/gnunet_codingstyle.xml
+++ b/contrib/conf/editors/eclipse/gnunet_codingstyle.xml
diff --git a/contrib/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf
index 7bcf6c8ae1..7bcf6c8ae1 100644
--- a/contrib/no_autostart_above_core.conf
+++ b/contrib/conf/gnunet/no_autostart_above_core.conf
diff --git a/contrib/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf
index a332d6da7d..a332d6da7d 100644
--- a/contrib/no_forcestart.conf
+++ b/contrib/conf/gnunet/no_forcestart.conf
diff --git a/contrib/nssswitch.conf b/contrib/conf/nss/nssswitch.conf
index 89af6471ea..89af6471ea 100644
--- a/contrib/nssswitch.conf
+++ b/contrib/conf/nss/nssswitch.conf
diff --git a/bin/wireshark.lua b/contrib/conf/wireshark/wireshark.lua
index ac77029f68..ac77029f68 100644
--- a/bin/wireshark.lua
+++ b/contrib/conf/wireshark/wireshark.lua
diff --git a/contrib/bootstrap.min.css b/contrib/gns/bootstrap.min.css
index c547283bbd..c547283bbd 100644
--- a/contrib/bootstrap.min.css
+++ b/contrib/gns/bootstrap.min.css
diff --git a/contrib/def.tex b/contrib/gns/def.tex
index 669302b080..669302b080 100644
--- a/contrib/def.tex
+++ b/contrib/gns/def.tex
diff --git a/contrib/gns-bcd.html b/contrib/gns/gns-bcd.html
index de2fdb6e69..de2fdb6e69 100644
--- a/contrib/gns-bcd.html
+++ b/contrib/gns/gns-bcd.html
diff --git a/contrib/gns-bcd.tex b/contrib/gns/gns-bcd.tex
index 73a302985c..f3a033ebc7 100644
--- a/contrib/gns-bcd.tex
+++ b/contrib/gns/gns-bcd.tex
@@ -18782,7 +18782,7 @@
                 \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-29.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}};
             }
             {
-                \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}};
+                \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{../branding/logo/gnunet-logo.pdf}};
                 \node[rectangle,draw=white,line width=1pt,inner sep=0pt] at (17mm,-17mm) {\begin{pspicture}(15mm,15mm) \psbarcode{gnunet://gns/\gns}{eclevel=Q}{qrcode}\end{pspicture}};
                 \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
                 \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-41.5mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}};
diff --git a/contrib/gns-form-fields.xml b/contrib/gns/gns-form-fields.xml
index 308e66e0d4..308e66e0d4 100644
--- a/contrib/gns-form-fields.xml
+++ b/contrib/gns/gns-form-fields.xml
diff --git a/contrib/gns-form.xslt b/contrib/gns/gns-form.xslt
index bf25856165..bf25856165 100644
--- a/contrib/gns-form.xslt
+++ b/contrib/gns/gns-form.xslt
diff --git a/contrib/experiments/nse/infiniband.conf b/contrib/nse/experiments/infiniband.conf
index c7b7f2a591..c7b7f2a591 100644
--- a/contrib/experiments/nse/infiniband.conf
+++ b/contrib/nse/experiments/infiniband.conf
diff --git a/contrib/lrn-indent.diff b/contrib/patches/lrn-indent.diff
index 8ba3b77ccc..8ba3b77ccc 100644
--- a/contrib/lrn-indent.diff
+++ b/contrib/patches/lrn-indent.diff
diff --git a/contrib/texi2html5-indent.diff b/contrib/patches/texi2html5-indent.diff
index 2abbcb7666..2abbcb7666 100644
--- a/contrib/texi2html5-indent.diff
+++ b/contrib/patches/texi2html5-indent.diff
diff --git a/contrib/transport_ats_years.diff b/contrib/patches/transport_ats_years.diff
index f48c9555d9..f48c9555d9 100644
--- a/contrib/transport_ats_years.diff
+++ b/contrib/patches/transport_ats_years.diff
diff --git a/contrib/repeat.sh b/contrib/repeat.sh
deleted file mode 100755
index 3efc95f073..0000000000
--- a/contrib/repeat.sh
+++ /dev/null
@@ -1 +0,0 @@
-while true; do rm -rf /tmp/test-gnunetd-*; make check || break; done
diff --git a/contrib/coverage.sh b/contrib/scripts/coverage.sh
index dd6a6ab53c..dd6a6ab53c 100755
--- a/contrib/coverage.sh
+++ b/contrib/scripts/coverage.sh
diff --git a/contrib/debug b/contrib/scripts/debug
index 3de2c9a14c..3de2c9a14c 100755
--- a/contrib/debug
+++ b/contrib/scripts/debug
diff --git a/contrib/find_typedefs.py b/contrib/scripts/find_typedefs.py
index 68f5c2782f..68f5c2782f 100644
--- a/contrib/find_typedefs.py
+++ b/contrib/scripts/find_typedefs.py
diff --git a/contrib/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py
index 79d46aa96e..79d46aa96e 100644
--- a/contrib/gdb-iterate-dll.py
+++ b/contrib/scripts/gdb-iterate-dll.py
diff --git a/contrib/generate-monkey-db.sh b/contrib/scripts/generate-monkey-db.sh
index 2afe555017..2afe555017 100755
--- a/contrib/generate-monkey-db.sh
+++ b/contrib/scripts/generate-monkey-db.sh
diff --git a/contrib/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in
index c976b2143d..c976b2143d 100755
--- a/contrib/gnunet-chk.py.in
+++ b/contrib/scripts/gnunet-chk.py.in
diff --git a/contrib/gnunet-logread b/contrib/scripts/gnunet-logread/gnunet-logread
index e4b6752b8a..9b1c65401b 100755
--- a/contrib/gnunet-logread
+++ b/contrib/scripts/gnunet-logread/gnunet-logread
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@PERL@
 # helper tool to make gnunet logs more readable
 # try 'gnunet-logread -h' for usage
 
diff --git a/contrib/gnunet-logread-ipc b/contrib/scripts/gnunet-logread/gnunet-logread-ipc
index 77515d8903..72f9f47df5 100755
--- a/contrib/gnunet-logread-ipc
+++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc
@@ -4,6 +4,7 @@
 #
 # ... obsoleted by gnunet-logread's new -f option that does the same thing
 
+# FIXME: Replace /tmp with our use of $TMPDIR and similar.
 ipc=${1:-/tmp/gnunet-logread-ipc.sock}
 test -e "$ipc" || mkfifo "$ipc"
 cat "$ipc"
diff --git a/contrib/gnunet-logread-ipc-sdedit b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit
index 197e6f5758..f8b7dc7350 100755
--- a/contrib/gnunet-logread-ipc-sdedit
+++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!@PERL@
 
 # 1. Start sdedit and enable 'RT diagram server' in 'Global preferences'.
 #
diff --git a/contrib/gnunet-suidfix b/contrib/scripts/gnunet-suidfix
index 9923789662..9923789662 100755
--- a/contrib/gnunet-suidfix
+++ b/contrib/scripts/gnunet-suidfix
diff --git a/contrib/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in
index 74fc708864..74fc708864 100644
--- a/contrib/gnunet_janitor.py.in
+++ b/contrib/scripts/gnunet_janitor.py.in
diff --git a/contrib/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in
index cfeb06d8d6..cfeb06d8d6 100644
--- a/contrib/gnunet_pyexpect.py.in
+++ b/contrib/scripts/gnunet_pyexpect.py.in
diff --git a/contrib/process_log.sh b/contrib/scripts/process_log.sh
index c25c515c2a..c25c515c2a 100755
--- a/contrib/process_log.sh
+++ b/contrib/scripts/process_log.sh
diff --git a/contrib/pydiffer.py.in b/contrib/scripts/pydiffer.py.in
index 10145371c3..10145371c3 100644
--- a/contrib/pydiffer.py.in
+++ b/contrib/scripts/pydiffer.py.in
diff --git a/contrib/pydmesg b/contrib/scripts/pydmesg
index d60e08fe3b..d60e08fe3b 100755
--- a/contrib/pydmesg
+++ b/contrib/scripts/pydmesg
diff --git a/contrib/regression.sh b/contrib/scripts/regression.sh
index 1f799797ac..1f799797ac 100755
--- a/contrib/regression.sh
+++ b/contrib/scripts/regression.sh
diff --git a/contrib/removetrailingwhitespace.py.in b/contrib/scripts/removetrailingwhitespace.py.in
index 5824fb5914..5824fb5914 100755
--- a/contrib/removetrailingwhitespace.py.in
+++ b/contrib/scripts/removetrailingwhitespace.py.in
diff --git a/contrib/report.sh b/contrib/scripts/report.sh
index 7fbb2f46c8..7fbb2f46c8 100755
--- a/contrib/report.sh
+++ b/contrib/scripts/report.sh
diff --git a/contrib/revisionary.sh b/contrib/scripts/revisionary.sh
index 5778cf1486..5778cf1486 100755
--- a/contrib/revisionary.sh
+++ b/contrib/scripts/revisionary.sh
diff --git a/contrib/terminate.py.in b/contrib/scripts/terminate.py.in
index 4a6719f38b..4a6719f38b 100644
--- a/contrib/terminate.py.in
+++ b/contrib/scripts/terminate.py.in
diff --git a/contrib/testbed_cleanup.sh b/contrib/scripts/testbed_cleanup.sh
index 57413fba0a..57413fba0a 100755
--- a/contrib/testbed_cleanup.sh
+++ b/contrib/scripts/testbed_cleanup.sh
diff --git a/contrib/texinfo-hacks.el b/contrib/scripts/texinfo-hacks.el
index bfb5c98fac..bfb5c98fac 100644
--- a/contrib/texinfo-hacks.el
+++ b/contrib/scripts/texinfo-hacks.el
diff --git a/contrib/visualize_stats.sh b/contrib/scripts/visualize_stats.sh
index aaa5e657b8..aaa5e657b8 100755
--- a/contrib/visualize_stats.sh
+++ b/contrib/scripts/visualize_stats.sh
diff --git a/contrib/zonewalk-to-types.sh b/contrib/scripts/zonewalk-to-types.sh
index c453702e65..c453702e65 100755
--- a/contrib/zonewalk-to-types.sh
+++ b/contrib/scripts/zonewalk-to-types.sh
diff --git a/contrib/testbed_perfhacks.patch b/contrib/testbed_perfhacks.patch
deleted file mode 100644
index 1ad524a308..0000000000
--- a/contrib/testbed_perfhacks.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: src/include/gnunet_constants.h
-===================================================================
---- src/include/gnunet_constants.h	(revision 26030)
-+++ src/include/gnunet_constants.h	(working copy)
-@@ -49,7 +49,7 @@
-  * After how long do we consider a connection to a peer dead
-  * if we don't receive messages from the peer?
-  */
--#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-+#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 5)
- 
- /**
-  * How long do we delay reading more from a peer after a quota violation?
-@@ -61,7 +61,7 @@
-  * even if we assume that the service commonly does not
-  * respond instantly (DNS, Database, etc.).
-  */
--#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10)
-+#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 10)
- 
- /**
-  * How long do we delay messages to get larger packet sizes (CORKing)?
-Index: src/transport/gnunet-service-transport_neighbours.c
-===================================================================
---- src/transport/gnunet-service-transport_neighbours.c	(revision 26030)
-+++ src/transport/gnunet-service-transport_neighbours.c	(working copy)
-@@ -65,7 +65,7 @@
-  * send 3 keepalives in each interval, so 3 messages would need to be
-  * lost in a row for a disconnect).
-  */
--#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-+#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 100)
- 
- /**
-  * How long are we willing to wait for a response from ATS before timing out?
-Index: src/transport/gnunet-service-transport_validation.c
-===================================================================
---- src/transport/gnunet-service-transport_validation.c	(revision 26030)
-+++ src/transport/gnunet-service-transport_validation.c	(working copy)
-@@ -43,7 +43,7 @@
-  * OTOH, we don't want to spend too much time generating PONG signatures,
-  * so they must have some lifetime to reduce our CPU usage.
-  */
--#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
-+#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
- 
- /**
-  * After how long do we expire an address in a HELLO that we just
-@@ -58,24 +58,24 @@
-  * we cannot validate (because after this time we can destroy the
-  * validation record).
-  */
--#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-+#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
- 
- /**
-  * How often do we PING an address that we have successfully validated
-  * in the past but are not actively using?  Should be (significantly)
-  * smaller than HELLO_ADDRESS_EXPIRATION.
-  */
--#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-+#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6)
- 
- /**
-  * How often do we PING an address that we are currently using?
-  */
--#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
-+#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 2)
- 
- /**
-  * How much delay is acceptable for sending the PING or PONG?
-  */
--#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
-+#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
- 
- /**
-  * Size of the validation map hashmap.
-@@ -745,9 +745,9 @@
- void
- GST_validation_start (unsigned int max_fds)
- {
--	validation_next = GNUNET_TIME_absolute_get();
--	validation_delay.rel_value = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value) /  max_fds;
--	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delay between validations: %u ms\n ", validation_delay.rel_value);
-+  validation_next = GNUNET_TIME_absolute_get();
-+  validation_delay.rel_value = GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
-+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delay between validations: %u ms\n ", validation_delay.rel_value);
-   validation_map = GNUNET_CONTAINER_multihashmap_create (VALIDATION_MAP_SIZE,
- 							 GNUNET_NO);
-   pnc = GNUNET_PEERINFO_notify (GST_cfg, &process_peerinfo_hello, NULL);
diff --git a/contrib/testbed_setup_pre_ecc_tree.sh b/contrib/testbed_setup_pre_ecc_tree.sh
deleted file mode 100755
index 4c6920144b..0000000000
--- a/contrib/testbed_setup_pre_ecc_tree.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-svn up -r26032 
-svn up -r26167 src/nse/
-svn up -r26079 src/include/gnunet_helper_lib.h src/util/helper.c
-svn up -r26219 src/include/gnunet_protocols.h
-svn up src/include/gnunet_testbed_service.h src/testbed/ src/regex/ src/dht/
-svn up contrib
-svn up configure.ac
diff --git a/contrib/transpot_delay.patch b/contrib/transpot_delay.patch
deleted file mode 100644
index 9ba8069608..0000000000
--- a/contrib/transpot_delay.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: src/transport/gnunet-service-transport_neighbours.c
-===================================================================
---- src/transport/gnunet-service-transport_neighbours.c	(revision 27335)
-+++ src/transport/gnunet-service-transport_neighbours.c	(working copy)
-@@ -65,7 +65,7 @@
-  * send 3 keepalives in each interval, so 3 messages would need to be
-  * lost in a row for a disconnect).
-  */
--#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-+#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 100)
- 
- /**
-  * How long are we willing to wait for a response from ATS before timing out?
-Index: src/transport/gnunet-service-transport_validation.c
-===================================================================
---- src/transport/gnunet-service-transport_validation.c	(revision 27335)
-+++ src/transport/gnunet-service-transport_validation.c	(working copy)
-@@ -42,7 +42,7 @@
-  * OTOH, we don't want to spend too much time generating PONG signatures,
-  * so they must have some lifetime to reduce our CPU usage.
-  */
--#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
-+#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
- 
- /**
-  * After how long do we expire an address in a HELLO that we just
-@@ -57,24 +57,24 @@
-  * we cannot validate (because after this time we can destroy the
-  * validation record).
-  */
--#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-+#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
- 
- /**
-  * How often do we PING an address that we have successfully validated
-  * in the past but are not actively using?  Should be (significantly)
-  * smaller than HELLO_ADDRESS_EXPIRATION.
-  */
--#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-+#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6)
- 
- /**
-  * How often do we PING an address that we are currently using?
-  */
--#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
-+#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 2)
- 
- /**
-  * How much delay is acceptable for sending the PING or PONG?
-  */
--#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
-+#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1)
- 
- /**
-  * Size of the validation map hashmap.
-Index: src/include/gnunet_constants.h
-===================================================================
---- src/include/gnunet_constants.h	(revision 27335)
-+++ src/include/gnunet_constants.h	(working copy)
-@@ -49,7 +49,7 @@
-  * After how long do we consider a connection to a peer dead
-  * if we don't receive messages from the peer?
-  */
--#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-+#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 5)
- 
- /**
-  * How long do we delay reading more from a peer after a quota violation?
-@@ -61,7 +61,7 @@
-  * even if we assume that the service commonly does not
-  * respond instantly (DNS, Database, etc.).
-  */
--#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10)
-+#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 10)
- 
- /**
-  * How long do we delay messages to get larger packet sizes (CORKing)?
diff --git a/contrib/log.php b/contrib/web/log.php
index b2ca9ed6cd..b2ca9ed6cd 100644
--- a/contrib/log.php
+++ b/contrib/web/log.php
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 28db606c5e..1070974d13 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,4 +7,4 @@ if !DOCUMENTATION
 endif
 
 EXTRA_DIST =							\
-	outdated-and-old-installation-instructions.txt		
+	outdated-and-old-installation-instructions.txt
diff --git a/guix-env.scm b/guix-env.scm
index 213b2769e1..11e5451e21 100644
--- a/guix-env.scm
+++ b/guix-env.scm
@@ -134,8 +134,6 @@
          (modify-phases %standard-phases
            (add-after 'unpack 'patch-bin-sh
              (lambda _
-               (substitute* "bootstrap"
-                 (("contrib/pogen.sh") "sh contrib/pogen.sh"))
                (for-each (lambda (f) (chmod f #o755))
                          (find-files "po" ""))
                #t))