From 46da3eedc5d15b8c395d0ed939ee7898db331e48 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 22 Jul 2020 02:42:38 +0100 Subject: [PATCH] gnunet: update to version 0.13.1 Signed-off-by: Daniel Golle --- net/gnunet/Makefile | 30 +++++++++++-------- ...fix-opus-and-pulse-library-detection.patch | 6 ++-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 58ac8f4cd..65410b532 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_VERSION:=0.12.2 +PKG_VERSION:=0.13.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gnunet -PKG_HASH:=ac288b047d1156fc5e739062b11242bad0487993631e79781aede620ddf18cd7 +PKG_HASH:=03d76a852e7fd2fc87b7145cb6abd900f73e4ea6097f3caac9e7d9fe8b625696 PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=COPYING @@ -54,8 +54,8 @@ endef define Package/gnunet $(call Package/gnunet/Default) TITLE+= - a peer-to-peer framework focusing on security - DEPENDS:=+libatomic +libgcrypt +libgpg-error +libidn2 +libltdl +libunistring \ - +librt +zlib $(ICONV_DEPENDS) $(INTL_DEPENDS) + DEPENDS:=+libatomic +libgcrypt +libgpg-error +libidn2 +libltdl +libsodium \ + +libunistring +librt +zlib $(ICONV_DEPENDS) $(INTL_DEPENDS) USERID:=gnunet=958:gnunet=958 MENU:=1 endef @@ -187,6 +187,13 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/gnunet/*.h $(1)/usr/include/gnunet endef +BIN_abd:=abd +LIB_abd:=abd +PLUGIN_abd:=gnsrecord_abd +LIBEXEC_abd:=service-abd +CONF_abd:=abd +DEPENDS_abd:=+gnunet-gns + BIN_auction:=auction-create auction-info auction-join LIBEXEC_auction:=service-auction CONF_auction:=auction @@ -260,12 +267,12 @@ LIBEXEC_datastore:=service-datastore CONF_datastore:=datastore -DEPENDS_reclaim:=+gnunet-gns +gnunet-sqlite +libpbc +libgabe -BIN_reclaim:=credential reclaim -LIB_reclaim:=consensus credential abe reclaim reclaimattribute secretsharing -LIBEXEC_reclaim:=service-consensus service-credential service-reclaim service-secretsharing -CONF_reclaim:=consensus credential reclaim secretsharing -PLUGIN_reclaim:=block_consensus gnsrecord_credential gnsrecord_reclaim reclaim_attribute_gnuid +DEPENDS_reclaim:=+gnunet-gns +gnunet-sqlite +libpbc +libgabe +jansson +BIN_reclaim:=reclaim +LIB_reclaim:=consensus abe reclaim reclaimattribute secretsharing +LIBEXEC_reclaim:=service-consensus service-reclaim service-secretsharing +CONF_reclaim:=consensus reclaim secretsharing +PLUGIN_reclaim:=block_consensus gnsrecord_reclaim reclaim_attestation_jwt reclaim_attribute_basic DEPENDS_rest:=+gnunet-gns +gnunet-reclaim +libmicrohttpd-ssl +jansson LIB_rest:=rest json @@ -331,8 +338,6 @@ PLUGIN_dhtcache-sqlite:=datacache_sqlite DEPENDS_fs-sqlite:=+gnunet-datastore +gnunet-sqlite PLUGIN_fs-sqlite:=datastore_sqlite - - DEPENDS_utils:=+certtool +openssl-util BIN_utils:=gns-proxy-setup-ca transport-certificate-creation @@ -388,6 +393,7 @@ $(eval $(call PostInstFixSUIDPerms,gnunet-transport-wlan)) $(eval $(call PostInstFixSUIDPerms,gnunet-vpn)) $(eval $(call BuildPackage,gnunet)) +$(eval $(call BuildComponent,abd,credential service components,)) $(eval $(call BuildComponent,auction,auction components,)) $(eval $(call BuildComponent,conversation,conversation component,)) $(eval $(call BuildComponent,curl,cURL wrapper component,)) 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 index 9b2743655..cfc79bd0f 100644 --- a/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch +++ b/net/gnunet/patches/100-fix-opus-and-pulse-library-detection.patch @@ -1,8 +1,6 @@ -diff --git a/configure.ac b/configure.ac -index e2c4dd39f..95053e672 100644 --- a/configure.ac +++ b/configure.ac -@@ -803,10 +803,12 @@ AC_ARG_WITH(libpulse, +@@ -811,10 +811,12 @@ AC_ARG_WITH(libpulse, LDFLAGS="-L$with_libpulse/lib $LDFLAGS" CPPFLAGS="-I$with_libpulse/include $CPPFLAGS" AC_CHECK_HEADERS(pulse/simple.h, @@ -19,7 +17,7 @@ index e2c4dd39f..95053e672 100644 ]) ], [AC_MSG_RESULT([--with-libpulse not specified]) -@@ -846,10 +848,12 @@ AC_ARG_WITH(libopus, +@@ -854,10 +856,12 @@ AC_ARG_WITH(libopus, LDFLAGS="-L$with_libopus/lib $LDFLAGS" CPPFLAGS="-I$with_libopus/include $CPPFLAGS" AC_CHECK_HEADERS(opus/opus.h,