From 09bc74fa23ed9a6bf6be4c9b913fdbca72b0cbbb Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Oct 2022 23:33:58 +0100 Subject: gnunet: update to version 0.19.2 GNUnet has not been updated for a while due to the gnurl-situation. Now that we got libcurl-gnutls, we can update GNUnet. For details, please see the GNUnet release notes: https://www.gnunet.org/en/news/2022-09-0.17.6.html https://www.gnunet.org/en/news/2022-10-0.18.0.html https://www.gnunet.org/en/news/2022-11-0.18.1.html https://www.gnunet.org/en/news/2022-12-0.19.0.html https://www.gnunet.org/en/news/2022-12-0.19.1.html https://www.gnunet.org/en/news/2023-01-0.19.2.html Signed-off-by: Daniel Golle --- net/gnunet/patches/010-endian.patch | 6 +++--- net/gnunet/patches/020-curl-no-runtime-test.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 net/gnunet/patches/020-curl-no-runtime-test.patch (limited to 'net/gnunet/patches') diff --git a/net/gnunet/patches/010-endian.patch b/net/gnunet/patches/010-endian.patch index 96e75ae2d..cbb83c228 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 -@@ -154,7 +154,6 @@ enum GNUNET_GenericReturnValue +@@ -164,7 +164,6 @@ enum GNUNET_GenericReturnValue * Endian operations */ -#if __BYTE_ORDER == __LITTLE_ENDIAN - #ifdef HAVE_BYTESWAP_H + #if defined(bswap_16) || defined(bswap_32) || defined(bswap_64) #define BYTE_SWAP_16(x) bswap_16 (x) #define BYTE_SWAP_32(x) bswap_32 (x) -@@ -174,6 +173,7 @@ enum GNUNET_GenericReturnValue +@@ -184,6 +183,7 @@ enum GNUNET_GenericReturnValue 56)) #endif diff --git a/net/gnunet/patches/020-curl-no-runtime-test.patch b/net/gnunet/patches/020-curl-no-runtime-test.patch new file mode 100644 index 000000000..6fc7d6bec --- /dev/null +++ b/net/gnunet/patches/020-curl-no-runtime-test.patch @@ -0,0 +1,16 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -727,12 +727,7 @@ LIBCURL_CHECK_CONFIG([], [7.34.0], [], + + OLD_LIBS=$LIBS + LIBS="$LIBS $LIBCURL" +-AC_RUN_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[return (CURLSSLSET_OK != curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL));]])], +- [curl_gnutls=1], +- [AC_MSG_WARN([cURL does not have GnuTLS backend]) +- curl_gnutls=0]) ++curl_gnutls=1 + LIBS=$OLD_LIBS + AM_CONDITIONAL([HAVE_GNUTLS_CURL], [test "x$curl_gnutls" = "x1"]) + AC_SUBST([curl_gnutls]) -- cgit v1.2.3