libgnunetchat

commit 2d03fc53f848d4575ba542188102174705575be9
parent 4c8c42477dd927029de0b8dd0b6c7c556ff8e774
Author: Jacki <jacki@thejackimonster.de>
Date:   Wed,  7 May 2025 16:25:04 +0200

Merge branch 'master' into dev/thejackimonster/messenger

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
M
.github/workflows/linux.yml
 | 
8
++++----
M
ChangeLog
 | 
9
+++++++++
M
Doxyfile
 | 
2
+-
M
include/gnunet/gnunet_chat_lib.h
 | 
2
+-
M
meson.build
 | 
2
+-
M
tests/test_gnunet_chat.h
 | 
6
+++++-
M
tools/gnunet_chat_lib_uml.c
 | 
4
++++
M
tools/gnunet_messenger_uml.c
 | 
4
++++

8 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Install dependencies (framework)
         run: |
-          sudo apt-get -qq install automake autoconf autopoint gcc gettext recutils uncrustify yapf3
+          sudo apt-get -qq install meson ninja-build gcc gettext recutils uncrustify yapf3
           sudo apt-get -qq install python3-sphinx python3-sphinx-multiversion python3-sphinx-rtd-theme
           sudo apt-get -qq install libgcrypt20-dev libjansson-dev libsodium-dev libcurl4-gnutls-dev libidn2-dev libunistring-dev libsqlite3-dev libmicrohttpd-dev libltdl-dev
 
@@ -27,9 +27,9 @@ jobs:
         run: |
           cd gnunet
           ./bootstrap
-          ./configure --prefix=/usr --disable-documentation
-          make -j $(nproc)
-          sudo make install
+          meson setup --prefix=/usr --libdir=lib build
+          meson compile -C build
+          sudo meson install -C build
           cd ..
 
       - name: Checkout the current branch
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+## Version 0.5.3
+* Fix build incompatibility with meson build from GNUnet
+
+## Version 0.5.2
+* Implement iteration of tags by chat contact
+* Adjust types and API to improve consistency
+* Add more test cases and fix some older test cases
+* Adjust IV derivation for file encryption/decryption key
+
 ## Version 0.5.1
 * Fixes discourses stalling application on exit of its process.
 * Fixes comparison of egos for proper account management.
diff --git a/Doxyfile b/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = libgnunetchat
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.5.1-8-g8c659dc
+PROJECT_NUMBER         = 0.5.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/include/gnunet/gnunet_chat_lib.h b/include/gnunet/gnunet_chat_lib.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021--2024 GNUnet e.V.
+   Copyright (C) 2021--2025 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
diff --git a/meson.build b/meson.build
@@ -37,7 +37,7 @@ gnunetchat_deps = [
     dependency('gnunetarm'),
     dependency('gnunetfs'),
     dependency('gnunetgns'),
-#   dependency('gnunetgnsrecord'),
+    dependency('gnunetgnsrecord'),
     dependency('gnunetidentity'),
     dependency('gnunetmessenger'),
     dependency('gnunetnamestore'),
diff --git a/tests/test_gnunet_chat.h b/tests/test_gnunet_chat.h
@@ -188,15 +188,19 @@ task_##test_call (void *cls,                                     \
 #define __CALL_GNUNET_TEST_TASK(test_call)             \
 {                                                      \
   enum GNUNET_GenericReturnValue result;               \
+  const struct GNUNET_OS_ProjectData *data;            \
   struct GNUNET_GETOPT_CommandLineOption options[] = { \
     GNUNET_GETOPT_OPTION_END                           \
   };                                                   \
                                                        \
+  data = GNUNET_OS_project_data_gnunet ();             \
+                                                       \
   char *binary = #test_call;                           \
-  char *const args [] = { binary };                    \
+  char *const args [] = { binary };                \
                                                        \
   fprintf(stdout, "Running: %s\n", binary);            \
   result = GNUNET_PROGRAM_run(                         \
+    data,                                              \
     1,                                                 \
     args,                                              \
     binary,                                            \
diff --git a/tools/gnunet_chat_lib_uml.c b/tools/gnunet_chat_lib_uml.c
@@ -233,6 +233,9 @@ main (int argc,
   struct GNUNET_CHAT_Tool tool;
   memset(&tool, 0, sizeof(tool));
 
+  const struct GNUNET_OS_ProjectData *data;
+  data = GNUNET_OS_project_data_gnunet ();
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_string(
       'a',
@@ -261,6 +264,7 @@ main (int argc,
   printf("@startuml\n");
 
   enum GNUNET_GenericReturnValue result = GNUNET_PROGRAM_run(
+    data,
     argc,
     argv,
     "libgnunetchat_uml",
diff --git a/tools/gnunet_messenger_uml.c b/tools/gnunet_messenger_uml.c
@@ -467,6 +467,9 @@ main (int argc,
   struct GNUNET_MESSENGER_Tool tool;
   memset(&tool, 0, sizeof(tool));
 
+  const struct GNUNET_OS_ProjectData *data;
+  data = GNUNET_OS_project_data_gnunet ();
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_string(
       'e',
@@ -508,6 +511,7 @@ main (int argc,
   tool.map = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
 
   enum GNUNET_GenericReturnValue result = GNUNET_PROGRAM_run(
+    data,
     argc,
     argv,
     "gnunet_messenger_uml",