pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/gnunet: Update to gnunet 0.11.7
Module Name: pkgsrc-wip
Committed By: ng0 <ng0%NetBSD.org@localhost>
Pushed By: ng0
Date: Sun Oct 27 23:08:43 2019 +0000
Changeset: 0665ce90e6a2b2c7cd1142c7fe69aeb1a7b01d23
Modified Files:
gnunet/Makefile
gnunet/PLIST
gnunet/distinfo
gnunet/options.mk
Added Files:
gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh
gnunet/patches/patch-src_namestore_test_plugin_rest_gns.sh
Log Message:
wip/gnunet: Update to gnunet 0.11.7
Changelog:
Sun Oct 27 17:17:00 2019 +0200
Released gnunet 0.11.7
-schanzen, ng0
Fri Oct 25 00:00:00 UTC 2019
Dropped glpk dependency(-check). -ng0
Wed Oct 23 20:55:12 2019 +0200
Make REST service start per user in a multiuser setup.
-schanzen
Wed Oct 23 00:00:00 UTC 2019
Remove setuid helpers. They never worked as intended. The
fixed version is not portable and the defacto good way to
handle this which is most portable is to let package managers
handle this (as they do right now, the good ones), and let
people handle this who read the documentation.
This commit removes what would be patched out by the majority
of package managers, which is setuid handling in Makefiles.
It is very likely that no one will notice this code is gone.
-ng0
Thu Oct 17 00:00:00 UTC 2019
Added support for doas, use it in some places conditionally
if sudo is not present. Fixed sudo detection. -ng0
Mon Oct 14 00:00:00 UTC 2019
Added 'pretty' make rule to run uncrustify over the source tree.
-ng0
Mon Sep 16 00:00:00 UTC 2019
Remove checks for CXX and CPP. Scans found no
(remaining) cxx code. ccache with clang on
NetBSD 9 hit no rebuilds. -ng0
Mon Sep 10 00:00:00 UTC 2019
Drop win32 and mingw support after discussion with
Christian. It has been unmaintained in our code base
for years and there are no known users.
Future implementors for Windows 10 support can
refer to this commit as reference. -ng0
Mon Sep 9 00:00:00 UTC 2019
Remove plibc, closes #5877 as discussed in
https://lists.gnu.org/archive/html/gnunet-developers/2019-09/msg00002.html
-ng0
Sun Sep 1 13:25:07 2019 +0200
Improved support for external applications/services wrt
localization/gettext.
https://lists.gnu.org/archive/html/gnunet-developers/2019-09/msg00000.html
Tue 20 Aug 2019 04:32:09 PM CEST
Fixed fatal bug in gnunet-bcd that prevented the main page
from showing up. -CG
Mon Aug 19 17:36:48 2019 +0200
REST: Added API plugin to read/write GNUnet configuration options -alexia
Sun Jul 28 00:00:00 2019 +0000
Adding --enable-texinfo4 configure switch, defaulting to off.
This allows distributors to override the texinfo 5.x and later
commandline options we use, and allows us on the serverside to
build html with newer output options. -ng0
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0665ce90e6a2b2c7cd1142c7fe69aeb1a7b01d23
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnunet/Makefile | 7 ++--
gnunet/PLIST | 20 ++++-------
gnunet/distinfo | 10 +++---
gnunet/options.mk | 42 ++++++++++++++++++----
.../patches/patch-src_gns_test_plugin_rest_gns.sh | 15 ++++++++
.../patch-src_namestore_test_plugin_rest_gns.sh | 33 +++++++++++++++++
6 files changed, 98 insertions(+), 29 deletions(-)
diffs:
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 79bfff0333..68adf73eb7 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= gnunet-0.11.6
+DISTNAME= gnunet-0.11.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=gnunet/}
@@ -9,9 +9,8 @@ HOMEPAGE= https://gnunet.org/
COMMENT= Framework for secure P2P networking
LICENSE= gnu-agpl-v3
-# Remove c++ with 0.11.7
-USE_TOOLS+= msgfmt
-USE_LANGUAGES= c c++
+USE_TOOLS+= msgfmt pkg-config gmake
+USE_LANGUAGES= c
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
TEST_TARGET= check
diff --git a/gnunet/PLIST b/gnunet/PLIST
index 256b7ac5f1..846c439402 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -13,7 +13,7 @@ bin/gnunet-consensus-profiler
${PLIST.conversations}bin/gnunet-conversation
${PLIST.conversations}bin/gnunet-conversation-test
bin/gnunet-core
-${PLIST.experimental}bin/gnunet-credential
+${PLIST.experimental}bin/gnunet-abd
bin/gnunet-datastore
bin/gnunet-dht-get
bin/gnunet-dht-monitor
@@ -54,12 +54,12 @@ bin/gnunet-vpn
bin/gnunet-zoneimport
include/gnunet/compat.h
include/gnunet/gettext.h
+include/gnunet/gnunet_abd_service.h
include/gnunet/gnunet_abe_lib.h
include/gnunet/gnunet_applications.h
include/gnunet/gnunet_arm_service.h
include/gnunet/gnunet_ats_application_service.h
include/gnunet/gnunet_ats_plugin.h
-include/gnunet/gnunet_ats_plugin_new.h
include/gnunet/gnunet_ats_service.h
include/gnunet/gnunet_ats_transport_service.h
include/gnunet/gnunet_bandwidth_lib.h
@@ -77,7 +77,6 @@ include/gnunet/gnunet_constants.h
include/gnunet/gnunet_container_lib.h
include/gnunet/gnunet_conversation_service.h
include/gnunet/gnunet_core_service.h
-include/gnunet/gnunet_credential_service.h
include/gnunet/gnunet_crypto_lib.h
include/gnunet/gnunet_curl_lib.h
include/gnunet/gnunet_datacache_lib.h
@@ -164,7 +163,6 @@ include/gnunet/gnunet_tun_lib.h
include/gnunet/gnunet_util_lib.h
include/gnunet/gnunet_vpn_service.h
include/gnunet/platform.h
-include/gnunet/plibc.h
${PLIST.doc}info/gnunet-tutorial.info
${PLIST.doc}info/gnunet.info
${PLIST.doc}info/images/daemon_lego_block.png
@@ -229,13 +227,12 @@ lib/gnunet/libexec/gnunet-namestore-fcfsd
lib/gnunet/libexec/gnunet-rest-server
lib/gnunet/libexec/gnunet-service-arm
lib/gnunet/libexec/gnunet-service-ats
-lib/gnunet/libexec/gnunet-service-ats-new
${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
-${PLIST.experimental}lib/gnunet/libexec/gnunet-service-credential
+${PLIST.experimental}lib/gnunet/libexec/gnunet-service-abd
lib/gnunet/libexec/gnunet-service-datastore
lib/gnunet/libexec/gnunet-service-dht
lib/gnunet/libexec/gnunet-service-dns
@@ -269,10 +266,7 @@ 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_ats2_simple.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.la
lib/gnunet/libgnunet_plugin_ats_proportional.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.la
lib/gnunet/libgnunet_plugin_block_consensus.la
lib/gnunet/libgnunet_plugin_block_dht.la
lib/gnunet/libgnunet_plugin_block_dns.la
@@ -287,7 +281,7 @@ ${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.conversations}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
-${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_credential.la
+${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_abd.la
lib/gnunet/libgnunet_plugin_gnsrecord_dns.la
lib/gnunet/libgnunet_plugin_gnsrecord_gns.la
lib/gnunet/libgnunet_plugin_gnsrecord_reclaim.la
@@ -316,16 +310,14 @@ lib/gnunet/libgnunet_plugin_transport_udp.la
lib/gnunet/libgnunet_plugin_transport_unix.la
lib/libgnunetarm.la
lib/libgnunetats.la
-lib/libgnunetatsapplication.la
lib/libgnunetatstesting.la
-lib/libgnunetatstransport.la
lib/libgnunetblock.la
lib/libgnunetblockgroup.la
lib/libgnunetcadet.la
lib/libgnunetconsensus.la
${PLIST.conversations}lib/libgnunetconversation.la
lib/libgnunetcore.la
-${PLIST.experimental}lib/libgnunetcredential.la
+${PLIST.experimental}lib/libgnunetabd.la
lib/libgnunetcurl.la
lib/libgnunetdatacache.la
lib/libgnunetdatastore.la
@@ -466,7 +458,7 @@ 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
-${PLIST.experimental}share/gnunet/config.d/credential.conf
+${PLIST.experimental}share/gnunet/config.d/abd.conf
share/gnunet/config.d/datacache.conf
share/gnunet/config.d/datastore.conf
share/gnunet/config.d/dht.conf
diff --git a/gnunet/distinfo b/gnunet/distinfo
index 7e82f14636..15946d9bf6 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -1,6 +1,8 @@
$NetBSD$
-SHA1 (gnunet-0.11.6.tar.gz) = 70ad46fb8aaf194f148032a10466c8e19bf6ac56
-RMD160 (gnunet-0.11.6.tar.gz) = cd370f709b21cd00daf76757e9cd879900673c67
-SHA512 (gnunet-0.11.6.tar.gz) = 1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278
-Size (gnunet-0.11.6.tar.gz) = 7639406 bytes
+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
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 3c3400d31f..1db8bcb28c 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -1,16 +1,22 @@
# $NetBSD$
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+= gstreamer
-PKG_SUGGESTED_OPTIONS= doc sqlite3 json
+
+# in 0.11.7 when fixed, swap doc for mdoc
+# in 0.11.7 when fixed, add back idn
+PKG_SUGGESTED_OPTIONS+= doc sqlite3 json opus ogg gstreamer
+
PLIST_VARS+= doc mdoc conversations
PLIST_VARS+= experimental json
PLIST_VARS+= pgsql mysql sqlite3
PLIST_VARS+= linux freebsd bluez
PLIST_VARS+= linuxfreebsd
+
# openssl is currently required by:
# src/transport/gnunet-transport-certificate-creation
# src/gns/gnunet-gns-proxy-setup-ca
@@ -20,6 +26,8 @@ PLIST_VARS+= linuxfreebsd
.if !empty(PKG_OPTIONS:Mtests)
.include "../../lang/python/tool.mk"
PYTHON_FOR_BUILD_ONLY= yes
+.else
+CONFIGURE_ARGS+= --disable-tests
.endif
.if !empty(PKG_OPTIONS:Mdoc)
@@ -65,43 +73,60 @@ CONFIGURE_ARGS+= --without-jansson
.if !empty(PKG_OPTIONS:Msqlite3)
.include "../../databases/sqlite3/buildlink3.mk"
PLIST.sqlite3= yes
+.else
+CONFIGURE_ARGS+= --without-sqlite3
.endif
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
PLIST.mysql= yes
+.else
+CONFIGURE_ARGS+= --without-mysql
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
PLIST.pgsql= yes
+.else
+CONFIGURE_ARGS+= --without-postgres
.endif
.if !empty(PKG_OPTIONS:Mexperimental)
-.include "../../math/glpk/buildlink3.mk"
CONFIGURE_ARGS+= --enable-experimental
PLIST.experimental= yes
+.else
+CONFIGURE_ARGS+= --disable-experimental
.endif
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-.include "../../audio/pulseaudio/buildlink3.mk"
-PLIST.conversations= yes
-.endif
-
+# conversation submodule. if gstreamer + opus + ogg
+# exists, pulseaudio is not necessary.
.if !empty(PKG_OPTIONS:Mopus)
.include "../../audio/libopus/buildlink3.mk"
PLIST.conversations= yes
+.else
+CONFIGURE_ARGS+= --without-libopus
.endif
.if !empty(PKG_OPTIONS:Mogg)
.include "../../multimedia/libogg/buildlink3.mk"
PLIST.conversations= yes
+.else
+CONFIGURE_ARGS+= --without-libogg
.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
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+PLIST.conversations= yes
+.else
+CONFIGURE_ARGS+= --without-libpulse
.endif
# FIXME: It would be good to provide a build of gnunet against
@@ -116,8 +141,11 @@ PLIST.conversations= yes
.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mbluez)
# Do we need more for bluez?
+# the switch will be valid starting with 0.11.7 release
.include "../../wip/bluez-libs/buildlink3.mk"
PLIST.bluez= yes
+.else
+CONFIGURE_ARGS+= --without-libbluetooth
.endif
.if ${OPSYS} == "Linux"
diff --git a/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh b/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh
new file mode 100644
index 0000000000..89e7ff5b07
--- /dev/null
+++ b/gnunet/patches/patch-src_gns_test_plugin_rest_gns.sh
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 0000000000..c2a6c22b9f
--- /dev/null
+++ b/gnunet/patches/patch-src_namestore_test_plugin_rest_gns.sh
@@ -0,0 +1,33 @@
+$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
Home |
Main Index |
Thread Index |
Old Index