[gnunet] branch master updated: BUILD: Use deprecated curl defines agian for now.

[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 31782eb2c BUILD: Use deprecated curl defines agian for now.
31782eb2c is described below

commit 31782eb2c5b6e00c2e27587d4ada897714bb63da
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Sep 23 10:51:04 2023 +0200

    BUILD: Use deprecated curl defines agian for now.
---
 contrib/meson.build                          | 23 +++++++++++++++++++++++
 src/hostlist/gnunet-daemon-hostlist_client.c |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/contrib/meson.build b/contrib/meson.build
index 59fb8ef12..92df78a62 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,2 +1,25 @@
 subdir('conf')
 
+install_data(['gns'/'def.tex',
+              'gns'/'gns-bcd.html',
+              'gns'/'gns-bcd.tex',
+              'gns'/'gns-bcd-forbidden.html',
+              'gns'/'gns-bcd-internal-error.html',
+              'gns'/'gns-bcd-invalid-key.html',
+              'gns'/'gns-bcd-not-found.html',
+              'gns'/'gns-bcd-png.tex',
+              'gns'/'gns-bcd-simple.html',
+              'gns'/'gns-bcd-simple.tex',
+              'fcfsd'/'fcfsd-index.html',
+              'fcfsd'/'fcfsd-forbidden.html',
+              'fcfsd'/'fcfsd-notfound.html',
+              'branding'/'logo'/'gnunet-logo.png',
+              'branding'/'logo'/'gnunet-logo-dark-text.svg',
+              'branding'/'logo'/'gnunet-logo-dark-only-text.svg',
+              'testing_hostkeys.ecc',
+              'netjail'/'netjail_core.sh',
+              'netjail'/'netjail_exec.sh',
+              'netjail'/'netjail_start.sh',
+              'netjail'/'netjail_stop.sh',
+              'netjail'/'topo.sh'],
+              install_dir: get_option('datadir')/'gnunet')
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c 
b/src/hostlist/gnunet-daemon-hostlist_client.c
index c212fe258..399a7dc39 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -1025,9 +1025,9 @@ download_hostlist ()
   }
   CURL_EASY_SETOPT (curl, CURLOPT_FOLLOWLOCATION, 1);
   CURL_EASY_SETOPT (curl,
-                    CURLOPT_REDIR_PROTOCOLS_STR,
+                    CURLOPT_REDIR_PROTOCOLS,
                     CURLPROTO_HTTP | CURLPROTO_HTTPS);
-  CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS_STR, CURLPROTO_HTTP | 
CURLPROTO_HTTPS);
+  CURL_EASY_SETOPT (curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
   CURL_EASY_SETOPT (curl, CURLOPT_MAXREDIRS, 4);
   /* no need to abort if the above failed */
   CURL_EASY_SETOPT (curl, CURLOPT_URL, current_url);

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