gnunet: Update to 0.16.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnunet: Update to 0.16.1
From: nikita <nikita%NetBSD.org@localhost>
Date: Sat, 19 Mar 2022 09:53:03 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Sat Mar 19 10:53:03 2022 +0100
Changeset:	b116e340e5b95c02d01b06d8c5e914ee9396e747

Modified Files:
	gnunet/Makefile
	gnunet/PLIST
	gnunet/buildlink3.mk
	gnunet/distinfo
	gnunet/options.mk
Added Files:
	gnunet/PLIST.conversations
	gnunet/PLIST.doc
	gnunet/PLIST.experimental
	gnunet/PLIST.mdoc
	gnunet/PLIST.mysql
	gnunet/PLIST.perl
	gnunet/PLIST.pgsql
	gnunet/PLIST.sqlite3
	gnunet/TODO
	gnunet/patches/patch-src_setu_gnunet-service-setu.c

Log Message:
gnunet: Update to 0.16.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b116e340e5b95c02d01b06d8c5e914ee9396e747

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnunet/Makefile                                    |  12 +-
 gnunet/PLIST                                       | 156 ++++++++-------------
 gnunet/PLIST.conversations                         |  10 ++
 gnunet/PLIST.doc                                   |   2 +
 gnunet/PLIST.experimental                          |  18 +++
 gnunet/PLIST.mdoc                                  |   3 +
 gnunet/PLIST.mysql                                 |   0
 gnunet/PLIST.perl                                  |   4 +
 gnunet/PLIST.pgsql                                 |   6 +
 gnunet/PLIST.sqlite3                               |   9 ++
 gnunet/TODO                                        |   3 +
 gnunet/buildlink3.mk                               |   9 +-
 gnunet/distinfo                                    |   7 +-
 gnunet/options.mk                                  |  81 +++++------
 .../patches/patch-src_setu_gnunet-service-setu.c   |  17 +++
 15 files changed, 181 insertions(+), 156 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 2b6c030469..52c37d99e2 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=		gnunet-0.13.3
+DISTNAME=		gnunet-0.16.1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=gnunet/}
 
@@ -27,6 +27,12 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-extractor=${BUILDLINK_PREFIX.libextractor}
 CONFIGURE_ARGS+=	--with-gnunetdns=gnunetdns
+CONFIGURE_ARGS+=	--with-jansson=${BUILDLINK_PREFIX.jansson}
+CONFIGURE_ARGS+=	--with-microhttpd=${BUILDLINK_PREFIX.libmicrohttpd}
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+CONFIGURE_ENV+=		DEFAULT_INTERFACE="\"lo0\""
+.endif
 
 GNUNET_DIR=		${VARBASE}/chroot/gnunet
 GNUNET_LOG_DIR?=	${VARBASE}/log/gnunet
@@ -91,7 +97,6 @@ SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client ${SETUID_R
 SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_ROOT_PERMS}
 .endif
 
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
@@ -103,8 +108,9 @@ SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_R
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.include "../../www/gnurl/buildlink3.mk"
+.include "../../wip/gnurl/buildlink3.mk"
 .include "../../www/libmicrohttpd/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gnunet/PLIST b/gnunet/PLIST
index 0b401311c9..27947c90eb 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -1,24 +1,21 @@
 @comment $NetBSD$
-@pkgdir man/man7
-${PLIST.experimental}bin/gnunet-abd
 bin/gnunet-arm
 bin/gnunet-ats
-${PLIST.experimental}bin/gnunet-auction-create
-${PLIST.experimental}bin/gnunet-auction-info
-${PLIST.experimental}bin/gnunet-auction-join
 bin/gnunet-auto-share
+bin/gnunet-base32
+bin/gnunet-bcd
 bin/gnunet-bugreport
 bin/gnunet-cadet
 bin/gnunet-config
 bin/gnunet-consensus-profiler
-${PLIST.conversations}bin/gnunet-conversation
-${PLIST.conversations}bin/gnunet-conversation-test
 bin/gnunet-core
 bin/gnunet-crypto-tvg
 bin/gnunet-datastore
 bin/gnunet-dht-get
+bin/gnunet-dht-hello
 bin/gnunet-dht-monitor
 bin/gnunet-dht-put
+bin/gnunet-did
 bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-ecc
@@ -27,9 +24,7 @@ bin/gnunet-gns
 bin/gnunet-gns-proxy-setup-ca
 bin/gnunet-gnsrecord-tvg
 bin/gnunet-identity
-${PLIST.perl}bin/gnunet-logread
-${PLIST.perl}bin/gnunet-logread-ipc
-${PLIST.perl}bin/gnunet-logread-ipc-sdedit
+bin/gnunet-messenger
 bin/gnunet-namecache
 bin/gnunet-namestore
 bin/gnunet-nat
@@ -39,12 +34,10 @@ bin/gnunet-nse
 bin/gnunet-peerinfo
 bin/gnunet-peerstore
 bin/gnunet-publish
-${PLIST.zbar}bin/gnunet-qr
 bin/gnunet-reclaim
 bin/gnunet-resolver
 bin/gnunet-revocation
 bin/gnunet-revocation-tvg
-${PLIST.experimental}bin/gnunet-rps
 bin/gnunet-scalarproduct
 bin/gnunet-scrypt
 bin/gnunet-search
@@ -64,6 +57,7 @@ bin/gnunet-vpn
 bin/gnunet-zoneimport
 include/gnunet/compat.h
 include/gnunet/gettext.h
+include/gnunet/gnu_name_system_record_types.h
 include/gnunet/gnunet_abd_service.h
 include/gnunet/gnunet_abe_lib.h
 include/gnunet/gnunet_applications.h
@@ -79,6 +73,7 @@ include/gnunet/gnunet_block_lib.h
 include/gnunet/gnunet_block_plugin.h
 include/gnunet/gnunet_buffer_lib.h
 include/gnunet/gnunet_cadet_service.h
+include/gnunet/gnunet_child_management_lib.h
 include/gnunet/gnunet_client_lib.h
 include/gnunet/gnunet_common.h
 include/gnunet/gnunet_config.h
@@ -96,6 +91,7 @@ include/gnunet/gnunet_datastore_plugin.h
 include/gnunet/gnunet_datastore_service.h
 include/gnunet/gnunet_db_lib.h
 include/gnunet/gnunet_dht_service.h
+include/gnunet/gnunet_dhtu_plugin.h
 include/gnunet/gnunet_disk_lib.h
 include/gnunet/gnunet_dns_service.h
 include/gnunet/gnunet_dnsparser_lib.h
@@ -105,13 +101,16 @@ include/gnunet/gnunet_friends_lib.h
 include/gnunet/gnunet_fs_service.h
 include/gnunet/gnunet_getopt_lib.h
 include/gnunet/gnunet_gns_service.h
+include/gnunet/gnunet_gnsrecord_json_lib.h
 include/gnunet/gnunet_gnsrecord_lib.h
 include/gnunet/gnunet_gnsrecord_plugin.h
 include/gnunet/gnunet_hello_lib.h
+include/gnunet/gnunet_hello_uri_lib.h
 include/gnunet/gnunet_helper_lib.h
 include/gnunet/gnunet_identity_service.h
 include/gnunet/gnunet_json_lib.h
 include/gnunet/gnunet_load_lib.h
+include/gnunet/gnunet_messenger_service.h
 include/gnunet/gnunet_mhd_compat.h
 include/gnunet/gnunet_microphone_lib.h
 include/gnunet/gnunet_mq_lib.h
@@ -164,6 +163,9 @@ include/gnunet/gnunet_strings_lib.h
 include/gnunet/gnunet_testbed_logger_service.h
 include/gnunet/gnunet_testbed_service.h
 include/gnunet/gnunet_testing_lib.h
+include/gnunet/gnunet_testing_netjail_lib.h
+include/gnunet/gnunet_testing_ng_lib.h
+include/gnunet/gnunet_testing_plugin.h
 include/gnunet/gnunet_time_lib.h
 include/gnunet/gnunet_transport_application_service.h
 include/gnunet/gnunet_transport_communication_service.h
@@ -178,82 +180,34 @@ include/gnunet/gnunet_uri_lib.h
 include/gnunet/gnunet_util_lib.h
 include/gnunet/gnunet_vpn_service.h
 include/gnunet/platform.h
-${PLIST.doc}info/gnunet.info
-${PLIST.doc}info/images/daemon_lego_block.png
-${PLIST.doc}info/images/daemon_lego_block.svg
-${PLIST.doc}info/images/gns.dot
-${PLIST.doc}info/images/gns.jpg
-${PLIST.doc}info/images/gnunet-0-10-peerinfo.png
-${PLIST.doc}info/images/gnunet-fs-gtk-0-10-star-tab.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-download-area.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-menu.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-publish-editing.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-publish-select.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-publish-with-file.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-publish.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-published.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs-search.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-fs.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-gns-a-done.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-gns-a.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-gns.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-identity.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-search-selected.png
-${PLIST.doc}info/images/gnunet-gtk-0-10-traffic.png
-${PLIST.doc}info/images/gnunet-namestore-gtk-phone.png
-${PLIST.doc}info/images/gnunet-namestore-gtk-vpn.png
-${PLIST.doc}info/images/gnunet-setup-exit.png
-${PLIST.doc}info/images/gnunet-tutorial-service.png
-${PLIST.doc}info/images/gnunet-tutorial-system.png
-${PLIST.doc}info/images/iceweasel-preferences.png
-${PLIST.doc}info/images/iceweasel-proxy.png
-${PLIST.doc}info/images/lego_stack.svg
-${PLIST.doc}info/images/service_lego_block.png
-${PLIST.doc}info/images/service_lego_block.svg
-${PLIST.doc}info/images/service_stack.png
-${PLIST.doc}info/images/structure.dot
+lib/gnunet/libexec/gnunet-cmds-helper
 lib/gnunet/libexec/gnunet-communicator-tcp
 lib/gnunet/libexec/gnunet-communicator-udp
 lib/gnunet/libexec/gnunet-communicator-unix
 lib/gnunet/libexec/gnunet-daemon-exit
 lib/gnunet/libexec/gnunet-daemon-hostlist
-lib/gnunet/libexec/gnunet-daemon-latency-logger
 lib/gnunet/libexec/gnunet-daemon-pt
 lib/gnunet/libexec/gnunet-daemon-regexprofiler
 lib/gnunet/libexec/gnunet-daemon-testbed-blacklist
-lib/gnunet/libexec/gnunet-daemon-testbed-underlay
 lib/gnunet/libexec/gnunet-daemon-topology
 lib/gnunet/libexec/gnunet-dns2gns
 lib/gnunet/libexec/gnunet-gns-proxy
-${PLIST.conversations}lib/gnunet/libexec/gnunet-helper-audio-playback
-${PLIST.conversations}lib/gnunet/libexec/gnunet-helper-audio-record
-${PLIST.linux}lib/gnunet/libexec/gnunet-helper-dns
-${PLIST.linux}lib/gnunet/libexec/gnunet-helper-exit
 lib/gnunet/libexec/gnunet-helper-fs-publish
-${PLIST.linuxfreebsd}lib/gnunet/libexec/gnunet-helper-nat-client
-${PLIST.linuxfreebsd}lib/gnunet/libexec/gnunet-helper-nat-server
 lib/gnunet/libexec/gnunet-helper-testbed
-${PLIST.bluez}lib/gnunet/libexec/gnunet-helper-transport-bluetooth
-${PLIST.linux}lib/gnunet/libexec/gnunet-helper-transport-wlan
-${PLIST.linux}lib/gnunet/libexec/gnunet-helper-vpn
 lib/gnunet/libexec/gnunet-namestore-fcfsd
 lib/gnunet/libexec/gnunet-rest-server
-${PLIST.experimental}lib/gnunet/libexec/gnunet-service-abd
 lib/gnunet/libexec/gnunet-service-arm
 lib/gnunet/libexec/gnunet-service-ats
-${PLIST.experimental}lib/gnunet/libexec/gnunet-service-auction
 lib/gnunet/libexec/gnunet-service-cadet
 lib/gnunet/libexec/gnunet-service-consensus
-${PLIST.conversations}lib/gnunet/libexec/gnunet-service-conversation
 lib/gnunet/libexec/gnunet-service-core
 lib/gnunet/libexec/gnunet-service-datastore
 lib/gnunet/libexec/gnunet-service-dht
 lib/gnunet/libexec/gnunet-service-dns
-lib/gnunet/libexec/gnunet-service-evil-consensus
 lib/gnunet/libexec/gnunet-service-fs
 lib/gnunet/libexec/gnunet-service-gns
 lib/gnunet/libexec/gnunet-service-identity
+lib/gnunet/libexec/gnunet-service-messenger
 lib/gnunet/libexec/gnunet-service-namecache
 lib/gnunet/libexec/gnunet-service-namestore
 lib/gnunet/libexec/gnunet-service-nat
@@ -265,7 +219,6 @@ lib/gnunet/libexec/gnunet-service-reclaim
 lib/gnunet/libexec/gnunet-service-regex
 lib/gnunet/libexec/gnunet-service-resolver
 lib/gnunet/libexec/gnunet-service-revocation
-${PLIST.experimental}lib/gnunet/libexec/gnunet-service-rps
 lib/gnunet/libexec/gnunet-service-scalarproduct-alice
 lib/gnunet/libexec/gnunet-service-scalarproduct-bob
 lib/gnunet/libexec/gnunet-service-scalarproduct-ecc-alice
@@ -277,6 +230,7 @@ lib/gnunet/libexec/gnunet-service-setu
 lib/gnunet/libexec/gnunet-service-statistics
 lib/gnunet/libexec/gnunet-service-testbed
 lib/gnunet/libexec/gnunet-service-testbed-logger
+lib/gnunet/libexec/gnunet-service-tng
 lib/gnunet/libexec/gnunet-service-transport
 lib/gnunet/libexec/gnunet-service-vpn
 lib/gnunet/libexec/gnunet-service-zonemaster
@@ -295,20 +249,14 @@ lib/gnunet/libgnunet_plugin_block_seti_test.la
 lib/gnunet/libgnunet_plugin_block_setu_test.la
 lib/gnunet/libgnunet_plugin_block_test.la
 lib/gnunet/libgnunet_plugin_datacache_heap.la
-${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_datacache_sqlite.la
 lib/gnunet/libgnunet_plugin_datastore_heap.la
-${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_datastore_sqlite.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_abd.la
-${PLIST.conversations}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
+lib/gnunet/libgnunet_plugin_dhtu_gnunet.la
+lib/gnunet/libgnunet_plugin_dhtu_ip.la
 lib/gnunet/libgnunet_plugin_gnsrecord_dns.la
 lib/gnunet/libgnunet_plugin_gnsrecord_gns.la
+lib/gnunet/libgnunet_plugin_gnsrecord_messenger.la
 lib/gnunet/libgnunet_plugin_gnsrecord_reclaim.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.la
-${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_namecache_sqlite.la
 lib/gnunet/libgnunet_plugin_namestore_flat.la
-${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_namestore_sqlite.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.la
-${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_peerstore_sqlite.la
 lib/gnunet/libgnunet_plugin_reclaim_attribute_basic.la
 lib/gnunet/libgnunet_plugin_reclaim_credential_jwt.la
 lib/gnunet/libgnunet_plugin_rest_config.la
@@ -319,23 +267,23 @@ lib/gnunet/libgnunet_plugin_rest_namestore.la
 lib/gnunet/libgnunet_plugin_rest_openid_connect.la
 lib/gnunet/libgnunet_plugin_rest_peerinfo.la
 lib/gnunet/libgnunet_plugin_rest_reclaim.la
-lib/gnunet/libgnunet_plugin_test.la
 lib/gnunet/libgnunet_plugin_transport_http_client.la
 lib/gnunet/libgnunet_plugin_transport_http_server.la
 lib/gnunet/libgnunet_plugin_transport_https_client.la
 lib/gnunet/libgnunet_plugin_transport_https_server.la
 lib/gnunet/libgnunet_plugin_transport_tcp.la
 lib/gnunet/libgnunet_plugin_transport_unix.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_udp.la
-${PLIST.experimental}lib/libgnunetabd.la
+lib/gnunet/libgnunet_plugin_utiltest.la
+lib/gnunet/libgnunet_test_transport_plugin_cmd_simple_send.la
+lib/gnunet/libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la
+lib/gnunet/libgnunet_test_transport_plugin_cmd_simple_send_dv.la
+lib/gnunet/libgnunet_test_transport_plugin_cmd_udp_backchannel.la
 lib/libgnunetarm.la
 lib/libgnunetats.la
-lib/libgnunetatstesting.la
 lib/libgnunetblock.la
 lib/libgnunetblockgroup.la
 lib/libgnunetcadet.la
 lib/libgnunetconsensus.la
-${PLIST.conversations}lib/libgnunetconversation.la
 lib/libgnunetcore.la
 lib/libgnunetcurl.la
 lib/libgnunetdatacache.la
@@ -347,10 +295,11 @@ lib/libgnunetfriends.la
 lib/libgnunetfs.la
 lib/libgnunetgns.la
 lib/libgnunetgnsrecord.la
+lib/libgnunetgnsrecordjson.la
 lib/libgnunethello.la
 lib/libgnunetidentity.la
-${PLIST.json}lib/libgnunetjson.la
-${PLIST.conversations}lib/libgnunetmicrophone.la
+lib/libgnunetjson.la
+lib/libgnunetmessenger.la
 lib/libgnunetnamecache.la
 lib/libgnunetnamestore.la
 lib/libgnunetnatauto.la
@@ -364,18 +313,16 @@ lib/libgnunetregex.la
 lib/libgnunetregexblock.la
 lib/libgnunetrest.la
 lib/libgnunetrevocation.la
-${PLIST.experimental}lib/libgnunetrps.la
 lib/libgnunetscalarproduct.la
 lib/libgnunetsecretsharing.la
 lib/libgnunetset.la
 lib/libgnunetseti.la
 lib/libgnunetsetu.la
-${PLIST.conversations}lib/libgnunetspeaker.la
-lib/libgnunetsq.la
 lib/libgnunetstatistics.la
 lib/libgnunettestbed.la
 lib/libgnunettestbedlogger.la
 lib/libgnunettesting.la
+lib/libgnunettestingdhtu.la
 lib/libgnunettransport.la
 lib/libgnunettransportapplication.la
 lib/libgnunettransportcommunicator.la
@@ -423,6 +370,7 @@ lib/pkgconfig/gnunetvpn.pc
 man/man1/gnunet-arm.1
 man/man1/gnunet-ats.1
 man/man1/gnunet-auto-share.1
+man/man1/gnunet-base32.1
 man/man1/gnunet-bcd.1
 man/man1/gnunet-bugreport.1
 man/man1/gnunet-cadet.1
@@ -467,29 +415,26 @@ man/man1/gnunet-uri.1
 man/man1/gnunet-vpn.1
 man/man1/gnunet-zoneimport.1
 man/man5/gnunet.conf.5
-${PLIST.mdoc}man/man7/gnunet-c-tutorial.7
-${PLIST.mdoc}man/man7/gnunet-documentation.7
+share/aclocal/gnunet.m4
 share/doc/gnunet/COPYING
-share/gnunet/LICENSE
 share/doc/gnunet/README
-${PLIST.experimental}share/gnunet/config.d/abd.conf
 share/gnunet/config.d/arm.conf
 share/gnunet/config.d/ats.conf
-${PLIST.experimental}share/gnunet/config.d/auction.conf
 share/gnunet/config.d/cadet.conf
 share/gnunet/config.d/communicator-unix.conf
 share/gnunet/config.d/consensus.conf
-${PLIST.conversations}share/gnunet/config.d/conversation.conf
 share/gnunet/config.d/core.conf
 share/gnunet/config.d/datacache.conf
 share/gnunet/config.d/datastore.conf
 share/gnunet/config.d/dht.conf
+share/gnunet/config.d/dhtu.conf
 share/gnunet/config.d/dns.conf
 share/gnunet/config.d/exit.conf
 share/gnunet/config.d/fs.conf
 share/gnunet/config.d/gns.conf
 share/gnunet/config.d/hostlist.conf
 share/gnunet/config.d/identity.conf
+share/gnunet/config.d/messenger.conf
 share/gnunet/config.d/namecache.conf
 share/gnunet/config.d/namestore.conf
 share/gnunet/config.d/nat-auto.conf
@@ -503,7 +448,6 @@ share/gnunet/config.d/regex.conf
 share/gnunet/config.d/resolver.conf
 share/gnunet/config.d/rest.conf
 share/gnunet/config.d/revocation.conf
-${PLIST.experimental}share/gnunet/config.d/rps.conf
 share/gnunet/config.d/scalarproduct.conf
 share/gnunet/config.d/secretsharing.conf
 share/gnunet/config.d/set.conf
@@ -514,34 +458,52 @@ share/gnunet/config.d/template.conf
 share/gnunet/config.d/testbed-logger.conf
 share/gnunet/config.d/testbed.conf
 share/gnunet/config.d/testing.conf
+share/gnunet/config.d/tlds.conf
 share/gnunet/config.d/topology.conf
 share/gnunet/config.d/transport.conf
 share/gnunet/config.d/util.conf
 share/gnunet/config.d/vpn.conf
 share/gnunet/config.d/zonemaster.conf
 share/gnunet/def.tex
-share/gnunet/existence.sh
-share/gnunet/existence_python.sh
+share/gnunet/fcfsd-forbidden.html
+share/gnunet/fcfsd-index.html
+share/gnunet/fcfsd-notfound.html
+share/gnunet/gns-bcd-forbidden.html
+share/gnunet/gns-bcd-internal-error.html
+share/gnunet/gns-bcd-invalid-key.html
+share/gnunet/gns-bcd-not-found.html
+share/gnunet/gns-bcd-png.tex
+share/gnunet/gns-bcd-simple.html
+share/gnunet/gns-bcd-simple.tex
 share/gnunet/gns-bcd.html
 share/gnunet/gns-bcd.tex
-share/gnunet/gns-form-fields.xml
-share/gnunet/gns-form.xslt
 share/gnunet/gnunet-gns-proxy-ca.template
+share/gnunet/gnunet-logo-big.png
 share/gnunet/gnunet-logo-color.png
+share/gnunet/gnunet-logo-dark-only-text.svg
+share/gnunet/gnunet-logo-dark-text.svg
 share/gnunet/gnunet-logo.pdf
 share/gnunet/gnunet-logo.png
 share/gnunet/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
-share/gnunet/msg.sh
-share/gnunet/progname.sh
-share/gnunet/python.sh
-share/gnunet/version_gnunet.sh
+share/gnunet/lynXified-amirouche-anonymous-v3.png
+share/gnunet/lynXified-amirouche-v3.svg
+share/gnunet/netjail_core.sh
+share/gnunet/netjail_exec.sh
+share/gnunet/netjail_start.sh
+share/gnunet/netjail_stop.sh
 share/gnunet/services/openrc/gnunet.initd
+share/gnunet/services/systemd/gnunet-user.service
 share/gnunet/services/systemd/gnunet.service
+share/gnunet/services/systemd/sysusers-gnunet.conf
+share/gnunet/services/systemd/tmpfiles-gnunet.conf
 share/gnunet/testing_hostkeys.ecc
+share/gnunet/topo.sh
 share/locale/de/LC_MESSAGES/gnunet.mo
 share/locale/es/LC_MESSAGES/gnunet.mo
 share/locale/fr/LC_MESSAGES/gnunet.mo
 share/locale/it/LC_MESSAGES/gnunet.mo
+share/locale/sr/LC_MESSAGES/gnunet.mo
 share/locale/sv/LC_MESSAGES/gnunet.mo
 share/locale/vi/LC_MESSAGES/gnunet.mo
 share/locale/zh_CN/LC_MESSAGES/gnunet.mo
+@pkgdir man/man7
diff --git a/gnunet/PLIST.conversations b/gnunet/PLIST.conversations
new file mode 100644
index 0000000000..ca22416b61
--- /dev/null
+++ b/gnunet/PLIST.conversations
@@ -0,0 +1,10 @@
+bin/gnunet-conversation
+bin/gnunet-conversation-test
+lib/gnunet/libexec/gnunet-helper-audio-playback
+lib/gnunet/libexec/gnunet-helper-audio-record
+lib/gnunet/libexec/gnunet-service-conversation
+lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
+lib/libgnunetconversation.la
+lib/libgnunetmicrophone.la
+lib/libgnunetspeaker.la
+share/gnunet/config.d/conversation.conf
diff --git a/gnunet/PLIST.doc b/gnunet/PLIST.doc
new file mode 100644
index 0000000000..5870c6debb
--- /dev/null
+++ b/gnunet/PLIST.doc
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+info/gnunet.info
diff --git a/gnunet/PLIST.experimental b/gnunet/PLIST.experimental
new file mode 100644
index 0000000000..9420c425ac
--- /dev/null
+++ b/gnunet/PLIST.experimental
@@ -0,0 +1,18 @@
+@comment $NetBSD$
+bin/gnunet-abd
+bin/gnunet-auction-create
+bin/gnunet-auction-info
+bin/gnunet-auction-join
+bin/gnunet-rps
+lib/gnunet/libexec/gnunet-service-abd
+lib/gnunet/libexec/gnunet-service-auction
+lib/gnunet/libexec/gnunet-service-rps
+lib/gnunet/libgnunet_plugin_gnsrecord_abd.la
+lib/gnunet/libgnunet_plugin_namecache_flat.la
+lib/gnunet/libgnunet_plugin_peerstore_flat.la
+lib/gnunet/libgnunet_plugin_transport_udp.la
+lib/libgnunetabd.la
+lib/libgnunetrps.la
+share/gnunet/config.d/abd.conf
+share/gnunet/config.d/auction.conf
+share/gnunet/config.d/rps.conf
diff --git a/gnunet/PLIST.mdoc b/gnunet/PLIST.mdoc
new file mode 100644
index 0000000000..020135ee12
--- /dev/null
+++ b/gnunet/PLIST.mdoc
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+man/man7/gnunet-documentation.7
+man/man7/gnunet-tutorial.7
diff --git a/gnunet/PLIST.mysql b/gnunet/PLIST.mysql
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gnunet/PLIST.perl b/gnunet/PLIST.perl
new file mode 100644
index 0000000000..3ea5afb05b
--- /dev/null
+++ b/gnunet/PLIST.perl
@@ -0,0 +1,4 @@
+@comment $NetBSD$
+bin/gnunet-logread
+bin/gnunet-logread-ipc
+bin/gnunet-logread-ipc-sdedit
diff --git a/gnunet/PLIST.pgsql b/gnunet/PLIST.pgsql
new file mode 100644
index 0000000000..a2b52a6f66
--- /dev/null
+++ b/gnunet/PLIST.pgsql
@@ -0,0 +1,6 @@
+@comment $NetBSD$
+lib/gnunet/libgnunet_plugin_datacache_postgres.la
+lib/gnunet/libgnunet_plugin_datastore_postgres.la
+lib/gnunet/libgnunet_plugin_namecache_postgres.la
+lib/gnunet/libgnunet_plugin_namestore_postgres.la
+lib/libgnunetpq.la
diff --git a/gnunet/PLIST.sqlite3 b/gnunet/PLIST.sqlite3
new file mode 100644
index 0000000000..f2486a1504
--- /dev/null
+++ b/gnunet/PLIST.sqlite3
@@ -0,0 +1,9 @@
+@comment $NetBSD$
+lib/gnunet/libexec/gnunet-daemon-latency-logger
+lib/gnunet/libexec/gnunet-daemon-testbed-underlay
+lib/gnunet/libgnunet_plugin_datacache_sqlite.la
+lib/gnunet/libgnunet_plugin_datastore_sqlite.la
+lib/gnunet/libgnunet_plugin_namecache_sqlite.la
+lib/gnunet/libgnunet_plugin_namestore_sqlite.la
+lib/gnunet/libgnunet_plugin_peerstore_sqlite.la
+lib/libgnunetsq.la
diff --git a/gnunet/TODO b/gnunet/TODO
new file mode 100644
index 0000000000..6c07099578
--- /dev/null
+++ b/gnunet/TODO
@@ -0,0 +1,3 @@
+- more contents of other PLISTs
+- debug the service
+- build on linux and freebsd
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index de9fff55dc..b8d336d697 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -21,10 +21,6 @@ pkgbase:= gnunet
 .include "../../devel/libidn/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gnunet:Mjson)
-.include "../../textproc/jansson/buildlink3.mk"
-.endif
-
 .if !empty(PKG_BUILD_OPTIONS.gnunet:Msqlite3)
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif
@@ -55,7 +51,7 @@ pkgbase:= gnunet
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.gnunet:Mzbar)
-.include "../../wip/zbar/buildlink3.mk"
+.include "../../graphics/zbar/buildlink3.mk"
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -67,8 +63,9 @@ pkgbase:= gnunet
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.include "../../www/gnurl/buildlink3.mk"
+.include "../../wip/gnurl/buildlink3.mk"
 .include "../../www/libmicrohttpd/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/gnunet/distinfo b/gnunet/distinfo
index 81f371046d..31ba4ef195 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-RMD160 (gnunet-0.13.3.tar.gz) = e278ab0afb9ed7e72e8e7bb35257549c4d738568
-SHA512 (gnunet-0.13.3.tar.gz) = 65b7cb32b47d08f3b639fbf492dda44d285189b0bee2b6155db00a1d2d451a52c869c9ad8da5665453467c64d5cc473ee1cbb54d12465184e8194d3817723610
-Size (gnunet-0.13.3.tar.gz) = 7721101 bytes
+BLAKE2s (gnunet-0.16.1.tar.gz) = a410f2d08942ad106df1fc3b4a6001411b2897db003c27a25ef3edf68e0bf61f
+SHA512 (gnunet-0.16.1.tar.gz) = cba1a86d5b10392185256efa498008d676ae0d9d6e66e1fa950f94f8ff7a92b1bbe6b4ab41074541cf96dc13cc99f28a3cbc59c99b72e2e770739281ff0ab0e6
+Size (gnunet-0.16.1.tar.gz) = 9387068 bytes
+SHA1 (patch-src_setu_gnunet-service-setu.c) = 2e6c8eb895544fe79e27edec85e37379ec9b3783
diff --git a/gnunet/options.mk b/gnunet/options.mk
index e81c560481..047e88aa20 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -4,15 +4,11 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 
 PKG_SUPPORTED_OPTIONS+=		doc mdoc idn mysql pgsql tests
 PKG_SUPPORTED_OPTIONS+=		experimental bluez pulseaudio
-PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 json
+PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
 # Should we name this qrcode instead?
 PKG_SUPPORTED_OPTIONS+=		zbar
-
-# mdoc should be fixed in 0.11.9, missing files were included
-# post-0.11.8.
-# in 0.11.9 when fixed for pkgsrc, add back idn.
-PKG_SUGGESTED_OPTIONS+=		doc sqlite3 json opus ogg gstreamer idn
+PKG_SUGGESTED_OPTIONS+=		idn gstreamer doc sqlite3 opus ogg
 
 # bluez is still in pkgsrc-wip, and I should test this
 # before claiming bluez from pkgsrc-wip on Linux works.
@@ -24,12 +20,10 @@ PKG_SUGGESTED_OPTIONS+=		bluez
 PKG_SUGGESTED_OPTIONS+=		zbar
 .endif
 
-PLIST_VARS+=			doc mdoc conversations
-PLIST_VARS+=			experimental json
-PLIST_VARS+=			pgsql mysql sqlite3
-PLIST_VARS+=			linux freebsd bluez
-PLIST_VARS+=			linuxfreebsd zbar
-PLIST_VARS+=			perl
+# We use several PLIST files, as the build process is
+# rather lengthy, and keeping it in one file for every
+# option is not easy on the one doing the updates.
+PLIST_SRC=			PLIST
 
 # openssl is currently required by:
 # src/transport/gnunet-transport-certificate-creation
@@ -40,15 +34,16 @@ PLIST_VARS+=			perl
 .if !empty(PKG_OPTIONS:Mtests)
 .include "../../lang/python/tool.mk"
 PYTHON_FOR_BUILD_ONLY=	yes
+CONFIGURE_ARGS+=	--enable-testruns
 .else
-CONFIGURE_ARGS+=	--disable-tests
+CONFIGURE_ARGS+=	--disable-testruns
 .endif
 
 .if !empty(PKG_OPTIONS:Mdoc)
 USE_TOOLS+=		makeinfo
 INFO_FILES=		yes
 CONFIGURE_ARGS+=	--enable-documentation
-PLIST.doc=		yes
+PLIST_SRC+=		PLIST.doc
 .else
 CONFIGURE_ARGS+=	--disable-documentation
 .endif
@@ -57,7 +52,7 @@ CONFIGURE_ARGS+=	--disable-documentation
 .if !empty(PKG_OPTIONS:Mmdoc)
 BUILD_DEPENDS+=		texi2mdoc-[0-9]*:../../textproc/texi2mdoc
 CONFIGURE_ARGS+=	--enable-texi2mdoc-generation
-PLIST.mdoc=		yes
+PLIST_SRC+=		PLIST.mdoc
 .else
 CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
 .endif
@@ -67,48 +62,43 @@ CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
 # https://bugs.gnunet.org/view.php?id=5948 is fixed.
 .if !empty(PKG_OPTIONS:Midn)
 .include "../../devel/libidn2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libidn=no
+CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn2}
 .else
 .include "../../devel/libidn/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 .endif
 
-.if !empty(PKG_OPTIONS:Mjson)
-.include "../../textproc/jansson/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-jansson=${BUILDLINK_PREFIX.jansson}
-PLIST.json=		yes
-.else
-CONFIGURE_ARGS+=	--without-jansson
-.endif
-
 # database support - they don't exclude other databases,
 # you can have mysql, pgsql, and the default all built in.
 # ideally we would check for at least sqlite3 existing, but
 # the build won't build when you have none of them.
 .if !empty(PKG_OPTIONS:Msqlite3)
 .include "../../databases/sqlite3/buildlink3.mk"
-PLIST.sqlite3=		yes
+PLIST_SRC+=		PLIST.sqlite3
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
 .include "../../mk/mysql.buildlink3.mk"
-PLIST.mysql=		yes
+PLIST_SRC+=		PLIST.mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
 .endif
 
+# \todo:
+# checking for mysql version... < 4.1
+# mysql version >= 4.1 required. Will not use MySQL
 .if !empty(PKG_OPTIONS:Mpgsql)
 .include "../../mk/pgsql.buildlink3.mk"
-PLIST.pgsql=		yes
+PLIST_SRC+=		PLIST.pgsql
 .else
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
 .if !empty(PKG_OPTIONS:Mexperimental)
 CONFIGURE_ARGS+=	--enable-experimental
-PLIST.experimental=	yes
+PLIST_SRC+=		PLIST.experimental
 .  if !empty(PKG_OPTIONS:Mverbose-logging)
 CONFIGURE_ARGS+=	--enable-logging=verbose
 .  endif
@@ -120,31 +110,23 @@ CONFIGURE_ARGS+=	--disable-experimental
 # exists, pulseaudio is not necessary.
 .if !empty(PKG_OPTIONS:Mopus)
 .include "../../audio/libopus/buildlink3.mk"
-PLIST.conversations=	yes
-.else
-CONFIGURE_ARGS+=	--without-libopus
+PLIST_SRC+=		PLIST.conversations
 .endif
 
 .if !empty(PKG_OPTIONS:Mogg)
 .include "../../multimedia/libogg/buildlink3.mk"
-PLIST.conversations=	yes
-.else
-CONFIGURE_ARGS+=	--without-libogg
+PLIST_SRC+=		PLIST.conversations
 .endif
 
 .if !empty(PKG_OPTIONS:Mgstreamer)
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-PLIST.conversations=	yes
-.else
-CONFIGURE_ARGS+=	--without-gstreamer
+PLIST_SRC+=		PLIST.conversations
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
-PLIST.conversations=	yes
-.else
-CONFIGURE_ARGS+=	--without-libpulse
+PLIST_SRC+=		PLIST.conversations
 .endif
 
 .if !empty(PKG_OPTIONS:Mzbar)
@@ -172,23 +154,28 @@ PLIST.bluez=		yes
 CONFIGURE_ARGS+=	--without-libbluetooth
 .endif
 
+# there are files which only exist on Linux, only on FreeBSD, and on both of them.
+# I have neither of them. If you do, please create the appropriate PLIST files
+# with content.
 .if ${OPSYS} == "Linux"
-PLIST.linux=		yes
+# PLIST_SRC+=		PLIST.linux
 .endif
 
 .if ${OPSYS} == "FreeBSD"
-PLIST.freebsd=		yes
+# PLIST_SRC+=		PLIST.freebsd
 .endif
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
-PLIST.linuxfreebsd=	yes
+# PLIST_SRC+=		PLIST.linuxfreebsd
 .endif
 
-# optional gnunet-logread
 .if !empty(PKG_OPTIONS:Mperl)
 USE_TOOLS+=		perl:run
-PLIST.perl=		yes
+PLIST_SRC+=		PLIST.perl
 CONFIGURE_ARGS+=	--with-gnunet-logread
-.else
-CONFIGURE_ARGS+=	--without-gnunet-logread
+REPLACE_INTERPRETER+=	envperl
+REPLACE.envperl.old=	.*@PERLEXE@
+REPLACE.envperl.new=	${PERL5}
+REPLACE_FILES.envperl=	contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit.in
+REPLACE_FILES.envperl=	contrib/scripts/gnunet-logread/gnunet-logread.in
 .endif
diff --git a/gnunet/patches/patch-src_setu_gnunet-service-setu.c b/gnunet/patches/patch-src_setu_gnunet-service-setu.c
new file mode 100644
index 0000000000..09aeb4a50e
--- /dev/null
+++ b/gnunet/patches/patch-src_setu_gnunet-service-setu.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Crudely fix NetBSD's missing log2l.
+
+--- src/setu/gnunet-service-setu.c.orig	2022-03-18 23:02:08.123202128 +0100
++++ src/setu/gnunet-service-setu.c	2022-03-18 23:03:42.434385369 +0100
+@@ -38,6 +38,10 @@
+ #include "gnunet_setu_service.h"
+ #include "setu.h"
+ 
++#ifdef __NetBSD__
++#define log2l log2
++#endif
++
+ #define LOG(kind, ...) GNUNET_log_from (kind, "setu", __VA_ARGS__)
+ 
+ /**
Prev by Date: pharo-vm: Update to 9.0.14-894f25d
Next by Date: tor-browser: update to 11.0.9.
Previous by Thread: pharo-vm: Update to 9.0.14-894f25d
Next by Thread: tor-browser: update to 11.0.9.
Indexes:
Home | Main Index | Thread Index | Old Index