Merge branch 'master' of gnunet.org:gnunet

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

1 files changed, 27 insertions, 9 deletions

diff --git a/README b/README
index 93c889442..dc0b4b8fb 100644
--- a/README
+++ b/README
@@ -15,8 +15,11 @@ 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.
@@ -25,13 +28,6 @@ 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
@@ -79,6 +75,28 @@ These are the optional dependencies:
 - 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: