diff options
Diffstat (limited to 'security/gvmd/files/patch-CMakeLists.txt')
| -rw-r--r-- | security/gvmd/files/patch-CMakeLists.txt | 104 |
1 files changed, 53 insertions, 51 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. |