diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 6cf315a95..be8c46609 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet -PKG_VERSION:=0.11.3 +PKG_VERSION:=0.11.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gnunet -PKG_HASH:=2405db9232ae6ded57e7ff513abdf810c65e3861823b3985717ce990b8d87a37 +PKG_HASH:=7afeb638bd8b5a33c6b8dab24b90c5d7467439adc79794ff33218e9180f8b01b PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=COPYING @@ -213,7 +213,6 @@ PLUGIN_transport-http_client:=transport_http_client transport_https_client DEPENDS_transport-http_server:=+libmicrohttpd-ssl PLUGIN_transport-http_server:=transport_http_server transport_https_server -BIN_transport-http_server:=transport-certificate-creation PLUGIN_transport-tcp:=transport_tcp @@ -241,7 +240,7 @@ CONF_fs:=fs DEPENDS_gns:=+gnunet-vpn +iptables-mod-extra USERID_gns:=gnunet=958:gnunetdns=452 -BIN_gns:=gns gns-import.sh gns-proxy-setup-ca namecache namestore resolver zoneimport +BIN_gns:=gns gns-import.sh 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 @@ -265,7 +264,7 @@ 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 reclaim_sqlite +PLUGIN_reclaim:=block_consensus gnsrecord_credential gnsrecord_reclaim reclaim_attribute_gnuid DEPENDS_rest:=+gnunet-gns +gnunet-reclaim +libmicrohttpd-ssl +jansson LIB_rest:=rest json diff --git a/net/gnunet/patches/001-fix-libgnunetabe-build.patch b/net/gnunet/patches/001-fix-libgnunetabe-build.patch deleted file mode 100644 index ed7474a31..000000000 --- a/net/gnunet/patches/001-fix-libgnunetabe-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/abe/Makefile.am b/src/abe/Makefile.am -index 23a7ae68e..cccd3ccb0 100644 ---- a/src/abe/Makefile.am -+++ b/src/abe/Makefile.am -@@ -20,6 +20,8 @@ libgnunetabe_la_LIBADD = \ - $(LTLIBICONV) \ - $(LTLIBINTL) \ - $(ABE_LIBADD) \ -+ $(top_builddir)/src/util/libgnunetutil.la \ -+ -lgmp \ - -lgabe \ - -lpbc \ - -lglib-2.0 \ -diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am -index 13918508e..be50cce26 100644 ---- a/src/reclaim/Makefile.am -+++ b/src/reclaim/Makefile.am -@@ -99,6 +99,7 @@ libgnunet_plugin_reclaim_sqlite_la_LIBADD = \ - libgnunetreclaim.la \ - $(top_builddir)/src/sq/libgnunetsq.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ -+ $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ - $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ - $(LTLIBINTL) - libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \ -@@ -126,6 +127,7 @@ libgnunetreclaim_la_SOURCES = \ - reclaim.h - libgnunetreclaim_la_LIBADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ -+ $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ - $(GN_LIBINTL) $(XLIB) - libgnunetreclaim_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) $(WINFLAGS) \