diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index e1c3e67f6f26..e7b51ec56d65 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,56 +1,55 @@ PORTNAME= gvmd -DISTVERSION= 21.4.4 -PORTREVISION= 2 +DISTVERSION= 21.4.5 DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Greenbone Vulnerability Manager central management service LICENSE= AGPLv3+ BUILD_DEPENDS= doxygen>0:devel/doxygen LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libgnutls.so:security/gnutls \ libgpgme.so:security/gpgme \ libical.so:devel/libical RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ doxygen>0:devel/doxygen \ p5-XML-Twig>=0:textproc/p5-XML-Twig \ snmpget:net-mgmt/net-snmp \ rsync:net/rsync \ wget:ftp/wget \ gpg:security/gnupg \ xml:textproc/xmlstarlet \ sshpass:security/sshpass \ socat:net/socat \ zip:archivers/zip USE_GITHUB= yes GH_ACCOUNT= greenbone USES= cmake gnome pkgconfig pgsql python samba:run shebangfix USE_GNOME= glib20 libxslt:build USE_LDCONFIG= yes USERS= gvm GROUPS= ${USERS} USE_RC_SUBR= gvmd SHEBANG_FILES= tools/gvm-lsc-rpm-creator \ tools/gvm-lsc-deb-creator \ src/alert_methods/TippingPoint/report-convert.py \ src/alert_methods/SCP/alert \ src/alert_methods/SMB/alert post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/manage_sql.c ${REINPLACE_CMD} -e 's|+660|660|g' ${WRKSRC}/tools/greenbone-feed-sync.in post-install: @${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg @${MKDIR} ${STAGEDIR}/var/log/gvm - @${MKDIR} ${STAGEDIR}/var/run/gvm + @${MKDIR} ${STAGEDIR}/var/run/gvmd .include diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index a7c9e71d86f0..5a8fa1e04d40 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635998903 -SHA256 (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 90809302c605744bdab4474f445f80523ce466fc02beed850b5f7b3f17de3cd3 -SIZE (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 1031202 +TIMESTAMP = 1651424657 +SHA256 (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 6329838fd70ba6e9fc8e649fe4e552e05b3711497df8343494da8537cae48635 +SIZE (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 1041186 diff --git a/security/gvmd/files/gvmd.in b/security/gvmd/files/gvmd.in index 5e2a6d1375c7..6fc265b18a44 100644 --- a/security/gvmd/files/gvmd.in +++ b/security/gvmd/files/gvmd.in @@ -1,30 +1,30 @@ #!/bin/sh # 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-openvas.sock --unix-socket=/var/run/gvm/gvmd.sock"} +: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd-openvas.sock --unix-socket=/var/run/gvmd/gvmd.sock"} command="%%PREFIX%%/sbin/gvmd" command_args="${gmvd_flags}" gvmd_user="gvm" gvmd_group="gvm" -pidfile=/var/run/gvm/gvmd.pid +pidfile=/var/run/gvmd/gvmd.pid run_rc_command "$1" diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt index 2026ea5523ab..e1798ca3cb50 100644 --- a/security/gvmd/files/patch-CMakeLists.txt +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -1,60 +1,60 @@ ---- CMakeLists.txt 2021-11-03 23:09:27.602060000 -0500 -+++ CMakeLists.txt 2021-11-03 23:17:41.187707000 -0500 +--- CMakeLists.txt.orig 2022-02-22 05:52:13.000000000 -0500 ++++ CMakeLists.txt 2022-05-02 18:07:40.263764000 -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 GVM_RUN_DIR) -- set (GVM_RUN_DIR "/run/gvm") -+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm") - endif (NOT GVM_RUN_DIR) + 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 GVM_FEED_LOCK_PATH) -@@ -190,7 +190,7 @@ + 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}") -@@ -238,7 +238,7 @@ +@@ -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) -@@ -280,7 +280,7 @@ +@@ -284,7 +284,7 @@ ## Configs (e.g. systemd service file) -add_subdirectory (config) -+#add_subdirectory (config) ++# add_subdirectory (config) ## Documentation -@@ -290,10 +290,10 @@ +@@ -296,10 +296,10 @@ - install (DIRECTORY DESTINATION ${GVMD_STATE_DIR}) + install (DIRECTORY DESTINATION ${GVMD_RUN_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/pkg-plist b/security/gvmd/pkg-plist index 01125dd6df73..59aaed41179a 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -1,57 +1,57 @@ 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.21 lib/libgvm-pg-server.so.21.4.4 sbin/greenbone-certdata-sync sbin/greenbone-feed-sync sbin/greenbone-scapdata-sync sbin/gvmd share/doc/gvm/example-gvm-manage-certs.conf share/doc/gvm/html/gmp.html share/gvm/cert/cert_bund_getbyname.xsl share/gvm/cert/dfn_cert_getbyname.xsl share/gvm/gvm-lsc-deb-creator share/gvm/gvm-lsc-exe-creator share/gvm/gvm-lsc-rpm-creator share/gvm/gvmd/global_alert_methods/159f79a5-fce8-4ec5-aa49-7d17a77739a3/alert share/gvm/gvmd/global_alert_methods/2db07698-ec49-11e5-bcff-28d24461215b/alert share/gvm/gvmd/global_alert_methods/4a398d42-87c0-11e5-a1c0-28d24461215b/alert share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/alert share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/report-convert.py share/gvm/gvmd/global_alert_methods/9d435134-15d3-11e6-bf5c-28d24461215b/alert share/gvm/gvmd/global_alert_methods/c427a688-b653-40ab-a9d0-d6ba842a9d63/alert share/gvm/gvmd/global_alert_methods/cd1f5a34-6bdc-11e0-9827-002264764cea/alert share/gvm/gvmd/global_alert_methods/f9d97653-f89b-41af-9ba1-0f6ee00e9c1a/alert share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/HTML.xsl share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/generate share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/rnc.xsl share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/GMP.xml share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/generate share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/RNC.xsl share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/generate share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/rnc.xsl share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/GMP.xsl share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/generate share/gvm/gvmd/template.nsis share/gvm/gvmd/wizards/delete_task_deep.xml share/gvm/gvmd/wizards/get_tasks_deep.xml share/gvm/gvmd/wizards/modify_task.xml share/gvm/gvmd/wizards/quick_auth_scan.xml share/gvm/gvmd/wizards/quick_first_scan.xml share/gvm/gvmd/wizards/quick_task.xml share/gvm/gvmd/wizards/reset_task.xml share/gvm/scap/cpe_getbyname.xsl share/gvm/scap/cve_getbyname.xsl share/gvm/scap/ovaldef_getbyname.xsl share/man/man1/gvm-manage-certs.1.gz share/man/man8/greenbone-certdata-sync.8.gz share/man/man8/greenbone-scapdata-sync.8.gz share/man/man8/gvmd.8.gz @dir(gvm,gvm,750) /var/lib/gvm/gvmd/gnupg @dir(gvm,gvm,750) /var/lib/gvm/gvmd @dir(gvm,gvm,750) /var/lib/gvm -@dir(gvm,gvm,750) /var/run/gvm +@dir(gvm,gvm,750) /var/run/gvmd @dir(gvm,gvm,750) /var/log/gvm @dir /var/lib