[gnunet] branch master updated (cef6317f1 -> eeff7e335)

[gnunet]

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

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from cef6317f1 Merge branch 'master' of ssh://gnunet.org/gnunet
     new 00f935e43 -fix build reclaim
     new 87def80f1 - unconditionally build dlog
     new eeff7e335 -towards #6851: autotools 2.70

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                 | 23 ++------
 po/POTFILES.in                               |  2 +
 src/include/platform.h                       |  8 +--
 src/reclaim/plugin_reclaim_credential_pabc.c | 82 +++-------------------------
 src/util/Makefile.am                         | 17 ++----
 5 files changed, 20 insertions(+), 112 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4a2f148ff..b82a72fec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@
 # Process this file with autoconf to produce a configure script.
 #
 #
-AC_PREREQ(2.61)
+AC_PREREQ([2.71])
 # Checks for programs.
-AC_INIT([gnunet], [0.14.1], [bug-gnunet@gnu.org])
+AC_INIT([gnunet],[0.14.1],[bug-gnunet@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 
 # check for legacy option that is no longer supported (#5627) and fail hard
@@ -35,14 +35,13 @@ AC_ARG_WITH(nssdir,
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AM_DEFAULT_VERBOSITY=1 
AC_SUBST(AM_DEFAULT_VERBOSITY)])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_AWK
-AC_PROG_CC_C99
+AC_PROG_CC
 AC_PROG_OBJC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -416,16 +415,7 @@ gcrypt=0
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.6.0
 
-# Check if we have libgcrypt >= 1.9. Some things do not work with it
-gcrypt19=0
-AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:1.9.0",
-  [AC_MSG_WARN(["Some subsystems do not work with gcrypt >=1.9.0"])
-   gcrypt=1
-   gcrypt19=1],
-  [AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)]
-)
-AM_CONDITIONAL(HAVE_NOLIBGCRYPT19,
-               [test "$gcrypt19" = 0])
+AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
 AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]])
 
 AS_IF([test $gcrypt = 0],
@@ -1323,7 +1313,6 @@ LIBS=$SAVE_LIBS
 
 # Checks for standard header files.
 AC_HEADER_DIRENT
-AC_HEADER_STDC
 
 # Check for headers that are ALWAYS required
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h 
string.h unistd.h stdarg.h signal.h locale.h sys/stat.h 
sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers 
files: fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h string.h 
unistd.h stdarg.h signal.h locale.h sys/stat.h sys/types.h]))
@@ -1544,7 +1533,8 @@ AM_GNU_GETTEXT_VERSION([0.18.1])
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_MODE_T
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+
 AC_HEADER_STAT
 AC_HEADER_STDBOOL
 AC_STRUCT_TM
@@ -1580,7 +1570,6 @@ AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_CHOWN
 
-AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dd36b7411..36f5e7734 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -313,6 +313,7 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
+src/reclaim/test.c
 src/regex/gnunet-daemon-regexprofiler.c
 src/regex/gnunet-regex-profiler.c
 src/regex/gnunet-regex-simulation-profiler.c
@@ -497,6 +498,7 @@ src/util/bandwidth.c
 src/util/benchmark.c
 src/util/bio.c
 src/util/buffer.c
+src/util/child_management.c
 src/util/client.c
 src/util/common_allocation.c
 src/util/common_endian.c
diff --git a/src/include/platform.h b/src/include/platform.h
index 355bf0051..32bb637f1 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -109,16 +109,10 @@
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
-#include <time.h>
-#endif
 #endif
+#include <time.h>
 #ifdef BSD
 #include <net/if.h>
 #endif
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c 
b/src/reclaim/plugin_reclaim_credential_pabc.c
index 2f6b7b8c4..89acd9032 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/reclaim/plugin_reclaim_credential_pabc.c
@@ -228,50 +228,6 @@ pabc_parse_attributes_p (void *cls,
   return pabc_parse_attributes (cls, cred->data, cred->data_size);
 }
 
-struct Finder
-{
-  const char* target;
-  char *result;
-};
-
-static void
-find_attr (char const *const key,
-                char const *const value,
-                void *ctx)
-{
-  struct Finder *fdr = ctx;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Found `%s', looking for `%s'\n",
-              key, fdr->target);
-  if (0 == strcmp (key, fdr->target))
-    fdr->result = GNUNET_strdup (value);
-}
-
-
-
-/**
- * Parse a pabc and return an attribute value.
- *
- * @param cls the plugin
- * @param data the pabc credential data
- * @param data_size the pabc credential size
- * @param skey the attribute key to look for.
- * @return a string, containing the isser
- */
-char *
-pabc_get_attribute (void *cls,
-                    const char *data,
-                    size_t data_size,
-                    const char *skey)
-{
-
-  struct Finder fdr;
-  memset (&fdr, 0, sizeof (fdr));
-  fdr.target = skey;
-  pabc_cred_inspect_credential (data, &find_attr, &fdr);
-  return fdr.result;
-}
-
 
 /**
  * Parse a pabc and return the issuer
@@ -294,22 +250,6 @@ pabc_get_issuer (void *cls,
 }
 
 
-/**
- * Parse a pabc and return the issuer
- *
- * @param cls the plugin
- * @param cred the pabc credential
- * @return a string, containing the isser
- */
-char*
-pabc_get_issuer (void *cls,
-                 const char *data,
-                 size_t data_size)
-{
-  return pabc_get_attribute (cls, data, data_size, "issuer");
-}
-
-
 /**
  * Parse a pabc and return the issuer
  *
@@ -351,27 +291,19 @@ pabc_get_issuer_p (void *cls,
  * @param cred the pabc credential
  * @return a string, containing the isser
  */
-int
+enum GNUNET_GenericReturnValue
 pabc_get_expiration (void *cls,
                      const char *data,
                      size_t data_size,
                      struct GNUNET_TIME_Absolute *exp)
 {
-  json_t *json_root;
-  json_t *json_attrs;
-  json_t *value;
-  json_t *exp_j;
-  json_error_t *json_err = NULL;
-  const char*key;
-
-  json_root = json_loads (data, JSON_DECODE_ANY, json_err);
-  if ((NULL == json_root) ||
-      (! json_is_object (json_root)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to retrive expiration from credential\n");
+  char *exp_str;
+  uint64_t exp_i;
+
+  if (PABC_OK != pabc_cred_get_attr_by_name_from_cred (data,
+                                                       "expiration",
+                                                       &exp_str))
     return GNUNET_SYSERR;
-  }
 
   if (1 != sscanf (exp_str, "%llu", &exp_i))
   {
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index f05fc7bf7..72fd37bde 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,10 +25,8 @@ if ENABLE_BENCHMARK
   PTHREAD = -lpthread
 endif
 
-if HAVE_NOLIBGCRYPT19
-  DLOG = crypto_ecc_dlog.c
-  DLOG_TEST = test_crypto_ecc_dlog
-endif
+DLOG = crypto_ecc_dlog.c
+DLOG_TEST = test_crypto_ecc_dlog
 
 gnunet_config_diff_SOURCES = \
  gnunet-config-diff.c
@@ -259,11 +257,8 @@ if HAVE_BENCHMARKS
   perf_crypto_asymmetric \
   perf_malloc \
   perf_mq \
-  perf_scheduler
-
-if HAVE_NOLIBGCRYPT19
-  BENCHMARKS += perf_crypto_ecc_dlog
-endif
+  perf_scheduler \
+  perf_crypto_ecc_dlog
 endif
 
 if HAVE_SSH_KEY
@@ -456,14 +451,12 @@ test_crypto_eddsa_LDADD = \
  libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
 
-if HAVE_NOLIBGCRYPT19
 test_crypto_ecc_dlog_SOURCES = \
  test_crypto_ecc_dlog.c
 test_crypto_ecc_dlog_LDADD = \
  -lsodium \
  libgnunetutil.la \
  $(LIBGCRYPT_LIBS)
-endif
 
 test_crypto_ecdhe_SOURCES = \
  test_crypto_ecdhe.c
@@ -606,13 +599,11 @@ perf_crypto_hash_SOURCES = \
 perf_crypto_hash_LDADD = \
  libgnunetutil.la
 
-if HAVE_NOLIBGCRYPT19
 perf_crypto_ecc_dlog_SOURCES = \
  perf_crypto_ecc_dlog.c
 perf_crypto_ecc_dlog_LDADD = \
  libgnunetutil.la \
  -lsodium
-endif
 
 perf_crypto_rsa_SOURCES = \
  perf_crypto_rsa.c

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