diff --git a/configure.ac b/configure.ac
index 2c0cdc027a16180a7a9e9d31a598c601cb1c5c9c..45e5b4fe4ea3315e49033cdbc5b4fd0520f94400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_LANG(C++)
dnl
dnl Check the operating system
@@ -548,6 +549,18 @@ AM_CONDITIONAL([BUILD_OPUS], [test "$HAVE_OPUS" -eq 1])
dnl check for openDHT
PKG_CHECK_MODULES([OPENDHT], [opendht >= 0.6.1],, AC_MSG_WARN([Missing OpenDHT]))
+AC_CHECK_HEADER([cryptopp/cryptlib.h], , AC_MSG_FAILURE([Unable to find the cryptopp headers (you may need to install the dev package).]))
+LDFLAGS+=" -lcryptopp"
+AS_IF([test "${SYS}" = "mingw32"],[
+ LDFLAGS+=" -lboost_random -lboost_system"
+ CPPFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
+], [
+ AX_BOOST_BASE([1.48],,[AC_MSG_ERROR([Ring needs Boost but it was not found in your system])])
+ AC_CHECK_LIB([boost_system], exit, , [AC_MSG_FAILURE(['Can't find boost system'])])
+ AC_CHECK_LIB([boost_random], exit, , [AC_MSG_FAILURE(['Can't find boost random'])])
+ CPPFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
+])
+
dnl IPv6 mode is default-disabled
AC_ARG_ENABLE([ipv6], AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support]))
diff --git a/contrib/src/boost/SHA512SUMS b/contrib/src/boost/SHA512SUMS
new file mode 100644
index 0000000000000000000000000000000000000000..eca12960db52f320b06bc5623d6b5917b497039c
--- /dev/null
+++ b/contrib/src/boost/SHA512SUMS
@@ -0,0 +1 @@
+a1c7338e2d2dbac8552ede7c554640d22cbb2fda7fbc325dc3cdcb51e769713626695426ffc158cbe0e1729dd9a7b5ad18af4800d74e24539e8d8564268c2b9d boost_1_61_0.tar.bz2
diff --git a/contrib/src/boost/rules.mak b/contrib/src/boost/rules.mak
new file mode 100644
index 0000000000000000000000000000000000000000..89783f26161d16510220d98d18ad06f85d5fa96f
--- /dev/null
+++ b/contrib/src/boost/rules.mak
@@ -0,0 +1,66 @@
+# Boost
+BOOST_VERSION := 1_61_0
+BOOST_URL := https://downloads.sourceforge.net/project/boost/boost/1.61.0/boost_$(BOOST_VERSION).tar.bz2
+
+PKGS += boost
+ifdef HAVE_LINUX
+ifndef HAVE_ANDROID
+PKGS_FOUND += boost
+endif
+endif
+
+BOOST_B2_OPTS := variant=release \
+ link=static \
+ --prefix="$(PREFIX)" \
+ --includedir="$(PREFIX)/include" \
+ --libdir="$(PREFIX)/lib" \
+ --build="$(BUILD)" \
+ --host="$(HOST)" \
+ --target="$(HOST)" \
+ --program-prefix="" \
+ --with-system --with-random \
+ define="BOOST_SYSTEM_NO_DEPRECATED" \
+ -sNO_BZIP2=1 cxxflags=-fPIC cflags=-fPIC
+
+ifdef HAVE_WIN32
+BOOST_B2_OPTS += target-os=windows \
+ threadapi=win32 \
+ runtime-link=static \
+ binary-format=pe \
+ architecture=x86 \
+ --user-config=user-config.jam \
+ cxxflags="-std=c++11 -fPIC -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+endif
+ifdef HAVE_ANDROID
+BOOST_B2_OPTS += --user-config=user-config.jam
+endif
+
+$(TARBALLS)/boost_$(BOOST_VERSION).tar.bz2:
+ $(call download,$(BOOST_URL))
+
+.sum-boost: boost_$(BOOST_VERSION).tar.bz2
+
+boost: boost_$(BOOST_VERSION).tar.bz2 .sum-boost
+ $(UNPACK)
+ $(MOVE)
+
+.boost: boost
+ifdef HAVE_WIN32
+ cd $< && echo "using gcc : mingw64 : ${HOST}-g++" > user-config.jam
+ cd $< && echo ":" >> user-config.jam
+ cd $< && echo "<rc>${HOST}-windres" >> user-config.jam
+ cd $< && echo "<archiver>${HOST}-ar" >> user-config.jam
+ cd $< && echo ";" >> user-config.jam
+endif
+ifdef HAVE_ANDROID
+ cd $< && echo "using gcc : android : clang++" > user-config.jam
+ cd $< && echo ":" >> user-config.jam
+ cd $< && echo "<archiver>${HOST}-ar" >> user-config.jam
+ cd $< && echo "<compileflags>-DANDROID" >> user-config.jam
+ cd $< && echo "<compileflags>-D__ANDROID__" >> user-config.jam
+ cd $< && echo "<compileflags>-I$(ANDROID_TOOLCHAIN)/include/c++/4.9" >> user-config.jam
+ cd $< && echo ";" >> user-config.jam
+endif
+ cd $< && $(HOSTVARS) ./bootstrap.sh
+ cd $< && $(HOSTVARS) ./b2 $(BOOST_B2_OPTS) install
+ touch $@
diff --git a/contrib/src/cryptopp/SHA512SUMS b/contrib/src/cryptopp/SHA512SUMS
new file mode 100644
index 0000000000000000000000000000000000000000..0608dd87d92224fe44cf75eb950df60df0c302cd
--- /dev/null
+++ b/contrib/src/cryptopp/SHA512SUMS
@@ -0,0 +1 @@
+bdb7563b8959c1a9261a3feda9d0f6a81172e12d2b34fbe761b7d60f3a5917d82d1bca285dd9d4da23e71b306ad5e2a7d283545a559c88da8118a3830487ab71 cryptopp-54557b18275053bbfc34594f7e65808dd92dd1a6.tar.gz
diff --git a/contrib/src/cryptopp/cmake-crosscompile.patch b/contrib/src/cryptopp/cmake-crosscompile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0b2b5f2b4a5ebd1ce6f883f1bdb32e9c40f4d60f
--- /dev/null
+++ b/contrib/src/cryptopp/cmake-crosscompile.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt.patched
+@@ -39,12 +39,7 @@ set(CRYPTOPP_DATA_DIR "" CACHE PATH "Crypto++ test data directory")
+ # Always 1 ahead in Master. Also see http://groups.google.com/forum/#!topic/cryptopp-users/SFhqLDTQPG4
+ set(LIB_VER ${cryptopp_VERSION_MAJOR}${cryptopp_VERSION_MINOR}${cryptopp_VERSION_PATCH})
+
+-# Only set when cross-compiling, http://www.vtk.org/Wiki/CMake_Cross_Compiling
+-if (NOT (CMAKE_SYSTEM_VERSION AND CMAKE_SYSTEM_PROCESSOR))
+- set(CRYPTOPP_CROSS_COMPILE 1)
+-else()
+- set(CRYPTOPP_CROSS_COMPILE 0)
+-endif()
++set(CRYPTOPP_CROSS_COMPILE 1)
+
+ # Don't use RPATH's. The resulting binary could fail a security audit.
+ if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
diff --git a/contrib/src/cryptopp/rules.mak b/contrib/src/cryptopp/rules.mak
new file mode 100644
index 0000000000000000000000000000000000000000..715d4e24b7d95d17db06c030fcaefee698be543e
--- /dev/null
+++ b/contrib/src/cryptopp/rules.mak
@@ -0,0 +1,31 @@
+# Crypto++
+CRYPTOPP_VERSION := 54557b18275053bbfc34594f7e65808dd92dd1a6
+CRYPTOPP_URL := https://github.com/weidai11/cryptopp/archive/$(CRYPTOPP_VERSION).tar.gz
+
+PKGS += cryptopp
+
+ifeq ($(call need_pkg,'libcrypto++'),)
+PKGS_FOUND += cryptopp
+endif
+
+CRYPTOPP_CMAKECONF := -DBUILD_TESTING=Off \
+ -DBUILD_SHARED=Off \
+ -DCMAKE_INSTALL_LIBDIR=lib
+
+$(TARBALLS)/cryptopp-$(CRYPTOPP_VERSION).tar.gz:
+ $(call download,$(CRYPTOPP_URL))
+
+.sum-cryptopp: cryptopp-$(CRYPTOPP_VERSION).tar.gz
+
+cryptopp: cryptopp-$(CRYPTOPP_VERSION).tar.gz .sum-cryptopp
+ $(UNPACK)
+ifdef HAVE_ANDROID
+ $(APPLY_BIN) $(SRC)/cryptopp/cmake-crosscompile.patch
+endif
+ $(MOVE)
+
+.cryptopp: cryptopp toolchain.cmake
+ cd $< && rm GNUmakefile*
+ cd $< && $(HOSTVARS) $(CMAKE) . $(CRYPTOPP_CMAKECONF)
+ cd $< && $(MAKE) install
+ touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 66472b04a6eca0b47e3171543b2fe0d7f73ce1a4..e12be91490dee7425cda4d66838c5724c1979bec 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -349,6 +349,7 @@ UNPACK = $(RM) -R $@ \
$(foreach f,$(filter %.zip,$^), && unzip $(f))
UNPACK_DIR = $(basename $(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
+APPLY_BIN = (cd $(UNPACK_DIR) && patch --binary -flp1) <
pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
MOVE = mv $(UNPACK_DIR) $@ && touch $@
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
new file mode 100644
index 0000000000000000000000000000000000000000..f3279f2b76eae35d782c6e95846f9fe369fa7100
--- /dev/null
+++ b/m4/ax_boost_base.m4
@@ -0,0 +1,285 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+# Test for the Boost C++ libraries of a particular version (or newer)
+#
+# If no path to the installed boost library is given the macro searchs
+# under /usr, /usr/local, /opt and /opt/local and evaluates the
+# $BOOST_ROOT environment variable. Further documentation is available at
+# <http://randspringer.de/boost/index.html>.
+#
+# This macro calls:
+#
+# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+#
+# And sets:
+#
+# HAVE_BOOST
+#
+# LICENSE
+#
+# Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+# Copyright (c) 2009 Peter Adolphs
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 26
+
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+ [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
+ [use Boost library from a standard location (ARG=yes),
+ from the specified location (ARG=<path>),
+ or disable it (ARG=no)
+ @<:@ARG=yes@:>@ ])],
+ [
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ac_boost_path=""
+ else
+ want_boost="yes"
+ ac_boost_path="$withval"
+ fi
+ ],
+ [want_boost="yes"])
+
+
+AC_ARG_WITH([boost-libdir],
+ AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
+ [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
+ [
+ if test -d "$withval"
+ then
+ ac_boost_lib_path="$withval"
+ else
+ AC_MSG_ERROR(--with-boost-libdir expected directory name)
+ fi
+ ],
+ [ac_boost_lib_path=""]
+)
+
+if test "x$want_boost" = "xyes"; then
+ boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+ boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+ boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+ boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+ boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+ if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+ boost_lib_version_req_sub_minor="0"
+ fi
+ WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+ AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+ succeeded=no
+
+ dnl On 64-bit systems check for system libraries in both lib64 and lib.
+ dnl The former is specified by FHS, but e.g. Debian does not adhere to
+ dnl this (as it rises problems for generic multi-arch support).
+ dnl The last entry in the list is chosen by default when no libraries
+ dnl are found, e.g. when only header-only libraries are installed!
+ libsubdirs="lib"
+ ax_arch=`uname -m`
+ case $ax_arch in
+ x86_64)
+ libsubdirs="lib64 libx32 lib lib64"
+ ;;
+ ppc64|s390x|sparc64|aarch64|ppc64le)
+ libsubdirs="lib64 lib lib64 ppc64le"
+ ;;
+ esac
+
+ dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+ dnl them priority over the other paths since, if libs are found there, they
+ dnl are almost assuredly the ones desired.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+
+ case ${host_cpu} in
+ i?86)
+ libsubdirs="lib/i386-${host_os} $libsubdirs"
+ ;;
+ esac
+
+ dnl first we check the system location for boost libraries
+ dnl this location ist chosen if boost libraries are installed with the --layout=system option
+ dnl or if you install boost with RPM
+ if test "$ac_boost_path" != ""; then
+ BOOST_CPPFLAGS="-I$ac_boost_path/include"
+ for ac_boost_path_tmp in $libsubdirs; do
+ if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
+ BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
+ break
+ fi
+ done
+ elif test "$cross_compiling" != yes; then
+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+ for libsubdir in $libsubdirs ; do
+ if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+ done
+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
+ BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+ break;
+ fi
+ done
+ fi
+
+ dnl overwrite ld flags if we have required special directory with
+ dnl --with-boost-libdir parameter
+ if test "$ac_boost_lib_path" != ""; then
+ BOOST_LDFLAGS="-L$ac_boost_lib_path"
+ fi
+
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ @%:@include <boost/version.hpp>
+ ]], [[
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+ ]])],[
+ AC_MSG_RESULT(yes)
+ succeeded=yes
+ found_system=yes
+ ],[
+ ])
+ AC_LANG_POP([C++])
+
+
+
+ dnl if we found no boost with system layout we search for boost libraries
+ dnl built and installed without the --layout=system option or for a staged(not installed) version
+ if test "x$succeeded" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ BOOST_CPPFLAGS=
+ BOOST_LDFLAGS=
+ _version=0
+ if test "$ac_boost_path" != ""; then
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ fi
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+ done
+ dnl if nothing found search for layout used in Windows distributions
+ if test -z "$BOOST_CPPFLAGS"; then
+ if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+ BOOST_CPPFLAGS="-I$ac_boost_path"
+ fi
+ fi
+ fi
+ else
+ if test "$cross_compiling" != yes; then
+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ best_path=$ac_boost_path
+ fi
+ done
+ fi
+ done
+
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+ if test "$ac_boost_lib_path" = ""; then
+ for libsubdir in $libsubdirs ; do
+ if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+ done
+ BOOST_LDFLAGS="-L$best_path/$libsubdir"
+ fi
+ fi
+
+ if test "x$BOOST_ROOT" != "x"; then
+ for libsubdir in $libsubdirs ; do
+ if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
+ done
+ if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
+ version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+ stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+ stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+ V_CHECK=`expr $stage_version_shorten \>\= $_version`
+ if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+ AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+ BOOST_CPPFLAGS="-I$BOOST_ROOT"
+ BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
+ fi
+ fi
+ fi
+ fi
+
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ @%:@include <boost/version.hpp>
+ ]], [[
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+ ]])],[
+ AC_MSG_RESULT(yes)
+ succeeded=yes
+ found_system=yes
+ ],[
+ ])
+ AC_LANG_POP([C++])
+ fi
+
+ if test "$succeeded" != "yes" ; then
+ if test "$_version" = "0" ; then
+ AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+ else
+ AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+ fi
+ # execute ACTION-IF-NOT-FOUND (if present):
+ ifelse([$3], , :, [$3])
+ else
+ AC_SUBST(BOOST_CPPFLAGS)
+ AC_SUBST(BOOST_LDFLAGS)
+ AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+ # execute ACTION-IF-FOUND (if present):
+ ifelse([$2], , :, [$2])
+ fi
+
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+fi
+
+])