Merge branch 'master' of git+ssh://gnunet.org/www

21 files changed, 318 insertions, 184 deletions

diff --git a/.buildbot/build.sh b/.buildbot/build.sh
new file mode 100755
index 00000000..da209c09
--- /dev/null
+++ b/.buildbot/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+./bootstrap
+./configure
+make
+if [ $? -eq 0 ]; then
+  exit 0
+fi
+echo "Try again"
+make
diff --git a/.buildbot/firefly-x86_64-amdepyc_deploy.sh b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
new file mode 100755
index 00000000..baad1bae
--- /dev/null
+++ b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Deploy websites from buildbot
+
+chmod -R ag+rX rendered/
+DEPLOY_USER="stage"
+if [ $(git rev-parse --abbrev-ref HEAD) == 'stable' ]; then
+  DEPLOY_USER="www"
+fi
+rsync -a --delete rendered/ $DEPLOY_USER@gnunet.org:~/www_deployment/
diff --git a/.gitmodules b/.gitmodules
index 1cb35121..e15461d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,4 @@
 [submodule "inc"]
 	path = inc
 	url = https://git.gnunet.org/www_shared.git
-	branch = default
         ignore = dirty
diff --git a/.mailmap b/.mailmap
index 017cc9a6..386cebe6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,5 @@
-ng0 <ng0@n0.is>
-ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
+nikita <nikita@n0.is>
+nikita <nikita@n0.is> ng0@n0.is <ng0@n0.is>
+nikita <nikita@n0.is> ng0 <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <gillmann@infotropique.org>
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
-Subproject d81bbfabc2538932f631d3946bd6a9b95182b4f
+Subproject d725a0cd1b4aa3ff54452a702b8c19db3f3c339
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 2f809854..9d797fed 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -56,3 +56,21 @@
     <![endif]-->
 
     <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" href="{{ url_localized('news/rss.xml') }}" />
+
+    <!-- opengraph -->
+    <!--
+      We do not actively use Twitter or endorse it, but people might
+      use our posts there or other websites might conform to the
+      twitter namespace of the opengraph. More opengraph must be
+      implemented in the sitecode.
+      -->
+    <meta name="twitter:card" content="article" />
+    <meta name="twitter:site" content="@gnunet" />
+    <meta name="twitter:creator" content="@gnunet" />
+    {#
+    TODO: Implement the necessary functions.
+    <meta property="og:url" content="{{ url_localized(url) }}" />
+    <meta property="og:title" content="{{ title }}" />
+    <meta property="og:description" content="{{ summary }}" />
+    <meta property="og:image" content="" />
+    #}
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 1befac86..5e288a94 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -61,10 +61,7 @@
           <li><a class="dropdown-item" href="https://bugs.gnunet.org" target="_blank">{{ _("Bug Tracker") }}</a></li>
           <li><a class="dropdown-item" href="https://git.gnunet.org" target="_blank">{{ _("Source Code") }}</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/doxygen/">{{ _("Source Code Documentation") }}</a></li>
-          <!-- 
-          /* Until there is no functional CI we don not show this */
-          <li><a class="dropdown-item" href="https://gitlab.gnunet.org/" target="_blank">{{ _("Continuous Integration") }}</a></li>
-          -->
+          <li><a class="dropdown-item" href="https://buildbot.gnunet.org/" target="_blank">{{ _("Continuous Integration") }}</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/tutorial/gnunet-tutorial.html">{{ _("Development Tutorial") }}</a></li>
 	  <li><a class="dropdown-item" href="{{ url_localized('gnurl.html') }}">libgnurl</a></li>
           <li><a class="dropdown-item" href="{{ url_localized('gns.html') }}">GNS</a></li>
diff --git a/inc b/inc
-Subproject 6a51c97bddcffef78e0c3b39a0eddd69876b690
+Subproject bdef602fcbd13d59aef971307b3730247a8b9c5
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index bef9c6d6..06477135 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2018-02-24 17:42\n"
 "Last-Translator: Torsten Grothoff <torsten@grothoff.org>\n"
 "Language-Team: German <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "GNUnet"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 13e165e9..a19f6a50 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "Contact"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 2a89f105..1d1ec761 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -12,8 +12,8 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Generated-By: Babel 2.4.0\n"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 433198f8..ca9bf922 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Generated-By: Babel 2.4.0\n"
 
 #~ msgid "_project_title"
diff --git a/static/images/ngi_trust.png b/static/images/ngi_trust.png
new file mode 100644
index 00000000..8490a06f
--- /dev/null
+++ b/static/images/ngi_trust.png
diff --git a/static/styles.css b/static/styles.css
index 5979d21a..3806ac19 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -47,6 +47,10 @@ code {
   margin-bottom: 1em;
   word-wrap: break-word; }
 
+code.block {
+  display: block; }
+
+
 a.btn {
   text-decoration: none !important;
   color: white !important;
diff --git a/template/about.html.j2 b/template/about.html.j2
index 45ef9fcd..be9a7298 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -118,6 +118,24 @@
             <img src="{{ url('static/images/nlnet_logo.gif') }}" alt="NLnet logo">
             </p>
           </li>
+          <li>
+            <p>
+            {% trans %}
+            This project has received funding from the European Union’s Horizon
+            2020 research and innovation programme under the NGI_TRUST grant
+            agreement no 825618.
+            The project aims to integrate re:claimID with the GNU Taler payment
+            system in a pilot in order to demonstrate the practical feasibility
+            and benefits of privacy enhancing technologies for users and
+            commercial service providers. The project is called "Decentralized
+            Identities for Self-Sovereign End-users" (DISSENS).
+            {% endtrans %}
+            <br>
+            <a href="https://wiki.geant.org/display/NGITrust/">GEANT NGI TRUST</a><br>
+            <img style="width: 35%" src="{{ url('static/images/ngi_trust.png') }}" alt="NGI TRUST logo">
+            </p>
+          </li>
+
         </ul>
 	<br>
 	{% trans %}
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index bddd2ee6..fac71cab 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -56,13 +56,15 @@
           <a href="https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex">https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex</a>.
           The current board consists of:
           <dl><dt>Vorsitz</dt>
-            <dd><a href="https://grothoff.org/christian/">Christian Grothoff</a></dd>
+            <dd><a href="https://schanzen.eu">Martin Schanzenbach</a></dd>
             <dt>stellvertretender Vorsitz</dt>
-            <dd>xrs</dd>
+            <dd><a href="https://grothoff.org/christian/">Christian Grothoff</a></dd>
             <dt>Kassenwart</dt>
             <dd>Florian Dold</dd>
             <dt>Beisitzer</dt>
-            <dd>Lurchi</dd>
+            <dd>
+                Hartmut Goebel, DVN
+            </dd>
           </dl>
         {% endtrans %}
       </p>
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index 7393bb6f..c9c5d8ba 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -28,9 +28,9 @@
           </p>
           <p>
             {% trans %}
-              Our main usecase is for GNUnet, but it might be usable
-              for others, hence we&#39;re releasing the code to the
-              general public.
+              Our main usecase is for GNUnet and Taler, but it might
+              be usable for others, hence we&#39;re releasing the code
+              to the general public.
             {% endtrans %}
           </p>
           <p>
@@ -129,8 +129,9 @@
               my mood. Note that this pretty much CANNOT be done without a fork, as
               renaming is an essential part of the fix. Now, there might be creative
               solutions to achieve the same thing within the standard cURL build
-              system, but I'm not happy to wait for a decade for Daniel to review
-              the patches. The changes libgnurl makes to curl are miniscule and can
+              system, but this was deemed to be too much work when
+              gnurl was originally started.
+              The changes libgnurl makes to curl are miniscule and can
               easily be applied again and again whenever libcurl makes a new
               release.
             {% endtrans %}
@@ -210,7 +211,7 @@
             {% trans %}
 	      Releases are published on <a href="https://ftpmirror.gnu.org/gnu/gnunet/">ftpmirror.gnu.org/gnu/gnunet</a>.
 	      gnurl is available from within a variety of distributions and package managers.
-	      Package Managers which include gnurl are:
+	      Some Package Managers which include gnurl are:
               <a href="https://www.gnu.org/software/guix/">GNU Guix</a> (available as "gnurl"),
 	      <a href="https://gentoo.org">Gentoo</a> through the collaborative ebuild collection
 	      <a href="https://git.gnunet.org/youbroketheinternet-overlay.git/">youbroketheinternet</a>,
@@ -266,7 +267,7 @@
             {% trans %}
               Fetch the signature key from
             {% endtrans %}
-            <a href="https://keys.openpgp.org/search?q=ng0%40n0.is">keys.openpgp.org</a>
+            <a href="https://keys.openpgp.org/search?q=nikita%40NetBSD.org">keys.openpgp.org</a>
             {% trans %}
               or via commandline with gnupg2.
             {% endtrans %}
@@ -394,11 +395,10 @@
           <h2>{{ _("Maintainer and Cryptographic signatures") }}</h3>
           <p>
             {% trans %}
-	      gnurl/libgnurl is maintained by ng0.
-	      Releases are signed with the OpenPGP Key
-              <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>,
-	      with the key fingerprint
-              <b>A88C 8ADD 1298 28D7 EAC0  2E52 E22F 9BBF EE34 8588</b>.
+	      gnurl/libgnurl is maintained by Nikita.
+	      Releases after version 7.69.1 are signed with the OpenPGP Key
+              <b>0xD6B570842F7E7F8D</b> (<a href="https://keys.openpgp.org/search?q=6115012DEA3026F62A98A556D6B570842F7E7F8D">keys.openpgp.org</a>, <a href="https://n0.is/pubkey.asc">n0.is</a>), with the key fingerprint
+              <b>6115 012D EA30 26F6 2A98  A556 D6B5 7084 2F7E 7F8D</b>.
             {% endtrans %}
           </p>
         </div>
diff --git a/template/gsoc.html.j2 b/template/gsoc.html.j2
index 43ed1876..5a8066f4 100644
--- a/template/gsoc.html.j2
+++ b/template/gsoc.html.j2
@@ -9,7 +9,7 @@
   <div class="row">
     <div class="col-2 d-none d-lg-block"><!-- for large viewports show menu for better orientation -->
       <nav class="nav subnav position-fixed flex-column border-right" style="position:fixed">
-      <a class="nav-link" href="#current">{{ _("Current projects") }}</a>
+      <a class="nav-link" href="#current">{{ _("Ideas 2020") }}</a>
       <a class="nav-link" href="#past">{{ _("Past projects") }}</a>
       <a class="nav-link" href="#finished">{{ _("Finished projects") }}</a>
       </nav>
@@ -20,12 +20,89 @@
         <p>
         {% trans %}
           As a GNU project, GNUnet has participated in the Google Summer of Code (GSoC) for a number of years. This page lists all current, past, and finished projects.
+          If you want to participate and apply for any of the ideas for 2020 below or any past project which is not yet finished (or even your own idea), please contact us either in IRC or mailing list.
         {% endtrans %}
         </p>
       </section>
 
 
-      <h2><a name="current" class="subnav-anchor"></a>{{ _("Current projects") }}</h2>
+      <h2><a name="current" class="subnav-anchor"></a>{{ _("Ideas 2020") }}</h2>
+      <section>
+        <h4>re:claimID/GNUnet Browser Plugin</h4>
+        <p>
+          {% trans %}
+            reclaimID is a decentralized identity system build on top of the GNU
+            Name System.
+            Currently, there is a Webextension which uses the GNUnet <a href="https://rest.gnunet.org">REST API</a>.
+            In order to improve adoption and ease of use, this project aims to include
+            a full GNUnet node within the Webextention as a fallback.
+            GNUnet can be compiled to Web Assembly or JavaScript as demonstrated
+            <a href="https://gnunet.io">here</a>.
+            The idea is to improve upon this concept and support more of GNUnet's
+            subsystems.
+
+            The difficulty of this project largely depends on the students
+            proficiency with build tools, emscripten and improvisation skills.
+            There non-exhaustive task list would be:
+            <ol>
+              <li>Improve existing GNUnet emscripten build to include more subsystems.</li>
+              <li>Integrate the result into a Webextention.</li>
+              <li>Integrate the result into the re:claimID Webextension</li>
+            </ol>
+            Advantageous skills/languages/frameworks:
+            <ol>
+              <li>C</li>
+              <li>emscripten</li>
+              <li>Webextensions</li>
+            </ol>
+            <br/>
+            <strong>Difficulty:</strong> Challenging
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
+
+      <section>
+        <h4>Canonical statistics identifier</h4>
+        <p>
+          {% trans %}
+            Currently, the keys in our statistics database are too verbose.
+            For example:
+        </p>
+        <p>
+          nse # flood messages received: 13<br/>
+          nse # peers connected: 4<br/>
+          nse # nodes in the network (estimate): 203<br/>
+          nse # flood messages started: 5<br/>
+          nse # estimated network diameter: 3<br/>
+          nse # flood messages transmitted: 10<br/>
+        </p>
+        <p>
+           With such verbose keys there's no easy way to form compact JSON
+           document or entries for time-series database.
+           And you can't query single stats without having to copypaste the line
+           exactly and put in quotes.
+            In short, the goals are to...
+            <ol>
+              <li>Think of a way how statistics entries can be made canonical.</li>
+              <li>Implement the change and migrate existing uses.</li>
+              <li>Document the format(s) and define an appropriate registration mechanism for identifiers</li>
+            </ol>
+            Relevant bugs: <a href="https://bugs.gnunet.org/view.php?id=5650">#5650</a><br/>
+            Advantageous skills/languages/frameworks:
+            <ol>
+              <li>C</li>
+              <li>HTML</li>
+            </ol>
+            <br/>
+            <strong>Difficulty:</strong> Beginner
+            <br/>
+            <strong>Mentors:</strong> Martin Schanzenbach
+          {% endtrans %}
+        </p>
+      </section>
+
       <!-- Past projects: Previously proposed, but left unfinished. Inspiration for students. -->
       <h2><a name="past" class="subnav-anchor"></a>{{ _("Past projects") }}</h2>
       <p>
@@ -42,7 +119,14 @@
         </p>
         <p>
           {% trans %}
-            <strong>Mentors:</strong> <a href="https://www.goebel-consult.de/">Hartmut Goebel</a>
+            Includes: Implementation of rudimentary Android compatibility for GNUnet,
+            in part by porting the GNUnet utils scheduler to act as
+            a thin wrapper over libuv.
+          {% endtrans %}
+        </p>
+        <p>
+          {% trans %}
+            <strong>Mentors:</strong> <a href="https://www.goebel-consult.de/">Hartmut Goebel</a>, Jeff Burdges, Christian Grothoff
           {% endtrans %}
         </p>
       </section>
@@ -68,71 +152,6 @@
         </p>
       </section>
 
-      <section>
-        <h4>re:claimID OpenID Connect performance improvements</h4>
-        <p>
-          {% trans %}
-            reclaimID is a decentralized identity system build on top of the GNU
-            Name System.
-            Upon authorization, the user provides a requesting party (RP) such as a website
-            with an authorization ticket (e.g. piggybacked in an OpenID authorization code).
-            The RP uses information contained in this ticket to
-            <ol>
-              <li> Retrieve the decryption key from GNS</li>
-              <li> Retrieve the user attributes from GNS</li>
-            </ol>
-            The GNS lookups ensure that the RP receives up-to-date attributes and functional
-            decryption keys. However, in particular the RP-specific encryption key
-            resolution can be slow and even fail depending on the network topology.
-            We propose that in an initial exchange, in particular OpenID authorization code
-            flows, we try to incorporate key and maybe even an attribute set in the ticket
-            exchange.
-
-            In order to mitigate this issue, this project is meant to investigate and implement how...
-            <ol>
-              <li> ... decryption keys can be added to an initial exchange in OpenID.</li>
-              <li> ... initial set(s) of attributes can be piggybacked in OpenID.</li>
-            </ol>
-            <br/>
-            <strong>Mentors:</strong> Martin Schanzenbach
-          {% endtrans %}
-        </p>
-      </section>
-
-      <section>
-        <h4>re:claimID alternative GNS-based encryption</h4>
-        <p>
-          {% trans %}
-            re:claimID is a decentralized identity system build on top of the GNU
-            Name System.
-            The initial design and implementation of re:claimID includes an attribute-based
-            encryption module in order to prevent unauthorized access to attributes in the
-            name system.
-            Our motivation for re:claimID was for it to be name system agnostic, which
-            means the design theoretically also works for other name systems such as
-            namecoin.
-            Other name systems often do not have built-in mechanisms in order to do this.
-            Hence, we implemented an ABE access control layer. Our ABE implementation
-            requires two third party libraries: libpbc and libgabe. While we could merge
-            libgabe into the gnunet service implementation of re:claimID, libpbc is a
-            rather large, third party library which lacks packaging in distributions and
-            for platforms.
-            On the other hand, GNS supports record data encryption using symmetric keys as
-            labels.
-            If we make the access control layer of re:claimID more generic in order to
-            support both ABE and GNS encryption, we could reduce the required depenencies.
-            This would result in gnunet packages to include re:claimID by default.
-
-            In short, the goals are to...
-            <ol>
-              <li> ... improve performance by reducing encryption overhead.</li>
-              <li> ... reduce dependencies.</li>
-            </ol>
-            <br/>
-            <strong>Mentors:</strong> Martin Schanzenbach
-          {% endtrans %}
-        </p>
-      </section>
 
       <section>
         <h4>Enable all networking applications to run over GNUnet out of the box</h4>
@@ -233,25 +252,6 @@
         </p>
       </section>
       <section>
-        <h4>RESTful GNUnet</h4>
-        <p>
-          {% trans %}
-            Design and implementation
-            of <a href="http://jsonapi.org/">REST APIs</a> that expose
-            the
-            <a href="https://docs.gnunet.org/doxygen/modules.html">GNUnet API</a>
-            so that easy, hands-on development is
-            possible. Also, browser-based UIs will be much easier to
-            create on top of REST APIs.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            <strong>Mentors:</strong> Martin Schanzenbach
-          {% endtrans %}
-        </p>
-      </section>
-      <section>
         <h4>Rust implementation of GNUnet utils</h4>
         <p>
           {% trans %}
@@ -268,21 +268,6 @@
         </p>
       </section>
       <section>
-        <h4>Android compatibility for GNUnet</h4>
-        <p>
-          {% trans %}
-            Implement rudimentary Android compatibility for GNUnet,
-            in part by porting the GNUnet utils scheduler to act as
-            a thin wrapper over libuv.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            <strong>Mentors:</strong> Jeff Burdges and Christian Grothoff
-          {% endtrans %}
-        </p>
-      </section>
-      <section>
         <h4>Implementation of a replacement for PANDA</h4>
         <p>
           {% trans %}
@@ -527,21 +512,6 @@
         <p><strong>Mentors:</strong> Krista Grothoff, Jeff Burdges</p>
       </section>
       <section>
-        <h4>Implementation of a replacement for PANDA</h4>
-        <p>
-          {% trans %}
-            Implementation of a replacement for PANDA (see Pond) with better
-            security, and maybe integration with the GNU Name System for key
-            exchange.
-          {% endtrans %}
-        </p>
-        <p>
-          {% trans %}
-            <strong>Mentors:</strong> Jeff Burdges
-          {% endtrans %}
-        </p>
-      </section>
-      <section>
         <h4>Supporting GNU Guix's package distribution</h4>
         <p>
           {% trans %}
diff --git a/template/install-on-archpi.html.j2 b/template/install-on-archpi.html.j2
index 37657188..66e904b2 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -16,8 +16,8 @@
   <h2>{{ _("Requirements for Raspberry Pi 3") }}</h2>
 
   <p>First you need the hardware. This tutorial works with a Raspberry Pi 3 or
-  any Arch Linux system. The other Pi versions I haven't tested, but they should
-  probably work, too. To install Arch Linux on the Pi3, follow the instructions
+  any Arch Linux system. The other Pi versions have not been tested, but they
+  should work, too. To install Arch Linux on the Pi3, follow the instructions
   from <a
   href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p>
 
@@ -25,7 +25,7 @@
   install the tools for building new software.</p>
 
   <p><code>
-  > sudo pacman -S base-devel
+  $ sudo pacman -S base-devel
   </code></p>
 
   <p>Now we can continue to install the following Arch Linux dependencies to
@@ -43,18 +43,18 @@
   in the next step:<p>
 
   <p><code>
-  > git clone https://gnunet.org/git/gnunet.git<br>
+  $ git clone https://gnunet.org/git/gnunet.git<br>
   </code></p>
 
   <p>Now it's time to compile and install GNUnet.</p>
 
   <p><code>
-  > cd gnunet<br>
-  > export GNUNET_PREFIX=/usr # for example, other locations possible<br>
-  > ./bootstrap # Run this to generate the configure files.<br>
-  > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help to see the various flags available to you.<br>
-  > make -j$(nproc || echo -n 1)<br>
-  > sudo make install<br>
+  $ cd gnunet<br>
+  $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br>
+  $ ./bootstrap # Run this to generate the configure files.<br>
+  $ ./configure --prefix=$GNUNET_PREFIX # Use --help to see the various flags available to you.<br>
+  $ make -j$(nproc || echo -n 1)<br>
+  $ sudo make install<br>
   </code></p>
 
   <p>Congrats! GNUnet is now installed!</p>
@@ -66,14 +66,16 @@
   <p><code>
   $ pacman -Su gtk3 glade
   </code></p>
+  <p><code>
+  $ git clone https://gnunet.org/git/gnunet-gtk.git<br>
+  </code></p>
   <code>
     $ cd ../gnunet-gtk<br>
     $ ./bootstrap<br>
-    $ export GNUNET_PREFIX=/usr # for example, other locations possible
-    $ export CFLAGS="-g -Wall -O0"<br>
+    $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br>
     $ ./configure --prefix=$GNUNET_PREFIX --with-gnunet=$GNUNET_PREFIX<br>
     $ make -j$(nproc || echo -n 1)<br>
-    $ sudo make install
+    $ sudo make install<br>
   </code>
 
   <h2>{{ _("Run") }}</h2>
@@ -82,20 +84,20 @@
   ~/.config/gnunet.conf. We can start with an empty file for now:</p>
 
   <p><code>
-  > touch ~/.config/gnunet.conf
+  $ touch ~/.config/gnunet.conf
   </code></p>
    <br />
   <p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
   Manager).</p>
 
   <p><code>
-  > gnunet-arm -s
+  $ gnunet-arm -s
   </code></p>
 
   <p>It starts the default GNUnet services. We can list them with the -I option:</p>
 
   <p><code>
-  > gnunet-arm -I<br>
+  $ gnunet-arm -I<br>
   Running services:<br>
   ats (gnunet-service-ats)<br>
   revocation (gnunet-service-revocation)<br>
@@ -125,7 +127,7 @@
   <p>For stopping GNUnet again we can use the -e option.</p>
 
   <p><code>
-  > gnunet-arm -e
+  $ gnunet-arm -e
   </code></p>
 
   <h2>{{ _("Make sure, it works!") }}</h2>
diff --git a/template/install.html.j2 b/template/install.html.j2
index 5d097a3d..598aaa6a 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -9,13 +9,65 @@
   <div class="row container justify-content-center">
     <div class="alert" style="background-color: #419edb;">
       <div class="alert-content">
+{% trans %}
           Notice: GNUnet is still undergoing major development. It is
           largely <i>not yet ready</i> for usage beyond developers.
+{% endtrans %}
       </div>
     </div>
+{% trans %}
+<p>Please be aware that this project is still in an early alpha
+stage when it comes to running software &#8211; its not an easy task
+to rewrite the whole Internet! We are happy to get your
+<a href="engage.html">helping hand</a> anytime!
+Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.
+If you have any queries about the installation or the usage, please <a href="engage.html">get in touch!</a></p>
+{% endtrans %}
   </div>
 
-  <h3>Current release downloads:</h3>
+  <h3>Binary packages</h3><br/>
+  <p>
+    {% trans %}
+    We recommend to use binary packages provided by the package manager integrated
+    within your Operating System. GNUnet is reportedly available for at least:
+    <ul>
+      <li><a href="https://pkgs.alpinelinux.org/package/edge/testing/x86_64/gnunet">Alpine</a></li>
+      <li><a href="https://copr.fedorainfracloud.org/coprs/yosl/gnunet/">Fedora (Copr)</a></li>
+      <li><a href="https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnunet.rb">Homebrew</a></li>
+    </ul>
+    If GNUnet is available for your Operating System and it is missing,
+    send us feedback so that we can add it to this list. Furthermore, if
+    you are interested in packaging GNUnet for your Operating System,
+    get in touch with us at gnunet-developers@gnu.org if you require
+    help with this job.
+
+    If you were using an Operating System with the Alpine package manager,
+    GNUnet could be installed as simple as:
+    {% endtrans %}
+  </p>
+  <code class="block">
+    $ apk add gnunet
+  </code>
+  <p>
+   Please beware that some distributions may include outdated GNUnet packages!
+  </p>
+  <h3>From source</h3>
+  <p>
+    {% trans %}
+    First, install the <a href="https://git.gnunet.org/gnunet.git/tree/README">required dependencies</a> of GNUnet. There are base requirements and optional
+    requirements.
+    {% endtrans %}
+  </p>
+  <p>
+    {% trans %}
+    Now, you need to decide if you want to install GNUnet from the release
+    tarball or from git. If you want to use GNUnet and there is no binary
+    package available for your OS, you should stick with the release tarball.
+    If you want to develop using the most recent build, you should go with
+    the <a href="https://git.gnunet.org/">git repository</a>.
+    {% endtrans %}
+  </p>
+  <p>The current release tarballs for gnunet, a Gtk UI and fuse extensions can be found here:</p>
   <div class="row container justify-content-center">
     <div class="col-md">
     <b>gnunet</b>: <a href="http://ftpmirror.gnu.org/gnunet/gnunet-latest.tar.gz">0.12.2</a> (<a href="http://ftpmirror.gnu.org/gnunet/gnunet-latest.tar.gz.sig">sig</a>)<br>
@@ -23,28 +75,63 @@
     <b>gnunet-fuse</b>: <a href="http://ftpmirror.gnu.org/gnunet/gnunet-fuse-latest.tar.gz">0.12.0</a> (<a href="http://ftpmirror.gnu.org/gnunet/gnunet-fuse-latest.tar.gz.sig">sig</a>)
     </div>
   </div>
-  <h3>Instructions</h3><br/>
-  <div class="row container justify-content-center">
-    <div class="col-md">
-      {% trans %}
-      <p>The following GNUnet installation instructions help you building from source for your Operating System.</p>
-      <p><i>Please note that the installation process will get much easier once we have proper packages again (planned for winter 2019).</i></p>
-      <p>You have already installed GNUnet and want to use it?
-      <a href="https://gnunet.org/en/use">Check this out!</a> </p>
-      {% endtrans %}
-    </div>
-    <div class="col-md">
-      {% trans %}
-      <p>Please be aware that this project is still in an early alpha
-      stage when it comes to running software &#8211; its not an easy task
-      to rewrite the whole Internet! We are happy to get your
-      <a href="engage.html">helping hand</a> anytime!</p>
-      <p>Further information is available in our <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">handbook</a>.</p>
-      <p>If you have any queries about the installation or the usage, please <a href="engage.html">get in touch!</a></p>
-      {% endtrans %}
-    </div>
-  </div>
+  <p>
+   {% trans %}
+   Alternatively, get the sources from git by entering:
+   {% endtrans %}
+  </p>
+  <code class="block">
+    $ git clone https://gnunet.org/git/gnunet.git
+  </code>
+  <p>
+   {% trans %}
+   Before building GNUnet, make sure that you setup the required groups and
+   add your user to the group <code>gnunet</code>:
+   {% endtrans %}
+  </p>
+  <code class="block">
+    # addgroup gnunetdns <br>
+    # adduser --system --home "/var/lib/gnunet" --group gnunet --shell /bin/sh<br>
+    # usermod -a -G gnunet &lt;username&gt;
+  </code>
+  <p>
+   {% trans %}
+   To compile GNUnet, execute:
+   {% endtrans %}
+  </p>
+  <code class="block">
+    $ export GNUNET_PREFIX=/usr/local/lib # or other directory of your choice<br>
+    $ ./bootstrap # only if you install from git <br>
+    $ ./configure --prefix=$GNUNET_PREFIX/.. <br>
+    $ make
+  </code>
+  <p>
+    {% trans %}
+    You can find more configuration flags in the
+    <a href="https://git.gnunet.org/gnunet.git/tree/README">README</a>.<br>
+    Install GNUnet with:
+    {% endtrans %}
+  </p>
+  <code class="block">
+    $ (sudo) make install # you only need sudo if your GNUNET_PREFIX is not writeable by your user
+  </code>
+  <p>
+    {% trans %}
+    You can now start GNUnet by running:
+    {% endtrans %}
+  </p>
+  <code class="block">
+    $ gnunet-arm -s
+  </code>
+  <p>
+    {% trans %}
+    Check the <a href="https://docs.gnunet.org/handbook/gnunet.html#Minimal-configuration">handbook</a> for detailed documentation.
+    For a more hands-on experience, <a href="https://gnunet.org/en/use.html">continue here</a>.
+    {% endtrans %}
+  </p>
 
+
+<!--
   <div class="row container justify-content-center text-center">
     <div class="col-md">
       <p><a href="install-on-ubuntu1804.html"><img src="{{ url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
@@ -55,7 +142,6 @@
       <h3>Debian 9</h3>
     </div>
     <div class="col-md">
-      <!-- Not the officially distributed file, but it's the same logo, in svg. Use this. -->
       <p><a href="install-on-netbsd.html"><img src="{{ url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
       <h3>NetBSD</h3>
     </div>
@@ -77,6 +163,6 @@
       <p><a href="https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"><img alt="gentoo linux" src ="{{ url('static/images/gentoo-logo.svg') }}" class="distro-logo" style="width:170px;height:auto"></a></p>
     </div>
   </div>
-
+-->
 </article>
 {% endblock body_content %}
diff --git a/www.yml b/www.yml
index cd544fae..ba0e42e0 100644
--- a/www.yml
+++ b/www.yml
@@ -55,6 +55,7 @@ meetingnotes:
   2016: 2016-12-28
   2017: 2017-12-27
   2018: 2018-12-27
+  2019: 2019-12-27
 newsposts:
   - page: 2020-01-0.12.2.html
     date: 2020-01-13
@@ -173,6 +174,20 @@ newsposts:
 # <!-- FIXME 2013: no media link. <li>Roger Dingledine and Jacob Appelbaum, "Q &amp; A", Technische Universität München (<a href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon" download>download</a>)</li> -->
 # <!-- FIXME 2013: no source link on web. <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> -->
 videoslist:
+  - year: 2020
+    authors:
+      - "Martin Schanzenbach"
+    location: "FOSDEM20"
+    description: "GNUnet presented at the Decentralized Internet and Privacy devroom at FOSDEM20 in 2020."
+    name: "GNUnet at FOSDEM20"
+    sources:
+      - "https://git.gnunet.org/gnunet-videos-2020.git/plain/FOSDEM20/dip_gnunet.webm"
+    mirror_sources:
+      - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.webm"
+      - "https://video.fosdem.org/2020/UA2.220/dip_gnunet.mp4"
+    slides:
+      - "https://git.gnunet.org/presentations.git/plain/fosdem20/20200202_fosdem20_gnunet.pdf"
+    comment:
   - year: 2019
     authors:
       - "Martin Schanzenbach"