[gnunet] branch master updated: build: update sqlite version requirement

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new ee72d1666 build: update sqlite version requirement
ee72d1666 is described below

commit ee72d1666abc24dc3c7f5194c59dbf251d9e56ea
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Dec 8 11:09:37 2023 +0100

    build: update sqlite version requirement
---
 README       |  2 +-
 contrib/gana |  2 +-
 meson.build  | 81 +++++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/README b/README
index 2981a9597..5d69b2c43 100644
--- a/README
+++ b/README
@@ -110,7 +110,7 @@ Direct dependencies of GNUnet:
                                      X.509 certificate
                                      for gnunet-gns-proxy-setup-ca)
 - libltdl            >= 2.2         (part of GNU libtool)
-- sqlite           >= 3.8           (default database, required)
+- sqlite             >= 3.35.0      (default database, required)
 - which                             (contrib/apparmor(?), gnunet-bugreport,
                                      and possibly more)
 - zlib
diff --git a/contrib/gana b/contrib/gana
index 557051695..f5577937d 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 557051695c575b45fb1bfdbacbc69d67c6908425
+Subproject commit f5577937ddfe880a49c8bcfce6e531959d62fdd8
diff --git a/meson.build b/meson.build
index 78c76398d..abffe9b84 100644
--- a/meson.build
+++ b/meson.build
@@ -135,13 +135,32 @@ unistr_dep = dependency('libunistring', required : false)
 if not unistr_dep.found()
   unistr_dep = cc.find_library('unistring', required : true)
 endif
-sqlite_dep = dependency ('sqlite3', required : false)
+sqlite_dep = dependency ('sqlite3', version: '>=3.35.0', required : false)
+# FIXME for fallbacks, we need to manually check version
 if not sqlite_dep.found()
   sqlite_dep = cc.find_library('sqlite3', required : true)
+  sqlite_version_check ='''#include <sqlite3.h>
+  int main(int argc, char **argv) {
+    return (SQLITE_VERSION_NUMBER >= 3035000) ? 0 : 1;
+  }
+  '''
+  if cc.run(sqlite_version_check, name : 'sqlite version check',
+                dependencies: sqlite_dep).returncode() != 0
+    error('Sqlite version >= 3.35.0 requried')
+  endif
 endif
 curl_dep = dependency('libcurl', version: '>=7.85.0', required : false)
 if not curl_dep.found()
   curl_dep = cc.find_library('curl', required : true)
+  curl_version_check ='''#include <curl/curl.h>
+  int main(int argc, char **argv) {
+    return (LIBCURL_VERSION_NUM >= 0x075500) ? 0 : 1;
+    }
+  '''
+  if cc.run(curl_version_check, name : 'cURL version check',
+    dependencies: curl_dep).returncode() != 0
+  error('cURL version >=7.85.0 required')
+endif
 endif
 zlib_dep = dependency('zlib', required : false)
 if not zlib_dep.found()
@@ -304,15 +323,15 @@ endif
 ## END conversation
 
 gnunetdeps = [mhd_dep,
-              sodium_dep,
-              gcrypt_dep,
-              curl_dep,
-              json_dep,
-              zlib_dep,
-              sqlite_dep,
-              unistr_dep, #dependency('libunistring'),
-              ltdl_dep, #dependency('ltdl'),
-              idn_dep]
+  sodium_dep,
+  gcrypt_dep,
+  curl_dep,
+  json_dep,
+  zlib_dep,
+  sqlite_dep,
+  unistr_dep, #dependency('libunistring'),
+  ltdl_dep, #dependency('ltdl'),
+  idn_dep]
 
 add_project_arguments('-DNEED_LIBGCRYPT_VERSION="1.6.0"', language : 'c')
 
@@ -368,19 +387,19 @@ endif
 # GNUTLS DANE
 if cc.check_header('gnutls/dane.h')
   if cc.has_function('dane_verify_crt_raw',
-                     prefix: '#include <gnutls/dane.h>',
-                     dependencies: gnutls_dep)
-    add_project_arguments('-DHAVE_GNUTLS_DANE', language : 'c')
-  endif
+    prefix: '#include <gnutls/dane.h>',
+    dependencies: gnutls_dep)
+  add_project_arguments('-DHAVE_GNUTLS_DANE', language : 'c')
+endif
 endif
 curl_ssl_check ='''#include <curl/curl.h>
   int main(int argc, char **argv) {
     return (CURLSSLSET_OK != curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, 
NULL));
-  }
+    }
   '''
 
 result = cc.run(curl_ssl_check, name : 'cURL gnutls check',
-                dependencies: curl_dep)
+  dependencies: curl_dep)
 cdata.set('curl_gnutls', 0)
 if result.returncode() == 0
   cdata.set('curl_gnutls', 1)
@@ -434,27 +453,27 @@ add_test_setup('default', env: 
['GNUNET_PREFIX='+gnunet_prefix], exclude_suites:
 add_test_setup('full',  env: ['GNUNET_PREFIX='+gnunet_prefix], is_default: 
false)
 
 summary({'host': host_machine.system(),
-         'prefix': get_option('prefix'),
-         'compiler': cc.get_id(),
-         'libdir': get_option('libdir'),
-         'datadir': get_option('datadir'),
-         'default interface': cdata.get('GNUNET_DEFAULT_INTERFACE'),
-         'PostgreSQL': pq_dep.found(),
-         'curl w/ gnutls': (cdata.get('curl_gnutls') == 1),
-         'ifconfig': ifconfig_bin.found(),
-         'iptables': iptables_bin.found()
-        }, section: 'Detected system')
+  'prefix': get_option('prefix'),
+  'compiler': cc.get_id(),
+  'libdir': get_option('libdir'),
+  'datadir': get_option('datadir'),
+  'default interface': cdata.get('GNUNET_DEFAULT_INTERFACE'),
+  'PostgreSQL': pq_dep.found(),
+  'curl w/ gnutls': (cdata.get('curl_gnutls') == 1),
+  'ifconfig': ifconfig_bin.found(),
+  'iptables': iptables_bin.found()
+  }, section: 'Detected system')
 
 if not gnunet_user
   message('Please make sure NOW to create a user and group \'gnunet\' and 
additionally a group \'gnunetdns\'. Make sure that \'/var/lib/gnunet\' is owned 
(and writable) by user \'gnunet\'')
   message('Each user of GNUnet should be added to the \'gnunet\' group')
   if adduser_bin.found() and not gnunet_user
     message('''Create the gnunet user and add users to the gnunetdns group, 
run:
-    # addgroup gnunetdns
-    # adduser --system --disabled-login --home /var/lib/gnunet gnunet''')
+      # addgroup gnunetdns
+      # adduser --system --disabled-login --home /var/lib/gnunet gnunet''')
     message('''To add users to the gnunet group, run:
-             # adduser USERNAME gnunet
-             for each of your users, replacing \'USERNAME\' with the 
respective login name.
-             Users may have to login again for the changes to take effect.''')
+      # adduser USERNAME gnunet
+      for each of your users, replacing \'USERNAME\' with the respective login 
name.
+      Users may have to login again for the changes to take effect.''')
   endif
 endif

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