diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile index e7b51ec56d65..8a5d8da317dc 100644 --- a/security/gvmd/Makefile +++ b/security/gvmd/Makefile @@ -1,55 +1,59 @@ PORTNAME= gvmd -DISTVERSION= 21.4.5 +DISTVERSION= 22.4.0 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} \ + ${LOCALBASE}/lib/postgresql/libpg-gvm.so:databases/pg-gvm \ 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 + ${REINPLACE_CMD} -e 's|#include ||g' ${WRKSRC}/src/manage.c \ + ${WRKSRC}/src/gvmd.c ${WRKSRC}/src/manage_sql_secinfo.c \ + ${WRKSRC}/src/manage_sql.c ${WRKSRC}/src/manage_sql_report_formats.c post-install: @${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg @${MKDIR} ${STAGEDIR}/var/log/gvm @${MKDIR} ${STAGEDIR}/var/run/gvmd .include diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo index 5a8fa1e04d40..412a519fe987 100644 --- a/security/gvmd/distinfo +++ b/security/gvmd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651424657 -SHA256 (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 6329838fd70ba6e9fc8e649fe4e552e05b3711497df8343494da8537cae48635 -SIZE (greenbone-gvmd-v21.4.5_GH0.tar.gz) = 1041186 +TIMESTAMP = 1659310415 +SHA256 (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 227e7ed383a5a51b1af54d8b848eaf101458bb64d3392bbc7ef56397c3474b69 +SIZE (greenbone-gvmd-v22.4.0_GH0.tar.gz) = 1024867 diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt index e1798ca3cb50..eb62a6e33d5f 100644 --- a/security/gvmd/files/patch-CMakeLists.txt +++ b/security/gvmd/files/patch-CMakeLists.txt @@ -1,60 +1,69 @@ ---- CMakeLists.txt.orig 2022-02-22 05:52:13.000000000 -0500 -+++ CMakeLists.txt 2022-05-02 18:07:40.263764000 -0500 +--- CMakeLists.txt 2022-07-21 02:20:24.000000000 -0500 ++++ CMakeLists.txt 2022-07-31 19:24:14.544647000 -0500 +@@ -53,7 +53,7 @@ + + # Set dev version if this is a development version and not a full release, + # unset (put value 0 or delete line) before a full release and reset after. +-set (PROJECT_DEV_VERSION 1) ++set (PROJECT_DEV_VERSION 0) + + # If PROJECT_DEV_VERSION is set, the version string will be set to: + # "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}" @@ -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 @@ ## Configs (e.g. systemd service file) -add_subdirectory (config) +# add_subdirectory (config) ## Documentation -@@ -296,10 +296,10 @@ +@@ -294,10 +294,10 @@ - install (DIRECTORY DESTINATION ${GVMD_RUN_DIR}) + install (DIRECTORY DESTINATION ${GVMD_STATE_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/files/patch-src_CMakeLists.txt b/security/gvmd/files/patch-src_CMakeLists.txt index 5e6801a41ca9..5afd6d919d93 100644 --- a/security/gvmd/files/patch-src_CMakeLists.txt +++ b/security/gvmd/files/patch-src_CMakeLists.txt @@ -1,19 +1,29 @@ ---- src/CMakeLists.txt 2020-08-11 10:05:36.000000000 -0500 -+++ src/CMakeLists.txt 2021-01-04 19:53:06.893137000 -0500 -@@ -227,7 +227,7 @@ +--- src/CMakeLists.txt 2022-07-21 02:20:24.000000000 -0500 ++++ src/CMakeLists.txt 2022-07-31 19:00:06.378204000 -0500 +@@ -32,7 +32,9 @@ + pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=22.4) + 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) ++endif() + pkg_check_modules (LIBICAL REQUIRED libical>=1.00) + + message (STATUS "Looking for PostgreSQL...") +@@ -271,7 +273,7 @@ ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS} - ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} + ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_GMP_LDFLAGS} -- ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS}) -+ ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} -lexecinfo) +- ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT}) ++ ${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} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} -@@ -441,5 +441,7 @@ + ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS} +@@ -489,5 +491,7 @@ COMMAND ctags ${C_FILES}) add_custom_target (tags COMMENT "Building tags files...") add_dependencies (tags etags ctags) + +file(RENAME "pwpolicy.conf" "pwpolicy.conf.sample") ## End diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c index 49ea71bfe998..f126c86db8e7 100644 --- a/security/gvmd/files/patch-src_gvmd.c +++ b/security/gvmd/files/patch-src_gvmd.c @@ -1,71 +1,81 @@ ---- src/gvmd.c 2020-08-11 10:05:36.000000000 -0500 -+++ src/gvmd.c 2021-01-03 16:50:30.707314000 -0500 -@@ -1362,6 +1362,7 @@ +--- src/gvmd.c 2022-07-21 02:20:24.000000000 -0500 ++++ src/gvmd.c 2022-07-31 19:20:20.775975000 -0500 +@@ -1558,6 +1558,7 @@ struct sockaddr_un address_unix; struct sockaddr_storage address_tls; int address_size; + socklen_t addrlen; memset (&address_tls, 0, sizeof (struct sockaddr_storage)); memset (&address_unix, 0, sizeof (struct sockaddr_un)); -@@ -1375,9 +1376,8 @@ +@@ -1571,9 +1572,8 @@ /* UNIX file socket. */ address_unix.sun_family = AF_UNIX; - strncpy (address_unix.sun_path, - address_str_unix, - sizeof (address_unix.sun_path) - 1); + strcpy (address_unix.sun_path, + address_str_unix); g_debug ("%s: address_unix.sun_path: %s", __func__, -@@ -1398,7 +1398,7 @@ +@@ -1594,7 +1594,7 @@ } address = (struct sockaddr *) &address_unix; - address_size = sizeof (address_unix); + addrlen = sizeof(struct sockaddr_un); /* Ensure the path of the socket exists. */ -@@ -1414,8 +1414,8 @@ +@@ -1610,8 +1610,8 @@ } else if (address_str_tls) { - struct sockaddr_in *addr4; - struct sockaddr_in6 *addr6; + struct sockaddr_in *addr4 = (struct sockaddr_in *) &address_tls; + struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address_tls; int port, optval; /* TLS TCP socket. */ -@@ -1440,17 +1440,17 @@ +@@ -1636,17 +1636,17 @@ port = htons (GVMD_PORT); } - addr4 = (struct sockaddr_in *) &address_tls; - addr6 = (struct sockaddr_in6 *) &address_tls; if (inet_pton (AF_INET6, address_str_tls, &addr6->sin6_addr) > 0) { address_tls.ss_family = AF_INET6; addr6->sin6_port = port; + addrlen = sizeof (*addr6); } else if (inet_pton (AF_INET, address_str_tls, &addr4->sin_addr) > 0) { address_tls.ss_family = AF_INET; addr4->sin_port = port; + addrlen = sizeof (*addr4); } else { -@@ -1491,7 +1491,7 @@ +@@ -1687,7 +1687,7 @@ return -1; } - if (bind (*soc, address, address_size) == -1) + if (bind (*soc, address, addrlen) == -1) { g_warning ("Failed to bind manager socket: %s", strerror (errno)); return -1; +@@ -2326,7 +2326,9 @@ + + /* Set process title. */ + ++#if !defined(__FreeBSD__) + setproctitle_init (argc, argv, env); ++#endif + setproctitle ("gvmd: Initializing"); + + /* Setup initial signal handlers. */ diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist index 880fa1a4ef9d..298bf2d2a0fe 100644 --- a/security/gvmd/pkg-plist +++ b/security/gvmd/pkg-plist @@ -1,57 +1,56 @@ 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.5 +lib/libgvm-pg-server.so.22 +lib/libgvm-pg-server.so.22.4.0 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/gvmd @dir(gvm,gvm,750) /var/log/gvm @dir /var/lib