summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-analyzer/openvas-libraries/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-analyzer/openvas-libraries/files')
-rw-r--r--net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch32
-rw-r--r--net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch16
-rw-r--r--net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch16
-rw-r--r--net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch32
-rw-r--r--net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch70
5 files changed, 166 insertions, 0 deletions
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
new file mode 100644
index 000000000000..6df661f5db75
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
@@ -0,0 +1,32 @@
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c
+--- openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c 2014-05-24 01:11:33.049417462 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c 2014-05-24 17:01:25.409361461 +0200
+@@ -24,7 +24,7 @@
+ *
+ */
+
+-#define _BSD_SOURCE 1
++#define _DEFAULT_SOURCE 1
+
+ #include <unistd.h> /* for close() */
+ #include <stdlib.h> /* for rand() */
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_raw.h openvas-libraries-7.0.1.new/nasl/nasl_raw.h
+--- openvas-libraries-7.0.1.orig/nasl/nasl_raw.h 2014-05-24 01:11:33.287412716 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_raw.h 2014-05-24 17:02:33.829967589 +0200
+@@ -20,12 +20,12 @@
+ #ifndef OPENVAS_RAW_H
+ #define OPENVAS_RAW_H
+ #ifdef __linux__
+-#ifndef __BSD_SOURCE
+-#define __BSD_SOURCE
++#ifndef __DEFAULT_SOURCE
++#define __DEFAULT_SOURCE
+ #endif
+
+-#ifndef _BSD_SOURCE
+-#define _BSD_SOURCE
++#ifndef _DEFAULT_SOURCE
++#define _DEFAULT_SOURCE
+ #endif
+
+ #ifndef __FAVOR_BSD
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
new file mode 100644
index 000000000000..d89459fe2bd0
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
@@ -0,0 +1,16 @@
+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-7.0.4-run.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch
new file mode 100644
index 000000000000..6ee5b775c88b
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 940f897..8b2f26b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,7 +180,7 @@ set (OPENVAS_DATA_DIR "${DATADIR}/openvas")
+ set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
+ set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas")
+ set (OPENVAS_CACHE_DIR "${LOCALSTATEDIR}/cache/openvas")
+-set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run")
++set (OPENVAS_PID_DIR "/run")
+ set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
+
+ set (OPENVAS_NVT_DIR "${OPENVAS_STATE_DIR}/plugins")
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
new file mode 100644
index 000000000000..a9c38159ba06
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
@@ -0,0 +1,32 @@
+ base/CMakeLists.txt | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index b798f85..c724473 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -100,24 +100,6 @@ endif (OPENVAS_PID_DIR)
+
+ add_custom_indent_targets (${FILES})
+
+-# Link the test-hosts executable
+-if (BUILD_SHARED)
+- add_executable (test-hosts test-hosts.c)
+- target_link_libraries (test-hosts openvas_base_shared openvas_misc_shared ${GLIB_LDFLAGS} -lgcrypt
+- "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
+- ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS})
+- set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
+- "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
+-endif (BUILD_SHARED)
+-if (BUILD_STATIC)
+- add_executable (test-hosts test-hosts.c)
+- target_link_libraries (test-hosts openvas_base_static openvas_misc_static ${GLIB_LDFLAGS} -lgcrypt
+- "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
+- ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS})
+- set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
+- "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
+-endif (BUILD_STATIC)
+-
+ ## Install
+ if (BUILD_STATIC)
+ install (TARGETS openvas_base_static
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
new file mode 100644
index 000000000000..e03dd085e3b1
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
@@ -0,0 +1,70 @@
+ 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);