diff options
Diffstat (limited to 'security/gvmd/files')
| -rw-r--r-- | security/gvmd/files/gvmd.in | 32 | ||||
| -rw-r--r-- | security/gvmd/files/patch-CMakeLists.txt | 52 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_CMakeLists.txt | 19 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_gvmd.c | 71 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_manage.c | 10 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_manage_sql.c | 19 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_manage_sql_secinfo.c | 10 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_sql_pg.c | 18 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_utils.c | 11 |
9 files changed, 242 insertions, 0 deletions
diff --git a/security/gvmd/files/gvmd.in b/security/gvmd/files/gvmd.in new file mode 100644 index 000000000000..0336e200a917 --- /dev/null +++ b/security/gvmd/files/gvmd.in @@ -0,0 +1,32 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: gvmd +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following to /etc/rc.conf[.local] to enable this service +# +# gvmd_enable (bool): Set to NO by default. +# Set it to YES to enable gvmd. +# gvmd_flags (params): Set params used to start gvmd. +# + +. /etc/rc.subr + +name=gvmd +rcvar=${name}_enable + +load_rc_config $name + +: ${gvmd_enable=NO} +: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd.sock --unix-socket=/var/run/gvm/gvmd.sock"} + +command="%%PREFIX%%/sbin/gvmd" +command_args="${gmvd_flags}" +gvmd_user="gvm" +gvmd_group="gvm" +pidfile=/var/run/gvm/gvmd.pid + +run_rc_command "$1" diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..10a249550366 --- /dev/null +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -0,0 +1,52 @@ +--- CMakeLists.txt 2020-08-11 10:05:36.000000000 -0500 ++++ CMakeLists.txt 2021-01-04 19:48:05.978938000 -0500 +@@ -132,7 +132,7 @@ + endif (NOT LIBDIR) + + if (NOT LOCALSTATEDIR) +- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var") ++ set (LOCALSTATEDIR "/var") + endif (NOT LOCALSTATEDIR) + + if (NOT DATADIR) +@@ -183,7 +183,7 @@ + set (GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem") + + if (NOT GVM_RUN_DIR) +- set (GVM_RUN_DIR "${LOCALSTATEDIR}/run") ++ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm") + endif (NOT GVM_RUN_DIR) + + if (NOT GVM_FEED_LOCK_PATH) +@@ -240,7 +240,7 @@ + configure_file (doc/Doxyfile_xml.in doc/Doxyfile_xml) + configure_file (doc/example-gvm-manage-certs.conf.in doc/example-gvm-manage-certs.conf @ONLY) + configure_file (VERSION.in VERSION) +-configure_file (src/gvmd_log_conf.cmake_in src/gvmd_log.conf) ++configure_file (src/gvmd_log_conf.cmake_in src/gvmd_log.conf.sample) + configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml @ONLY) + configure_file (tools/greenbone-feed-sync.in tools/greenbone-feed-sync @ONLY) + configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY) +@@ -282,7 +282,7 @@ + + ## Configs (e.g. systemd service file) + +-add_subdirectory (config) ++# add_subdirectory (config) + + ## Documentation + +@@ -292,10 +292,11 @@ + + install (DIRECTORY DESTINATION ${GVMD_STATE_DIR}) + +-install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf ++install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf.sample + DESTINATION ${GVM_SYSCONF_DIR}) + +-install (FILES ${CMAKE_SOURCE_DIR}/src/pwpolicy.conf ++ ++install (FILES ${CMAKE_SOURCE_DIR}/src/pwpolicy.conf.sample + DESTINATION ${GVM_SYSCONF_DIR}) + + # Schema formats. diff --git a/security/gvmd/files/patch-src_CMakeLists.txt b/security/gvmd/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..5e6801a41ca9 --- /dev/null +++ b/security/gvmd/files/patch-src_CMakeLists.txt @@ -0,0 +1,19 @@ +--- src/CMakeLists.txt 2020-08-11 10:05:36.000000000 -0500 ++++ src/CMakeLists.txt 2021-01-04 19:53:06.893137000 -0500 +@@ -227,7 +227,7 @@ + ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS} + ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} + ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_GMP_LDFLAGS} +- ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS}) ++ ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} -lexecinfo) + target_link_libraries (manage-test cgreen m + ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS} + ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} +@@ -441,5 +441,7 @@ + COMMAND ctags ${C_FILES}) + add_custom_target (tags COMMENT "Building tags files...") + add_dependencies (tags etags ctags) ++ ++file(RENAME "pwpolicy.conf" "pwpolicy.conf.sample") + + ## End diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c new file mode 100644 index 000000000000..49ea71bfe998 --- /dev/null +++ b/security/gvmd/files/patch-src_gvmd.c @@ -0,0 +1,71 @@ +--- src/gvmd.c 2020-08-11 10:05:36.000000000 -0500 ++++ src/gvmd.c 2021-01-03 16:50:30.707314000 -0500 +@@ -1362,6 +1362,7 @@ + struct sockaddr_un address_unix; + struct sockaddr_storage address_tls; + int address_size; ++ socklen_t addrlen; + + memset (&address_tls, 0, sizeof (struct sockaddr_storage)); + memset (&address_unix, 0, sizeof (struct sockaddr_un)); +@@ -1375,9 +1376,8 @@ + /* UNIX file socket. */ + + address_unix.sun_family = AF_UNIX; +- strncpy (address_unix.sun_path, +- address_str_unix, +- sizeof (address_unix.sun_path) - 1); ++ strcpy (address_unix.sun_path, ++ address_str_unix); + + g_debug ("%s: address_unix.sun_path: %s", + __func__, +@@ -1398,7 +1398,7 @@ + } + + address = (struct sockaddr *) &address_unix; +- address_size = sizeof (address_unix); ++ addrlen = sizeof(struct sockaddr_un); + + /* Ensure the path of the socket exists. */ + +@@ -1414,8 +1414,8 @@ + } + else if (address_str_tls) + { +- struct sockaddr_in *addr4; +- struct sockaddr_in6 *addr6; ++ struct sockaddr_in *addr4 = (struct sockaddr_in *) &address_tls; ++ struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address_tls; + int port, optval; + + /* TLS TCP socket. */ +@@ -1440,17 +1440,17 @@ + port = htons (GVMD_PORT); + } + +- addr4 = (struct sockaddr_in *) &address_tls; +- addr6 = (struct sockaddr_in6 *) &address_tls; + if (inet_pton (AF_INET6, address_str_tls, &addr6->sin6_addr) > 0) + { + address_tls.ss_family = AF_INET6; + addr6->sin6_port = port; ++ addrlen = sizeof (*addr6); + } + else if (inet_pton (AF_INET, address_str_tls, &addr4->sin_addr) > 0) + { + address_tls.ss_family = AF_INET; + addr4->sin_port = port; ++ addrlen = sizeof (*addr4); + } + else + { +@@ -1491,7 +1491,7 @@ + return -1; + } + +- if (bind (*soc, address, address_size) == -1) ++ if (bind (*soc, address, addrlen) == -1) + { + g_warning ("Failed to bind manager socket: %s", strerror (errno)); + return -1; diff --git a/security/gvmd/files/patch-src_manage.c b/security/gvmd/files/patch-src_manage.c new file mode 100644 index 000000000000..85f58ef903cf --- /dev/null +++ b/security/gvmd/files/patch-src_manage.c @@ -0,0 +1,10 @@ +--- src/manage.c 2020-12-31 17:01:32.913198000 -0500 ++++ src/manage.c 2020-12-31 17:01:47.001860000 -0500 +@@ -75,6 +75,7 @@ + #include <sys/file.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/wait.h> + #include <time.h> + #include <unistd.h> diff --git a/security/gvmd/files/patch-src_manage_sql.c b/security/gvmd/files/patch-src_manage_sql.c new file mode 100644 index 000000000000..b84efda2bca7 --- /dev/null +++ b/security/gvmd/files/patch-src_manage_sql.c @@ -0,0 +1,19 @@ +--- src/manage_sql.c 2020-08-11 10:05:36.000000000 -0500 ++++ src/manage_sql.c 2021-01-04 17:08:05.732803000 -0500 +@@ -51,7 +51,6 @@ + #include <dirent.h> + #include <errno.h> + #include <glib/gstdio.h> +-#include <malloc.h> + #include <pwd.h> + #include <stdlib.h> + #include <sys/socket.h> +@@ -15276,7 +15275,7 @@ + + cleanup_iterator (&nvts); + +- malloc_trim (0); ++ // malloc_trim (0); + } + + /** diff --git a/security/gvmd/files/patch-src_manage_sql_secinfo.c b/security/gvmd/files/patch-src_manage_sql_secinfo.c new file mode 100644 index 000000000000..64e96501bd87 --- /dev/null +++ b/security/gvmd/files/patch-src_manage_sql_secinfo.c @@ -0,0 +1,10 @@ +--- src/manage_sql_secinfo.c 2020-12-31 16:49:24.318202000 -0500 ++++ src/manage_sql_secinfo.c 2020-12-31 16:49:46.253146000 -0500 +@@ -44,6 +44,7 @@ + #include <sys/file.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/wait.h> + #include <unistd.h> + + #include <gvm/base/proctitle.h> diff --git a/security/gvmd/files/patch-src_sql_pg.c b/security/gvmd/files/patch-src_sql_pg.c new file mode 100644 index 000000000000..ab311fbc3767 --- /dev/null +++ b/security/gvmd/files/patch-src_sql_pg.c @@ -0,0 +1,18 @@ +--- src/sql_pg.c 2020-12-31 16:50:03.471244000 -0500 ++++ src/sql_pg.c 2020-12-31 16:50:43.332754000 -0500 +@@ -26,13 +26,13 @@ + #include "sql.h" + + #include <assert.h> +-#include <endian.h> ++#include <sys/endian.h> + #include <errno.h> + #include <arpa/inet.h> + #include <glib.h> + #include <inttypes.h> + #include <netinet/in.h> +-#include <postgresql/libpq-fe.h> ++#include <libpq-fe.h> + #include <stdlib.h> + #include <string.h> + diff --git a/security/gvmd/files/patch-src_utils.c b/security/gvmd/files/patch-src_utils.c new file mode 100644 index 000000000000..00bcbffaace2 --- /dev/null +++ b/security/gvmd/files/patch-src_utils.c @@ -0,0 +1,11 @@ +--- src/utils.c 2020-12-31 16:52:50.534962000 -0500 ++++ src/utils.c 2020-12-31 16:52:59.759527000 -0500 +@@ -34,7 +34,7 @@ + /** + * @brief Needed for nanosleep. + */ +-#define _POSIX_C_SOURCE 199309L ++//#define _POSIX_C_SOURCE 199309L + + #include "utils.h" + |