31 files changed, 915 insertions, 221 deletions

diff --git a/Makefile.am b/Makefile.am
index 567e7b5ff..0466fcc10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,11 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS  = doc m4 src po pkgconfig
+
+if DOC_ONLY
+  SUBDIRS = doc m4 po pkgconfig
+else
+  SUBDIRS  = doc m4 src po pkgconfig
+endif
 
 if !TALER_ONLY
   SUBDIRS += contrib
diff --git a/README b/README
index 0e85fadfd..30ebf5f4f 100644
--- a/README
+++ b/README
@@ -48,7 +48,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       Tested with version 6.3
+- Texinfo       >= 5.2
 - libglpk       >= 4.45 (optional for experimental code)
 
 Recommended autotools for compiling the SVN version are:
diff --git a/configure.ac b/configure.ac
index 027724774..206a407fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,6 +586,23 @@ AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
 
 
+# should the build process be restricted to only building
+# the documentation?
+AC_MSG_CHECKING(whether to build documentation ONLY)
+AC_ARG_ENABLE([documentation],
+   [AS_HELP_STRING([--enable-documentation], [only build the documentation])],
+   [doc_only=${enableval}],
+   [doc_only=no])
+AC_MSG_RESULT($doc_only)
+if test "x$doc_only" = "xyes"
+then
+  AM_CONDITIONAL([DOC_ONLY],true)
+  AC_DEFINE([DOC_ONLY],[1],[Building the documentation])
+else
+  AM_CONDITIONAL([DOC_ONLY],false)
+  AC_DEFINE([DOC_ONLY],[0],[Canonical compilation])
+fi
+
 # should the build process be restricted to the code required
 # for GNU Taler wallets?
 AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY)
diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm
index a2a9a2393..9974c1b51 100644
--- a/contrib/packages/guix/gnunet-doc.scm
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -46,6 +46,7 @@
  (gnu packages gstreamer)
  (gnu packages gtk)
  (gnu packages guile)
+ (gnu packages graphviz)
  (gnu packages image)
  (gnu packages image-viewers)
  (gnu packages libidn)
@@ -64,13 +65,14 @@
  (gnu packages video)
  (gnu packages web)
  (gnu packages xiph)
+ ;;(gnunet packages texlive) ;GNUnet module including texlive-2012 WIP
  ((guix licenses) #:prefix license:))
 
 (define %source-dir (string-append (current-source-directory)
                                    "/../../../"))
 
 (define gnunet-doc
-  (let* ((revision "1")
+  (let* ((revision "2")
          (select? (delay (or (git-predicate
                               (string-append (current-source-directory)
                                              "/../../../"))
@@ -115,17 +117,20 @@
          ("bluez" ,bluez) ; for optional bluetooth feature
          ("glib" ,glib)
          ;;("texlive-minimal" ,texlive-minimal) ; optional.
-         ("texlive" ,texlive)
+         ("texlive" ,texlive) ;TODO: Stabilize Texlive-2012 package
          ("libogg" ,libogg)))
       (native-inputs
        `(("pkg-config" ,pkg-config)
          ("autoconf" ,autoconf)
          ("automake" ,automake)
          ("gnu-gettext" ,gnu-gettext)
-         ("texinfo" ,texinfo)
+         ("graphviz" ,graphviz) ; dot
+         ("texinfo-5" ,texinfo-5) ; Debian stable
          ("libtool" ,libtool)))
       (arguments
-       `(#:tests? #f ;Don't run tests
+       `(#:configure-flags
+         (list "--enable-documentation")
+         #:tests? #f ;Don't run tests
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'autoconf
@@ -140,22 +145,29 @@
                (chdir "doc")
                (zero? (system* "make" "doc-all-give-me-the-noise"))))
            (replace 'install
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (doc (string-append out "/share/doc/gnunet")))
-                 (mkdir-p doc)
-                 (mkdir-p (string-append doc "/gnunet"))
-                 (install-file "gnunet.pdf" doc)
-                 (install-file "gnunet.info" doc)
-                 (copy-recursively "gnunet"
-                                   (string-append doc
-                                                  "/gnunet"))
-                 (install-file "gnunet-c-tutorial.pdf" doc)
-                 (install-file "gnunet-c-tutorial.info" doc)
-                 (copy-recursively "gnunet-c-tutorial"
-                                   (string-append doc
-                                                  "/gnunet-c-tutorial")))
-               #t)))))
+             (lambda _
+               (zero? (system* "make" "doc-all-install")))))))
+             ;;(lambda* (#:key outputs #:allow-other-keys)
+               ;; (let* ((out (assoc-ref outputs "out"))
+               ;;        (doc (string-append out "/share/doc/gnunet")))
+               ;;   (mkdir-p doc)
+               ;;   (copy-recursively "images"
+               ;;                     (string-append doc
+               ;;                                    "/images"))
+               ;;   (mkdir-p (string-append doc "/gnunet"))
+               ;;   (install-file "gnunet.pdf" doc)
+               ;;   (install-file "gnunet.info" doc)
+               ;;   (install-file "gnunet.log" doc) ;TODO: Move to 'dev' output?
+               ;;   (copy-recursively "gnunet"
+               ;;                     (string-append doc
+               ;;                                    "/gnunet"))
+               ;;   (install-file "gnunet-c-tutorial.pdf" doc)
+               ;;   (install-file "gnunet-c-tutorial.info" doc)
+               ;;   (install-file "gnunet-c-tutorial.log" doc) ;TODO: Move to 'dev' output?
+               ;;   (copy-recursively "gnunet-c-tutorial"
+               ;;                     (string-append doc
+               ;;                                    "/gnunet-c-tutorial")))
+               ;; #t)))))
       (synopsis "Documentation of GNUnet")
       (description
        "GNUnet documentation build")
diff --git a/contrib/packages/guix/gnunet.scm b/contrib/packages/guix/gnunet.scm
new file mode 100644
index 000000000..a358fcecc
--- /dev/null
+++ b/contrib/packages/guix/gnunet.scm
@@ -0,0 +1,165 @@
+;;; This file is part of GNUnet.
+;;; Copyright (C) 2016, 2017 GNUnet e.V.
+;;;
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
+;;;
+;;; GNUnet is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+
+(use-modules
+ (ice-9 popen)
+ (ice-9 match)
+ (ice-9 rdelim)
+ (guix packages)
+ (guix build-system gnu)
+ (guix gexp)
+ ((guix build utils) #:select (with-directory-excursion))
+ (guix git-download)
+ (guix utils) ; current-source-directory
+ (gnu packages)
+ (gnu packages aidc)
+ (gnu packages autotools)
+ (gnu packages backup)
+ (gnu packages base)
+ (gnu packages compression)
+ (gnu packages curl)
+ (gnu packages databases)
+ (gnu packages file)
+ (gnu packages gettext)
+ (gnu packages glib)
+ (gnu packages gnome)
+ (gnu packages gnunet)
+ (gnu packages gnupg)
+ (gnu packages gnuzilla)
+ (gnu packages groff)
+ (gnu packages gstreamer)
+ (gnu packages gtk)
+ (gnu packages guile)
+ (gnu packages image)
+ (gnu packages image-viewers)
+ (gnu packages libidn)
+ (gnu packages libunistring)
+ (gnu packages linux)
+ (gnu packages maths)
+ (gnu packages multiprecision)
+ (gnu packages perl)
+ (gnu packages pkg-config)
+ (gnu packages pulseaudio)
+ (gnu packages python)
+ (gnu packages tex)
+ (gnu packages texinfo)
+ (gnu packages tex)
+ (gnu packages tls)
+ (gnu packages video)
+ (gnu packages web)
+ (gnu packages xiph)
+ ((guix licenses) #:prefix license:))
+
+(define %source-dir (string-append (current-source-directory)
+                                   "/../../../"))
+
+(define gnunet-test-git
+  (let* ((revision "1")
+         (select? (delay (or (git-predicate
+                              (string-append (current-source-directory)
+                                             "/../../../"))
+                             source-file?))))
+    (package
+      (name "gnunet-test-git")
+      (version (string-append "0.10.1-" revision "." "dev"))
+      (source
+       (local-file ;;"../../.."
+        ;;%source-dir
+        ;;(string-append (getcwd) "/../../../")
+        (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME!
+        #:recursive? #t))
+      ;;#:select? (git-predicate %source-dir)))
+      ;;#:select? (force select?)))
+      (build-system gnu-build-system)
+      (inputs
+       `(("glpk" ,glpk)
+         ("gnurl" ,gnurl)
+         ("gstreamer" ,gstreamer)
+         ("gst-plugins-base" ,gst-plugins-base)
+         ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged.
+         ("libextractor" ,libextractor)
+         ("libgcrypt" ,libgcrypt)
+         ("libidn" ,libidn)
+         ("libmicrohttpd" ,libmicrohttpd)
+         ("libltdl" ,libltdl)
+         ("libunistring" ,libunistring)
+         ("openssl" ,openssl)
+         ("opus" ,opus)
+         ("pulseaudio" ,pulseaudio)
+         ("sqlite" ,sqlite)
+         ("postgresql" ,postgresql)
+         ("mysql" ,mysql)
+         ("zlib" ,zlib)
+         ("perl" ,perl)
+         ("python" ,python) ; tests and gnunet-qr
+         ("jansson" ,jansson)
+         ("nss" ,nss)
+         ("glib" ,glib "bin")
+         ("gmp" ,gmp)
+         ("bluez" ,bluez) ; for optional bluetooth feature
+         ("glib" ,glib)
+         ;; There are currently no binary substitutes for texlive on
+         ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it.
+         ;;("texlive-minimal" ,texlive-minimal) ; optional.
+         ("texlive" ,texlive)
+         ("libogg" ,libogg)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("gnu-gettext" ,gnu-gettext)
+         ("texinfo" ,texinfo-5) ; Debian stable: 5.2
+         ("libtool" ,libtool)))
+      (outputs '("out" "debug"))
+      (arguments
+       `(#:configure-flags
+         (list (string-append "--with-nssdir=" %output "/lib")
+               "--enable-gcc-hardening"
+               "--enable-linker-hardening"
+               "--enable-logging=verbose"
+               "CFLAGS=-ggdb -O0")
+         #:phases
+         ;; swap check and install phases and set paths to installed bin
+         (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))
+           (add-after 'patch-bin-sh 'bootstrap
+             (lambda _
+               (zero? (system* "sh" "bootstrap"))))
+           (delete 'check)
+           ;; XXX: https://gnunet.org/bugs/view.php?id=4619
+           (add-after 'install 'set-path-for-check
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (lib (string-append out "/lib")))
+                 (setenv "GNUNET_PREFIX" lib)
+                 (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+                 (zero? (system* "make" "check"))))))))
+      (synopsis "tests enabled without experimental")
+      (description
+       "GNUnet from git HEAD")
+      (license license:gpl3+)
+      (home-page "https://gnunet.org"))))
+
+gnunet-test-git
diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm
index 6946fee57..c62a713a2 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -146,7 +146,7 @@
          ("autoconf" ,autoconf)
          ("automake" ,automake)
          ("gnu-gettext" ,gnu-gettext)
-         ("texinfo" ,texinfo)
+         ("texinfo" ,texinfo-5) ; Debian stable: 5.2
          ("libtool" ,libtool)))
       ;; TODO:  To make use of out:debug, which carries the symbols,
       ;; this file needs to fixed.
diff --git a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
index 7840705a6..fbc132d78 100644
--- a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
+++ b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
@@ -61,8 +61,8 @@
 ;; Explanation for name scheme: UNIXPATH is capped at 108 characters,
 ;; this causes lots of tests to fail.
 (define-public gnunetg
-  (let* ((commit "b005d5e4dac03fcfdabf0d0de434da3b295f6d63")
-         (revision "30"))
+  (let* ((commit "3c3090717610ea787fdd3562901329254a6af0d6")
+         (revision "32"))
     (package
       (inherit gnunet)
       (name "gnunetg")
@@ -77,7 +77,7 @@
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32
-           "10wfb58pi55399cw100vplq3f8nxg2vl6sywcmvkx3wg1d3firla"))))
+           "0g0x1r833jkssfd2sndy37509dqf9f8myjvg7mnadwc1irp393bl"))))
       (build-system gnu-build-system)
       (inputs
        `(("glpk" ,glpk)
@@ -333,6 +333,47 @@
                (zero? (system* "make" "check"))))))))
     (synopsis "gnunet, full git with tests enabled with parallel tests")))
 
+(define-public gnunetg-test
+  (package
+    (inherit gnunetg)
+    (name "gnunetg-test")
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-nssdir=" %output "/lib")
+             "--enable-gcc-hardening"
+             "--enable-linker-hardening"
+
+             ;;"--enable-poisoning"
+             ;;"--enable-sanitizer"
+             "--enable-logging=verbose"
+             "CFLAGS=-ggdb -O0")
+       ;; #:parallel-tests? #f ; parallel building seems to fail
+       ;;#:tests? #f ; fail: test_gnunet_statistics.py
+       #:phases
+       ;; swap check and install phases and set paths to installed bin
+       (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))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (delete 'check)
+         ;; XXX: https://gnunet.org/bugs/view.php?id=4619
+         (add-after 'install 'set-path-for-check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib")))
+               (setenv "GNUNET_PREFIX" lib)
+               (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+               (zero? (system* "make" "check"))))))))
+    (synopsis "gnunet, full git with tests enabled without experimental")))
+
 ;; ... and one package to test the package with "parallel-tests? #f"
 (define-public gnunetgftn
   (package
diff --git a/contrib/packages/guix/packages/gnunet/packages/texlive.scm b/contrib/packages/guix/packages/gnunet/packages/texlive.scm
new file mode 100644
index 000000000..77256a947
--- /dev/null
+++ b/contrib/packages/guix/packages/gnunet/packages/texlive.scm
@@ -0,0 +1,182 @@
+;;; This file is part of GNUnet.
+;;; Copyright (C) 2017 GNUnet e.V.
+;;;
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
+;;;
+;;; GNUnet is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+
+;; Initially based on Guix commit eb0119efde826590a13973ab928c173780a7f257
+
+(define-module (gnunet packages texlive)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages compression))
+
+(define texlive-extra-src
+  (origin
+    (method url-fetch)
+    (uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-extra.tar.xz")
+    ;;(uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-extra.tar.xz")
+    (sha256 (base32
+             "0cb8fnv4x281gy5ka779f00ssdmdpjj4x3pkh9j9vq45hrwg3522"))))
+
+(define texlive-texmf-src
+  (origin
+    (method url-fetch)
+    (uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-texmf.tar.xz")
+    ;;(uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-texmf.tar.xz")
+    (sha256 (base32
+             "1fn1dg9k7pnh8a80j23zfkbrfnqyc4c2w4ss30dpkqj490nxsywq"))))
+
+;; Note that right now this does not include security fixes!
+;; FIXME: Needs more fixes, currently this fails building!
+
+(define-public texlive
+  (package
+    (name "texlive")
+    (version "2012")
+    (source (origin
+              (method url-fetch)
+              (uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-source.tar.xz")
+              ;;(uri "ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-source.tar.xz")
+              (sha256 (base32
+                       "10bcrdfsqnc6y3gqcb8ndnjy07i5kz63as39irbq4gmcbmyn2rln"))))
+    (build-system gnu-build-system)
+    (inputs `(("texlive-extra-src" ,texlive-extra-src)
+              ("texlive-texmf-src" ,texlive-texmf-src)
+              ("fontconfig" ,fontconfig)
+              ("freetype" ,freetype)
+              ("icu4c" ,icu4c)
+              ("ghostscript" ,ghostscript)
+              ("libpng" ,libpng)
+              ("perl" ,perl)
+              ("poppler" ,poppler)
+              ("pkg-config" ,pkg-config)
+              ;; FIXME: Add interpreters csh, fontforge and ruby,
+              ;; once they are available.
+              ("python" ,python)
+              ("teckit" ,teckit)
+              ("t1lib" ,t1lib)
+              ("zlib" ,zlib)
+              ("zziplib" ,zziplib)))
+    (outputs '("out" "data"))
+    (arguments
+     `(#:out-of-source? #t
+       #:configure-flags
+       `("--disable-native-texlive-build"
+         ;; Although the texmf and texmf-dist data is taken from
+         ;; texlive-texmf, setting datarootdir is still useful:
+         ;; "make install" creates symbolic links to scripts in this place.
+         ,(string-append "--datarootdir=" (assoc-ref %outputs "data"))
+         ,(string-append "--infodir=" (assoc-ref %outputs "out") "/share/info")
+         ,(string-append "--mandir=" (assoc-ref %outputs "out") "/share/man")
+         "--without-x" ; FIXME: Drop as soon as X is available.
+         "--with-system-freetype2"
+         ;; "--with-system-gd"
+         ;; "--with-system-graphite"
+         "--with-system-icu"
+         "--with-system-libgs"
+         "--with-system-libpng"
+         "--with-system-poppler"
+         "--with-system-t1lib"
+         "--with-system-teckit"
+         "--with-system-xpdf"
+         "--with-system-zlib"
+         "--with-system-zziplib")
+       #:phases
+       (alist-replace
+        'configure
+        (lambda* (#:key outputs #:allow-other-keys #:rest args)
+          (let ((configure (assoc-ref %standard-phases 'configure)))
+            (substitute* "utils/psutils/Makefile.in"
+              (("/usr/bin/env perl") (which "perl")))
+            (apply configure args)))
+        (alist-cons-after
+         'install 'postinst
+         (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+           (let ((texlive-extra (assoc-ref inputs "texlive-extra-src"))
+                 (texlive-texmf (assoc-ref inputs "texlive-texmf-src"))
+                 (out (assoc-ref outputs "out"))
+                 (data (assoc-ref outputs "data"))
+                 (unpack (assoc-ref %standard-phases 'unpack))
+                 (patch-source-shebangs
+                  (assoc-ref %standard-phases 'patch-source-shebangs)))
+             ;; Create symbolic links for the latex variants and their
+             ;; man pages.
+             (with-directory-excursion (string-append out "/bin/")
+               (for-each symlink
+                         '("pdftex" "pdftex"   "xetex"   "luatex")
+                         '("latex"  "pdflatex" "xelatex" "lualatex")))
+             (with-directory-excursion (string-append out "/share/man/man1/")
+               (symlink "luatex.1" "lualatex.1"))
+             ;; Delete texmf and texmf-dist from "data", since they
+             ;; will be reinstalled from texlive-texmf.
+             (system* "rm" "-r" (string-append data "/texmf"))
+             (system* "rm" "-r" (string-append data "/texmf-dist"))
+             ;; Unpack texlive-extra and install tlpkg.
+             (mkdir "texlive-extra")
+             (with-directory-excursion "texlive-extra"
+               (apply unpack (list #:source texlive-extra))
+               (apply patch-source-shebangs (list #:source texlive-extra))
+               (system* "mv" "tlpkg" data)
+               (chdir ".."))
+             ;; Unpack and install texlive-texmf.
+             (mkdir "texlive-texmf")
+             (with-directory-excursion "texlive-texmf"
+               (apply unpack (list #:source texlive-texmf))
+               (apply patch-source-shebangs (list #:source texlive-texmf))
+               ;; Register "data" for kpathsea in texmf.cnf.
+               (substitute* "texmf/web2c/texmf.cnf"
+                 (("TEXMFROOT = \\$SELFAUTOPARENT")
+                  (string-append "TEXMFROOT = " data)))
+               (system* "mv" "texmf" data)
+               (system* "mv" "texmf-dist" data)
+               (chdir ".."))
+             ;; texmf.cnf must also be placed in "out", since kpsewhich does
+             ;; not know about "data" until it has found this file.
+             (mkdir (string-append out "/share/texmf"))
+             (mkdir (string-append out "/share/texmf/web2c"))
+             (copy-file (string-append data "/texmf/web2c/texmf.cnf")
+                        (string-append out "/share/texmf/web2c/texmf.cnf"))))
+         (alist-cons-after 'patch-shebangs 'texconfig
+                           (lambda* (#:key outputs #:allow-other-keys)
+                             (let ((out (assoc-ref outputs "out")))
+                               ;; Configure the texlive system; inspired from
+                               ;; http://slackbuilds.org/repository/13.37/office/texlive/
+                               (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
+                               (system* "updmap-sys" "--nohash" "--syncwithtrees")
+                               (system* "mktexlsr")
+                               (system* "fmtutil-sys" "--all")))
+                           %standard-phases)))))
+    (synopsis "Tex Live, a package of the TeX typesetting system")
+    (description
+     "TeX Live provides a comprehensive TeX document production system.
+It includes all the major TeX-related programs, macro packages, and fonts
+that are free software, including support for many languages around the
+world.")
+    (license (license:fsf-free "http://tug.org/texlive/copying.html"))
+    (home-page "http://www.tug.org/texlive/")))
diff --git a/doc/.gitignore b/doc/.gitignore
index daa5ccaa0..25617d1b0 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,7 +1,6 @@
-gnunet-c-tutorial.aux
-gnunet-c-tutorial.out
-*.log
 *.aux
+*.out
+*.log
 *.pdf
 *.toc
 *.cp
@@ -11,3 +10,9 @@ gnunet-c-tutorial.out
 *.info
 \#*\#
 version.texi
+gnunet.info-1
+gnunet.info-2
+gnunet.info-3
+mdate-sh
+stamp-vti
+texinfo.tex
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 07aafbb51..1a8bb64b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,39 +5,76 @@ docdir = $(datadir)/doc/gnunet/
 
 infoimagedir = $(infodir)/images
 
+#DOT_FILES = images/$(wildcard *.dot)
+
+#DOT_VECTOR_GRAPHICS =                                                          \
+#       $(DOT_FILES:%.dot=%.eps)                                                \
+#       $(DOT_FILES:%.dot=%.pdf)
+
 dist_infoimage_DATA =                                           \
-        %D%/images/gnunet-gtk-0-10-gns-a-done.png               \
-        %D%/images/gnunet-gtk-0-10-gns-a.png                    \
-        %D%/images/daemon_lego_block.png                        \
-        %D%/images/gnunet-gtk-0-10-gns.png                      \
-        %D%/images/gnunet-0-10-peerinfo.png                     \
-        %D%/images/gnunet-gtk-0-10-identity.png                 \
-        %D%/images/gnunet-fs-gtk-0-10-star-tab.png              \
-        %D%/images/gnunet-gtk-0-10.png                          \
-        %D%/images/gnunet-gtk-0-10-download-area.png            \
-        %D%/images/gnunet-gtk-0-10-search-selected.png          \
-        %D%/images/gnunet-gtk-0-10-fs-menu.png                  \
-        %D%/images/gnunet-gtk-0-10-traffic.png                  \
-        %D%/images/gnunet-gtk-0-10-fs.png                       \
-        %D%/images/gnunet-namestore-gtk-phone.png               \
-        %D%/images/gnunet-gtk-0-10-fs-publish-editing.png       \
-        %D%/images/gnunet-namestore-gtk-vpn.png                 \
-        %D%/images/gnunet-gtk-0-10-fs-published.png             \
-        %D%/images/gnunet-setup-exit.png                        \
-        %D%/images/gnunet-gtk-0-10-fs-publish.png               \
-        %D%/images/iceweasel-preferences.png                    \
-        %D%/images/gnunet-gtk-0-10-fs-publish-select.png        \
-        %D%/images/iceweasel-proxy.png                          \
-        %D%/images/gnunet-gtk-0-10-fs-publish-with-file_0.png   \
-        %D%/images/service_lego_block.png                       \
-        %D%/images/gnunet-gtk-0-10-fs-publish-with-file.png     \
-        %D%/images/service_stack.png                            \
-        %D%/images/gnunet-gtk-0-10-fs-search.png                \
-        %D%/images/gnunet-tutorial-service.png                  \
-        %D%/images/gnunet-tutorial-system.png                   \
-        %D%/images/daemon_lego_block.svg                        \
-        %D%/images/lego_stack.svg                               \
-        %D%/images/service_lego_block.svg
+        images/gnunet-gtk-0-10-gns-a-done.png                   \
+        images/gnunet-gtk-0-10-gns-a.png                        \
+        images/daemon_lego_block.png                            \
+        images/gnunet-gtk-0-10-gns.png                          \
+        images/gnunet-0-10-peerinfo.png                         \
+        images/gnunet-gtk-0-10-identity.png                     \
+        images/gnunet-fs-gtk-0-10-star-tab.png                  \
+        images/gnunet-gtk-0-10.png                              \
+        images/gnunet-gtk-0-10-download-area.png                \
+        images/gnunet-gtk-0-10-search-selected.png              \
+        images/gnunet-gtk-0-10-fs-menu.png                      \
+        images/gnunet-gtk-0-10-traffic.png                      \
+        images/gnunet-gtk-0-10-fs.png                           \
+        images/gnunet-namestore-gtk-phone.png                   \
+        images/gnunet-gtk-0-10-fs-publish-editing.png           \
+        images/gnunet-namestore-gtk-vpn.png                     \
+        images/gnunet-gtk-0-10-fs-published.png                 \
+        images/gnunet-setup-exit.png                            \
+        images/gnunet-gtk-0-10-fs-publish.png                   \
+        images/iceweasel-preferences.png                        \
+        images/gnunet-gtk-0-10-fs-publish-select.png            \
+        images/iceweasel-proxy.png                              \
+        images/gnunet-gtk-0-10-fs-publish-with-file_0.png       \
+        images/service_lego_block.png                           \
+        images/gnunet-gtk-0-10-fs-publish-with-file.png         \
+        images/service_stack.png                                \
+        images/gnunet-gtk-0-10-fs-search.png                    \
+        images/gnunet-tutorial-service.png                      \
+        images/gnunet-tutorial-system.png                       \
+        images/daemon_lego_block.svg                            \
+        images/lego_stack.svg                                   \
+        images/service_lego_block.svg                           \
+        images/structure.dot
+
+#       images/$(wildcard *.png)                                                \
+#       images/$(wildcard *.svg)
+#       $(DOT_FILES:%.dot=%.png)
+
+#DOT_OPTIONS =                                                                  \
+#       -Gratio=.9 -Gnodesep=.005 -Granksep=.00005                              \
+#       -Nfontsite=9 -Nheight=.1 -Nwidth=.1
+
+# .dot.png:
+#       $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.pdf:
+#       $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.eps:
+#       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+#       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .png.eps:
+#       $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
+#       mv "$@-tmp.eps" "$@"
+
+# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
+# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
+# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)                \
+#       $(top_srcdir)/%D%/images/coreutils-size-map.eps
+# dvi-local: ps-local
 
 gnunet_tutorial_examples =                                      \
         001.c                                                   \
@@ -67,25 +104,40 @@ gnunet_tutorial_examples =					\
         025.c                                                   \
         026.c
 
-info_TEXINFOS = \
-        gnunet.texi \
+info_TEXINFOS =                                                 \
+        gnunet.texi                                             \
         gnunet-c-tutorial.texi
 
-gnunet_TEXINFOS = \
-        chapters/developer.texi \
-        chapters/installation.texi \
-        chapters/philosophy.texi \
-        chapters/user.texi \
-        fdl-1.3.texi \
+gnunet_TEXINFOS =                                               \
+        chapters/developer.texi                                 \
+        chapters/installation.texi                              \
+        chapters/philosophy.texi                                \
+        chapters/user.texi                                      \
+        fdl-1.3.texi                                            \
         gpl-3.0.texi
 
-EXTRA_DIST = \
-        $(gnunet_TEXINFOS) \
-        $(gnunet_tutorial_examples) \
-        outdated-and-old-installation-instructions.txt \
-        gnunet-c-tutorial-v1.pdf \
+EXTRA_DIST =                                                    \
+        $(gnunet_TEXINFOS)                                      \
+        outdated-and-old-installation-instructions.txt          \
+        gnunet-c-tutorial-v1.pdf                                \
+        $(gnunet_tutorial_examples)                             \
         README.txt
 
+
+#       $(DOT_FILES)                                                            \
+#       $(DOT_VECTOR_GRAPHICS)
+
+DISTCLEANFILES =                                                \
+        gnunet.cps                                              \
+        gnunet-c-tutorial.cps                                   \
+        chapters/developer.cps                                  \
+        chapters/installation.cps                               \
+        chapter/philosophy.cps                                  \
+        chapters/user.cps                                       \
+        fdl-1.3.cps                                             \
+        gpl-3.0.cps
+
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING
 daemon_lego_block.png: images/daemon_lego_block.svg
         convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
         pngcrush images/daemon_lego_block.png images/daemon_lego_block.png
@@ -142,4 +194,39 @@ doc-info-tutorial-noise: version.texi
 
 doc-all-give-me-the-noise: doc-pdf-noise doc-html-noise doc-info-noise doc-pdf-tutorial-noise doc-html-tutorial-noise doc-info-tutorial-noise
 
+doc-all-install: doc-all-give-me-the-noise
+        @mkdir -p $(DESTDIR)/$(docdir)
+        @mkdir -p $(DESTDIR)/$(infoimagedir)
+        @mkdir -p $(DESTDIR)/$(infodir)
+        @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
+        @install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir)
+        @install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir)
+        @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
+        @cp -r gnunet $(DESTDIR)/$(docdir)
+        @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir)
+
+#       @cp -r images $(DESTDIR)/$(infoimagedir)
+
+# TODO: Add more to clean.
+# clean:
+#       @rm gnunet.pdf
+#       @rm gnunet-c-tutorial.pdf
+#       @rm gnunet.info
+#       @rm gnunet-c-tutorial.info
+
+# CLEANFILES =                                          \
+#       gnunet.log                                      \
+#       gnunet-c-tutorial.log                           \
+#       $(wildcard *.aux)                               \
+#       $(wildcard *.toc)                               \
+#       $(wildcard *.cp)                                \
+#       $(wildcard *.cps)
+
 .PHONY: version.texi
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF
+
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML
+
+# endif
+# endif
+# endif
diff --git a/doc/README.txt b/doc/README.txt
index 2abe479dd..fbbc24424 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -14,7 +14,7 @@ guix environment gnunet-doc
 
 You need to have Texinfo and Texlive in your path.
 sh bootstrap
-./configure
+./configure --enable-documentation
 cd doc
 make doc-all-give-me-the-noise
 
diff --git a/doc/chapters/developer.texi b/doc/chapters/developer.texi
index e7f507746..f5493fd63 100644
--- a/doc/chapters/developer.texi
+++ b/doc/chapters/developer.texi
@@ -7261,13 +7261,14 @@ the research report.
 @subsubsection Namespace Advertisements
 
 @c %**end of header
+@c %**FIXME: all zeroses -> ?
 
-An @code{SBlock} with identifier ′all zeros′ is a signed
+An @code{SBlock} with identifier all zeros is a signed
 advertisement for a namespace. This special @code{SBlock} contains metadata
 describing the content of the namespace. Instead of the name of the identifier
 for a potential update, it contains the identifier for the root of the
 namespace. The URI should always be empty. The @code{SBlock} is signed with
-the content provder′s RSA private key (just like any other SBlock). Peers
+the content provder's RSA private key (just like any other SBlock). Peers
 can search for @code{SBlock}s in order to find out more about a namespace.
 
 @node KSBlocks
diff --git a/doc/chapters/installation.texi b/doc/chapters/installation.texi
index edbad84de..14c10d2b0 100644
--- a/doc/chapters/installation.texi
+++ b/doc/chapters/installation.texi
@@ -1687,7 +1687,7 @@ dlltool --input-def ../include/libmySQL.def --dllname libmysql.dll
  Copy include\* to include\mysql\ 
 
 @item
- Pass "--with-mysql=/c/mysql" to ./configure and copy libmysql.dll to your PATH or GNUnet′s bin\ directory 
+ Pass "--with-mysql=/c/mysql" to ./configure and copy libmysql.dll to your PATH or GNUnet's @file{bin} directory
 @end itemize
 
 
diff --git a/doc/gnunet-c-tutorial.texi b/doc/gnunet-c-tutorial.texi
index 4f56ae5c4..3a4200d7c 100644
--- a/doc/gnunet-c-tutorial.texi
+++ b/doc/gnunet-c-tutorial.texi
@@ -58,6 +58,48 @@ important and do not hesitate to contact the GNUnet team if you have
 any questions or problems! Check here how to contact the GNUnet
 team: @uref{https://gnunet.org/contact_information}
 
+@menu
+
+* Installing GNUnet::                   Installing GNUnet
+* Introduction to GNUnet Architecture:: Introduction to GNUnet Architecture
+* First Steps with GNUnet::             First Steps with GNUnet
+* Developing Applications::             Developing Applications
+
+@detailmenu
+ --- The Detailed Node Listing ---
+
+Installing GNUnet
+
+* Obtaining a stable version::
+* Installing Build Tool Chain and Dependencies::
+* Obtaining the latest version from Git::
+* Compiling and Installing GNUnet::
+* Common Issues - Check your GNUnet installation::
+
+Introduction to GNUnet Architecture
+
+First Steps with GNUnet
+
+* Configure your peer::
+* Start a peer::
+* Monitor a peer::
+* Starting Two Peers by Hand::
+* Starting Peers Using the Testbed Service::
+
+Developing Applications
+
+* gnunet-ext::
+* Adapting the Template::
+* Writing a Client Application::
+* Writing a Service::
+* Interacting directly with other Peers using the CORE Service::
+* Storing peer-specific data using the PEERSTORE service::
+* Using the DHT::
+* Debugging with gnunet-arm::
+
+@end detailmenu
+@end menu
+
 @node Installing GNUnet
 @chapter Installing GNUnet
 
@@ -70,6 +112,14 @@ latest development version things can be broken, functionality can be changed or
 can fail. You should only use the development version if you know that you require a
 certain feature or a certain issue has been fixed since the last release.
 
+@menu
+* Obtaining a stable version::
+* Installing Build Tool Chain and Dependencies::
+* Obtaining the latest version from Git::
+* Compiling and Installing GNUnet::
+* Common Issues - Check your GNUnet installation::
+@end menu
+
 @node Obtaining a stable version
 @section Obtaining a stable version
 
@@ -150,6 +200,10 @@ $ sudo make install
 $ cd ..
 @end example
 
+@menu
+* Installation::
+@end menu
+
 @node Installation
 @subsection Installation
 Assuming all dependencies are installed, the following commands will
@@ -210,8 +264,8 @@ PASS: test_gnunet_prefix
 =============
 @end example
 
-@node Background: GNUnet Architecture
-@chapter Background: GNUnet Architecture
+@node Introduction to GNUnet Architecture
+@chapter Introduction to GNUnet Architecture
 
 GNUnet is organized in layers and services. Each service is composed of a
 main service implementation and a client library for other programs to use
@@ -263,6 +317,14 @@ the programmer.
 @node First Steps with GNUnet
 @chapter First Steps with GNUnet
 
+@menu
+* Configure your peer::
+* Start a peer::
+* Monitor a peer::
+* Starting Two Peers by Hand::
+* Starting Peers Using the Testbed Service::
+@end menu
+
 @node Configure your peer
 @section Configure your peer
 
@@ -351,6 +413,12 @@ The process is rather painful, but the description is somewhat instructive.
 In practice, you might prefer the automated method
 (@pxref{Starting Peers Using the Testbed Service}).
 
+@menu
+* Setup a second peer::
+* Start the second peer and connect the peers::
+* How to connect manually::
+@end menu
+
 @node Setup a second peer
 @subsection Setup a second peer
 We will now start a second peer on your machine.
@@ -540,6 +608,17 @@ network.
 @node Developing Applications
 @chapter Developing Applications
 
+@menu
+* gnunet-ext::
+* Adapting the Template::
+* Writing a Client Application::
+* Writing a Service::
+* Interacting directly with other Peers using the CORE Service::
+* Storing peer-specific data using the PEERSTORE service::
+* Using the DHT::
+* Debugging with gnunet-arm::
+@end menu
+
 @node gnunet-ext
 @section gnunet-ext
 To develop a new peer-to-peer application or to extend GNUnet we provide
@@ -605,6 +684,12 @@ used, which is typically not needed):
 @verbatiminclude tutorial-examples/001.c
 @end example
 
+@menu
+* Handling command-line options::
+* Writing a Client Library::
+* Writing a user interface::
+@end menu
+
 @node Handling command-line options
 @subsection Handling command-line options
 
@@ -657,6 +742,12 @@ Unique message types must be defined for each message struct in the
 @file{gnunet\_protocols.h} header (or an extension-specific include
 file).
 
+@menu
+* Connecting to the Service::
+* Sending messages::
+* Receiving Replies from the Service::
+@end menu
+
 @node Connecting to the Service
 @subsubsection Connecting to the Service
 
@@ -746,6 +837,11 @@ command-line to the service.
 Before you can test the client you've written so far, you'll need to also
 implement the corresponding service.
 
+@menu
+* Code Placement::
+* Starting a Service::
+@end menu
+
 @node Code Placement
 @subsection Code Placement
 
@@ -810,6 +906,13 @@ is connect to the @code{CORE} service using:
 @verbatiminclude tutorial-examples/009.c
 @end example
 
+@menu
+* New P2P connections::
+* Receiving P2P Messages::
+* Sending P2P Messages::
+* End of P2P connections::
+@end menu
+
 @node New P2P connections
 @subsection New P2P connections
 
@@ -900,6 +1003,13 @@ The first step is to start a connection to the PEERSTORE service:
 The service handle @code{peerstore_handle} will be needed for all subsequent
 PEERSTORE operations.
 
+@menu
+* Storing records::
+* Retrieving records::
+* Monitoring records::
+* Disconnecting from PEERSTORE::
+@end menu
+
 @node Storing records
 @subsection Storing records
 
@@ -992,6 +1102,13 @@ The second parameter indicates how many requests in parallel to expect.
 It is not a hard limit, but a good approximation will make the DHT more
 efficient.
 
+@menu
+* Storing data in the DHT::
+* Obtaining data from the DHT::
+* Implementing a block plugin::
+* Monitoring the DHT::
+@end menu
+
 @node Storing data in the DHT
 @subsection Storing data in the DHT
 Since the DHT is a dynamic environment (peers join and leave frequently)
@@ -1049,6 +1166,14 @@ in the service's respective directory. The
 mandatory functions that need to be implemented for a block plugin are
 described in the following sections.
 
+@menu
+* Validating requests and replies::
+* Deriving a key from a reply::
+* Initialization of the plugin::
+* Shutdown of the plugin::
+* Integration of the plugin with the build system::
+@end menu
+
 @node Validating requests and replies
 @subsubsection Validating requests and replies
 
diff --git a/doc/structure.dot b/doc/images/structure.dot
index a53db90b8..a53db90b8 100644
--- a/doc/structure.dot
+++ b/doc/images/structure.dot
diff --git a/doc/man/gnunet-identity.1 b/doc/man/gnunet-identity.1
index b552ad6e3..50efa74d4 100644
--- a/doc/man/gnunet-identity.1
+++ b/doc/man/gnunet-identity.1
@@ -30,7 +30,7 @@ Print help page.
 
 .TP
 \fB\-d\fR, \fB\-\-display\fR
-display all ouf our egos
+display all of our egos
 
 .TP
 \fB\-m\fR, \fB\-\-monitor\fR
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 77b8409cd..cc56f5959 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -185,21 +185,22 @@ static void
 create_indices (sqlite3 * dbh)
 {
   /* create indices */
-  if ((SQLITE_OK !=
+  if (0 !=
+      (SQLITE_OK !=
        sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS idx_hash ON gn091 (hash)",
-                     NULL, NULL, NULL)) ||
+                     NULL, NULL, NULL)) +
       (SQLITE_OK !=
        sqlite3_exec (dbh,
                      "CREATE INDEX IF NOT EXISTS idx_anon_type ON gn091 (anonLevel ASC,type)",
-                     NULL, NULL, NULL)) ||
+                     NULL, NULL, NULL)) +
       (SQLITE_OK !=
        sqlite3_exec (dbh,
                      "CREATE INDEX IF NOT EXISTS idx_expire ON gn091 (expire ASC)",
-                     NULL, NULL, NULL)) ||
+                     NULL, NULL, NULL)) +
       (SQLITE_OK !=
        sqlite3_exec (dbh,
                      "CREATE INDEX IF NOT EXISTS idx_repl_rvalue ON gn091 (repl,rvalue)",
-                     NULL, NULL, NULL)))
+                     NULL, NULL, NULL)) )
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "sqlite",
                      "Failed to create indices: %s\n", sqlite3_errmsg (dbh));
 }
@@ -354,40 +355,24 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle *cfg,
        (SQLITE_OK !=
         sq_prepare (plugin->dbh,
                     "SELECT " RESULT_COLUMNS " FROM gn091 "
-#if SQLITE_VERSION_NUMBER >= 3007000
-                    "INDEXED BY idx_repl_rvalue "
-#endif
                     "WHERE repl=?2 AND " " (rvalue>=?1 OR "
                     "  NOT EXISTS (SELECT 1 FROM gn091 "
-#if SQLITE_VERSION_NUMBER >= 3007000
-                    "INDEXED BY idx_repl_rvalue "
-#endif
                     "WHERE repl=?2 AND rvalue>=?1 LIMIT 1) ) "
                     "ORDER BY rvalue ASC LIMIT 1",
                     &plugin->selRepl)) ||
        (SQLITE_OK !=
         sq_prepare (plugin->dbh,
-                    "SELECT MAX(repl) FROM gn091"
-#if SQLITE_VERSION_NUMBER >= 3007000
-                    " INDEXED BY idx_repl_rvalue"
-#endif
-                    "",
+                    "SELECT MAX(repl) FROM gn091",
                     &plugin->maxRepl)) ||
        (SQLITE_OK !=
         sq_prepare (plugin->dbh,
                     "SELECT " RESULT_COLUMNS " FROM gn091 "
-#if SQLITE_VERSION_NUMBER >= 3007000
-                    "INDEXED BY idx_expire "
-#endif
                     "WHERE NOT EXISTS (SELECT 1 FROM gn091 WHERE expire < ?1 LIMIT 1) OR (expire < ?1) "
                     "ORDER BY expire ASC LIMIT 1",
                     &plugin->selExpi)) ||
        (SQLITE_OK !=
         sq_prepare (plugin->dbh,
                     "SELECT " RESULT_COLUMNS " FROM gn091 "
-#if SQLITE_VERSION_NUMBER >= 3007000
-                    "INDEXED BY idx_anon_type "
-#endif
                     "WHERE _ROWID_ >= ? AND "
                     "anonLevel = 0 AND "
                     "type = ? "
diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c
index 902519f15..c762835ce 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/fs/plugin_block_fs.c
@@ -71,17 +71,22 @@ block_plugin_fs_create_group (void *cls,
     return NULL;
   case GNUNET_BLOCK_TYPE_FS_UBLOCK:
     guard = va_arg (va, const char *);
-    if (0 != strcmp (guard,
+    if (0 == strcmp (guard,
                      "seen-set-size"))
     {
-      /* va-args invalid! bad bug, complain! */
-      GNUNET_break (0);
-      size = 8;
+      size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int),
+                                                          BLOOMFILTER_K);
+    }
+    else if (0 == strcmp (guard,
+                          "filter-size"))
+    {
+      size = va_arg (va, unsigned int);
     }
     else
     {
-      size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int),
-                                                          BLOOMFILTER_K);
+      /* va-args invalid! bad bug, complain! */
+      GNUNET_break (0);
+      size = 8;
     }
     if (0 == size)
       size = raw_data_size; /* not for us to determine, use what we got! */
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h
index 6e822d82e..a2999aebc 100644
--- a/src/include/gnunet_set_service.h
+++ b/src/include/gnunet_set_service.h
@@ -452,6 +452,8 @@ GNUNET_SET_listen (const struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * Cancel the given listen operation.  After calling cancel, the
  * listen callback for this listen handle will not be called again.
+ * Note that cancelling a listen operation will automatically reject
+ * all operations that have not yet been accepted.
  *
  * @param lh handle for the listen operation
  */
@@ -556,7 +558,8 @@ GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element);
  *        should be stored
  */
 void
-GNUNET_SET_element_hash (const struct GNUNET_SET_Element *element, struct GNUNET_HashCode *ret_hash);
+GNUNET_SET_element_hash (const struct GNUNET_SET_Element *element,
+                         struct GNUNET_HashCode *ret_hash);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/multicast/.gitignore b/src/multicast/.gitignore
index 43752ec4b..a97844e81 100644
--- a/src/multicast/.gitignore
+++ b/src/multicast/.gitignore
@@ -3,3 +3,5 @@ gnunet-multicast
 test_multicast 
 test_multicast_multipeer
 test_multicast_2peers
+test_multicast_multipeer_line
+test_multicast_multipeer_star
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index b75d4e291..8b47ed444 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -334,11 +334,12 @@ handle_info (void *cls,
 {
   struct GNUNET_PEERINFO_Handle *h = cls;
   struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
-  const struct GNUNET_HELLO_Message *hello;
+  const struct GNUNET_HELLO_Message *hello = NULL;
   uint16_t ms;
 
   ms = ntohs (im->header.size);
-  hello = (0 == ms) ? NULL : (const struct GNUNET_HELLO_Message *) &im[1];
+  if (ms > sizeof (struct InfoMessage))
+    hello = (const struct GNUNET_HELLO_Message *) &im[1];
   if (NULL != ic->callback)
     ic->callback (ic->callback_cls,
                   &im->peer,
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index c0b33f8ef..57f275c81 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -260,8 +260,6 @@ destroy_service_session (struct AliceServiceSession *s)
   }
   if (NULL != s->intersection_listen)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Set intersection, listen still up!\n");
     GNUNET_SET_listen_cancel (s->intersection_listen);
     s->intersection_listen = NULL;
   }
@@ -274,8 +272,6 @@ destroy_service_session (struct AliceServiceSession *s)
   }
   if (NULL != s->intersection_set)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Set intersection, set still there!\n");
     GNUNET_SET_destroy (s->intersection_set);
     s->intersection_set = NULL;
   }
@@ -809,10 +805,6 @@ cb_intersection_request_alice (void *cls,
     prepare_client_end_notification (s);
     return;
   }
-  GNUNET_SET_destroy (s->intersection_set);
-  s->intersection_set = NULL;
-  GNUNET_SET_listen_cancel (s->intersection_listen);
-  s->intersection_listen = NULL;
 }
 
 
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index a55d03900..fcb1ce032 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -243,8 +243,6 @@ free_element_cb (void *cls,
 static void
 destroy_service_session (struct AliceServiceSession *s)
 {
-  unsigned int i;
-
   if (GNUNET_YES == s->in_destroy)
     return;
   s->in_destroy = GNUNET_YES;
@@ -285,7 +283,7 @@ destroy_service_session (struct AliceServiceSession *s)
   }
   if (NULL != s->sorted_elements)
   {
-    for (i=0;i<s->used_element_count;i++)
+    for (unsigned int i=0;i<s->used_element_count;i++)
       gcry_mpi_release (s->sorted_elements[i].value);
     GNUNET_free (s->sorted_elements);
     s->sorted_elements = NULL;
@@ -1043,10 +1041,6 @@ cb_intersection_request_alice (void *cls,
     prepare_client_end_notification (s);
     return;
   }
-  GNUNET_SET_destroy (s->intersection_set);
-  s->intersection_set = NULL;
-  GNUNET_SET_listen_cancel (s->intersection_listen);
-  s->intersection_listen = NULL;
 }
 
 
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index f98d43a7d..42d06b275 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -155,6 +155,17 @@ static struct Listener *listener_head;
 static struct Listener *listener_tail;
 
 /**
+ * Number of active clients.
+ */
+static unsigned int num_clients;
+
+/**
+ * Are we in shutdown? if #GNUNET_YES and the number of clients
+ * drops to zero, disconnect from CADET.
+ */
+static int in_shutdown;
+
+/**
  * Counter for allocating unique IDs for clients, used to identify
  * incoming operation requests from remote peers, that the client can
  * choose to accept or refuse.  0 must not be used (reserved for
@@ -485,6 +496,7 @@ client_connect_cb (void *cls,
 {
   struct ClientState *cs;
 
+  num_clients++;
   cs = GNUNET_new (struct ClientState);
   cs->client = c;
   cs->mq = mq;
@@ -616,13 +628,29 @@ client_disconnect_cb (void *cls,
     GNUNET_CADET_close_port (listener->open_port);
     listener->open_port = NULL;
     while (NULL != (op = listener->op_head))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Destroying incoming operation `%u' from peer `%s'\n",
+                  (unsigned int) op->client_request_id,
+                  GNUNET_i2s (&op->peer));
       incoming_destroy (op);
+    }
     GNUNET_CONTAINER_DLL_remove (listener_head,
                                  listener_tail,
                                  listener);
     GNUNET_free (listener);
   }
   GNUNET_free (cs);
+  num_clients--;
+  if ( (GNUNET_YES == in_shutdown) &&
+       (0 == num_clients) )
+  {
+    if (NULL != cadet)
+    {
+      GNUNET_CADET_disconnect (cadet);
+      cadet = NULL;
+    }
+  }
 }
 
 
@@ -1299,6 +1327,7 @@ handle_client_listen (void *cls,
   }
   listener = GNUNET_new (struct Listener);
   listener->cs = cs;
+  cs->listener = listener;
   listener->app_id = msg->app_id;
   listener->operation = (enum GNUNET_SET_OperationType) ntohl (msg->operation);
   GNUNET_CONTAINER_DLL_insert (listener_head,
@@ -1917,10 +1946,14 @@ static void
 shutdown_task (void *cls)
 {
   /* Delay actual shutdown to allow service to disconnect clients */
-  if (NULL != cadet)
+  in_shutdown = GNUNET_YES;
+  if (0 == num_clients)
   {
-    GNUNET_CADET_disconnect (cadet);
-    cadet = NULL;
+    if (NULL != cadet)
+    {
+      GNUNET_CADET_disconnect (cadet);
+      cadet = NULL;
+    }
   }
   GNUNET_STATISTICS_destroy (_GSS_statistics,
                              GNUNET_YES);
diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c
index a36aae4d5..16de983cf 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/src/set/test_set_intersection_result_full.c
@@ -131,8 +131,6 @@ listen_cb (void *cls,
               "starting intersection by accepting and committing\n");
   GNUNET_assert (NULL != context_msg);
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
-  GNUNET_SET_listen_cancel (listen_handle);
-  listen_handle = NULL;
   oh2 = GNUNET_SET_accept (request,
                            GNUNET_SET_RESULT_FULL,
                            (struct GNUNET_SET_Option[]) { 0 },
diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c
index f81c7b8f7..3008e5aac 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/set/test_set_union_result_symmetric.c
@@ -182,8 +182,6 @@ listen_cb (void *cls,
   GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "listen cb called\n");
-  GNUNET_SET_listen_cancel (listen_handle);
-  listen_handle = NULL;
   oh2 = GNUNET_SET_accept (request,
                            GNUNET_SET_RESULT_SYMMETRIC,
                            (struct GNUNET_SET_Option[]) { 0 },
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 0dc2a9d30..64ef10125 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -57,6 +57,9 @@ struct GNUNET_PeerIdentity this_peer;
 
 struct GNUNET_IDENTITY_Handle *id;
 
+const struct GNUNET_IDENTITY_Ego *identity_host_ego;
+const struct GNUNET_IDENTITY_Ego *identity_guest_ego;
+
 const struct GNUNET_SOCIAL_Ego *host_ego;
 const struct GNUNET_SOCIAL_Ego *guest_ego;
 
@@ -69,8 +72,8 @@ struct GNUNET_CRYPTO_EcdsaPrivateKey *guest_key;
 struct GNUNET_CRYPTO_EddsaPublicKey place_pub_key;
 struct GNUNET_HashCode place_pub_hash;
 
-struct GNUNET_CRYPTO_EcdsaPublicKey guest_pub_key;
-struct GNUNET_CRYPTO_EcdsaPublicKey host_pub_key;
+const struct GNUNET_CRYPTO_EcdsaPublicKey *guest_pub_key;
+const struct GNUNET_CRYPTO_EcdsaPublicKey *host_pub_key;
 
 struct GNUNET_PSYC_Slicer *host_slicer;
 struct GNUNET_PSYC_Slicer *guest_slicer;
@@ -120,29 +123,28 @@ uint8_t is_guest_reconnected = GNUNET_NO;
 enum
 {
   TEST_NONE                         =  0,
-  TEST_HOST_CREATE                  =  1,
+  TEST_IDENTITIES_CREATE            =  1,
   TEST_HOST_ENTER                   =  2,
-  TEST_GUEST_CREATE                 =  3,
-  TEST_GUEST_ENTER                  =  4,
-  TEST_HOST_ANSWER_DOOR_REFUSE      =  5,
-  TEST_GUEST_RECV_ENTRY_DCSN_REFUSE =  6,
-  TEST_HOST_ANSWER_DOOR_ADMIT       =  7,
-  TEST_GUEST_RECV_ENTRY_DCSN_ADMIT  =  8,
-  TEST_HOST_ANNOUNCE                =  9,
-  TEST_HOST_ANNOUNCE_END            = 10,
-  TEST_GUEST_TALK                   = 11,
-  TEST_HOST_ANNOUNCE2               = 12,
-  TEST_HOST_ANNOUNCE2_END           = 13,
-  TEST_GUEST_HISTORY_REPLAY         = 14,
-  TEST_GUEST_HISTORY_REPLAY_LATEST  = 15,
-  TEST_GUEST_LOOK_AT                = 16,
-  TEST_GUEST_LOOK_FOR               = 17,
+  TEST_GUEST_ENTER                  =  3,
+  TEST_HOST_ANSWER_DOOR_REFUSE      =  4,
+  TEST_GUEST_RECV_ENTRY_DCSN_REFUSE =  5,
+  TEST_HOST_ANSWER_DOOR_ADMIT       =  6,
+  TEST_GUEST_RECV_ENTRY_DCSN_ADMIT  =  9,
+  TEST_HOST_ANNOUNCE                = 10,
+  TEST_HOST_ANNOUNCE_END            = 11,
+  TEST_GUEST_TALK                   = 12,
+  TEST_HOST_ANNOUNCE2               = 13,
+  TEST_HOST_ANNOUNCE2_END           = 14,
+  TEST_GUEST_HISTORY_REPLAY         = 15,
+  TEST_GUEST_HISTORY_REPLAY_LATEST  = 16,
+  TEST_GUEST_LOOK_AT                = 17,
+  TEST_GUEST_LOOK_FOR               = 18,
   TEST_GUEST_LEAVE                  = 18,
-  TEST_ZONE_ADD_PLACE               = 19,
-  TEST_GUEST_ENTER_BY_NAME          = 20,
-  TEST_RECONNECT                    = 21,
-  TEST_GUEST_LEAVE2                 = 22,
-  TEST_HOST_LEAVE                   = 23,
+  TEST_ZONE_ADD_PLACE               = 20,
+  TEST_GUEST_ENTER_BY_NAME          = 21,
+  TEST_RECONNECT                    = 22,
+  TEST_GUEST_LEAVE2                 = 23,
+  TEST_HOST_LEAVE                   = 24,
 } test;
 
 
@@ -458,30 +460,42 @@ app_recv_guest (void *cls,
 
 
 static void
+enter_if_ready ()
+{
+  if (NULL == host_ego || NULL == guest_ego)
+  {
+    return;
+  }
+  host_enter ();
+  guest_init ();
+}
+
+
+static void
 app_recv_ego (void *cls,
               struct GNUNET_SOCIAL_Ego *ego,
               const struct GNUNET_CRYPTO_EcdsaPublicKey *ego_pub_key,
               const char *name)
 {
   char *ego_pub_str = GNUNET_CRYPTO_ecdsa_public_key_to_string (ego_pub_key);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Got app ego notification: %p %s %s\n",
               test, ego, name, ego_pub_str);
   GNUNET_free (ego_pub_str);
 
-  if (NULL != strstr (name, host_name) && TEST_HOST_CREATE == test)
+  if (NULL != strstr (name, host_name))
   {
     host_ego = ego;
-    host_pub_key = *(GNUNET_SOCIAL_ego_get_pub_key (host_ego));
-    GNUNET_assert (TEST_HOST_CREATE == test);
-    host_enter ();
+    host_pub_key = ego_pub_key;
+    GNUNET_assert (TEST_IDENTITIES_CREATE == test);
+    enter_if_ready ();
   }
   else if (NULL != strstr (name, guest_name))
   {
     guest_ego = ego;
-
-    if (TEST_GUEST_CREATE == test)
-      guest_init ();
+    guest_pub_key = ego_pub_key;
+    GNUNET_assert (TEST_IDENTITIES_CREATE == test);
+    enter_if_ready ();
   }
 }
 
@@ -548,9 +562,9 @@ host_farewell (void *cls,
               test, GNUNET_h2s (GNUNET_SOCIAL_nym_get_pub_key_hash (nym)), str);
   GNUNET_free (str);
   GNUNET_assert (1 == GNUNET_PSYC_env_get_count (env));
-  if (0 != memcmp (&guest_pub_key, nym_key, sizeof (*nym_key)))
+  if (0 != memcmp (guest_pub_key, nym_key, sizeof (*nym_key)))
   {
-    str = GNUNET_CRYPTO_ecdsa_public_key_to_string (&guest_pub_key);
+    str = GNUNET_CRYPTO_ecdsa_public_key_to_string (guest_pub_key);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Test #%u: Farewell: nym does not match guest: %s\n",
                 test, str);
@@ -1029,7 +1043,7 @@ guest_recv_entry_decision (void *cls,
                            int is_admitted,
                            const struct GNUNET_PSYC_Message *entry_msg)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Guest received entry decision (try %u): %d.\n",
               test, join_req_count, is_admitted);
 
@@ -1121,7 +1135,7 @@ guest_recv_local_enter (void *cls, int result,
                         const struct GNUNET_CRYPTO_EddsaPublicKey *place_pub_key,
                         uint64_t max_message_id)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Guest entered to local place: %d\n",
               test, result);
   GNUNET_assert (0 <= result);
@@ -1131,7 +1145,7 @@ guest_recv_local_enter (void *cls, int result,
 static void
 guest_enter ()
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Entering to place as guest.\n", test);
 
   struct GuestEnterMessage *emsg = &guest_enter_msg;
@@ -1200,7 +1214,7 @@ app_recv_zone_add_nym_result (void *cls, int64_t result,
 static void
 guest_init ()
 {
-  guest_pub_key = *(GNUNET_SOCIAL_ego_get_pub_key (guest_ego));
+  guest_pub_key = GNUNET_SOCIAL_ego_get_pub_key (guest_ego);
 
   guest_slicer = GNUNET_PSYC_slicer_create ();
   GNUNET_PSYC_slicer_method_add (guest_slicer, "", NULL,
@@ -1210,10 +1224,25 @@ guest_init ()
                                    guest_recv_mod_foo_bar, &mod_foo_bar_rcls);
   test = TEST_HOST_ANSWER_DOOR_ADMIT;
 
-  GNUNET_SOCIAL_zone_add_nym (app, guest_ego, "host", &host_pub_key,
+  GNUNET_SOCIAL_zone_add_nym (app, guest_ego, "host", host_pub_key,
                               GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES),
                               app_recv_zone_add_nym_result, NULL);
-  guest_enter ();
+}
+
+
+static void
+id_host_created (void *cls, const char *emsg)
+{
+  if (NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Test #%u: Could not create host identity: %s\n",
+                test, emsg);
+#if ! DEBUG_TEST_SOCIAL
+    GNUNET_assert (0);
+#endif
+  }
+
 }
 
 
@@ -1229,8 +1258,8 @@ id_guest_created (void *cls, const char *emsg)
     GNUNET_assert (0);
 #endif
   }
-  if (NULL != guest_ego)
-    guest_init ();
+  //if (NULL != guest_ego)
+  //  guest_init ();
 }
 
 
@@ -1241,12 +1270,10 @@ host_entered (void *cls, int result,
 {
   place_pub_key = *home_pub_key;
   GNUNET_CRYPTO_hash (&place_pub_key, sizeof (place_pub_key), &place_pub_hash);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Host entered to place %s\n",
               test, GNUNET_h2s (&place_pub_hash));
-
-  test = TEST_GUEST_CREATE;
-  GNUNET_IDENTITY_create (id, guest_name, &id_guest_created, NULL);
+  guest_enter ();
 }
 
 
@@ -1258,7 +1285,7 @@ host_enter ()
                                  host_recv_method, host_recv_modifier,
                                  host_recv_data, host_recv_eom, NULL);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%u: Entering to place as host.\n", test);
   test = TEST_HOST_ENTER;
   hst = GNUNET_SOCIAL_host_enter (app, host_ego,
@@ -1273,19 +1300,14 @@ host_enter ()
 
 
 static void
-id_host_created (void *cls, const char *emsg)
+start_app_if_ready ()
 {
-  if (NULL != emsg)
+  if (NULL == identity_host_ego || NULL == identity_guest_ego)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Test #%u: Could not create host identity: %s\n",
-                test, emsg);
-#if ! DEBUG_TEST_SOCIAL
-    GNUNET_assert (0);
-#endif
+    return;
   }
-
-  app = GNUNET_SOCIAL_app_connect (cfg, app_id,
+  app = GNUNET_SOCIAL_app_connect (cfg,
+                                   app_id,
                                    app_recv_ego,
                                    app_recv_host,
                                    app_recv_guest,
@@ -1298,6 +1320,35 @@ static void
 identity_ego_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego,
                  void **ctx, const char *name)
 {
+  if (NULL != ego)
+  {
+    if (ego == identity_host_ego)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Host ego deleted\n");
+    }
+    else if (ego == identity_guest_ego)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Guest ego deleted\n");
+    }
+    else if (0 == strcmp (name, host_name))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Created ego %s\n",
+                  name);
+      identity_host_ego = ego;
+      start_app_if_ready ();
+    }
+    else if (0 == strcmp (name, guest_name))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Created guest ego %s\n",
+                  name);
+      identity_guest_ego = ego;
+      start_app_if_ready ();
+    }
+  }
 }
 
 
@@ -1326,8 +1377,9 @@ run (void *cls,
 
   id = GNUNET_IDENTITY_connect (cfg, &identity_ego_cb, NULL);
 
-  test = TEST_HOST_CREATE;
+  test = TEST_IDENTITIES_CREATE;
   GNUNET_IDENTITY_create (id, host_name, &id_host_created, NULL);
+  GNUNET_IDENTITY_create (id, guest_name, &id_guest_created, NULL);
 }
 
 
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c
index 6b4daa525..d0ce790fc 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -1477,23 +1477,6 @@ GNUNET_SERVER_connect_notify_cancel (struct GNUNET_SERVER_Handle *server,
 
 
 /**
- * Destroy the connection that is passed in via @a cls.  Used
- * as calling #GNUNET_CONNECTION_destroy from within a function
- * that was itself called from within process_notify() of
- * 'connection.c' is not allowed (see #2329).
- *
- * @param cls connection to destroy
- */
-static void
-destroy_connection (void *cls)
-{
-  struct GNUNET_CONNECTION_Handle *connection = cls;
-
-  GNUNET_CONNECTION_destroy (connection);
-}
-
-
-/**
  * Ask the server to disconnect from the given client.
  * This is the same as returning #GNUNET_SYSERR from a message
  * handler, except that it allows dropping of a client even
@@ -1565,8 +1548,7 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
     GNUNET_CONNECTION_persist_ (client->connection);
   if (NULL != client->th.cth)
     GNUNET_SERVER_notify_transmit_ready_cancel (&client->th);
-  (void) GNUNET_SCHEDULER_add_now (&destroy_connection,
-                                   client->connection);
+  GNUNET_CONNECTION_destroy (client->connection);
   /* need to cancel again, as it might have been re-added
      in the meantime (i.e. during callbacks) */
   if (NULL != client->warn_task)
diff --git a/src/util/.gitignore b/src/util/.gitignore
index 3576a2134..d32a66833 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -67,3 +67,4 @@ test_socks.nc
 perf_crypto_asymmetric
 perf_crypto_hash
 perf_crypto_symmetric
+perf_crypto_rsa
diff --git a/src/util/network.c b/src/util/network.c
index 66a468e45..942288613 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -1793,10 +1793,18 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
          _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
          "select");
   }
-  tv.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
-  tv.tv_usec =
-    (timeout.rel_value_us -
-     (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
+  if (timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us > (unsigned long long) LONG_MAX)
+  {
+    tv.tv_sec = LONG_MAX;
+    tv.tv_usec = 999999L;
+  }
+  else
+  {
+    tv.tv_sec = (long) (timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us);
+    tv.tv_usec =
+      (timeout.rel_value_us -
+       (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
+  }
   return select (nfds,
                  (NULL != rfds) ? &rfds->sds : NULL,
                  (NULL != wfds) ? &wfds->sds : NULL,
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index a7b1d8e2a..e9c25d68a 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -73,7 +73,7 @@
  * Argument to be passed from the driver to
  * #GNUNET_SCHEDULER_run_from_driver().  Contains the
  * scheduler's internal state.
- */ 
+ */
 struct GNUNET_SCHEDULER_Handle
 {
   /**
@@ -94,7 +94,7 @@ struct GNUNET_SCHEDULER_Handle
    * Driver we used for the event loop.
    */
   const struct GNUNET_SCHEDULER_Driver *driver;
-  
+
 };
 
 
@@ -127,7 +127,7 @@ struct GNUNET_SCHEDULER_Task
    * Handle to the scheduler's state.
    */
   const struct GNUNET_SCHEDULER_Handle *sh;
-  
+
   /**
    * Set of file descriptors this task is waiting
    * for for reading.  Once ready, this is updated
@@ -172,7 +172,7 @@ struct GNUNET_SCHEDULER_Task
    * Size of the @e fds array.
    */
   unsigned int fds_len;
-  
+
   /**
    * Why is the task ready?  Set after task is added to ready queue.
    * Initially set to zero.  All reasons that have already been
@@ -1849,7 +1849,7 @@ GNUNET_SCHEDULER_task_ready (struct GNUNET_SCHEDULER_Task *task,
  *
  * @param sh scheduler handle that was given to the `loop`
  * @return #GNUNET_OK if there are more tasks that are ready,
- *          and thus we would like to run more (yield to avoid 
+ *          and thus we would like to run more (yield to avoid
  *          blocking other activities for too long)
  *         #GNUNET_NO if we are done running tasks (yield to block)
  *         #GNUNET_SYSERR on error
@@ -1876,11 +1876,11 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh)
       pending_timeout_last = NULL;
     queue_ready_task (pos);
   }
-  
+
   if (0 == ready_count)
     return GNUNET_NO;
 
-  /* find out which task priority level we are going to 
+  /* find out which task priority level we are going to
      process this time */
   max_priority_added = GNUNET_SCHEDULER_PRIORITY_KEEP;
   GNUNET_assert (NULL == ready_head[GNUNET_SCHEDULER_PRIORITY_KEEP]);