From c1c2b6cf5d6e542eea24df52a1b4888eaf44ec79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 3 Jan 2025 12:44:13 +0100 Subject: [PATCH 1/3] Fix: Require libcurl >= 7.83.0 The curl function curl_easy_header is used which got introduced into libcurl with 7.83.0 according to https://curl.se/libcurl/c/curl_easy_header.html. Closes #861 --- INSTALL.md | 2 +- openvasd/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index e0c26730..52dbbe96 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,7 +18,7 @@ General build environment: Specific development libraries: * libcjson >= 1.7.14 (util) -* libcurl >= 7.74.0 (openvasd) +* libcurl >= 7.83.0 (openvasd) * libglib >= 2.42 (all) * libgio >= 2.42 (util) * zlib >= 1.2.8 (util) diff --git a/openvasd/CMakeLists.txt b/openvasd/CMakeLists.txt index 030ac798..ce0c8cda 100644 --- a/openvasd/CMakeLists.txt +++ b/openvasd/CMakeLists.txt @@ -13,7 +13,7 @@ endif (NOT PKG_CONFIG_FOUND) ## Dependency checks pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42) -pkg_check_modules (CURL REQUIRED libcurl>=7.77.0) +pkg_check_modules (CURL REQUIRED libcurl>=7.83.0) # for json parsing we need cJSON pkg_check_modules (CJSON REQUIRED libcjson>=1.7.14) From 1b64974f7b9c834181d1efbf05840f57ab8bafc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Fri, 3 Jan 2025 12:49:44 +0100 Subject: [PATCH 2/3] Fix comment according to code format checker The code format checker requires this code comment to be fixed. --- util/kb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/kb.h b/util/kb.h index a67b7a58..fccb36b6 100644 --- a/util/kb.h +++ b/util/kb.h @@ -73,7 +73,7 @@ struct kb_item { char *v_str; /**< Hold an str value for this kb item. */ int v_int; /**< Hold an int value for this kb item. */ - }; /**< Value of this knowledge base item. */ + }; /**< Value of this knowledge base item. */ size_t len; /**< Length of string. */ struct kb_item *next; /**< Next item in list. */ From 7fe862834b9727429bb00e5756b4fe357ea7ba35 Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Thu, 5 Dec 2024 15:51:14 +0200 Subject: [PATCH 3/3] Fix: add const for libxml2 2.12.0 API change --- util/xmlutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/xmlutils.c b/util/xmlutils.c index e6edba5f..fbcf4f48 100644 --- a/util/xmlutils.c +++ b/util/xmlutils.c @@ -3030,7 +3030,7 @@ xml_file_iterator_next (xml_file_iterator_t iterator, gchar **error) { if (error) { - xmlErrorPtr xml_error; + const xmlError *xml_error; xml_error = xmlCtxtGetLastError (iterator->parser_ctxt); *error = g_strdup_printf ("error parsing XML" " (line %d column %d): %s",