diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 21:27:47 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-07 22:57:01 +0100 |
| commit | 6d49ad9e5c5a93014cc99f1c956eaa51b36ee95f (patch) | |
| tree | b24ffa8e5a3948a1307e789a565d9d9750593b5e /net/gnunet/patches | |
| parent | d3b50744769fe954b6713cca98c45325cc477df1 (diff) | |
gnunet: update to version 0.17.5
Beware that switching to the new major version 0.17.x results in
incompatibility with clients still running 0.16.x.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'net/gnunet/patches')
| -rw-r--r-- | net/gnunet/patches/010-endian.patch | 4 | ||||
| -rw-r--r-- | net/gnunet/patches/100-remove-mysql-version-check.patch | 38 |
2 files changed, 2 insertions, 40 deletions
diff --git a/net/gnunet/patches/010-endian.patch b/net/gnunet/patches/010-endian.patch index f07ab7eaf..96e75ae2d 100644 --- a/net/gnunet/patches/010-endian.patch +++ b/net/gnunet/patches/010-endian.patch @@ -1,6 +1,6 @@ --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h -@@ -150,7 +150,6 @@ enum GNUNET_GenericReturnValue +@@ -154,7 +154,6 @@ enum GNUNET_GenericReturnValue * Endian operations */ @@ -8,7 +8,7 @@ #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 +@@ -174,6 +173,7 @@ enum GNUNET_GenericReturnValue 56)) #endif diff --git a/net/gnunet/patches/100-remove-mysql-version-check.patch b/net/gnunet/patches/100-remove-mysql-version-check.patch deleted file mode 100644 index c6c131e32..000000000 --- a/net/gnunet/patches/100-remove-mysql-version-check.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -981,33 +981,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])], |