summaryrefslogtreecommitdiff
path: root/security/gvmd/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/gvmd/files')
-rw-r--r--security/gvmd/files/patch-CMakeLists.txt104
-rw-r--r--security/gvmd/files/patch-src_CMakeLists.txt43
-rw-r--r--security/gvmd/files/patch-src_manage_alerts.c25
-rw-r--r--security/gvmd/files/patch-src_manage_sql.c29
4 files changed, 112 insertions, 89 deletions
diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt
index 4fbf556cb694..9087e4d7c363 100644
--- a/security/gvmd/files/patch-CMakeLists.txt
+++ b/security/gvmd/files/patch-CMakeLists.txt
@@ -1,60 +1,62 @@
---- CMakeLists.txt 2023-04-02 01:50:20.312770000 -0500
-+++ CMakeLists.txt 2023-04-02 01:54:10.831990000 -0500
-@@ -110,7 +110,7 @@
- endif (SYSCONF_INSTALL_DIR)
-
- if (NOT SYSCONFDIR)
-- set (SYSCONFDIR "/etc")
-+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
- endif (NOT SYSCONFDIR)
-
- if (NOT EXEC_PREFIX)
-@@ -181,7 +181,7 @@
- set (GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem")
-
- if (NOT GVMD_RUN_DIR)
-- set (GVMD_RUN_DIR "/run/gvmd")
-+ set (GVMD_RUN_DIR "${LOCALSTATEDIR}/run/gvmd")
- endif (NOT GVMD_RUN_DIR)
-
- if (NOT GVMD_PID_PATH)
-@@ -194,7 +194,7 @@
- add_definitions (-DGVM_FEED_LOCK_PATH="${GVM_FEED_LOCK_PATH}")
-
- if (NOT OPENVAS_DEFAULT_SOCKET)
-- set (OPENVAS_DEFAULT_SOCKET "/run/ospd/ospd-openvas.sock")
-+ set (OPENVAS_DEFAULT_SOCKET "${LOCALSTATEDIR}/run/ospd/ospd-openvas.sock")
- endif (NOT OPENVAS_DEFAULT_SOCKET)
- add_definitions (-DOPENVAS_DEFAULT_SOCKET="${OPENVAS_DEFAULT_SOCKET}")
-
-@@ -242,7 +242,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)
-@@ -284,7 +284,7 @@
+--- CMakeLists.txt.orig 2025-05-13 13:02:11 UTC
++++ CMakeLists.txt
+@@ -122,7 +122,7 @@ if(NOT SYSCONFDIR)
+ endif(SYSCONF_INSTALL_DIR)
+
+ if(NOT SYSCONFDIR)
+- set(SYSCONFDIR "/etc")
++ set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
+ endif(NOT SYSCONFDIR)
+
+ if(NOT EXEC_PREFIX)
+@@ -195,7 +195,7 @@ if(NOT GVMD_RUN_DIR)
+ set(GVM_CA_CERTIFICATE "${GVM_STATE_DIR}/CA/cacert.pem")
+
+ if(NOT GVMD_RUN_DIR)
+- set(GVMD_RUN_DIR "/run/gvmd")
++ set(GVMD_RUN_DIR "${LOCALSTATEDIR}/run/gvmd")
+ endif(NOT GVMD_RUN_DIR)
+
+ if(NOT GVMD_PID_PATH)
+@@ -208,7 +208,7 @@ if(NOT OPENVAS_DEFAULT_SOCKET)
+ add_definitions(-DGVM_FEED_LOCK_PATH="${GVM_FEED_LOCK_PATH}")
+
+ if(NOT OPENVAS_DEFAULT_SOCKET)
+- set(OPENVAS_DEFAULT_SOCKET "/run/ospd/ospd-openvas.sock")
++ set(OPENVAS_DEFAULT_SOCKET "${LOCALSTATEDIR}/run/ospd/ospd-openvas.sock")
+ endif(NOT OPENVAS_DEFAULT_SOCKET)
+ add_definitions(-DOPENVAS_DEFAULT_SOCKET="${OPENVAS_DEFAULT_SOCKET}")
+
+@@ -284,7 +284,7 @@ configure_file(VERSION.in VERSION)
+ @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
+@@ -348,7 +348,7 @@ endif(NOT SKIP_SRC)
## Configs (e.g. systemd service file)
--add_subdirectory (config)
-+# add_subdirectory (config)
+-add_subdirectory(config)
++# add_subdirectory(config)
## Documentation
-@@ -294,10 +294,10 @@
+@@ -359,12 +359,12 @@ install(
+ install(DIRECTORY DESTINATION ${GVMD_STATE_DIR})
- install (DIRECTORY DESTINATION ${GVMD_STATE_DIR})
+ install(
+- FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf
++ FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf.sample
+ DESTINATION ${GVM_SYSCONF_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
++ FILES ${CMAKE_SOURCE_DIR}/src/pwpolicy.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
index d17a7fd1955a..b77a6a8dec51 100644
--- a/security/gvmd/files/patch-src_CMakeLists.txt
+++ b/security/gvmd/files/patch-src_CMakeLists.txt
@@ -1,28 +1,27 @@
---- src/CMakeLists.txt 2025-04-08 00:29:30.000000000 -0700
-+++ src/CMakeLists.txt 2025-04-14 18:23:00.165064000 -0700
-@@ -39,7 +39,9 @@
- endif (OPENVASD)
- pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
- pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
+--- src/CMakeLists.txt.orig 2025-05-13 13:02:11 UTC
++++ src/CMakeLists.txt
+@@ -39,7 +39,9 @@ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.42)
+ endif(OPENVASD)
+ pkg_check_modules(GNUTLS REQUIRED gnutls>=3.2.15)
+ pkg_check_modules(GLIB REQUIRED glib-2.0>=2.42)
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- pkg_check_modules (LIBBSD REQUIRED libbsd)
+ pkg_check_modules(LIBBSD REQUIRED libbsd)
+endif()
- pkg_check_modules (LIBICAL REQUIRED libical>=1.00)
- pkg_check_modules (GPGME REQUIRED gpgme)
+ pkg_check_modules(LIBICAL REQUIRED libical>=1.00)
+ pkg_check_modules(GPGME REQUIRED gpgme)
-@@ -338,7 +340,7 @@
- ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
- ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${CJSON_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
- ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_OPENVASD_LDFLAGS}
-- ${LIBGVM_GMP_LDFLAGS} ${LIBGVM_HTTP_LDFLAGS} ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT})
-+ ${LIBGVM_GMP_LDFLAGS} ${LIBGVM_HTTP_LDFLAGS} ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT} -lexecinfo)
- target_link_libraries (manage-test cgreen m
- ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
- ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${CJSON_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
-@@ -555,5 +557,7 @@
- COMMAND ctags ${C_FILES})
- add_custom_target (tags COMMENT "Building tags files...")
- add_dependencies (tags etags ctags)
+@@ -358,6 +360,7 @@ target_link_libraries(
+ ${LIBICAL_LDFLAGS}
+ ${LINKER_HARDENING_FLAGS}
+ ${OPT_THEIA_TGT}
++ -lexecinfo
+ )
+ target_link_libraries(
+ manage-test
+@@ -692,5 +695,7 @@ add_dependencies(tags etags ctags)
+ add_custom_target(ctags COMMENT "Building tags..." COMMAND ctags ${C_FILES})
+ add_custom_target(tags COMMENT "Building tags files...")
+ add_dependencies(tags etags ctags)
+
+file(RENAME "pwpolicy.conf" "pwpolicy.conf.sample")
diff --git a/security/gvmd/files/patch-src_manage_alerts.c b/security/gvmd/files/patch-src_manage_alerts.c
new file mode 100644
index 000000000000..3010412c662e
--- /dev/null
+++ b/security/gvmd/files/patch-src_manage_alerts.c
@@ -0,0 +1,25 @@
+--- src/manage_alerts.c 2025-09-05 02:59:51.000000000 -0700
++++ src/manage_alerts.c 2025-10-07 22:40:51.468412000 -0700
+@@ -33,12 +33,12 @@
+ #include "manage_sql_tickets.h"
+ #include "manage_tickets.h"
+
+-#include <bsd/unistd.h>
+ #include <glib/gstdio.h>
+ #include <grp.h>
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <unistd.h>
+
+ #include <gvm/gmp/gmp.h>
+ #include <gvm/util/fileutils.h>
+@@ -1043,7 +1043,7 @@
+ g_debug (" HTTP_GET %s", url);
+
+ cmd = (gchar **) g_malloc (5 * sizeof (gchar *));
+- cmd[0] = g_strdup ("/usr/bin/wget");
++ cmd[0] = g_strdup ("/usr/local/bin/wget");
+ cmd[1] = g_strdup ("-O");
+ cmd[2] = g_strdup ("-");
+ cmd[3] = g_strdup (url);
diff --git a/security/gvmd/files/patch-src_manage_sql.c b/security/gvmd/files/patch-src_manage_sql.c
index f0a2558a25c8..4a8c168b398a 100644
--- a/security/gvmd/files/patch-src_manage_sql.c
+++ b/security/gvmd/files/patch-src_manage_sql.c
@@ -1,31 +1,28 @@
---- src/manage_sql.c 2024-01-12 03:14:29.000000000 -0500
-+++ src/manage_sql.c 2024-01-26 16:42:23.043251000 -0500
-@@ -54,7 +54,6 @@
+--- src/manage_sql.c 2025-09-05 02:59:51.000000000 -0700
++++ src/manage_sql.c 2025-10-07 22:42:53.666243000 -0700
+@@ -72,7 +72,6 @@
#include <errno.h>
#include <glib/gstdio.h>
#include <gnutls/x509.h>
-#include <malloc.h>
- #include <pwd.h>
#include <stdlib.h>
#include <sys/socket.h>
-@@ -71,7 +70,6 @@
+ #include <sys/stat.h>
+@@ -84,12 +83,12 @@
+ #include <gpgme.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include <gvm/base/gvm_sentry.h>
#include <gvm/base/hosts.h>
#include <gvm/base/pwpolicy.h>
#include <gvm/base/logging.h>
-#include <bsd/unistd.h>
#include <gvm/util/fileutils.h>
- #include <gvm/util/gpgmeutils.h>
#include <gvm/util/serverutils.h>
-@@ -9431,7 +9429,7 @@
- g_debug (" HTTP_GET %s", url);
-
- cmd = (gchar **) g_malloc (5 * sizeof (gchar *));
-- cmd[0] = g_strdup ("/usr/bin/wget");
-+ cmd[0] = g_strdup ("/usr/local/bin/wget");
- cmd[1] = g_strdup ("-O");
- cmd[2] = g_strdup ("-");
- cmd[3] = g_strdup (url);
-@@ -15775,8 +15773,6 @@
+ #include <gvm/util/uuidutils.h>
+@@ -6382,8 +6381,6 @@
cleanup_iterator (&nvts);
cleanup_iterator (&prefs);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 10:47:55 +0000