aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authort3sserakt <t3ss@posteo.de>2023-02-05 11:20:10 +0100
committert3sserakt <t3ss@posteo.de>2023-02-05 11:20:10 +0100
commit54638eb127fa967972bdbc7e887f12948d037409 (patch)
tree6010f9b85604ee5727ef9272afbe897bf24521f9
parenta7ed3578f84d98fba07e0da8999bff9cbed54d98 (diff)
parent6b0475afe46431f55cf6588bc9add529f9a0c773 (diff)
downloadgnunet-54638eb127fa967972bdbc7e887f12948d037409.tar.gz
gnunet-54638eb127fa967972bdbc7e887f12948d037409.zip
Merge branch 'master' of ssh://git.gnunet.org/gnunet
-rw-r--r--configure.ac18
-rwxr-xr-xcontrib/conf/prepare-commit-msg2
m---------contrib/gana0
m---------contrib/sphinx0
-rw-r--r--pkgconfig/Makefile.am2
-rw-r--r--pkgconfig/gnunetmessenger.pc.in6
-rw-r--r--src/include/gnunet_mysql_compat.h.in (renamed from src/include/gnunet_mysql_compat.h)12
-rw-r--r--src/util/configuration.c24
8 files changed, 44 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 7ba1d27a7..2bc9d0f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,6 +935,22 @@ AC_ARG_WITH([mysql],
935AC_SUBST(MYSQL_LDFLAGS) 935AC_SUBST(MYSQL_LDFLAGS)
936AC_SUBST(MYSQL_CPPFLAGS) 936AC_SUBST(MYSQL_CPPFLAGS)
937 937
938mysql_bool="bool"
939# check for my_bool
940AS_IF([test "x$mysql" = "xtrue"],
941 [AC_MSG_CHECKING([for my_bool])
942 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
943 [[#include <mysql/mysql.h>]],
944 [[#ifndef my_bool
945#no my_bool found
946#endif]])],
947 [AC_MSG_RESULT([yes])
948 mysql_bool="my_bool"],
949 [AC_MSG_RESULT([no])
950 mysql_bool="bool"])])
951
952AC_SUBST([mysql_bool])
953
938# additional version checks for mysql 954# additional version checks for mysql
939AS_IF([test "x$mysql" = "xtrue"], 955AS_IF([test "x$mysql" = "xtrue"],
940 [AC_MSG_CHECKING([for mysql version]) 956 [AC_MSG_CHECKING([for mysql version])
@@ -1329,6 +1345,7 @@ src/identity/Makefile
1329src/identity/identity.conf 1345src/identity/identity.conf
1330src/include/Makefile 1346src/include/Makefile
1331src/include/gnunet_config.h 1347src/include/gnunet_config.h
1348src/include/gnunet_mysql_compat.h
1332src/integration-tests/Makefile 1349src/integration-tests/Makefile
1333src/json/Makefile 1350src/json/Makefile
1334src/hostlist/Makefile 1351src/hostlist/Makefile
@@ -1410,6 +1427,7 @@ pkgconfig/gnunetfs.pc
1410pkgconfig/gnunetgns.pc 1427pkgconfig/gnunetgns.pc
1411pkgconfig/gnunethello.pc 1428pkgconfig/gnunethello.pc
1412pkgconfig/gnunetidentity.pc 1429pkgconfig/gnunetidentity.pc
1430pkgconfig/gnunetmessenger.pc
1413pkgconfig/gnunetmicrophone.pc 1431pkgconfig/gnunetmicrophone.pc
1414pkgconfig/gnunetmysql.pc 1432pkgconfig/gnunetmysql.pc
1415pkgconfig/gnunetnamestore.pc 1433pkgconfig/gnunetnamestore.pc
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
index 8acca9e38..a95f29430 100755
--- a/contrib/conf/prepare-commit-msg
+++ b/contrib/conf/prepare-commit-msg
@@ -27,7 +27,7 @@ done
27if [ -z "$COMMIT_SOURCE" ]; 27if [ -z "$COMMIT_SOURCE" ];
28then 28then
29 hint=$(cat "$COMMIT_MSG_FILE") 29 hint=$(cat "$COMMIT_MSG_FILE")
30 echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." >> "$COMMIT_MSG_FILE" 30 echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." > "$COMMIT_MSG_FILE"
31 if [ $RET = 1 ]; 31 if [ $RET = 1 ];
32 then 32 then
33 echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE" 33 echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE"
diff --git a/contrib/gana b/contrib/gana
Subproject 66228b8a4306f028d843d78fbfcca54260539ff Subproject 79163ab6ea6f6cfe7f4311f91fb45c747b8c33d
diff --git a/contrib/sphinx b/contrib/sphinx
Subproject 9c5b9d9040d21542eff792e26624cf9669b127a Subproject 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 3199a04a4..b00993d0f 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -17,6 +17,7 @@ pcfiles = \
17 gnunethello.pc \ 17 gnunethello.pc \
18 gnunetidentity.pc \ 18 gnunetidentity.pc \
19 gnunetcadet.pc \ 19 gnunetcadet.pc \
20 gnunetmessenger.pc \
20 gnunetmicrophone.pc \ 21 gnunetmicrophone.pc \
21 gnunetmysql.pc \ 22 gnunetmysql.pc \
22 gnunetnamestore.pc \ 23 gnunetnamestore.pc \
@@ -59,6 +60,7 @@ EXTRA_DIST = \
59 gnunethello.pc.in \ 60 gnunethello.pc.in \
60 gnunetidentity.pc.in \ 61 gnunetidentity.pc.in \
61 gnunetcadet.pc.in \ 62 gnunetcadet.pc.in \
63 gnunetmessenger.pc.in \
62 gnunetmicrophone.pc.in \ 64 gnunetmicrophone.pc.in \
63 gnunetmysql.pc.in \ 65 gnunetmysql.pc.in \
64 gnunetnamestore.pc.in \ 66 gnunetnamestore.pc.in \
diff --git a/pkgconfig/gnunetmessenger.pc.in b/pkgconfig/gnunetmessenger.pc.in
index 465663d0c..126aae737 100644
--- a/pkgconfig/gnunetmessenger.pc.in
+++ b/pkgconfig/gnunetmessenger.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: GNUnet MESSENGER 6Name: GNUnet MESSENGER
7Description: Instant messaging based on the CADET subsystem 7Description: Provides API to access the GNUnet Messenger subsystem
8URL: https://gnunet.org 8URL: http://gnunet.org
9Version: @VERSION@ 9Version: @VERSION@
10Requires: 10Requires:
11Libs: -L${libdir} -lgnunetmessenger_common -lgnunetmessenger 11Libs: -L${libdir} -lgnunetmessenger
12Cflags: -I${includedir} 12Cflags: -I${includedir}
diff --git a/src/include/gnunet_mysql_compat.h b/src/include/gnunet_mysql_compat.h.in
index 9fb9db30f..6218386aa 100644
--- a/src/include/gnunet_mysql_compat.h
+++ b/src/include/gnunet_mysql_compat.h.in
@@ -22,6 +22,8 @@
22 * 22 *
23 * @file 23 * @file
24 * MySQL/MariaDB compatibility insanity helper header 24 * MySQL/MariaDB compatibility insanity helper header
25 * Note: gnunet_mysql_compat.h is AUTOGENERATED from gnunet_mysql_compat.h.in
26 * Please do not modify or commit gnunet_mysql_compat.h
25 * 27 *
26 * @defgroup mysql MySQL library 28 * @defgroup mysql MySQL library
27 * Helper library to access a MySQL database. 29 * Helper library to access a MySQL database.
@@ -41,15 +43,7 @@ extern "C"
41#endif 43#endif
42#endif 44#endif
43 45
44#ifndef LIBMARIADB 46#define MYSQL_BOOL @mysql_bool@
45#if MYSQL_VERSION_ID >= 80000
46#define MYSQL_BOOL bool
47#else
48#define MYSQL_BOOL my_bool /* MySQL < 8 wants this */
49#endif
50#else
51#define MYSQL_BOOL my_bool /* MariaDB still uses my_bool */
52#endif
53 47
54#if 0 /* keep Emacsens' auto-indent happy */ 48#if 0 /* keep Emacsens' auto-indent happy */
55{ 49{
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 1a66458db..b7ca377a9 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -801,7 +801,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
801 *end = '\0'; 801 *end = '\0';
802 directive = line + 1; 802 directive = line + 1;
803 803
804 if (0 == strcasecmp (directive, "INLINE")) 804 if (0 == strcasecmp (directive,
805 "INLINE"))
805 { 806 {
806 const char *path = end + 1; 807 const char *path = end + 1;
807 808
@@ -816,7 +817,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
816 source_filename, 817 source_filename,
817 nr); 818 nr);
818 } 819 }
819 else if (0 == strcasecmp (directive, "INLINE-MATCHING")) 820 else if (0 == strcasecmp (directive,
821 "INLINE-MATCHING"))
820 { 822 {
821 const char *path = end + 1; 823 const char *path = end + 1;
822 824
@@ -831,7 +833,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
831 source_filename, 833 source_filename,
832 nr); 834 nr);
833 } 835 }
834 else if (0 == strcasecmp (directive, "INLINE-SECRET")) 836 else if (0 == strcasecmp (directive,
837 "INLINE-SECRET"))
835 { 838 {
836 char *secname = end + 1; 839 char *secname = end + 1;
837 char *secname_end; 840 char *secname_end;
@@ -881,7 +884,8 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
881 } 884 }
882 continue; 885 continue;
883 } 886 }
884 if (('[' == line[0]) && (']' == line[line_size - 1])) 887 if ( ('[' == line[0]) &&
888 (']' == line[line_size - 1]) )
885 { 889 {
886 /* [value] */ 890 /* [value] */
887 line[line_size - 1] = '\0'; 891 line[line_size - 1] = '\0';
@@ -923,18 +927,24 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
923 927
924 /* remove quotes */ 928 /* remove quotes */
925 i = 0; 929 i = 0;
926 if (('"' == value[0]) && ('"' == value[strlen (value) - 1])) 930 if ( ('"' == value[0]) &&
931 ('"' == value[strlen (value) - 1]) )
927 { 932 {
928 value[strlen (value) - 1] = '\0'; 933 value[strlen (value) - 1] = '\0';
929 value++; 934 value++;
930 } 935 }
931 GNUNET_CONFIGURATION_set_value_string (cfg, section, tag, &value[i]); 936 GNUNET_CONFIGURATION_set_value_string (cfg,
937 section,
938 tag,
939 &value[i]);
932 if (cfg->diagnostics) 940 if (cfg->diagnostics)
933 { 941 {
934 set_entry_hint (cfg, 942 set_entry_hint (cfg,
935 section, 943 section,
936 tag, 944 tag,
937 source_filename ? source_filename : "<input>", 945 source_filename
946 ? source_filename
947 : "<input>",
938 nr); 948 nr);
939 } 949 }
940 GNUNET_free (tag); 950 GNUNET_free (tag);