diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2021-11-05 16:31:27 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2021-11-05 16:32:20 +0000 |
| commit | 77f5aa5d324bbd3771bda67e493cfa6ca55337f7 (patch) | |
| tree | 29341ab30cb695644be2297722666ad333bbb2d1 /security/gvmd | |
| parent | 4143618d2897118590dbb9c98c302ecf4c486d31 (diff) | |
| download | ports-77f5aa5d324bbd3771bda67e493cfa6ca55337f7.tar.gz ports-77f5aa5d324bbd3771bda67e493cfa6ca55337f7.zip | |
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/gvmd.in | 2 | ||||
| -rw-r--r-- | security/gvmd/files/patch-CMakeLists.txt | 44 | ||||
| -rw-r--r-- | security/gvmd/pkg-plist | 2 |
5 files changed, 33 insertions, 24 deletions
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index a2e20220137d..6257c5cd75cf 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,5 +1,5 @@ PORTNAME= gvmd -DISTVERSION= 21.4.3 +DISTVERSION= 21.4.4 DISTVERSIONPREFIX= v CATEGORIES= security @@ -45,6 +45,7 @@ SHEBANG_FILES= tools/gvm-lsc-rpm-creator \ 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 diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index daf325ca7bd5..a7c9e71d86f0 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630799976 -SHA256 (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 3e69be5248695116d14820c09ed228c22f1422ee4b0f337ad22c2ee27dd74028 -SIZE (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 1026412 +TIMESTAMP = 1635998903 +SHA256 (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 90809302c605744bdab4474f445f80523ce466fc02beed850b5f7b3f17de3cd3 +SIZE (greenbone-gvmd-v21.4.4_GH0.tar.gz) = 1031202 diff --git a/security/gvmd/files/gvmd.in b/security/gvmd/files/gvmd.in index 17b7ff691eab..5e2a6d1375c7 100644 --- a/security/gvmd/files/gvmd.in +++ b/security/gvmd/files/gvmd.in @@ -19,7 +19,7 @@ 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"} +: ${gmvd_flags="--osp-vt-update=/var/run/ospd/ospd-openvas.sock --unix-socket=/var/run/gvm/gvmd.sock"} command="%%PREFIX%%/sbin/gvmd" command_args="${gmvd_flags}" diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt index 10a249550366..2026ea5523ab 100644 --- a/security/gvmd/files/patch-CMakeLists.txt +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -1,24 +1,33 @@ ---- 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 @@ +--- CMakeLists.txt 2021-11-03 23:09:27.602060000 -0500 ++++ CMakeLists.txt 2021-11-03 23:17:41.187707000 -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 "${LOCALSTATEDIR}/run") +- set (GVM_RUN_DIR "/run/gvm") + set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm") endif (NOT GVM_RUN_DIR) if (NOT GVM_FEED_LOCK_PATH) -@@ -240,7 +240,7 @@ +@@ -190,7 +190,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 @@ 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) @@ -27,16 +36,16 @@ 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 @@ +@@ -280,7 +280,7 @@ ## Configs (e.g. systemd service file) -add_subdirectory (config) -+# add_subdirectory (config) ++#add_subdirectory (config) ## Documentation -@@ -292,10 +292,11 @@ +@@ -290,10 +290,10 @@ install (DIRECTORY DESTINATION ${GVMD_STATE_DIR}) @@ -45,7 +54,6 @@ 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}) diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist index a39ff2b1d424..01125dd6df73 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -3,7 +3,7 @@ bin/gvm-manage-certs @sample etc/gvm/pwpolicy.conf.sample lib/libgvm-pg-server.so lib/libgvm-pg-server.so.21 -lib/libgvm-pg-server.so.21.4.3 +lib/libgvm-pg-server.so.21.4.4 sbin/greenbone-certdata-sync sbin/greenbone-feed-sync sbin/greenbone-scapdata-sync |