From 09bc74fa23ed9a6bf6be4c9b913fdbca72b0cbbb Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 6 Oct 2022 23:33:58 +0100 Subject: [PATCH] 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/Makefile | 32 +++++++++++-------- net/gnunet/patches/010-endian.patch | 6 ++-- .../patches/020-curl-no-runtime-test.patch | 16 ++++++++++ 3 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 net/gnunet/patches/020-curl-no-runtime-test.patch diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 59c4062371..193c6c1020 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_VERSION:=0.17.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.19.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gnunet -PKG_HASH:=8a744ff7a95d1e83215cce118050640f6c12261abe4c60a56bcf88e500f0023d +PKG_HASH:=86034d92ebf8f6623dad95f1031ded1466e064b96ffac9d3e9d47229ac2c22ff PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=COPYING @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= \ --with-gnutls=$(STAGING_DIR)/usr \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-transport-bluetooth),--with-bluetooth="$(STAGING_DIR)/usr",--without-bluetooth) \ --with-jose=$(STAGING_DIR)/usr \ - --with-libgnurl=$(STAGING_DIR)/usr \ + --with-libcurl=$(STAGING_DIR)/usr \ --with-ogg=$(STAGING_DIR)/usr \ --with-opus=$(STAGING_DIR)/usr \ --with-pabc=$(STAGING_DIR)/usr \ @@ -131,6 +131,13 @@ define BuildComponent done \ fi ) + ( if [ "$(SQL_$(1))" ]; then \ + $(INSTALL_DIR) $$(1)/usr/share/gnunet/sql && \ + for sql in $(SQL_$(1)); do \ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/gnunet/sql/$$$$$$$$sql.sql $$(1)/usr/share/gnunet/sql || exit 1; \ + done \ + fi ) + ( if [ -e ./files/gnunet-$(1).defaults ]; then \ $(INSTALL_DIR) $$(1)/etc/uci-defaults && \ $(INSTALL_BIN) ./files/gnunet-$(1).defaults $$(1)/etc/uci-defaults/gnunet-$(1) ; \ @@ -145,7 +152,7 @@ define Package/gnunet/install $(INSTALL_DIR) $(1)/usr/share/gnunet/config.d $(1)/usr/share/gnunet/hellos ( for bin in arm ats cadet core config ecc identity nat nat-auto nat-server nse \ - peerinfo peerstore revocation scalarproduct scrypt statistics transport uri; do \ + peerinfo revocation scalarproduct scrypt statistics transport uri; do \ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnunet-$$$$bin $(1)/usr/bin/ || exit 1; \ done ) @@ -217,7 +224,7 @@ CONF_conversation:=conversation BIN_dht-cli:=dht-get dht-hello dht-put dht-monitor PLUGIN_dht-cli:=block_test -DEPENDS_curl:=+libgnurl +jansson +DEPENDS_curl:=+libcurl-gnutls +jansson LIB_curl:=curl DEPENDS_hostlist:=+libmicrohttpd-ssl +gnunet-curl +ca-bundle @@ -264,7 +271,7 @@ USERID_gns:=:gnunetdns=452 BIN_gns:=gns namecache namestore resolver zoneimport LIB_gns:=gns gnsrecord namecache namestore PLUGIN_gns:=block_dns block_gns gnsrecord_conversation gnsrecord_dns gnsrecord_gns -LIBEXEC_gns:=dns2gns helper-dns service-dns service-gns service-namecache service-namestore service-resolver service-zonemaster service-zonemaster-monitor +LIBEXEC_gns:=dns2gns helper-dns service-dns service-gns service-namecache service-namestore service-resolver service-zonemaster CONF_gns:=dns gns namecache namestore resolver zonemaster FILE_MODES_gns:=/usr/lib/gnunet/libexec/gnunet-helper-dns:root:gnunetdns:4750 /usr/lib/gnunet/libexec/gnunet-service-dns:gnunet:gnunetdns:2750 @@ -307,9 +314,6 @@ CONF_rps:=rps PLUGIN_dhtcache-heap:=datacache_heap CONFLICTS_dhtcache-heap:=gnunet-dhtcache-pgsql gnunet-dhtcache-sqlite -DEPENDS_gns-flat:=+gnunet-gns -PLUGIN_gns-flat:=namecache_flat namestore_flat - PLUGIN_peerstore-flat:=peerstore_flat DEPENDS_fs-heap:=+gnunet-datastore @@ -326,26 +330,29 @@ CONFLICTS_fs-mysql:=gnunet-fs-pgsql gnunet-fs-sqlite DEPENDS_pgsql:=+libpq +pgsql-server LIB_pgsql:=pq +SQL_pgsql:=versioning USERID_pgsql:=gnunet=958::postgres=5432 DEPENDS_dhtcache-pgsql:=+gnunet-pgsql PLUGIN_dhtcache-pgsql:=datacache_postgres CONFLICTS_dhtcache-pgsql:=gnunet-dhtcache-sqlite +SQL_dhtcache-pgsql:=datacache-0001 datacache-drop DEPENDS_fs-pgsql:=+gnunet-pgsql +gnunet-datastore PLUGIN_fs-pgsql:=datastore_postgres CONFLICTS_fs-pgsql:=gnunet-fs-sqlite +SQL_fs-pgsql:=datastore-0001 datastore-drop DEPENDS_gns-pgsql:=+gnunet-pgsql +gnunet-gns PLUGIN_gns-pgsql:=namecache_postgres namestore_postgres -CONFLICTS_gns-pgsql:=gnunet-gns-sqlite gnunet-gns-flat +CONFLICTS_gns-pgsql:=gnunet-gns-sqlite +SQL_gns-pgsql:=namecache-0001 namecache-drop namestore-0001 namestore-drop DEPENDS_sqlite:=+libsqlite3 LIB_sqlite:=sq DEPENDS_gns-sqlite:=+gnunet-gns +gnunet-sqlite PLUGIN_gns-sqlite:=namecache_sqlite namestore_sqlite -CONFLICTS_gns-sqlite:=gnunet-gns-flat DEPENDS_peerstore-sqlite:=+gnunet-sqlite PLUGIN_peerstore-sqlite:=peerstore_sqlite @@ -430,7 +437,6 @@ $(eval $(call BuildComponent,rps,RPS routing component,y)) $(eval $(call BuildComponent,namestore-fcfsd,first-come-first-serve registration server,)) $(eval $(call BuildComponent,dhtcache-heap,heap-based dhtcache plugin,y)) $(eval $(call BuildComponent,fs-heap,heap-based filesharing plugin,)) -$(eval $(call BuildComponent,gns-flat,flat storage GNS plugins,y)) $(eval $(call BuildComponent,peerstore-flat,flat storage peerstore plugin,)) $(eval $(call BuildComponent,mysql,mySQL backend,)) $(eval $(call BuildComponent,fs-mysql,mySQL filesharing plugins,)) diff --git a/net/gnunet/patches/010-endian.patch b/net/gnunet/patches/010-endian.patch index 96e75ae2d5..cbb83c2288 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 0000000000..6fc7d6bec7 --- /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]) -- 2.30.2