diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /net-analyzer/openvas-libraries/files | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'net-analyzer/openvas-libraries/files')
3 files changed, 0 insertions, 131 deletions
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch deleted file mode 100644 index d89459fe2bd0..000000000000 --- a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://www.mail-archive.com/openvas-discuss@wald.intevation.org/msg05828.html -Fixes build issue with the newer version of libssh - -diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c ---- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c 2014-04-14 19:15:40.000000000 +0200 -+++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c 2014-05-23 00:13:56.791111974 +0200 -@@ -1861,7 +1861,8 @@ - return NULL; - session = session_table[tbl_slot].session; - -- banner = ssh_get_serverbanner (session); -+ //banner = ssh_get_serverbanner (session); -+ banner = (char*) ssh_get_serverbanner (session); - if (!banner) - return NULL; - diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch deleted file mode 100644 index e03dd085e3b1..000000000000 --- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch +++ /dev/null @@ -1,70 +0,0 @@ - base/CMakeLists.txt | 2 ++ - nasl/CMakeLists.txt | 5 +++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt -index c2dccf5..4f17892 100644 ---- a/base/CMakeLists.txt -+++ b/base/CMakeLists.txt -@@ -56,6 +56,7 @@ endif (MINGW) - - if (BUILD_STATIC) - add_library (openvas_base_static STATIC ${FILES}) -+ set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}") - set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base") - set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}") -@@ -63,6 +64,7 @@ endif (BUILD_STATIC) - - if (BUILD_SHARED) - add_library (openvas_base_shared SHARED ${FILES}) -+ set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}") - set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base") - set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}") -diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt -index 52fa5c6..afd18c2 100644 ---- a/nasl/CMakeLists.txt -+++ b/nasl/CMakeLists.txt -@@ -41,7 +41,7 @@ endif (SNMP) - # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME! - # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h. - # Once the warnings have been addressed this flag should be removed. --set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing") -+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}") - - ## Compile the parser - note that there are (better) CMake macros to achieve - ## that -@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc) - - if (BUILD_STATIC) - add_library (openvas_nasl_static STATIC ${FILES}) -- -+ set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}") - set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl") - set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}") -@@ -118,6 +118,7 @@ endif (BUILD_STATIC) - - if (BUILD_SHARED) - add_library (openvas_nasl_shared SHARED ${FILES}) -+ set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}") - set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl") - set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}") - base/gpgme_util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/gpgme_util.h b/base/gpgme_util.h -index 56e1b85..ab4e9fa 100644 ---- a/base/gpgme_util.h -+++ b/base/gpgme_util.h -@@ -33,7 +33,7 @@ - #ifndef _OPENVAS_LIBRARIES_GPGME_UTIL_H - #define _OPENVAS_LIBRARIES_GPGME_UTIL_H - --#include <gpgme.h> -+#include <gpgme/gpgme.h> - - gpgme_ctx_t openvas_init_gpgme_ctx (void); - gpgme_ctx_t openvas_init_gpgme_sysconf_ctx (void); diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch deleted file mode 100644 index 817815edb317..000000000000 --- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch +++ /dev/null @@ -1,45 +0,0 @@ - base/CMakeLists.txt | 10 +++++----- - misc/CMakeLists.txt | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt -index 07febee..40305b7 100644 ---- a/base/CMakeLists.txt -+++ b/base/CMakeLists.txt -@@ -73,7 +73,7 @@ if (BUILD_SHARED) - assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm) - target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS}) - else (MINGW) -- target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS}) -+ target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS}) - endif (MINGW) - endif (BUILD_SHARED) - -@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES}) - - # Link the test-hosts executable - # TODO: This is currently only built for BUILD_SHARED --if (BUILD_SHARED) -- add_executable (test-hosts test-hosts.c) -- target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS}) --endif (BUILD_SHARED) -+#if (BUILD_SHARED) -+# add_executable (test-hosts test-hosts.c) -+# target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS}) -+#endif (BUILD_SHARED) - - ## Install - if (BUILD_STATIC) -diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt -index 7aaca2c..e7a0870 100644 ---- a/misc/CMakeLists.txt -+++ b/misc/CMakeLists.txt -@@ -126,7 +126,7 @@ if (BUILD_SHARED) - else (MINGW) - target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS} - ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS} -- ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS}) -+ ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS}) - endif (MINGW) - endif (BUILD_SHARED) - |