Subject: gnunet updates (gnunet,gnunet-gtk,gnurl,libextractor)

From: [email-masked]
Date: Thu, 14 Mar 2019 14:19:58 +0000

Hi,

here are 5 patches.

1 + 2: in retrospective and experience this makes sense.
3: libextractor
4: gnurl
5: gnunet + gnunet-gtk

Caveat at 5: This is the absolute base of an update.
             I can't invest more time for Guix at the
             the moment but I can help with answering
             questions of the person who'll finish this
             patch:
             gnunet-gtk doesn't find gnunet, can't link
             against it.
             gnunet does not pick up on the @PYTHON@
             for python3.7 which should be replaced
             at build time, which happens in every
             other system I tested.
             gnunet doesn't run its tests but they
             should work now. Note that if tests
             fail on guix or guixsd, you should report
             them to us, we've started to fix what we
             can fix for certain systems.

Cheers!
ng0
From 5424bb3428a9b38ee335fdca0bc6728332f22b50 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Mar 2019 09:33:38 +0000
Subject: [PATCH 1/5] mailmap: Adjustment my nick.

---
 .mailmap | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.mailmap b/.mailmap
index 981decdeef..7de5313923 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,20 +43,20 @@ Mathieu Lirzin <[email-masked]> <[email-masked]>
 Mathieu Othacehe <[email-masked]>
 Mathieu Othacehe <[email-masked]>
 Nikita Karetnikov <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> ng0 <[email-masked]>
-Nils Gillmann <[email-masked]> Nils Gillmann <[email-masked]>
-Nils Gillmann <[email-masked]> ng0 <[email-masked]>
-Nils Gillmann <[email-masked]> ng0 <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
-Nils Gillmann <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> Nils Gillmann <[email-masked]>
+ng0 <[email-masked]> Nils Gillmann <[email-masked]>
+ng0 <[email-masked]> ng0 <[email-masked]>
+ng0 <[email-masked]> ng0 <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
 Pierre Neidhardt <[email-masked]>
 Pierre-Antoine Rouby <[email-masked]>
 Pjotr Prins <[email-masked]> <[email-masked]>
-- 
2.21.0

From e7f558a21a393576b2a6b03f611b502a9fa5f808 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Mar 2019 10:13:44 +0000
Subject: [PATCH 2/5] Revert name changes for ng0.

* Makefile.am: Correct name for ng0.
* doc/guix.de.texi,
doc/guix.fr.texi,
doc/guix.texi,
etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm,
gnu/packages/admin.scm,
gnu/packages/audio.scm,
gnu/packages/autotools.scm,
gnu/packages/cdrom.scm,
gnu/packages/check.scm,
gnu/packages/cinnamon.scm,
gnu/packages/compression.scm,
gnu/packages/crypto.scm,
gnu/packages/databases.scm,
gnu/packages/django.scm,
gnu/packages/dns.scm,
gnu/packages/elixir.scm,
gnu/packages/emacs-xyz.scm,
gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm,
gnu/packages/erlang.scm,
gnu/packages/fonts.scm,
gnu/packages/fontutils.scm,
gnu/packages/forth.scm,
gnu/packages/fvwm.scm,
gnu/packages/games.scm,
gnu/packages/gl.scm,
gnu/packages/gnome.scm,
gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/gtk.scm,
gnu/packages/guile-wm.scm,
gnu/packages/guile-xyz.scm,
gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm,
gnu/packages/haskell.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/irc.scm,
gnu/packages/language.scm,
gnu/packages/libcanberra.scm,
gnu/packages/linux.scm,
gnu/packages/lisp.scm,
gnu/packages/lolcode.scm,
gnu/packages/lxde.scm,
gnu/packages/lxqt.scm,
gnu/packages/mail.scm,
gnu/packages/markup.scm,
gnu/packages/mate.scm,
gnu/packages/maths.scm,
gnu/packages/mc.scm,
gnu/packages/messaging.scm,
gnu/packages/music.scm,
gnu/packages/ncurses.scm,
gnu/packages/networking.scm,
gnu/packages/nickle.scm,
gnu/packages/openbox.scm,
gnu/packages/pdf.scm,
gnu/packages/perl-check.scm,
gnu/packages/perl.scm,
gnu/packages/python-compression.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/python-xyz.scm,
gnu/packages/python.scm,
gnu/packages/qt.scm,
gnu/packages/ruby.scm,
gnu/packages/rust.scm,
gnu/packages/scheme.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/ssh.scm,
gnu/packages/suckless.scm,
gnu/packages/tbb.scm,
gnu/packages/telephony.scm,
gnu/packages/text-editors.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tls.scm,
gnu/packages/tor.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/vim.scm,
gnu/packages/web.scm,
gnu/packages/wm.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xfce.scm,
gnu/packages/xml.scm,
gnu/packages/xorg.scm,
gnu/services/certbot.scm,
gnu/services/desktop.scm,
gnu/services/version-control.scm,
gnu/services/web.scm,
guix/import/hackage.scm,
guix/licenses.scm: Likewise.
---
 Makefile.am                         | 2 +-
 doc/guix.de.texi                    | 2 +-
 doc/guix.fr.texi                    | 2 +-
 doc/guix.texi                       | 2 +-
 etc/completion/fish/guix.fish       | 2 +-
 gnu/packages/accessibility.scm      | 2 +-
 gnu/packages/admin.scm              | 2 +-
 gnu/packages/audio.scm              | 2 +-
 gnu/packages/autotools.scm          | 2 +-
 gnu/packages/cdrom.scm              | 2 +-
 gnu/packages/check.scm              | 2 +-
 gnu/packages/cinnamon.scm           | 2 +-
 gnu/packages/compression.scm        | 2 +-
 gnu/packages/crypto.scm             | 2 +-
 gnu/packages/databases.scm          | 2 +-
 gnu/packages/django.scm             | 2 +-
 gnu/packages/dns.scm                | 2 +-
 gnu/packages/elixir.scm             | 2 +-
 gnu/packages/emacs-xyz.scm          | 2 +-
 gnu/packages/emacs.scm              | 2 +-
 gnu/packages/enlightenment.scm      | 2 +-
 gnu/packages/erlang.scm             | 2 +-
 gnu/packages/fonts.scm              | 2 +-
 gnu/packages/fontutils.scm          | 2 +-
 gnu/packages/forth.scm              | 2 +-
 gnu/packages/fvwm.scm               | 2 +-
 gnu/packages/games.scm              | 2 +-
 gnu/packages/gl.scm                 | 2 +-
 gnu/packages/gnome.scm              | 2 +-
 gnu/packages/gnunet.scm             | 2 +-
 gnu/packages/gnupg.scm              | 2 +-
 gnu/packages/gnuzilla.scm           | 2 +-
 gnu/packages/gtk.scm                | 2 +-
 gnu/packages/guile-wm.scm           | 2 +-
 gnu/packages/guile-xyz.scm          | 2 +-
 gnu/packages/haskell-check.scm      | 2 +-
 gnu/packages/haskell-crypto.scm     | 2 +-
 gnu/packages/haskell.scm            | 2 +-
 gnu/packages/image-viewers.scm      | 2 +-
 gnu/packages/image.scm              | 2 +-
 gnu/packages/irc.scm                | 2 +-
 gnu/packages/language.scm           | 2 +-
 gnu/packages/libcanberra.scm        | 2 +-
 gnu/packages/linux.scm              | 2 +-
 gnu/packages/lisp.scm               | 2 +-
 gnu/packages/lolcode.scm            | 2 +-
 gnu/packages/lxde.scm               | 2 +-
 gnu/packages/lxqt.scm               | 2 +-
 gnu/packages/mail.scm               | 2 +-
 gnu/packages/markup.scm             | 2 +-
 gnu/packages/mate.scm               | 2 +-
 gnu/packages/maths.scm              | 2 +-
 gnu/packages/mc.scm                 | 2 +-
 gnu/packages/messaging.scm          | 2 +-
 gnu/packages/music.scm              | 2 +-
 gnu/packages/ncurses.scm            | 2 +-
 gnu/packages/networking.scm         | 2 +-
 gnu/packages/nickle.scm             | 2 +-
 gnu/packages/openbox.scm            | 2 +-
 gnu/packages/pdf.scm                | 2 +-
 gnu/packages/perl-check.scm         | 2 +-
 gnu/packages/perl.scm               | 2 +-
 gnu/packages/python-compression.scm | 2 +-
 gnu/packages/python-crypto.scm      | 2 +-
 gnu/packages/python-web.scm         | 2 +-
 gnu/packages/python-xyz.scm         | 2 +-
 gnu/packages/python.scm             | 2 +-
 gnu/packages/qt.scm                 | 2 +-
 gnu/packages/ruby.scm               | 2 +-
 gnu/packages/rust.scm               | 2 +-
 gnu/packages/scheme.scm             | 2 +-
 gnu/packages/serialization.scm      | 2 +-
 gnu/packages/shells.scm             | 2 +-
 gnu/packages/ssh.scm                | 2 +-
 gnu/packages/suckless.scm           | 2 +-
 gnu/packages/tbb.scm                | 2 +-
 gnu/packages/telephony.scm          | 2 +-
 gnu/packages/text-editors.scm       | 2 +-
 gnu/packages/textutils.scm          | 2 +-
 gnu/packages/time.scm               | 2 +-
 gnu/packages/tls.scm                | 2 +-
 gnu/packages/tor.scm                | 2 +-
 gnu/packages/version-control.scm    | 2 +-
 gnu/packages/video.scm              | 2 +-
 gnu/packages/vim.scm                | 2 +-
 gnu/packages/web.scm                | 2 +-
 gnu/packages/wm.scm                 | 2 +-
 gnu/packages/xdisorg.scm            | 2 +-
 gnu/packages/xfce.scm               | 2 +-
 gnu/packages/xml.scm                | 2 +-
 gnu/packages/xorg.scm               | 2 +-
 gnu/services/certbot.scm            | 2 +-
 gnu/services/desktop.scm            | 2 +-
 gnu/services/version-control.scm    | 2 +-
 gnu/services/web.scm                | 2 +-
 guix/import/hackage.scm             | 2 +-
 guix/licenses.scm                   | 2 +-
 97 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e7109ec69c..50839fcb27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 # Copyright © 2017 Ricardo Wurmus <[email-masked]>
 # Copyright © 2017 Jan Nieuwenhuizen <[email-masked]>
 # Copyright © 2017 Arun Isaac <[email-masked]>
-# Copyright © 2018 Nils Gillmann <[email-masked]>
+# Copyright © 2018 ng0 <[email-masked]>
 # Copyright © 2018 Julien Lepiller <[email-masked]>
 # Copyright © 2018 Oleg Pykhalov <[email-masked]>
 # Copyright © 2018 Alex Vong <[email-masked]>
diff --git a/doc/guix.de.texi b/doc/guix.de.texi
index 3f02c850e7..83dae0d3ec 100644
--- a/doc/guix.de.texi
+++ b/doc/guix.de.texi
@@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo
 Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{}
 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018
 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright
-@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017,
+@copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017,
 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@*
 Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016,
 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018
diff --git a/doc/guix.fr.texi b/doc/guix.fr.texi
index 4ef3c1a0ff..541fd6f0d0 100644
--- a/doc/guix.fr.texi
+++ b/doc/guix.fr.texi
@@ -34,7 +34,7 @@ Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo
 Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{}
 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018
 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright
-@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017,
+@copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017,
 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@*
 Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016,
 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018
diff --git a/doc/guix.texi b/doc/guix.texi
index 043aad1b65..eec383e528 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -30,7 +30,7 @@ Copyright @copyright{} 2016 Ben Woodcroft@*
 Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
 Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@*
 Copyright @copyright{} 2016 John Darrington@*
-Copyright @copyright{} 2016, 2017 Nils Gillmann@*
+Copyright @copyright{} 2016, 2017 ng0@*
 Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@*
 Copyright @copyright{} 2016 Julien Lepiller@*
 Copyright @copyright{} 2016 Alex ter Weele@*
diff --git a/etc/completion/fish/guix.fish b/etc/completion/fish/guix.fish
index d5b28cdc2b..525d39679d 100644
--- a/etc/completion/fish/guix.fish
+++ b/etc/completion/fish/guix.fish
@@ -1,6 +1,6 @@
 #
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2017, 2018 Nils Gillmann <[email-masked]>
+# Copyright © 2017, 2018 ng0 <[email-masked]>
 #
 # This file is part of GNU Guix.
 #
diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm
index 35c8c8f19b..431e5924c9 100644
--- a/gnu/packages/accessibility.scm
+++ b/gnu/packages/accessibility.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Stefan Reichör <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2019 Andrew Miloradovsky <[email-masked]>
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f3052953cf..ed20a50de2 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Peter Feigl <[email-masked]>
 ;;; Copyright © 2016 John J. Foerch <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2016 John Darrington <[email-masked]>
 ;;; Copyright © 2017 Ben Sturmfels <[email-masked]>
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8bcd3c4b85..aabbd5d0cd 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2016 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016, 2017 Alex Griffin <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Lukas Gradl <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Oleg Pykhalov <[email-masked]>
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 4edfb5725e..ceb70dfee7 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <[email-masked]>
 ;;; Copyright © 2015, 2017, 2018 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016 David Thompson <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index cdbe25fe44..50bf3abcb9 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017 John Darrington <[email-masked]>
 ;;; Copyright © 2017 Thomas Danckaert <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Oleg Pykhalov <[email-masked]>
 ;;; Copyright © 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2019 Eric Bavier <[email-masked]>
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 43f3892cde..41e5a4b0b6 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2017 Frederick M. Muriithi <[email-masked]>
 ;;; Copyright © 2017 Mathieu Othacehe <[email-masked]>
 ;;; Copyright © 2017, 2019 Kei Kebreau <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017, 2018 Ludovic Courtès <[email-masked]>
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
index 7cac863f92..72403e1b11 100644
--- a/gnu/packages/cinnamon.scm
+++ b/gnu/packages/cinnamon.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 090c164e18..5ce9064dca 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016, 2019 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016, 2018 Marius Bakke <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <[email-masked]>
 ;;; Copyright © 2017 Theodoros Foradis <[email-masked]>
 ;;; Copyright © 2017 Stefan Reichör <[email-masked]>
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index e0d4f27874..d6f8e22eab 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2019 Eric Bavier <[email-masked]>
 ;;; Copyright © 2017 Pierre Langlois <[email-masked]>
 ;;; Copyright © 2018 Efraim Flashner <[email-masked]>
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index be02b79efa..a11cb58f3e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016 Hartmut Goebel <[email-masked]>
 ;;; Copyright © 2016 Christopher Allan Webber <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Roel Janssen <[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 9bb81621d9..e6307545d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Hartmut Goebel <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2018 Vijayalakshmi Vedantham <[email-masked]>
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 656c1f9d70..310a5526fe 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 John Darrington <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2016 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017 Vasile Dumitrascu <[email-masked]>
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index e154a2b2c1..29c7ee966f 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017 nee <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2018 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5896060a76..eb0fc0b9b4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016 David Thompson <[email-masked]>
 ;;; Copyright © 2016 Matthew Jordan <[email-masked]>
 ;;; Copyright © 2016, 2017 Roel Janssen <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Alex Vong <[email-masked]>
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 74005972db..e00931c504 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016, 2018 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016 Federico Beffa <[email-masked]>
 ;;; Copyright © 2016 David Thompson <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2017 Alex Vong <[email-masked]>
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index c3aa469776..d2853e62d6 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015 Tomáš Čech <[email-masked]>
 ;;; Copyright © 2015 Daniel Pimentel <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Timo Eisenmann <[email-masked]>
 ;;;
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 45206f71a0..9c38b53581 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016, 2017 Pjotr Prins <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2018 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index bb8548c1eb..f6760c8a2e 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <[email-masked]>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2015, 2016 Leo Famulari <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016 Jookia <[email-masked]>
 ;;; Copyright © 2016 Eric Bavier <[email-masked]>
 ;;; Copyright © 2016 Dmitry Nikolaev <[email-masked]>
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 274efe5fd8..8f8a300644 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2017 Rene Saavedra <[email-masked]>
 ;;; Copyright © 2017 Leo Famulari <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2018 Ludovic Courtès <[email-masked]>
diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm
index 5efc668b78..6902a4a4a3 100644
--- a/gnu/packages/forth.scm
+++ b/gnu/packages/forth.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/fvwm.scm b/gnu/packages/fvwm.scm
index 386edba591..ad0720a60c 100644
--- a/gnu/packages/fvwm.scm
+++ b/gnu/packages/fvwm.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46b58e352c..27ba383f5a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2015, 2016, 2017 Alex Kost <[email-masked]>
 ;;; Copyright © 2015 Paul van der Walt <[email-masked]>
 ;;; Copyright © 2016, 2017 Rodger Fox <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016 Albin Söderqvist <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 08ba3c8b8c..743932fd07 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2013 Joshua Grant <[email-masked]>
 ;;; Copyright © 2014, 2016 David Thompson <[email-masked]>
 ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016 David Thompson <[email-masked]>
 ;;; Copyright © 2017, 2018 Efraim Flashner <[email-masked]>
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3d67b7b9c1..a17849be9d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2016 Roel Janssen <[email-masked]>
 ;;; Copyright © 2016, 2018 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Thomas Danckaert <[email-masked]>
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 461180161e..93c905406f 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2017, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016 Mark H Weaver <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Alex Vong <[email-masked]>
 ;;;
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index c5c99bfeb6..fcec2f065d 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016 Christopher Allan Webber <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Christopher Baines <[email-masked]>
 ;;; Copyright © 2016 Mike Gerwitz <[email-masked]>
 ;;; Copyright © 2016 Troy Sankey <[email-masked]>
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index e11c0eb576..785d5c1342 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
 ;;; Copyright © 2017 Clément Lassieur <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2019 Ivan Petkov <[email-masked]>
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fb5c178d53..1ac90216ef 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Fabian Harfert <[email-masked]>
 ;;; Copyright © 2016 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016 Patrick Hetu <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2017 Roel Janssen <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm
index 3755282403..7b1731171a 100644
--- a/gnu/packages/guile-wm.scm
+++ b/gnu/packages/guile-wm.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2016 Alex ter Weele <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a64a54323a..d4f019c814 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2017 David Thompson <[email-masked]>
 ;;; Copyright © 2017, 2018 Mathieu Othacehe <[email-masked]>
 ;;; Copyright © 2017 Theodoros Foradis <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2018 Arun Isaac <[email-masked]>
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 0d4501df86..19eb40eaa4 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Eric Bavier <[email-masked]>
 ;;; Copyright © 2015 Federico Beffa <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2017 Danny Milosavljevic <[email-masked]>
 ;;; Copyright © 2017 rsiddharth <[email-masked]>
diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm
index 88a3ea467b..0c294849be 100644
--- a/gnu/packages/haskell-crypto.scm
+++ b/gnu/packages/haskell-crypto.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Paul van der Walt <[email-masked]>
 ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2017 rsiddharth <[email-masked]>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index cd0fdd22fc..4d88056a31 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015 Paul van der Walt <[email-masked]>
 ;;; Copyright © 2015 Eric Bavier <[email-masked]>
 ;;; Copyright © 2016, 2018, 2019 Ludovic Courtès <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017 David Craven <[email-masked]>
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 7da0b0dab9..59a0501230 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015, 2016 Alex Kost <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2017 Alex Griffin <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Mathieu Othacehe <[email-masked]>
 ;;; Copyright © 2017 nee <[email-masked]>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9f25578050..413bda3c97 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Eric Bavier <[email-masked]>
 ;;; Copyright © 2016, 2017 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016, 2017 Kei Kebreau <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Hartmut Goebel <[email-masked]>
 ;;; Copyright © 2017 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <[email-masked]>
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index e6f23d14d7..d3b3a51294 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014 Kevin Lemonnier <[email-masked]>
 ;;; Copyright © 2015, 2017 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 110f07a476..46b60b7055 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Eric Bavier <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2018 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 0032d9a85f..121ba11f89 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Andreas Enge <[email-masked]>
 ;;; Copyright © 2014, 2015, 2019 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2016 Fabian Harfert <[email-masked]>
-;;; Copyright © 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017, 2018 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1cdffb8c79..5214d4d9bd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -18,7 +18,7 @@
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email-masked]>
 ;;; Copyright © 2016, 2018 Rene Saavedra <[email-masked]>
 ;;; Copyright © 2016 Carlos Sánchez de La Lama <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Leo Famulari <[email-masked]>
 ;;; Copyright © 2017 José Miguel Sánchez García <[email-masked]>
 ;;; Copyright © 2017 Gábor Boskovits <[email-masked]>
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 3d43b7c509..87dcf36372 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <[email-masked]>
 ;;; Copyright © 2015 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016 Federico Beffa <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017 Andy Patterson <[email-masked]>
 ;;; Copyright © 2017, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017, 2018 Efraim Flashner <[email-masked]>
diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm
index f7e2da380c..e55a36c509 100644
--- a/gnu/packages/lolcode.scm
+++ b/gnu/packages/lolcode.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index a5720ce979..fc464b4a25 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Mathieu Lirzin <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Mathieu Othacehe <[email-masked]>
 ;;; Copyright © 2017 Brendan Tildesley <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 9813005a34..ddfeaf5cde 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2016 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Meiyo Peng <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 29ba1a92ef..ea8896230d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2016 Lukas Gradl <[email-masked]>
 ;;; Copyright © 2016 Alex Kost <[email-masked]>
 ;;; Copyright © 2016, 2017 Troy Sankey <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016 John Darrington <[email-masked]>
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 67f2bf2881..2b1e2ef63c 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015 Mathieu Lirzin <[email-masked]>
 ;;; Copyright © 2015 David Thompson <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index ef94491622..16e9148506 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Fabian Harfert <[email-masked]>
 ;;; Copyright © 2016, 2017 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 33c1416c75..af2c141ee5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -16,7 +16,7 @@
 ;;; Copyright © 2016 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016, 2017 Thomas Danckaert <[email-masked]>
 ;;; Copyright © 2017, 2018 Paul Garlick <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2017 Theodoros Foradis <[email-masked]>
 ;;; Copyright © 2017, 2019 Arun Isaac <[email-masked]>
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index ecac5412e4..3d6185ca78 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Eric Bavier <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ae22218675..5fa4aaa956 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Andreas Enge <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2015, 2018 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Andy Patterson <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2017 Mekeor Melire <[email-masked]>
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 05fdc1428f..88ec8b5064 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016, 2017 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016 John J. Foerch <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Rodger Fox <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <[email-masked]>
 ;;; Copyright © 2017, 2018 Pierre Langlois <[email-masked]>
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index ae3fb887e8..9b5498688b 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2014, 2016 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2015, 2017 Leo Famulari <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index ce775a3a0f..be29878bbf 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 John Darrington <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Nicolas Goaziou <[email-masked]>
 ;;; Copyright © 2016 Eric Bavier <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016 Benz Schenk <[email-masked]>
 ;;; Copyright © 2016, 2017 Pjotr Prins <[email-masked]>
diff --git a/gnu/packages/nickle.scm b/gnu/packages/nickle.scm
index c8179419bb..9cc38867b6 100644
--- a/gnu/packages/nickle.scm
+++ b/gnu/packages/nickle.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm
index 1643b7502b..ceca6e53e0 100644
--- a/gnu/packages/openbox.scm
+++ b/gnu/packages/openbox.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2016 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 29f2381e6d..ff26bed64f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2015 Paul van der Walt <[email-masked]>
 ;;; Copyright © 2016 Roel Janssen <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016, 2017 Marius Bakke <[email-masked]>
 ;;; Copyright © 2016, 2017 Ludovic Courtès <[email-masked]>
diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index c1edf48f06..f9238ad771 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Danny Milosavljevic <[email-masked]>
 ;;; Copyright © 2016 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016, 2017 Alex Sassmannshausen <[email-masked]>
 ;;; Copyright © 2016, 2017 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 978062d262..7a963c2659 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016, 2018 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016 Jochem Raat <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Alex Sassmannshausen <[email-masked]>
 ;;; Copyright © 2016, 2018 Roel Janssen <[email-masked]>
 ;;; Copyright © 2016 Ben Woodcroft <[email-masked]>
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index e13227b616..88f62d1934 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2018, 2019 Efraim Flashner <[email-masked]>
 ;;;
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 688c8c4378..08f1e4d399 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2014, 2017 Eric Bavier <[email-masked]>
 ;;; Copyright © 2015, 2016 David Thompson <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2014, 2015 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016 Danny Milosavljevic <[email-masked]>
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e25b68153d..238f4d2431 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017 Roel Janssen <[email-masked]>
 ;;; Copyright © 2016, 2017 Julien Lepiller <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2014, 2017 Eric Bavier <[email-masked]>
 ;;; Copyright © 2014, 2015 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2015 Cyril Roelandt <[email-masked]>
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ab8e543295..1ddb0084ff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2016, 2017 Troy Sankey <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 25f2ffa73c..57ced499cb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2016, 2017 Troy Sankey <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8179911539..6e567792f8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2015, 2018, 2019 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016 Thomas Danckaert <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017 Quiliro <[email-masked]>
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 818553848d..7a2b191063 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2015 David Thompson <[email-masked]>
 ;;; Copyright © 2015, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017, 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index be916743fb..96a68f4347 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016 Eric Le Bihan <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2017 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2017, 2018 Nikolai Merinov <[email-masked]>
 ;;; Copyright © 2017 Efraim Flashner <[email-masked]>
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 93a1a3e152..9dbb3713ee 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 John Darrington <[email-masked]>
 ;;; Copyright © 2017 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 876318869c..05e0d1d833 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017 Corentin Bocquillon <[email-masked]>
 ;;; Copyright © 2017 Gregor Giesen <[email-masked]>
 ;;; Copyright © 2017 Frederick M. Muriithi <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <[email-masked]>
 ;;;
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index d0561559e9..8179ba041b 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2016 Stefan Reichör <[email-masked]>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Leo Famulari <[email-masked]>
 ;;; Copyright © 2017 Arun Isaac <[email-masked]>
 ;;; Copyright © 2019 Meiyo Peng <[email-masked]>
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index fc7a711395..030d5697f2 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Stefan Reichör <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Manuel Graf <[email-masked]>
 ;;; Copyright © 2019 Gábor Boskovits <[email-masked]>
 ;;;
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index d15fdbaddd..c1357bd282 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 Cyril Roelandt <[email-masked]>
 ;;; Copyright © 2015 Amirouche Boubekki <[email-masked]>
 ;;; Copyright © 2016 Al McElrath <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2015 Dmitry Bogatov <[email-masked]>
 ;;; Copyright © 2015 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016 Eric Bavier <[email-masked]>
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index ee21a61895..788eabfdfa 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 63709935c3..559fb3d63f 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Lukas Gradl <[email-masked]>
 ;;; Copyright © 2016 Francesco Frassinelli <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Jovany Leandro G.C <[email-masked]>
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 0c60d202a3..c739aca0bd 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Carlo Zancanaro <[email-masked]>
 ;;; Copyright © 2017, 2018 Eric Bavier <[email-masked]>
 ;;; Copyright © 2017 Feng Shu <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2014 Taylan Ulrich Bayırlı/Kammer <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index d55f27fd6b..8cdbca754a 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016 Jelle Licht <[email-masked]>
 ;;; Copyright © 2016 Alex Griffin <[email-masked]>
 ;;; Copyright © 2016, 2018 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017 Eric Bavier <[email-masked]>
 ;;; Copyright © 2017 Rene Saavedra <[email-masked]>
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 948d2b995c..747e4cf080 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016 Marius Bakke <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Ben Woodcroft <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2018 Alex Vong <[email-masked]>
 ;;; Copyright © 2019 Kyle Meyer <[email-masked]>
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index bdfbc003d3..6ecb5673e6 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015 David Thompson <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016 Hartmut Goebel <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017, 2018 Marius Bakke <[email-masked]>
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index a0b16db3a7..a24923c045 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2014, 2015 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017, 2018 Eric Bavier <[email-masked]>
 ;;; Copyright © 2017 Rutger Helling <[email-masked]>
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 674850e0ac..d750863f30 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2015, 2018 Kyle Meyer <[email-masked]>
 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Vasile Dumitrascu <[email-masked]>
 ;;; Copyright © 2017 Clément Lassieur <[email-masked]>
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c97dbbe204..56e283d3e9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2016 Dmitry Nikolaev <[email-masked]>
 ;;; Copyright © 2016 Andy Patterson <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2018, 2019 Eric Bavier <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2017 Feng Shu <[email-masked]>
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 6a98f0a5a4..4e161f4543 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 463f18b7f0..6d0b9d7846 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016 Rene Saavedra <[email-masked]>
 ;;; Copyright © 2016 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2016 Clément Lassieur <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2016 Bake Timmons <[email-masked]>
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 4a6fc62069..491e290b5f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016 Al McElrath <[email-masked]>
 ;;; Copyright © 2016 Carlo Zancanaro <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
 ;;; Copyright © 2016 doncatnip <[email-masked]>
 ;;; Copyright © 2016 Ivan Vilata i Balaguer <[email-masked]>
 ;;; Copyright © 2017 Mekeor Melire <[email-masked]>
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index e18d7e9719..ca9e6f6747 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2016, 2017, 2019 Marius Bakke <[email-masked]>
 ;;; Copyright © 2016 Petter <[email-masked]>
 ;;; Copyright © 2017 Mekeor Melire <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017 Marek Benc <[email-masked]>
 ;;; Copyright © 2017 Mike Gerwitz <[email-masked]>
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b47fe5d301..f5618932ca 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016 Kei Kebreau <[email-masked]>
 ;;; Copyright © 2017, 2019 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017 Petter <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 0ba23bcba4..d84b8d3374 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016 Ben Woodcroft <[email-masked]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Marius Bakke <[email-masked]>
 ;;; Copyright © 2017 Adriano Peluso <[email-masked]>
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a029d23953..59fb9ca570 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016 Mathieu Lirzin <[email-masked]>
 ;;; Copyright © 2015 Cyrill Schenkel <[email-masked]>
 ;;; Copyright © 2016, 2017 Efraim Flashner <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Alex Kost <[email-masked]>
 ;;; Copyright © 2016 David Craven <[email-masked]>
 ;;; Copyright © 2016, 2017 John Darrington <[email-masked]>
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
index 7548145c98..7565bc97ca 100644
--- a/gnu/services/certbot.scm
+++ b/gnu/services/certbot.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2017, 2018 Clément Lassieur <[email-masked]>
 ;;;
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 0dee57e3bc..d2a462a2b2 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2015 Mark H Weaver <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2017 Maxim Cournoyer <[email-masked]>
-;;; Copyright © 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2017 ng0 <[email-masked]>
 ;;; Copyright © 2018 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017, 2019 Christopher Baines <[email-masked]>
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index 13669925ab..e332b93096 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016 Sou Bunnbu <[email-masked]>
 ;;; Copyright © 2017 Oleg Pykhalov <[email-masked]>
 ;;; Copyright © 2017 Clément Lassieur <[email-masked]>
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index d71fed20ed..b6ebe90774 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <[email-masked]>
 ;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <[email-masked]>
 ;;; Copyright © 2017 Christopher Baines <[email-masked]>
 ;;; Copyright © 2017 nee <[email-masked]>
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 48db764b3c..2a51420d14 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Federico Beffa <[email-masked]>
 ;;; Copyright © 2016 Eric Bavier <[email-masked]>
-;;; Copyright © 2016 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016 ng0 <[email-masked]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/guix/licenses.scm b/guix/licenses.scm
index d22c3fa36e..676e71acdb 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Leo Famulari <[email-masked]>
 ;;; Copyright © 2016 Fabian Harfert <[email-masked]>
 ;;; Copyright © 2016 Rene Saavedra <[email-masked]>
-;;; Copyright © 2016, 2017 Nils Gillmann <[email-masked]>
+;;; Copyright © 2016, 2017 ng0 <[email-masked]>
 ;;; Copyright © 2017 Clément Lassieur <[email-masked]>
 ;;; Copyright © 2017 Petter <[email-masked]>
 ;;; Copyright © 2017 Marius Bakke <[email-masked]>
-- 
2.21.0

From 7c14c8163ad3bc09fd29d35750eee3857eed728f Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Mar 2019 10:43:47 +0000
Subject: [PATCH 3/5] gnu: libextractor: Update to 1.9.

* gnu/packages/gnunet (libextractor): Update to 1.9.
[source]: Remove patches.
* gnu/packages/patches/libextractor-CVE-2018-2043{1,0}.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  2 -
 gnu/packages/gnunet.scm                       |  8 +--
 .../patches/libextractor-CVE-2018-20430.patch | 60 -------------------
 .../patches/libextractor-CVE-2018-20431.patch | 53 ----------------
 4 files changed, 3 insertions(+), 120 deletions(-)
 delete mode 100644 gnu/packages/patches/libextractor-CVE-2018-20430.patch
 delete mode 100644 gnu/packages/patches/libextractor-CVE-2018-20431.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index af2bf87273..49537e19f8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -968,8 +968,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libevent-2.1-skip-failing-test.patch	\
   %D%/packages/patches/libexif-CVE-2016-6328.patch		\
   %D%/packages/patches/libexif-CVE-2017-7544.patch		\
-  %D%/packages/patches/libextractor-CVE-2018-20430.patch	\
-  %D%/packages/patches/libextractor-CVE-2018-20431.patch	\
   %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch	\
   %D%/packages/patches/libgit2-mtime-0.patch			\
   %D%/packages/patches/libgit2-oom-test.patch			\
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 93c905406f..19e99644dd 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2017, 2019 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2016 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2016 Mark H Weaver <[email-masked]>
-;;; Copyright © 2016, 2017, 2018 ng0 <[email-masked]>
+;;; Copyright © 2016, 2017, 2018, 2019 ng0 <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2018 Alex Vong <[email-masked]>
 ;;;
@@ -68,16 +68,14 @@
 (define-public libextractor
   (package
    (name "libextractor")
-   (version "1.8")
+   (version "1.9")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/libextractor/libextractor-"
                                 version ".tar.gz"))
-            (patches (search-patches "libextractor-CVE-2018-20430.patch"
-                                     "libextractor-CVE-2018-20431.patch"))
             (sha256
              (base32
-              "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2"))))
+              "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"))))
    (build-system gnu-build-system)
    ;; WARNING: Checks require /dev/shm to be in the build chroot, especially
    ;; not to be a symbolic link to /run/shm.
diff --git a/gnu/packages/patches/libextractor-CVE-2018-20430.patch b/gnu/packages/patches/libextractor-CVE-2018-20430.patch
deleted file mode 100644
index 570cd7c006..0000000000
--- a/gnu/packages/patches/libextractor-CVE-2018-20430.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix CVE-2018-20430:
-
-https://gnunet.org/bugs/view.php?id=5493
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20430
-https://security-tracker.debian.org/tracker/CVE-2018-20430
-
-Patch copied from upstream source repository:
-
-https://gnunet.org/git/libextractor.git/commit/?id=b405d707b36e0654900cba78e89f49779efea110
-
-From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <[email-masked]>
-Date: Thu, 20 Dec 2018 22:47:53 +0100
-Subject: [PATCH] fix #5493 (out of bounds read)
-
----
- src/common/convert.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/common/convert.c b/src/common/convert.c
-index c0edf21..2be2108 100644
---- a/src/common/convert.c
-+++ b/src/common/convert.c
-@@ -36,8 +36,8 @@
-  *  string is returned.
-  */
- char *
--EXTRACTOR_common_convert_to_utf8 (const char *input, 
--				  size_t len, 
-+EXTRACTOR_common_convert_to_utf8 (const char *input,
-+				  size_t len,
- 				  const char *charset)
- {
- #if HAVE_ICONV
-@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
-   i = input;
-   cd = iconv_open ("UTF-8", charset);
-   if (cd == (iconv_t) - 1)
--    return strdup (i);
-+    return strndup (i, len);
-   if (len > 1024 * 1024)
-     {
-       iconv_close (cd);
-@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
-     }
-   itmp = tmp;
-   finSize = tmpSize;
--  if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX)
-+  if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1))
-     {
-       iconv_close (cd);
-       free (tmp);
--      return strdup (i);
-+      return strndup (i, len);
-     }
-   ret = malloc (tmpSize - finSize + 1);
-   if (ret == NULL)
--- 
-2.20.1
-
diff --git a/gnu/packages/patches/libextractor-CVE-2018-20431.patch b/gnu/packages/patches/libextractor-CVE-2018-20431.patch
deleted file mode 100644
index 855c5ba64b..0000000000
--- a/gnu/packages/patches/libextractor-CVE-2018-20431.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix CVE-2018-20431:
-
-https://gnunet.org/bugs/view.php?id=5494
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20431
-https://security-tracker.debian.org/tracker/CVE-2018-20431
-
-Patch copied from upstream source repository:
-
-https://gnunet.org/git/libextractor.git/commit/?id=489c4a540bb2c4744471441425b8932b97a153e7
-
-To apply the patch to libextractor 1.8 release tarball,
-hunk #1 which patches ChangeLog is removed. 
-
-From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff <[email-masked]>
-Date: Thu, 20 Dec 2018 23:02:28 +0100
-Subject: [PATCH] fix #5494
-
----
- ChangeLog                    | 3 ++-
- src/plugins/ole2_extractor.c | 9 +++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
-index 53fa1b9..a48b726 100644
---- a/src/plugins/ole2_extractor.c
-+++ b/src/plugins/ole2_extractor.c
-@@ -173,7 +173,7 @@ struct ProcContext
-   EXTRACTOR_MetaDataProcessor proc;
- 
-   /**
--   * Closure for 'proc'.
-+   * Closure for @e proc.
-    */
-   void *proc_cls;
- 
-@@ -213,7 +213,12 @@ process_metadata (gpointer key,
- 
-   if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
-     {
--      contents = strdup (g_value_get_string (gval));
-+      const char *gvals;
-+
-+      gvals = g_value_get_string (gval);
-+      if (NULL == gvals)
-+        return;
-+      contents = strdup (gvals);
-     }
-   else
-     {
--- 
-2.20.1
-
-- 
2.21.0

From 11fa7272b33f65be915214c28d48fddf7bfbd4ff Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Mar 2019 10:48:08 +0000
Subject: [PATCH 4/5] gnu: gnurl: Update to 7.64.0.

* gnu/packages/gnunet.scm (gnurl): Update to 7.64.0.
---
 gnu/packages/gnunet.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 19e99644dd..029e174a79 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -175,13 +175,13 @@ authentication and support for SSL3 and TLS.")
 (define-public gnurl
   (package
    (name "gnurl")
-   (version "7.63.0")
+   (version "7.64.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z"))
             (sha256
              (base32
-              "021b3pdfnqywk5q07y48kxyz7g4jjg35dk3cv0ps0x50qjr4ix33"))))
+              "095y0ic34ahrlsdylzvn29yg3zglz3jz9mmhymav2svc6knilwgf"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                             ; 1.7 MiB of man3 pages
-- 
2.21.0

From d051cd918f92039122bbe89414801c5e669ed149 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Mar 2019 11:19:47 +0000
Subject: [PATCH 5/5] gnu: gnunet: Update to 0.11.0.

* gnu/packages/gnunet.scm (gnunet): Update to 0.11.0.
[inputs]: Replace libidn with libidn2, remove perl,
remove python-2, remove glpk (only used when compiled
--with-experimental), add which.
[native-inputs]: remove pkg-config (pc files provided
but pkg-config is not used), add python.
[arguments]: Remove configure flags, --with-nssdir no
longer exists.
[license]: switch to agpl3+.

(gnunet-gtk)[source]: Update checksum.
---
 gnu/packages/gnunet.scm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 029e174a79..94c8016175 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu packages file)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gettext)
@@ -53,6 +54,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
@@ -231,7 +233,7 @@ supports HTTP, HTTPS and GnuTLS.")
 (define-public gnunet
   (package
    (name "gnunet")
-   (version "0.10.1")
+   (version "0.11.0")
    (source
     (origin
       (method url-fetch)
@@ -239,39 +241,40 @@ supports HTTP, HTTPS and GnuTLS.")
                           ".tar.gz"))
       (sha256
        (base32
-        "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
+        "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"))))
    (build-system gnu-build-system)
+   ;; python2.7 is optionally detected at runtime in $PATH of user,
+   ;; no longer required in 0.11.1 released (gnunet-qr C rewrite).
    (inputs
-    `(("glpk" ,glpk)
-      ("gnurl" ,gnurl)
+    `(("gnurl" ,gnurl)
       ("gstreamer" ,gstreamer)
       ("gst-plugins-base" ,gst-plugins-base)
       ("gnutls" ,gnutls/dane)
       ("libextractor" ,libextractor)
       ("libgcrypt" ,libgcrypt)
-      ("libidn" ,libidn)
+      ("libidn2" ,libidn2)
       ("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more
       ("libltdl" ,libltdl)
       ("libunistring" ,libunistring) ; fs and more
       ("openssl" ,openssl) ; transport, certificate creation, contribs
-      ("opus" ,opus) ; gnunet-conversation
-      ("pulseaudio" ,pulseaudio) ; conversation
+      ("opus" ,opus) ;conversation
+      ("pulseaudio" ,pulseaudio) ;conversation
       ("sqlite" ,sqlite) ; sqlite bindings, *store
       ("zlib" ,zlib)
-      ("perl" ,perl) ; doxygen and more
       ("jansson" ,jansson) ; identity, taler (external), gnunet-json, gns
       ("nss" ,nss) ; gns
       ("gmp" ,gmp) ; util
       ("bluez" ,bluez) ; gnunet-transport
       ("glib" ,glib)
-      ("libogg" ,libogg) ; gnunet-conversation
-      ("python-2" ,python-2))) ; tests, gnunet-qr
+      ("libogg" ,libogg)
+      ;; https://bugs.gnunet.org/view.php?id=5614
+      ("which" ,which)))
    (native-inputs
-    `(("pkg-config" ,pkg-config)))
+    `(("python" ,python)
+      ;; Will be removed in 0.11.1:
+      ("python-future" ,python-future)))
    (arguments
-    '(#:configure-flags
-      (list (string-append "--with-nssdir=" %output "/lib"))
-      #:parallel-tests? #f
+    '(#:parallel-tests? #f
       ;; test_gnunet_service_arm fails; reported upstream
       #:tests? #f
       #:phases
@@ -294,7 +297,7 @@ global, distributed network that provides security and privacy.  GNUnet in
 that sense aims to replace the current internet protocol stack.  Along with
 an application for secure publication of files, it has grown to include all
 kinds of basic applications for the foundation of a GNU internet.")
-   (license license:gpl3+)
+   (license license:agpl3+)
    (home-page "https://gnunet.org/")))
 
 (define-public guile-gnunet                       ;GSoC 2015!
@@ -339,7 +342,7 @@ services.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g"))))
+                "1vr9iyji25r87ym1jw033l9xyqfj4971anamfvz810rl65jjhb6z"))))
     (arguments
      `(#:configure-flags
        (list "--with-libunique"
-- 
2.21.0