gnunet: update to 0.18.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnunet: update to 0.18.0
From: nikita <nikita%NetBSD.org@localhost>
Date: Tue, 01 Nov 2022 21:12:33 +0000
Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Tue Nov 1 22:12:33 2022 +0100
Changeset:	4525ce1a540c7bbebae0547bb7a0c8657315840f

Modified Files:
	gnunet/Makefile
	gnunet/PLIST
	gnunet/PLIST.doc
	gnunet/TODO
	gnunet/buildlink3.mk
	gnunet/distinfo
	gnunet/options.mk
Added Files:
	gnunet/patches/patch-contrib_packages_fedora_10-dns2gns.sh
Removed Files:
	gnunet/PLIST.mdoc

Log Message:
gnunet: update to 0.18.0

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

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

diffstat:
 gnunet/Makefile                                    |   4 +-
 gnunet/PLIST                                       |  16 +-
 gnunet/PLIST.doc                                   | 256 ++++++++++-----------
 gnunet/PLIST.mdoc                                  |   3 -
 gnunet/TODO                                        |   1 +
 gnunet/buildlink3.mk                               |   2 +-
 gnunet/distinfo                                    |   7 +-
 gnunet/options.mk                                  |  13 +-
 .../patch-contrib_packages_fedora_10-dns2gns.sh    |  15 ++
 9 files changed, 164 insertions(+), 153 deletions(-)

diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index ff647e4e15..8f1b33c112 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=		gnunet-0.17.5
+DISTNAME=		gnunet-0.18.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=gnunet/}
 
@@ -117,7 +117,7 @@ SPECIAL_PERMS+=	${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_R
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../wip/jose/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.include "../../wip/gnurl/buildlink3.mk"
+.include "../../www/curl/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 e83bfd0281..1b53df6c6b 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -27,6 +27,8 @@ bin/gnunet-identity
 bin/gnunet-messenger
 bin/gnunet-namecache
 bin/gnunet-namestore
+bin/gnunet-namestore-dbtool
+bin/gnunet-namestore-zonefile
 bin/gnunet-nat
 bin/gnunet-nat-auto
 bin/gnunet-nat-server
@@ -58,6 +60,7 @@ bin/gnunet-zoneimport
 etc/gnunet/gnunet.conf
 etc/gnunet/gnunet_user.conf
 include/gnunet/compat.h
+include/gnunet/gnunet_error_codes.h
 include/gnunet/gettext.h
 include/gnunet/gnu_name_system_record_types.h
 include/gnunet/gnunet_abd_service.h
@@ -236,7 +239,6 @@ lib/gnunet/libexec/gnunet-service-tng
 lib/gnunet/libexec/gnunet-service-transport
 lib/gnunet/libexec/gnunet-service-vpn
 lib/gnunet/libexec/gnunet-service-zonemaster
-lib/gnunet/libexec/gnunet-service-zonemaster-monitor
 lib/gnunet/libexec/gnunet-timeout
 lib/gnunet/libgnunet_plugin_ats_proportional.la
 lib/gnunet/libgnunet_plugin_block_consensus.la
@@ -258,7 +260,6 @@ 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
-lib/gnunet/libgnunet_plugin_namestore_flat.la
 lib/gnunet/libgnunet_plugin_reclaim_attribute_basic.la
 lib/gnunet/libgnunet_plugin_reclaim_credential_jwt.la
 lib/gnunet/libgnunet_plugin_rest_config.la
@@ -394,6 +395,8 @@ man/man1/gnunet-identity.1
 man/man1/gnunet-namecache.1
 man/man1/gnunet-namestore-fcfsd.1
 man/man1/gnunet-namestore.1
+man/man1/gnunet-namestore-dbtool.1
+man/man1/gnunet-namestore-zonefile.1
 man/man1/gnunet-nat-auto.1
 man/man1/gnunet-nat-server.1
 man/man1/gnunet-nat.1
@@ -482,12 +485,14 @@ share/gnunet/gns-bcd-simple.tex
 share/gnunet/gns-bcd.html
 share/gnunet/gns-bcd.tex
 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/old-gnunet-logo-big.png
+share/gnunet/old-gnunet-logo-color.png
+share/gnunet/old-gnunet-logo-regrouped.svg
+share/gnunet/old-gnunet-logo.pdf
+share/gnunet/old-gnunet-logo.svg
 share/gnunet/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
 share/gnunet/lynXified-amirouche-anonymous-v3.png
 share/gnunet/lynXified-amirouche-v3.svg
@@ -510,4 +515,3 @@ 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.doc b/gnunet/PLIST.doc
index d169a5ab29..1d6f852c6d 100644
--- a/gnunet/PLIST.doc
+++ b/gnunet/PLIST.doc
@@ -1,5 +1,4 @@
 @comment $NetBSD$
-man/man1/gnunet.1
 share/doc/gnunet/html/.buildinfo
 share/doc/gnunet/html/_images/ascension_ssd.png
 share/doc/gnunet/html/_images/daemon_lego_block.png
@@ -9,61 +8,76 @@ share/doc/gnunet/html/_images/service_stack.png
 share/doc/gnunet/html/_images/tng.png
 share/doc/gnunet/html/_sources/about.rst.txt
 share/doc/gnunet/html/_sources/faq.rst.txt
-share/doc/gnunet/html/_sources/gana.rst.txt
 share/doc/gnunet/html/_sources/guis/fs-gtk.rst.txt
 share/doc/gnunet/html/_sources/guis/gtk.rst.txt
 share/doc/gnunet/html/_sources/guis/index.rst.txt
 share/doc/gnunet/html/_sources/index.rst.txt
 share/doc/gnunet/html/_sources/installing.rst.txt
 share/doc/gnunet/html/_sources/livingstandards.rst.txt
-share/doc/gnunet/html/_sources/man_developers/contributing.rst.txt
-share/doc/gnunet/html/_sources/man_developers/doxygen.rst.txt
-share/doc/gnunet/html/_sources/man_developers/index.rst.txt
-share/doc/gnunet/html/_sources/man_developers/repo.rst.txt
-share/doc/gnunet/html/_sources/man_developers/style.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/apps.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/ats/ats.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/cadet/cadet.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/core/core.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/corestack.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/deps.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/dht/dht.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/fs/fs.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/gns/gns.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/gnsstack.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/hostlist/hostlist.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/identity/identity.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/index.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/messenger/messenger.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/namecache/namecache.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/namestore/namestore.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/nse/nse.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/peerinfo/peerinfo.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/peerstore/peerstore.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/regex/regex.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/rest/rest.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/revocation/revocation.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/rps/rps.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/set/set.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/seti/seti.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/setops.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/setu/setu.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/stability.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/statistics/statistics.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/transport-ng/transport-ng.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/transport/transport.rst.txt
-share/doc/gnunet/html/_sources/man_developers/subsystems/vpnstack.rst.txt
-share/doc/gnunet/html/_sources/man_developers/tutorial.rst.txt
-share/doc/gnunet/html/_sources/man_developers/util/index.rst.txt
-share/doc/gnunet/html/_sources/man_users/configuration.rst.txt
-share/doc/gnunet/html/_sources/man_users/fs.rst.txt
-share/doc/gnunet/html/_sources/man_users/gns.rst.txt
-share/doc/gnunet/html/_sources/man_users/index.rst.txt
-share/doc/gnunet/html/_sources/man_users/messenger.rst.txt
-share/doc/gnunet/html/_sources/man_users/reclaim.rst.txt
-share/doc/gnunet/html/_sources/man_users/start.rst.txt
-share/doc/gnunet/html/_sources/man_users/vpn.rst.txt
+share/doc/gnunet/html/_sources/developers/contributing.rst.txt
+share/doc/gnunet/html/_sources/developers/doxygen.rst.txt
+share/doc/gnunet/html/_sources/developers/index.rst.txt
+share/doc/gnunet/html/_sources/developers/repo.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/config.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/configuration.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/conventions.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/gns.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/identity.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/index.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/namestore.rst.txt
+share/doc/gnunet/html/_sources/developers/rest/peerinfo.rst.txt
+share/doc/gnunet/html/_sources/developers/style.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/apps.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/ats/ats.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/cadet/cadet.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/core/core.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/corestack.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/deps.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/dht/dht.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/fs/fs.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/gns/gns.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/gnsstack.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/hostlist/hostlist.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/identity/identity.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/index.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/messenger/messenger.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/namecache/namecache.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/namestore/namestore.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/nse/nse.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/peerinfo/peerinfo.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/peerstore/peerstore.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/regex/regex.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/rest/rest.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/revocation/revocation.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/rps/rps.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/set/set.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/seti/seti.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/setops.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/setu/setu.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/stability.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/statistics/statistics.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/transport-ng/transport-ng.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/transport/transport.rst.txt
+share/doc/gnunet/html/_sources/developers/subsystems/vpnstack.rst.txt
+share/doc/gnunet/html/_sources/developers/tutorial.rst.txt
+share/doc/gnunet/html/_sources/developers/util/index.rst.txt
+share/doc/gnunet/html/_sources/gana/gnu_name_system_record_types.rst.txt
+share/doc/gnunet/html/_sources/gana/gnunet_dht_block_types.rst.txt
+share/doc/gnunet/html/_sources/gana/gnunet_error_codes.rst.txt
+share/doc/gnunet/html/_sources/gana/gnunet_signatures.rst.txt
+share/doc/gnunet/html/_sources/gana/index.rst.txt
+share/doc/gnunet/html/_sources/gana/intro.rst.txt
+share/doc/gnunet/html/_sources/gana/tlds.rst.txt
+share/doc/gnunet/html/_sources/users/configuration.rst.txt
+share/doc/gnunet/html/_sources/users/fs.rst.txt
+share/doc/gnunet/html/_sources/users/gns.rst.txt
+share/doc/gnunet/html/_sources/users/index.rst.txt
+share/doc/gnunet/html/_sources/users/messenger.rst.txt
+share/doc/gnunet/html/_sources/users/reclaim.rst.txt
+share/doc/gnunet/html/_sources/users/start.rst.txt
+share/doc/gnunet/html/_sources/users/vpn.rst.txt
 share/doc/gnunet/html/_sources/preface.rst.txt
+share/doc/gnunet/html/_static/_sphinx_javascript_frameworks_compat.js
 share/doc/gnunet/html/_static/basic.css
 share/doc/gnunet/html/_static/css/badge_only.css
 share/doc/gnunet/html/_static/css/custom.css
@@ -71,35 +85,6 @@ share/doc/gnunet/html/_static/css/theme.css
 share/doc/gnunet/html/_static/doctools.js
 share/doc/gnunet/html/_static/documentation_options.js
 share/doc/gnunet/html/_static/file.png
-share/doc/gnunet/html/_static/fonts/Lato/lato-bold.eot
-share/doc/gnunet/html/_static/fonts/Lato/lato-bold.ttf
-share/doc/gnunet/html/_static/fonts/Lato/lato-bold.woff
-share/doc/gnunet/html/_static/fonts/Lato/lato-bold.woff2
-share/doc/gnunet/html/_static/fonts/Lato/lato-bolditalic.eot
-share/doc/gnunet/html/_static/fonts/Lato/lato-bolditalic.ttf
-share/doc/gnunet/html/_static/fonts/Lato/lato-bolditalic.woff
-share/doc/gnunet/html/_static/fonts/Lato/lato-bolditalic.woff2
-share/doc/gnunet/html/_static/fonts/Lato/lato-italic.eot
-share/doc/gnunet/html/_static/fonts/Lato/lato-italic.ttf
-share/doc/gnunet/html/_static/fonts/Lato/lato-italic.woff
-share/doc/gnunet/html/_static/fonts/Lato/lato-italic.woff2
-share/doc/gnunet/html/_static/fonts/Lato/lato-regular.eot
-share/doc/gnunet/html/_static/fonts/Lato/lato-regular.ttf
-share/doc/gnunet/html/_static/fonts/Lato/lato-regular.woff
-share/doc/gnunet/html/_static/fonts/Lato/lato-regular.woff2
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
-share/doc/gnunet/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
-share/doc/gnunet/html/_static/fonts/fontawesome-webfont.eot
-share/doc/gnunet/html/_static/fonts/fontawesome-webfont.svg
-share/doc/gnunet/html/_static/fonts/fontawesome-webfont.ttf
-share/doc/gnunet/html/_static/fonts/fontawesome-webfont.woff
-share/doc/gnunet/html/_static/fonts/fontawesome-webfont.woff2
 share/doc/gnunet/html/_static/gnunet-blue.png
 share/doc/gnunet/html/_static/images/ascension_interaction.png
 share/doc/gnunet/html/_static/images/ascension_ssd.png
@@ -144,9 +129,9 @@ share/doc/gnunet/html/_static/images/service_stack.png
 share/doc/gnunet/html/_static/images/structure.dot
 share/doc/gnunet/html/_static/images/tng.dot
 share/doc/gnunet/html/_static/images/tng.png
-share/doc/gnunet/html/_static/jquery-3.5.1.js
+share/doc/gnunet/html/_static/jquery-3.6.0.js
+share/doc/gnunet/html/_static/js/badge_only.js
 share/doc/gnunet/html/_static/jquery.js
-share/doc/gnunet/html/_static/js/modernizr.min.js
 share/doc/gnunet/html/_static/js/theme.js
 share/doc/gnunet/html/_static/language_data.js
 share/doc/gnunet/html/_static/minus.png
@@ -157,7 +142,6 @@ share/doc/gnunet/html/_static/underscore-1.13.1.js
 share/doc/gnunet/html/_static/underscore.js
 share/doc/gnunet/html/about.html
 share/doc/gnunet/html/faq.html
-share/doc/gnunet/html/gana.html
 share/doc/gnunet/html/genindex.html
 share/doc/gnunet/html/guis/fs-gtk.html
 share/doc/gnunet/html/guis/gtk.html
@@ -165,54 +149,70 @@ share/doc/gnunet/html/guis/index.html
 share/doc/gnunet/html/index.html
 share/doc/gnunet/html/installing.html
 share/doc/gnunet/html/livingstandards.html
-share/doc/gnunet/html/man_developers/contributing.html
-share/doc/gnunet/html/man_developers/doxygen.html
-share/doc/gnunet/html/man_developers/index.html
-share/doc/gnunet/html/man_developers/repo.html
-share/doc/gnunet/html/man_developers/style.html
-share/doc/gnunet/html/man_developers/subsystems/apps.html
-share/doc/gnunet/html/man_developers/subsystems/ats/ats.html
-share/doc/gnunet/html/man_developers/subsystems/cadet/cadet.html
-share/doc/gnunet/html/man_developers/subsystems/core/core.html
-share/doc/gnunet/html/man_developers/subsystems/corestack.html
-share/doc/gnunet/html/man_developers/subsystems/deps.html
-share/doc/gnunet/html/man_developers/subsystems/dht/dht.html
-share/doc/gnunet/html/man_developers/subsystems/fs/fs.html
-share/doc/gnunet/html/man_developers/subsystems/gns/gns.html
-share/doc/gnunet/html/man_developers/subsystems/gnsstack.html
-share/doc/gnunet/html/man_developers/subsystems/hostlist/hostlist.html
-share/doc/gnunet/html/man_developers/subsystems/identity/identity.html
-share/doc/gnunet/html/man_developers/subsystems/index.html
-share/doc/gnunet/html/man_developers/subsystems/messenger/messenger.html
-share/doc/gnunet/html/man_developers/subsystems/namecache/namecache.html
-share/doc/gnunet/html/man_developers/subsystems/namestore/namestore.html
-share/doc/gnunet/html/man_developers/subsystems/nse/nse.html
-share/doc/gnunet/html/man_developers/subsystems/peerinfo/peerinfo.html
-share/doc/gnunet/html/man_developers/subsystems/peerstore/peerstore.html
-share/doc/gnunet/html/man_developers/subsystems/regex/regex.html
-share/doc/gnunet/html/man_developers/subsystems/rest/rest.html
-share/doc/gnunet/html/man_developers/subsystems/revocation/revocation.html
-share/doc/gnunet/html/man_developers/subsystems/rps/rps.html
-share/doc/gnunet/html/man_developers/subsystems/set/set.html
-share/doc/gnunet/html/man_developers/subsystems/seti/seti.html
-share/doc/gnunet/html/man_developers/subsystems/setops.html
-share/doc/gnunet/html/man_developers/subsystems/setu/setu.html
-share/doc/gnunet/html/man_developers/subsystems/stability.html
-share/doc/gnunet/html/man_developers/subsystems/statistics/statistics.html
-share/doc/gnunet/html/man_developers/subsystems/transport-ng/transport-ng.html
-share/doc/gnunet/html/man_developers/subsystems/transport/transport.html
-share/doc/gnunet/html/man_developers/subsystems/vpnstack.html
-share/doc/gnunet/html/man_developers/tutorial.html
-share/doc/gnunet/html/man_developers/util/index.html
-share/doc/gnunet/html/man_users/configuration.html
-share/doc/gnunet/html/man_users/fs.html
-share/doc/gnunet/html/man_users/gns.html
-share/doc/gnunet/html/man_users/index.html
-share/doc/gnunet/html/man_users/messenger.html
-share/doc/gnunet/html/man_users/reclaim.html
-share/doc/gnunet/html/man_users/start.html
-share/doc/gnunet/html/man_users/vpn.html
+share/doc/gnunet/html/developers/contributing.html
+share/doc/gnunet/html/developers/doxygen.html
+share/doc/gnunet/html/developers/index.html
+share/doc/gnunet/html/developers/repo.html
+share/doc/gnunet/html/developers/rest/config.html
+share/doc/gnunet/html/developers/rest/configuration.html
+share/doc/gnunet/html/developers/rest/conventions.html
+share/doc/gnunet/html/developers/rest/gns.html
+share/doc/gnunet/html/developers/rest/identity.html
+share/doc/gnunet/html/developers/rest/index.html
+share/doc/gnunet/html/developers/rest/namestore.html
+share/doc/gnunet/html/developers/rest/peerinfo.html
+share/doc/gnunet/html/developers/style.html
+share/doc/gnunet/html/developers/subsystems/apps.html
+share/doc/gnunet/html/developers/subsystems/ats/ats.html
+share/doc/gnunet/html/developers/subsystems/cadet/cadet.html
+share/doc/gnunet/html/developers/subsystems/core/core.html
+share/doc/gnunet/html/developers/subsystems/corestack.html
+share/doc/gnunet/html/developers/subsystems/deps.html
+share/doc/gnunet/html/developers/subsystems/dht/dht.html
+share/doc/gnunet/html/developers/subsystems/fs/fs.html
+share/doc/gnunet/html/developers/subsystems/gns/gns.html
+share/doc/gnunet/html/developers/subsystems/gnsstack.html
+share/doc/gnunet/html/developers/subsystems/hostlist/hostlist.html
+share/doc/gnunet/html/developers/subsystems/identity/identity.html
+share/doc/gnunet/html/developers/subsystems/index.html
+share/doc/gnunet/html/developers/subsystems/messenger/messenger.html
+share/doc/gnunet/html/developers/subsystems/namecache/namecache.html
+share/doc/gnunet/html/developers/subsystems/namestore/namestore.html
+share/doc/gnunet/html/developers/subsystems/nse/nse.html
+share/doc/gnunet/html/developers/subsystems/peerinfo/peerinfo.html
+share/doc/gnunet/html/developers/subsystems/peerstore/peerstore.html
+share/doc/gnunet/html/developers/subsystems/regex/regex.html
+share/doc/gnunet/html/developers/subsystems/rest/rest.html
+share/doc/gnunet/html/developers/subsystems/revocation/revocation.html
+share/doc/gnunet/html/developers/subsystems/rps/rps.html
+share/doc/gnunet/html/developers/subsystems/set/set.html
+share/doc/gnunet/html/developers/subsystems/seti/seti.html
+share/doc/gnunet/html/developers/subsystems/setops.html
+share/doc/gnunet/html/developers/subsystems/setu/setu.html
+share/doc/gnunet/html/developers/subsystems/stability.html
+share/doc/gnunet/html/developers/subsystems/statistics/statistics.html
+share/doc/gnunet/html/developers/subsystems/transport-ng/transport-ng.html
+share/doc/gnunet/html/developers/subsystems/transport/transport.html
+share/doc/gnunet/html/developers/subsystems/vpnstack.html
+share/doc/gnunet/html/developers/tutorial.html
+share/doc/gnunet/html/developers/util/index.html
+share/doc/gnunet/html/gana/gnu_name_system_record_types.html
+share/doc/gnunet/html/gana/gnunet_dht_block_types.html
+share/doc/gnunet/html/gana/gnunet_error_codes.html
+share/doc/gnunet/html/gana/gnunet_signatures.html
+share/doc/gnunet/html/gana/index.html
+share/doc/gnunet/html/gana/intro.html
+share/doc/gnunet/html/gana/tlds.html
+share/doc/gnunet/html/users/configuration.html
+share/doc/gnunet/html/users/fs.html
+share/doc/gnunet/html/users/gns.html
+share/doc/gnunet/html/users/index.html
+share/doc/gnunet/html/users/messenger.html
+share/doc/gnunet/html/users/reclaim.html
+share/doc/gnunet/html/users/start.html
+share/doc/gnunet/html/users/vpn.html
 share/doc/gnunet/html/objects.inv
 share/doc/gnunet/html/preface.html
 share/doc/gnunet/html/search.html
 share/doc/gnunet/html/searchindex.js
+info/gnunet.info
diff --git a/gnunet/PLIST.mdoc b/gnunet/PLIST.mdoc
deleted file mode 100644
index 020135ee12..0000000000
--- a/gnunet/PLIST.mdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-man/man7/gnunet-documentation.7
-man/man7/gnunet-tutorial.7
diff --git a/gnunet/TODO b/gnunet/TODO
index 2659997aac..90cbcb1b05 100644
--- a/gnunet/TODO
+++ b/gnunet/TODO
@@ -1,3 +1,4 @@
+- package curl built against GnuTLS, as gnunet stopped checking for gnurl.
 - more contents of other PLISTs
 - debug the service
   - XXX: gnunetuser currently prevents a shutdown via "normal" shutdown(1),
diff --git a/gnunet/buildlink3.mk b/gnunet/buildlink3.mk
index a3f8ba5e11..069c98979c 100644
--- a/gnunet/buildlink3.mk
+++ b/gnunet/buildlink3.mk
@@ -69,7 +69,7 @@ pkgbase:= gnunet
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
-.include "../../wip/gnurl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../www/libmicrohttpd/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/gnunet/distinfo b/gnunet/distinfo
index 824fa70186..5826ba881b 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -1,7 +1,8 @@
 $NetBSD$
 
-BLAKE2s (gnunet-0.17.5.tar.gz) = 34f927fea2c12e1320fdb0e6220420c9da716ce20a59d962ddc6ccc63eb72b88
-SHA512 (gnunet-0.17.5.tar.gz) = 02c6deac7d5008df4a6b2783a954cf7cd2432669ca2d5c872421cb9ee52ebffc3f8302f68535dcb13745751b5f68277a438e4710bd5ac8709ef933d75b2ed70c
-Size (gnunet-0.17.5.tar.gz) = 9069716 bytes
+BLAKE2s (gnunet-0.18.0.tar.gz) = 564fa228a308344f42ac15f1a058125707ee64dff70d0fcc608e55dc0e29d69b
+SHA512 (gnunet-0.18.0.tar.gz) = 73813d45b6c54df8db88cec8bdafaf3dc8c9abf419cd5e439b62aba0d3938f83ac4f517a4d11027f1020744808b0156dd6c93e806c30904764f2890b3cb9b022
+Size (gnunet-0.18.0.tar.gz) = 10592422 bytes
+SHA1 (patch-contrib_packages_fedora_10-dns2gns.sh) = 67711ca18ff29e122dbc10eb99461ddd36a15e68
 SHA1 (patch-src_include_gnunet_common.h) = 44a0f31cd3d7fa4df5491cf9cf2efa31e695cdb9
 SHA1 (patch-src_setu_gnunet-service-setu.c) = 2e6c8eb895544fe79e27edec85e37379ec9b3783
diff --git a/gnunet/options.mk b/gnunet/options.mk
index e1ae7227d9..5275b356b0 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gnunet
 
-PKG_SUPPORTED_OPTIONS+=		doc mdoc idn mysql pgsql tests
+PKG_SUPPORTED_OPTIONS+=		doc idn mysql pgsql tests
 PKG_SUPPORTED_OPTIONS+=		experimental pulseaudio
 PKG_SUPPORTED_OPTIONS+=		opus ogg sqlite3 audio
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl verbose-logging
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+=	--enable-testruns
 CONFIGURE_ARGS+=	--disable-testruns
 .endif
 
+# \XXX: 7 MB in size, but useful (although we could strip off some files).
 .if ${PKG_OPTIONS:Mdoc}
 .include "../../lang/python/tool.mk"
 TOOL_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
@@ -44,19 +45,11 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 CONFIGURE_ARGS+=	--enable-documentation
 PLIST_SRC+=		PLIST.doc
+INFO_FILES=yes
 .else
 CONFIGURE_ARGS+=	--disable-documentation
 .endif
 
-# Build the texi2mdoc output.
-.if ${PKG_OPTIONS:Mmdoc}
-BUILD_DEPENDS+=		texi2mdoc-[0-9]*:../../textproc/texi2mdoc
-CONFIGURE_ARGS+=	--enable-texi2mdoc-generation
-PLIST_SRC+=		PLIST.mdoc
-.else
-CONFIGURE_ARGS+=	--disable-texi2mdoc-generation
-.endif
-
 # idn is mandatory but idn or idn2 can be used with a preference for
 # idn2.
 .if ${PKG_OPTIONS:Midn}
diff --git a/gnunet/patches/patch-contrib_packages_fedora_10-dns2gns.sh b/gnunet/patches/patch-contrib_packages_fedora_10-dns2gns.sh
new file mode 100644
index 0000000000..97808f6388
--- /dev/null
+++ b/gnunet/patches/patch-contrib_packages_fedora_10-dns2gns.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix test portability.
+
+--- contrib/packages/fedora/10-dns2gns.sh.orig	2022-11-01 19:42:47.417189244 +0100
++++ contrib/packages/fedora/10-dns2gns.sh	2022-11-01 19:44:26.474856703 +0100
+@@ -28,7 +28,7 @@
+         exit 1
+       fi
+       olddns=$(resolvectl status $interface | grep "DNS Servers" | cut -d':' -f2-)
+-      if [ $? == 0 ]; then
++      if [ $? = 0 ]; then
+         #echo "Setting to $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9"
+         #resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9
+         echo "Setting to $dns2gns:$port [$dns2gns6]:$port"
Prev by Date: Add nextpnr and prjtrellis.
Next by Date: gnunet: update MESSAGE
Previous by Thread: Add nextpnr and prjtrellis.
Next by Thread: gnunet: update MESSAGE
Indexes:
Home | Main Index | Thread Index | Old Index