From 5e31728637129258819716d83bbe4defbe47b45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Nicola?= Date: Thu, 8 Aug 2024 17:08:28 +0200 Subject: [PATCH] Fix: update feed_version response's field after feed update (#1692) --- nasl/CMakeLists.txt | 38 +++++++++++++++++++------------------- src/CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt index 845cd1ac9..582e6f724 100644 --- a/nasl/CMakeLists.txt +++ b/nasl/CMakeLists.txt @@ -84,26 +84,26 @@ if (NETSNMP) endif (NETSNMP) message (STATUS "Looking for libgcrypt...") -find_library (GCRYPT gcrypt) +pkg_check_modules (GCRYPT REQUIRED libgcrypt) message (STATUS "Looking for libgcrypt... ${GCRYPT}") -if (NOT GCRYPT) - message (SEND_ERROR "The libgcrypt library is required.") -else (NOT GCRYPT) - execute_process (COMMAND libgcrypt-config --libs - OUTPUT_VARIABLE GCRYPT_LDFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND libgcrypt-config --cflags - OUTPUT_VARIABLE GCRYPT_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND libgcrypt-config --version - OUTPUT_VARIABLE GCRYPT_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - message (STATUS " found libgcrypt, version ${GCRYPT_VERSION}") - if (GCRYPT_VERSION VERSION_LESS "1.6") - message (SEND_ERROR "libgcrypt 1.6 or greater is required") - endif (GCRYPT_VERSION VERSION_LESS "1.6") - string(REPLACE "-I" "" GCRYPT_INCLUDE_DIRS "${GCRYPT_CFLAGS}") -endif (NOT GCRYPT) +#if (NOT GCRYPT) +# message (SEND_ERROR "The libgcrypt library is required.") +#else (NOT GCRYPT) +# execute_process (COMMAND libgcrypt-config --libs +# OUTPUT_VARIABLE GCRYPT_LDFLAGS +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# execute_process (COMMAND libgcrypt-config --cflags +# OUTPUT_VARIABLE GCRYPT_CFLAGS +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# execute_process (COMMAND libgcrypt-config --version +# OUTPUT_VARIABLE GCRYPT_VERSION +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# message (STATUS " found libgcrypt, version ${GCRYPT_VERSION}") +# if (GCRYPT_VERSION VERSION_LESS "1.6") +# message (SEND_ERROR "libgcrypt 1.6 or greater is required") +# endif (GCRYPT_VERSION VERSION_LESS "1.6") +# string(REPLACE "-I" "" GCRYPT_INCLUDE_DIRS "${GCRYPT_CFLAGS}") +#endif (NOT GCRYPT) ## Library diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 24b5b0994..438c1209c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,26 +19,26 @@ pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42) pkg_check_modules (LIBBSD REQUIRED libbsd) message (STATUS "Looking for libgcrypt...") -find_library (GCRYPT gcrypt) -if (NOT GCRYPT) - message (SEND_ERROR "The libgcrypt library is required.") -else (NOT GCRYPT) - message (STATUS "Looking for libgcrypt... ${GCRYPT}") - execute_process (COMMAND libgcrypt-config --libs - OUTPUT_VARIABLE GCRYPT_LDFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND libgcrypt-config --cflags - OUTPUT_VARIABLE GCRYPT_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND libgcrypt-config --version - OUTPUT_VARIABLE GCRYPT_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - message (STATUS " found libgcrypt, version ${GCRYPT_VERSION}") - if (GCRYPT_VERSION VERSION_LESS "1.6") - message (SEND_ERROR "libgcrypt 1.6 or greater is required") - endif (GCRYPT_VERSION VERSION_LESS "1.6") - string(REPLACE "-I" "" GCRYPT_INCLUDE_DIRS "${GCRYPT_CFLAGS}") -endif (NOT GCRYPT) +pkg_check_modules (GCRYPT REQUIRED libgcrypt) +#if (NOT GCRYPT) +# message (SEND_ERROR "The libgcrypt library is required.") +#else (NOT GCRYPT) +# message (STATUS "Looking for libgcrypt... ${GCRYPT}") +# execute_process (COMMAND libgcrypt-config --libs +# OUTPUT_VARIABLE GCRYPT_LDFLAGS +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# execute_process (COMMAND libgcrypt-config --cflags +# OUTPUT_VARIABLE GCRYPT_CFLAGS +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# execute_process (COMMAND libgcrypt-config --version +# OUTPUT_VARIABLE GCRYPT_VERSION +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# message (STATUS " found libgcrypt, version ${GCRYPT_VERSION}") +# if (GCRYPT_VERSION VERSION_LESS "1.6") +# message (SEND_ERROR "libgcrypt 1.6 or greater is required") +# endif (GCRYPT_VERSION VERSION_LESS "1.6") +# string(REPLACE "-I" "" GCRYPT_INCLUDE_DIRS "${GCRYPT_CFLAGS}") +#endif (NOT GCRYPT) message (STATUS "Looking for pcap...") find_library (PCAP pcap)