[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 02/02: merge
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 02/02: merge |
|
Date: |
Thu, 09 Aug 2018 16:43:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 5b7ed686d4a6c4ecb8e0302a42e85bb9bff42cac
Merge: 7caba0601 c1d682ec3
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Aug 9 16:43:47 2018 +0200
merge
Dockerfile | 102 ++
Makefile.am | 7 +-
README | 8 +-
README.md | 268 ++++
configure.ac | 6 +-
contrib/.gitignore | 1 -
contrib/Makefile.am | 11 -
contrib/branding/logo/gnunet-logo-dark-text.svg | 1411 ++++++++++++++++++++
contrib/gnunet-arch-full.svg | 648 +++++++++
contrib/packages/guix/notest-guix-env.scm | 145 ++
contrib/services/shepherd/ng0_wip/.gitignore | 1 -
.../00001-gnu-services-Add-gnunet-service.patch | 186 ---
.../0001-gnu-services-Add-gnunet-service.patch | 225 ----
.../001-gnu-services-Add-gnunet-service.patch | 204 ---
contrib/services/shepherd/ng0_wip/README | 11 -
contrib/services/shepherd/ng0_wip/gnunet.scm | 173 ---
.../shepherd/ng0_wip/janneke-os-modified.scm | 62 -
doc/documentation/Makefile.am | 5 +-
doc/documentation/agpl-3.0.texi | 698 ++++++++++
doc/documentation/chapters/contributing.texi | 25 +-
doc/documentation/chapters/developer.texi | 13 +-
doc/documentation/chapters/installation.texi | 129 +-
doc/documentation/chapters/preface.texi | 67 +-
doc/documentation/chapters/user.texi | 364 ++++-
doc/documentation/gnunet.texi | 21 +-
doc/man/Makefile.am | 1 +
doc/man/gnunet-gns.1 | 2 +-
doc/man/gnunet-timeout.1 | 20 +
docker/README.md | 138 ++
docker/docker-entrypoint.sh | 15 +
docker/gnunet.conf | 21 +
po/POTFILES.in | 136 +-
src/Makefile.am | 6 +-
src/arm/test_exponential_backoff.c | 3 +
src/cadet/cadet.conf.in | 2 +-
src/cadet/cadet_api.c | 20 +-
src/cadet/gnunet-cadet.c | 2 +-
src/core/test_core_api_reliability.c | 4 +-
src/core/test_core_quota_compliance.c | 5 +-
src/datacache/plugin_datacache_sqlite.c | 5 +-
src/gns/gns_api.c | 7 +-
src/gns/gnunet-dns2gns.c | 1 +
src/gns/gnunet-gns.c | 10 +-
src/gns/nss/nss_gns.c | 269 ++--
src/gns/nss/nss_gns_query.c | 25 +-
src/gns/nss/nss_gns_query.h | 30 +-
src/gns/plugin_rest_gns.c | 11 +-
src/gnsrecord/plugin_gnsrecord_dns.c | 4 +-
src/identity-provider/identity-token.conf | 2 -
src/identity-provider/jwt.c | 189 ---
src/identity-provider/jwt.h | 9 -
src/identity-provider/test_idp.conf | 33 -
src/identity-provider/test_idp.sh | 31 -
src/identity-provider/test_idp_attribute.sh | 40 -
src/identity-provider/test_idp_consume.sh | 43 -
src/identity-provider/test_idp_issue.sh | 42 -
src/identity-provider/test_idp_revoke.sh | 65 -
src/identity/gnunet-service-identity.c | 49 +-
src/identity/identity_api_lookup.c | 8 +-
src/identity/plugin_rest_identity.c | 7 -
src/include/Makefile.am | 2 +-
src/include/gnunet_abe_lib.h | 2 +-
src/include/gnunet_common.h | 4 +-
src/include/gnunet_crypto_lib.h | 26 +-
src/include/gnunet_dnsparser_lib.h | 53 +
src/include/gnunet_gnsrecord_lib.h | 10 +
src/include/gnunet_protocols.h | 30 +-
...ribute_lib.h => gnunet_reclaim_attribute_lib.h} | 64 +-
..._plugin.h => gnunet_reclaim_attribute_plugin.h} | 24 +-
...y_provider_plugin.h => gnunet_reclaim_plugin.h} | 28 +-
...provider_service.h => gnunet_reclaim_service.h} | 116 +-
src/include/gnunet_signatures.h | 6 +-
src/include/gnunet_strings_lib.h | 8 +-
src/multicast/gnunet-service-multicast.c | 18 +-
src/multicast/test_multicast_multipeer.c | 2 +
src/namestore/gnunet-zoneimport.c | 15 +-
src/namestore/plugin_namestore_flat.c | 65 +-
src/psyc/Makefile.am | 4 +-
.../Makefile.am | 20 +-
.../plugin_reclaim_attribute_gnuid.c} | 22 +-
.../reclaim_attribute.c} | 110 +-
.../reclaim_attribute.h} | 10 +-
src/{identity-provider => reclaim}/.gitignore | 0
src/{identity-provider => reclaim}/Makefile.am | 95 +-
.../gnunet-idp.c => reclaim/gnunet-reclaim.c} | 269 ++--
.../gnunet-service-reclaim.c} | 206 +--
src/reclaim/jwt.c | 1 +
src/reclaim/oidc_helper.c | 440 ++++++
src/reclaim/oidc_helper.h | 109 ++
.../plugin_gnsrecord_reclaim.c} | 12 +-
.../plugin_reclaim_sqlite.c} | 72 +-
.../plugin_rest_openid_connect.c | 787 ++++++-----
.../plugin_rest_reclaim.c} | 118 +-
.../reclaim.conf} | 15 +-
.../identity_provider.h => reclaim/reclaim.h} | 24 +-
.../reclaim_api.c} | 345 +++--
src/reclaim/test_reclaim.sh | 31 +
src/reclaim/test_reclaim_attribute.sh | 40 +
src/reclaim/test_reclaim_consume.sh | 43 +
.../test_reclaim_defaults.conf} | 0
src/reclaim/test_reclaim_issue.sh | 42 +
src/reclaim/test_reclaim_revoke.sh | 65 +
src/rest/Makefile.am | 12 +
src/rest/plugin_rest_copying.c | 231 ++++
src/rps/gnunet-rps-profiler.c | 284 ++--
src/rps/gnunet-service-rps.c | 676 +++++-----
src/rps/gnunet-service-rps_custommap.c | 2 +-
src/rps/rps-test_util.c | 80 +-
src/set/gnunet-service-set_intersection.c | 19 +-
src/set/gnunet-service-set_union.c | 39 +-
src/transport/test_quota_compliance.c | 4 +-
src/transport/test_transport_api_reliability.c | 4 +-
src/util/.gitignore | 4 +
src/util/Makefile.am | 16 +-
src/util/client.c | 13 +-
src/util/crypto_hash.c | 26 +-
src/util/dnsparser.c | 125 +-
src/util/gnunet-service-resolver.c | 1173 ++++++++--------
.../util/gnunet-timeout-w32.c | 6 +-
.../util/gnunet-timeout.c | 82 +-
src/util/resolver.h | 4 +-
src/util/resolver_api.c | 26 +-
src/util/scheduler.c | 189 +--
src/util/strings.c | 39 +-
124 files changed, 8230 insertions(+), 4223 deletions(-)
diff --cc src/set/gnunet-service-set_union.c
index 8c0c52d64,c1268948a..73d3f5c83
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@@ -1379,7 -1399,7 +1399,8 @@@ send_client_done (void *cls
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SET_ResultMessage *rm;
-- if (GNUNET_YES == op->state->client_done_sent) {
++ if (GNUNET_YES == op->state->client_done_sent)
++ {
return;
}
--
To stop receiving notification emails like this one, please contact
address@hidden