gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] 02/03: Merge branch 'master' of ssh://gnunet.org/gnunet


From: gnunet
Subject: [gnunet] 02/03: Merge branch 'master' of ssh://gnunet.org/gnunet
Date: Tue, 05 Jan 2021 17:40:27 +0100

This is an automated email from the git hooks/post-receive script.

t3sserakt pushed a commit to branch master
in repository gnunet.

commit fac97cea47df432d6418e0399e799e47057e89d7
Merge: 5affc9ad0 fd30e4bf7
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Tue Jan 5 13:35:49 2021 +0100

    Merge branch 'master' of ssh://gnunet.org/gnunet

 .buildbot/build.sh                                 |    3 +-
 debian/changelog                                   | 1484 ++++++++++++++++++++
 debian/control                                     |  115 ++
 debian/copyright                                   |  743 ++++++++++
 .../X11/xinit/xinitrc.d/80-gnunet-user-services    |   48 +
 debian/etc/gnunet.conf                             |    9 +
 debian/etc/skel/.config/gnunet.conf                |   10 +
 .../.config/systemd/gnunet-user-gns-proxy.service  |   10 +
 .../skel/.config/systemd/gnunet-userpeer.service   |    9 +
 debian/gnunet.README.Debian                        |   16 +
 debian/gnunet.config                               |   22 +
 debian/gnunet.dirs                                 |    2 +
 debian/gnunet.docs                                 |    1 +
 debian/gnunet.install                              |   15 +
 debian/gnunet.links                                |    1 +
 debian/gnunet.lintian-overrides                    |    3 +
 debian/gnunet.logrotate                            |   10 +
 debian/gnunet.postinst                             |  309 ++++
 debian/gnunet.postrm                               |  103 ++
 debian/gnunet.preseed                              |    7 +
 debian/gnunet.service                              |   12 +
 debian/gnunet.templates                            |   45 +
 debian/libgnunet-dev.docs                          |    2 +
 debian/libgnunet-dev.install                       |    3 +
 debian/libgnunet.install                           |    6 +
 debian/patches/series                              |    1 +
 debian/po/POTFILES.in                              |    1 +
 debian/po/cs.po                                    |   80 ++
 debian/po/da.po                                    |   80 ++
 debian/po/de.po                                    |   83 ++
 debian/po/es.po                                    |   88 ++
 debian/po/fi.po                                    |   82 ++
 debian/po/fr.po                                    |   86 ++
 debian/po/gl.po                                    |   79 ++
 debian/po/it.po                                    |   84 ++
 debian/po/ja.po                                    |   79 ++
 debian/po/nl.po                                    |   83 ++
 debian/po/pt.po                                    |   81 ++
 debian/po/pt_BR.po                                 |   86 ++
 debian/po/ru.po                                    |   87 ++
 debian/po/sv.po                                    |   80 ++
 debian/po/templates.pot                            |   74 +
 debian/po/vi.po                                    |   84 ++
 debian/rules                                       |   52 +
 debian/source/format                               |    1 +
 debian/source/options                              |    3 +
 debian/upstream/metadata                           |    4 +
 debian/upstream/signing-key.asc                    |  637 +++++++++
 debian/watch                                       |    3 +
 doc/handbook/chapters/configuration.texi           |   74 +-
 doc/handbook/chapters/installation.texi            |    5 +-
 doc/handbook/chapters/user.texi                    |   66 +-
 doc/handbook/gnunet.texi                           |   10 +-
 doc/man/gnunet-scrypt.1                            |  125 +-
 doc/man/produce_html.sh.in                         |    2 +-
 po/POTFILES.in                                     |  105 +-
 src/fs/gnunet-search.c                             |   15 +-
 src/fs/test_fs_download.c                          |    7 +-
 src/fs/test_fs_file_information.c                  |    6 +-
 src/fs/test_fs_list_indexed.c                      |    6 +-
 src/fs/test_fs_publish.c                           |    6 +-
 src/fs/test_fs_publish_persistence.c               |    6 +-
 src/fs/test_fs_unindex.c                           |    3 +-
 src/fs/test_fs_unindex_persistence.c               |    3 +-
 src/gns/test_gnunet_gns.sh.in                      |    2 +-
 src/gns/test_proxy.sh                              |    8 +-
 src/gnsrecord/Makefile.am                          |    2 +
 src/identity/gnunet-service-identity.c             |    6 +-
 src/include/gnunet_common.h                        |    4 +-
 src/include/gnunet_configuration_lib.h             |   59 +-
 src/include/gnunet_crypto_lib.h                    |   30 +-
 src/include/gnunet_disk_lib.h                      |   54 +-
 src/include/gnunet_scheduler_lib.h                 |   12 +-
 src/namecache/Makefile.am                          |    1 +
 src/namestore/Makefile.am                          |   65 +-
 src/nse/gnunet-service-nse.c                       |   23 +-
 src/peerinfo-tool/gnunet-peerinfo.c                |   15 +-
 src/peerinfo/gnunet-service-peerinfo.c             |   31 +-
 src/pq/pq_connect.c                                |    4 +-
 src/reclaim/gnunet-service-reclaim.c               |  411 ++++--
 src/reclaim/gnunet-service-reclaim_tickets.c       |    1 +
 src/reclaim/json_reclaim.c                         |    8 +-
 src/reclaim/oidc_helper.c                          |   73 +-
 src/reclaim/plugin_reclaim_attribute_basic.c       |    2 +-
 src/reclaim/plugin_reclaim_credential_jwt.c        |   88 +-
 src/reclaim/plugin_rest_openid_connect.c           |   41 +-
 src/reclaim/plugin_rest_reclaim.c                  |    2 +
 src/reclaim/reclaim_attribute.c                    |   31 +
 src/reclaim/reclaim_credential.c                   |   36 +-
 src/reclaim/test_reclaim_consume.sh                |    6 +-
 src/reclaim/test_reclaim_issue.sh                  |    2 +-
 src/reclaim/test_reclaim_revoke.sh                 |   10 +-
 src/revocation/gnunet-revocation.c                 |   21 +-
 src/scalarproduct/test_scalarproduct.sh            |    4 +-
 src/scalarproduct/test_scalarproduct_negative.sh   |    4 +-
 .../test_scalarproduct_negativezero.sh             |    4 +-
 src/testbed/gnunet_mpi_test.c                      |    3 +-
 src/topology/friends.c                             |    9 -
 src/transport/Makefile.am                          |    6 +-
 src/transport/gnunet-communicator-udp.c            |   89 +-
 src/transport/test_communicator_basic.c            |  149 +-
 src/util/Makefile.am                               |    2 +-
 src/util/configuration.c                           |  472 ++-----
 src/util/crypto_ecc.c                              |  251 +---
 src/util/crypto_ecc_setup.c                        |  118 +-
 src/util/crypto_rsa.c                              |  181 +--
 src/util/disk.c                                    |  561 ++------
 src/util/gnunet-scrypt.c                           |   15 +-
 src/util/network.c                                 |   31 +-
 src/util/os_installation.c                         |   23 +-
 src/util/plugin.c                                  |   71 +-
 src/util/test_disk.c                               |    4 +-
 112 files changed, 6561 insertions(+), 1929 deletions(-)

diff --cc src/transport/test_communicator_basic.c
index 0eeaecb6c,ea1a7b1fb..1f85a9895
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@@ -342,24 -341,27 +345,26 @@@ long_test_cb (void *cls
  
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "long_test_cb %u/%u\n",
-        num_sent_long,
-        num_received_long);
+        (unsigned int) num_sent_long,
+        (unsigned int) num_received_long);
    payload = make_payload (long_message_size);
    num_sent_long++;
 -  GNUNET_TRANSPORT_TESTING_transport_communicator_send (
 -    my_tc,
 -    ((BURST_PACKETS * 0.91 == num_received_long) ||
 -     (BURST_PACKETS == num_sent_long))
 -    ? NULL
 -    : &long_test,
 -    NULL,
 -    payload,
 -    long_message_size);
 +  GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
 +                                                        (BURST_PACKETS ==
 +                                                         num_sent_long)
 +                                                        ? NULL
 +                                                        : &long_test,
 +                                                        NULL,
 +                                                        payload,
 +                                                        long_message_size);
    GNUNET_free (payload);
-   timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (
-                                                 GNUNET_TIME_UNIT_SECONDS,
-                                                 TIMEOUT_MULTIPLIER));
+   timeout = GNUNET_TIME_relative_to_absolute (
+     GNUNET_TIME_relative_multiply (
+       GNUNET_TIME_UNIT_SECONDS,
+       TIMEOUT_MULTIPLIER));
  }
  
+ 
  static void
  long_test (void *cls)
  {
@@@ -381,18 -385,19 +388,18 @@@ short_test_cb (void *cls
  
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "short_test_cb %u/%u\n",
-        num_sent_short,
-        num_received_short);
+        (unsigned int) num_sent_short,
+        (unsigned int) num_received_short);
    payload = make_payload (SHORT_MESSAGE_SIZE);
    num_sent_short++;
 -  GNUNET_TRANSPORT_TESTING_transport_communicator_send (
 -    my_tc,
 -    ( (BURST_PACKETS * 0.91 == num_received_short) ||
 -      (BURST_PACKETS == num_sent_short) )
 -    ? NULL
 -    : &short_test,
 -    NULL,
 -    payload,
 -    SHORT_MESSAGE_SIZE);
 +  GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
 +                                                        (BURST_PACKETS ==
 +                                                         num_sent_short)
 +                                                        ? NULL
 +                                                        : &short_test,
 +                                                        NULL,
 +                                                        payload,
 +                                                        SHORT_MESSAGE_SIZE);
    GNUNET_free (payload);
    timeout = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (
                                                  GNUNET_TIME_UNIT_SECONDS,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]