diff options
Diffstat (limited to 'security/gvmd')
| -rw-r--r-- | security/gvmd/Makefile | 3 | ||||
| -rw-r--r-- | security/gvmd/distinfo | 6 | ||||
| -rw-r--r-- | security/gvmd/files/patch-CMakeLists.txt | 104 | ||||
| -rw-r--r-- | security/gvmd/files/patch-src_CMakeLists.txt | 43 | ||||
| -rw-r--r-- | security/gvmd/pkg-plist | 4 |
5 files changed, 81 insertions, 79 deletions
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index e6b9a5c85f9e..0648b0880e09 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,5 +1,6 @@ PORTNAME= gvmd -DISTVERSION= 25.2.1 +DISTVERSION= 26.0.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= security diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index 5bf28bf601bd..3b51e4292115 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744679865 -SHA256 (greenbone-gvmd-v25.2.1_GH0.tar.gz) = de0156058ea2fb2abdf96ed73f69f506bcf63e80574f6440a782366f2e5fbc4b -SIZE (greenbone-gvmd-v25.2.1_GH0.tar.gz) = 1123704 +TIMESTAMP = 1750728558 +SHA256 (greenbone-gvmd-v26.0.0_GH0.tar.gz) = c209a735147235b4c5d0956cfb883cb358386d0682751db3f73fc90bc5675d30 +SIZE (greenbone-gvmd-v26.0.0_GH0.tar.gz) = 1125084 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/pkg-plist b/security/gvmd/pkg-plist index b7349a16468c..16a215ec225e 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -2,8 +2,8 @@ bin/gvm-manage-certs @sample etc/gvm/gvmd_log.conf.sample @sample etc/gvm/pwpolicy.conf.sample lib/libgvm-pg-server.so -lib/libgvm-pg-server.so.25 -lib/libgvm-pg-server.so.25.2.1 +lib/libgvm-pg-server.so.26 +lib/libgvm-pg-server.so.26.0.0 sbin/gvmd share/doc/gvm/example-gvm-manage-certs.conf share/doc/gvm/html/gmp.html |