gnunet: update to version 0.16.1

 * OPUS and Pulse can be configured nicely by default now, no longer
   need a local patch for that
 * mysql version checks fail when cross-compiling, add patch to remove
   them and always assume MySQL >8.0.
 * Package new services, communicators, ...

This is a new major release. It breaks protocol compatibility with the
0.15.x versions. Please be aware that Git master is thus henceforth
(and has been for a while) INCOMPATIBLE with the 0.15.x GNUnet network,
and interactions between old and new peers will result in issues.
0.15.x peers will be able to communicate with Git master or 0.16.x
peers, but some services - in particular GNS - will not be compatible.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

3 files changed, 43 insertions, 41 deletions

diff --git a/net/gnunet/patches/010-endian.patch b/net/gnunet/patches/010-endian.patch
index 4a956f14b..f07ab7eaf 100644
--- a/net/gnunet/patches/010-endian.patch
+++ b/net/gnunet/patches/010-endian.patch
@@ -1,14 +1,14 @@
 --- a/src/include/gnunet_common.h
 +++ b/src/include/gnunet_common.h
-@@ -142,7 +142,6 @@ enum GNUNET_GenericReturnValue
+@@ -150,7 +150,6 @@ enum GNUNET_GenericReturnValue
   * Endian operations
   */
  
 -#if __BYTE_ORDER == __LITTLE_ENDIAN
- #if defined(__linux__)
- #define BYTE_SWAP_16(x) __bswap_16 (x)
- #define BYTE_SWAP_32(x) __bswap_32 (x)
-@@ -162,6 +161,7 @@ enum GNUNET_GenericReturnValue
+ #ifdef HAVE_BYTESWAP_H
+ #define BYTE_SWAP_16(x) bswap_16 (x)
+ #define BYTE_SWAP_32(x) bswap_32 (x)
+@@ -170,6 +169,7 @@ enum GNUNET_GenericReturnValue
                                               56))
  #endif
  
diff --git a/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch b/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch
deleted file mode 100644
index 0e40bb4ed..000000000
--- a/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -851,10 +851,12 @@ AC_ARG_WITH(libpulse,
-             LDFLAGS="-L$with_libpulse/lib $LDFLAGS"
-             CPPFLAGS="-I$with_libpulse/include $CPPFLAGS"
-             AC_CHECK_HEADERS(pulse/simple.h,
--                             AC_CHECK_LIB([pulse],
--                                          [pa_stream_peek],
--                                          EXT_LIB_PATH="-L$with_libpulse/lib $EXT_LIB_PATH"
--                                          pulse=1))
-+                             AC_CHECK_DECL([pa_stream_peek],
-+                                       [pulse=1],
-+                                       [],
-+                                       [[
-+                                       #include <pulse/stream.h>
-+                                       ]]))
-         ])
-     ],
-     [AC_MSG_RESULT([--with-libpulse not specified])
-@@ -894,10 +896,12 @@ AC_ARG_WITH(libopus,
-         LDFLAGS="-L$with_libopus/lib $LDFLAGS"
-         CPPFLAGS="-I$with_libopus/include $CPPFLAGS"
-         AC_CHECK_HEADERS(opus/opus.h,
--                         AC_CHECK_LIB([opus],
--                                      [OPUS_SET_GAIN],
--                                      EXT_LIB_PATH="-L$with_libopus/lib $EXT_LIB_PATH"
--                                      opus=1))
-+                         AC_CHECK_DECL([OPUS_SET_GAIN],
-+                                       [opus=1],
-+                                       [],
-+                                       [[
-+                                       #include <opus/opus.h>
-+                                       ]]))
-       ])
-     ],
-     [AC_MSG_RESULT([--with-libopus not specified])
diff --git a/net/gnunet/patches/100-remove-mysql-version-check.patch b/net/gnunet/patches/100-remove-mysql-version-check.patch
new file mode 100644
index 000000000..26d233fdc
--- /dev/null
+++ b/net/gnunet/patches/100-remove-mysql-version-check.patch
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -978,33 +978,13 @@ AC_ARG_WITH([mysql],
+     AC_CHECK_LIB([mysqlclient], [mysql_init],
+       [AC_CHECK_HEADERS([mysql/mysql.h],
+          [MYSQL_LDFLAGS="-L$MYSQL_LIBDIR"
+-          mysql=true],
++          mysql=true
++          mysql8=true],
+          [mysql=false])],
+       [mysql=false])])
+ AC_SUBST(MYSQL_LDFLAGS)
+ AC_SUBST(MYSQL_CPPFLAGS)
+ 
+-# additional version checks for mysql
+-AS_IF([test "x$mysql" = "xtrue"],
+-  [AC_MSG_CHECKING([for mysql version])
+-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+-     [[include <mysql/mysql_version.h>]],
+-     [[#if (MYSQL_VERSION_ID < 40100)
+-#error required at least version 4.1
+-#endif]])],
+-     [mysql=true],
+-     [mysql=false])
+-   AS_IF([test "x$mysql" = "xfalse"],
+-     [AC_MSG_RESULT([< 4.1])
+-      AC_MSG_RESULT([mysql version >= 4.1 required. Will not use MySQL])])
+-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+-     [[#include <mysql/mysql_version.h>]],
+-     [[#if (MYSQL_VERSION_ID < 80000)
+-#error needs at least version 8.0
+-#endif]])],
+-     [mysql8=true],
+-     [mysql8=false])])
+-
+ AS_IF([test "x$mysql" = "xtrue"],
+   [AS_IF([test "x$mysql8" = "xfalse"],
+      [AC_MSG_RESULT([between 4.1 and 8.0])],