wip/gnunet: Update to 0.11.8.

Release changes:

Changes in 0.11.8 (since 0.11.7):

gns: portability fix
     change [ a == b ] to the more portable [ a = b ]

pq:  include pq.h in dist
     Fixes commit e3e21acb ("libgnunetpq API change to fix #5733")

diff --git a/gnunet/Makefile b/gnunet/Makefile
index e71f420df2ac0c5b10bc7a60f6924453b02601b7..b50d077392dfd88fe36044880e02c3f4b1ad3500 100644 (file)
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=              gnunet-0.11.7
+DISTNAME=              gnunet-0.11.8
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GNU:=gnunet/}
 
@@ -9,7 +9,7 @@ HOMEPAGE=               https://gnunet.org/
 COMMENT=               Framework for secure P2P networking
 LICENSE=               gnu-agpl-v3
 
-USE_TOOLS+=            msgfmt pkg-config gmake
+USE_TOOLS+=            msgfmt pkg-config # gmake
 USE_LANGUAGES=         c
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes

diff --git a/gnunet/distinfo b/gnunet/distinfo
index 15946d9bf68680717a1583c5f02c93aa54e27f32..d3f0bf41cd2e0b6bf2b3189b0be2af3d2ff51877 100644 (file)
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (gnunet-0.11.7.tar.gz) = 64b6fe28c0ce78026a2bc5885fbdff795d76234f
-RMD160 (gnunet-0.11.7.tar.gz) = b29dbfedd6e35d30aee61e4fadf5b0ac43dee1e2
-SHA512 (gnunet-0.11.7.tar.gz) = bd92e0c7ba1f87684f348eecd097b0c7de3d6c370bd7a3745555fc83518f17cbe49a30821d3d1338b45f14052d4a77f2f3673b961ccab36e6a82220b9acdf76b
-Size (gnunet-0.11.7.tar.gz) = 7352977 bytes
-SHA1 (patch-src_gns_test_plugin_rest_gns.sh) = b420b6ee51d174c5975b68a63d84461edb3bd0d4
-SHA1 (patch-src_namestore_test_plugin_rest_gns.sh) = 98729f9d1c4af5318a30682bb82aea6843756a6e
+SHA1 (gnunet-0.11.8.tar.gz) = d82e896c1017f8370e183671f98cfb69ae40296a
+RMD160 (gnunet-0.11.8.tar.gz) = ee0d41d3d38f66d04f928611229845b53467a2dc
+SHA512 (gnunet-0.11.8.tar.gz) = bcdcd9452a905dcc0c474517f2941ae5822bda23e918c4ba5d61d085016d69eba5b1477bb30cf8179a6d6290898ea23ec485e3f1acfb3cf4ed0979ce8054af7e
+Size (gnunet-0.11.8.tar.gz) = 7352208 bytes

diff --git a/gnunet/options.mk b/gnunet/options.mk
index 5e0581265f235a9b7ca5118483aa0a7f3224e723..a4ff9e2b4c77c0c1a5d60a37531e9fcd8efb8862 100644 (file)
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -9,8 +9,9 @@ PKG_SUPPORTED_OPTIONS+=         gstreamer
 # Should we name this qrcode instead?
 PKG_SUPPORTED_OPTIONS+=                zbar
 
-# in 0.11.7 when fixed, swap doc for mdoc
-# in 0.11.7 when fixed, add back idn
+# 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 zbar
 
 # bluez is still in pkgsrc-wip, and I should test this
@@ -24,7 +25,7 @@ PLIST_VARS+=                  doc mdoc conversations
 PLIST_VARS+=                   experimental json
 PLIST_VARS+=                   pgsql mysql sqlite3
 PLIST_VARS+=                   linux freebsd bluez
-PLIST_VARS+=                   linuxfreebsd
+PLIST_VARS+=                   linuxfreebsd zbar
 
 # openssl is currently required by:
 # src/transport/gnunet-transport-certificate-creation

diff --git a/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh b/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh
deleted file mode 100644 (file)
index 89e7ff5..0000000
--- a/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-pick from 95485f2f9b181cc710ddbf806b5f8601f23edb33
-
---- src/gns/test_plugin_rest_gns.sh~
-+++ src/gns/test_plugin_rest_gns.sh
-@@ -24,7 +24,7 @@ curl_get () {
-     #$2 is grep
-     cache="$(gnurl -v "$1" 2>&1 | grep "$2")"
-     #echo "$cache"
--    if [ "" == "$cache" ]
-+    if [ "" = "$cache" ]
-     then
-         gnunet-identity -D "$TEST_TLD" -c test_gns_lookup.conf > /dev/null 2>&1
-         gnunet-arm -e -c test_gns_lookup.conf

diff --git a/gnunet/patches/patch-src_namestore_test_plugin_rest_gns.sh b/gnunet/patches/patch-src_namestore_test_plugin_rest_gns.sh
deleted file mode 100644 (file)
index c2a6c22..0000000
--- a/gnunet/patches/patch-src_namestore_test_plugin_rest_gns.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-pick from cf9440cc40334ed87755615ecf6d5d2c2445f17b
-
---- src/namestore/test_plugin_rest_namestore.sh~
-+++ src/namestore/test_plugin_rest_namestore.sh
-@@ -25,7 +25,7 @@ curl_get () {
-   resp=$(curl -v "$1" 2>&1)
-   cache="$(echo $resp | grep "$2")"
-   #echo $cache
--  if [ "" == "$cache" ]
-+  if [ "" = "$cache" ]
-   then
-     echo "Error in get response: $resp, expected $2"
-     gnunet-arm -e -c test_namestore_api.conf
-@@ -40,7 +40,7 @@ curl_post () {
-   resp=$(curl -v -X "POST" "$1" --data "$2" 2>&1)
-   cache="$(echo $resp | grep "$3")"
-   #echo $cache
--  if [ "" == "$cache" ]
-+  if [ "" = "$cache" ]
-   then
-     echo "Error in post response: $resp ($2), expected $3"
-     gnunet-arm -e -c test_namestore_api.conf
-@@ -54,7 +54,7 @@ curl_delete () {
-   resp=$(curl -v -X "DELETE" "$1" 2>&1)
-   cache="$(echo $resp | grep "$2")"
-   #echo $cache
--  if [ "" == "$cache" ]
-+  if [ "" = "$cache" ]
-   then
-     echo "Error in delete response: $resp, expected $2"
-     gnunet-arm -e -c test_namestore_api.conf