Merge branch 'master' of gnunet.org:gnunet

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

diff --cc README
index 93c889442279cfffc8aa0281b2bb918f14567c12,61c54b4f42dbc87eae2b076c59d04ebd8172dd76..dc0b4b8fb6ec89822c013fcee010d7c394983e56
--- 1/README
--- 2/README
+++ b/README
@@@ -15,76 -15,45 +15,94 @@@ GNU package (http://www.gnu.org/)
  This is an ALPHA release.  There are known and significant bugs as
  well as many missing features in this release.
  
- GNUnet is free software released under the GNU General Public License
- (v3 or later). For details see the COPYING file in this directory.
+ GNUnet is free software released under the GNU Affero General Public
+ License (v3 or later). For details see the COPYING file in this
+ directory.  If you fork this software, you MUST adjust GNUNET_AGPL_URL
+ in src/include/gnunet_util_lib.h to point to the source code of your
+ fork!
  
  Additional documentation about GNUnet can be found at
 -https://gnunet.org/ and in the doc/ folder.
 +https://gnunet.org/ and in the 'doc/' folder.
  
  
  Dependencies:
  =============
  
- Please note that for many of its dependencies GNUnet requires very
- recent versions of the libraries which are often NOT to be found in
- stable distributions in 2014.  While using older packages may in some
- cases on some operating systems may seem to work in some limited
- fashion, we are in many cases aware of serious problems with older
- packages.  Hence please make sure to use the versions listed below.
- 
  These are the direct dependencies for running GNUnet:
  
 +- libmicrohttpd      >= 0.9.42
 +- libgcrypt          >= 1.6
 +- libgnurl           >= 7.35.0      (recommended, available from https://gnunet.org/gnurl)
 +- libcurl            >= 7.35.0      (alternative to libgnurl)
 +- libunistring       >= 0.9.2
 +- gnutls             >= 3.2.12      (highly recommended a gnutls linked against libunbound)
 +- libidn             >= 1.0
 +- libextractor       >= 0.6.1       (highly recommended)
 +- openssl            >= 1.0         (binary, used to generate X.509 certificate)
 +- libltdl            >= 2.2         (part of GNU libtool)
 +- sqlite             >= 3.8         (default database, required)
 +- mysql              >= 5.1         (alternative to sqlite)
 +- postgres           >= 9.5         (alternative to sqlite)
 +- Texinfo            >= 5.2         [*1]
 +- which                             (for the bootstrap script)
 +- gettext
 +- zlib
 +- pkg-config
 +
 +
 +These are the dependencies for GNUnet's testsuite:
 +
 +- Bash                              (optional (?), for some tests)
 +- python             >= 2.7         (optional, only python 2.7 is supported)
 +- python-future      >= 2.7         (optional, only python 2.7 is supported)
 +
 +
 +These are the optional dependencies:
 +
 +- libopus            >= 1.0.1       (optional, for experimental conversation tool)
 +- libpulse           >= 2.0         (optional, for experimental conversation tool)
 +- libogg             >= 1.3.0       (optional, for experimental conversation tool)
 +- libnss                            (optional, certtool binary (for convenient installation of GNS proxy))
 +- python-future                     (optional, for some testcases and utilities)
 +- python-zbar        >= 0.10        (optional, for gnunet-qr)
 +- TeX Live           >= 2012        (optional, for gnunet-bcd[*])
 +- libglpk            >= 4.45        (optional, for experimental code)
 +- perl5                             (optional, for some utilities)
 +- python             >= 2.7         (optional, for gnunet-qr, only python 2.7 is supported)
 +- bluez                             (optional, for bluetooth support)
 +- miniupnpc
 +- libpbc             >= 0.5.14      (optional, for Attribute-Based Encryption and Identity Provider functionality)
 +- libgabe                           (optional, for Attribute-Based Encryption and Identity Provider functionality,
 +                                    from https://github.com/schanzen/libgabe)
 +
++=======
++These are the direct dependencies for running GNUnet:
++
+ - libmicrohttpd >= 0.9.52
+ - libgcrypt     >= 1.6
+ - libgnurl      >= 7.35.0 (available from https://gnunet.org/gnurl)
+ - libunistring  >= 0.9.2
+ - gnutls        >= 3.2.12
+ - libidn        >= 1.0
+ - libextractor  >= 0.6.1 (highly recommended)
+ - openssl       >= 1.0 (binary, used to generate X.509 certificate)
+ - libltdl       >= 2.2 (part of GNU libtool)
+ - sqlite        >= 3.8 (default database, required)
+ - mysql         >= 5.1 (alternative to sqlite)
+ - postgres      >= 9.5 (alternative to sqlite)
+ - libopus       >= 1.0.1 (optional for experimental conversation tool)
+ - libpulse      >= 2.0 (optional for experimental conversation tool)
+ - libogg        >= 1.3.0 (optional for experimental conversation tool)
+ - python-zbar   >= 0.10 (optional for gnunet-qr)
+ - TeX Live      >= 2012 (optional for gnunet-bcd[*])
+ - Texinfo       >= 5.2 [*1]
+ - libglpk       >= 4.45 (optional for experimental code)
  
  Recommended autotools for compiling the git version are:
 -- autoconf >= 2.59
 -- automake >= 1.11.1
 -- libtool  >= 2.2
 +
 +- autoconf           >= 2.59
 +- automake           >= 1.11.1
 +- libtool            >= 2.2
  
  
  [*] Mandatory for compiling the info output of the documentation,

diff --cc contrib/Makefile.am
Simple merge

diff --cc guix-env.scm
Simple merge