diff --git a/security/openvas8-manager/Makefile b/security/openvas8-manager/Makefile index dd6d33f1a601..8c6876d1dce0 100644 --- a/security/openvas8-manager/Makefile +++ b/security/openvas8-manager/Makefile @@ -1,33 +1,39 @@ # $FreeBSD$ -PORTNAME= openvas-manager -PORTVERSION= 6.0.8 -PORTREVISION= 5 +PORTNAME?= openvas8-manager +PORTVERSION?= 6.0.11 CATEGORIES= security -MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/ +MASTER_SITES?= http://wald.intevation.org/frs/download.php/2445/ +DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION} +DIST_SUBDIR= openvas${OPENVAS_VER} -MAINTAINER= ports@FreeBSD.org -COMMENT= OpenVAS manager +MAINTAINER= acm @FreeBSD.org +COMMENT?= OpenVAS 8 manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls \ libgpgme.so:security/gpgme \ libgcrypt.so:security/libgcrypt \ - libopenvas_base.so:security/openvas-libraries + libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries + +CONFLICTS?= ${PORTNAME:S/${OPENVAS_VER}/9/}-* USES= cmake:outsource execinfo gnome pkgconfig sqlite USE_GNOME= glib20 USE_RC_SUBR= openvasmd +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/${OPENVAS_VER}//} REINPLACE_ARGS= -i '' +OPENVAS_VER?= 8 + OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '1d' ${WRKSRC}/tools/extra/xml_split post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} .include diff --git a/security/openvas8-manager/distinfo b/security/openvas8-manager/distinfo index 083318e78af0..dcb4b650f549 100644 --- a/security/openvas8-manager/distinfo +++ b/security/openvas8-manager/distinfo @@ -1,2 +1,3 @@ -SHA256 (openvas-manager-6.0.8.tar.gz) = 498f72a047841d55102ed50a16b0a096f66a5c951010cfaa3241689d693c11d7 -SIZE (openvas-manager-6.0.8.tar.gz) = 1946231 +TIMESTAMP = 1501780869 +SHA256 (openvas8/openvas-manager-6.0.11.tar.gz) = 9c5468afba020ff61beb0d9a5ba8d0c9925bc2e596a337f70157c2e5b6c2af59 +SIZE (openvas8/openvas-manager-6.0.11.tar.gz) = 1969045 diff --git a/security/openvas8-manager/files/patch-src-openvasmd.c b/security/openvas8-manager/files/patch-src-openvasmd.c index fe9670073793..68a77701b8fe 100644 --- a/security/openvas8-manager/files/patch-src-openvasmd.c +++ b/security/openvas8-manager/files/patch-src-openvasmd.c @@ -1,382 +1,391 @@ ---- src/openvasmd.c.orig 2015-12-08 07:09:32 UTC -+++ src/openvasmd.c -@@ -629,7 +629,7 @@ cleanup () +--- src/openvasmd.c 2017-06-16 03:06:07.000000000 -0500 ++++ src/openvasmd.c 2017-08-03 13:21:58.536708000 -0500 +@@ -634,7 +634,7 @@ } #endif /* LOG */ tracef (" Exiting.\n"); - if (log_config) log_config_free (log_config); + if (log_config) log_config_free (); /* Tear down authentication system conf, if any. */ openvas_auth_tear_down (); -@@ -831,7 +831,7 @@ update_or_rebuild_nvt_cache (int update_ +@@ -887,7 +887,7 @@ break; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); break; case -3: -@@ -839,7 +839,7 @@ update_or_rebuild_nvt_cache (int update_ +@@ -895,7 +895,7 @@ case -1: default: g_critical ("%s: failed to initialise OMP daemon\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); } -@@ -849,7 +849,7 @@ update_or_rebuild_nvt_cache (int update_ +@@ -905,7 +905,7 @@ { g_critical ("%s: failed to register `atexit' cleanup function\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); } -@@ -1148,6 +1148,7 @@ manager_listen (const char *address_str, +@@ -1234,6 +1234,7 @@ struct sockaddr_storage address; struct sockaddr_in *addr4 = (struct sockaddr_in *) &address; struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address; + socklen_t addrlen; int port, optval; if (!address_str) -@@ -1176,11 +1177,13 @@ manager_listen (const char *address_str, +@@ -1262,11 +1263,13 @@ { address.ss_family = AF_INET6; addr6->sin6_port = port; + addrlen = sizeof (*addr6); } else if (inet_pton (AF_INET, address_str, &addr4->sin_addr) > 0) { address.ss_family = AF_INET; addr4->sin_port = port; + addrlen = sizeof (*addr4); } else { -@@ -1211,7 +1214,7 @@ manager_listen (const char *address_str, +@@ -1297,7 +1300,7 @@ return -1; } - if (bind (*soc, (struct sockaddr *) &address, sizeof (address)) + if (bind (*soc, (struct sockaddr *) &address, addrlen) == -1) { g_warning ("Failed to bind manager socket: %s", strerror (errno)); -@@ -1468,25 +1471,25 @@ main (int argc, char** argv) +@@ -1556,25 +1559,25 @@ switch (manage_optimize (log_config, database, optimize)) { case 0: - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; case 1: - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } return EXIT_SUCCESS; -@@ -1524,7 +1527,7 @@ main (int argc, char** argv) +@@ -1612,7 +1615,7 @@ scanner_ca_pub, scanner_key_pub, scanner_key_priv); g_free (stype); - log_config_free (log_config); + log_config_free (); switch (ret) { case 0: -@@ -1576,7 +1579,7 @@ main (int argc, char** argv) +@@ -1664,7 +1667,7 @@ stype, scanner_ca_pub, scanner_key_pub, scanner_key_priv); g_free (stype); - log_config_free (log_config); + log_config_free (); switch (ret) { case 0: -@@ -1606,22 +1609,22 @@ main (int argc, char** argv) +@@ -1694,22 +1697,22 @@ switch (manage_create_user (log_config, database, create_user, role)) { case 0: - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } return EXIT_SUCCESS; -@@ -1635,32 +1638,32 @@ main (int argc, char** argv) +@@ -1723,32 +1726,32 @@ switch (manage_delete_user (log_config, database, delete_user)) { case 0: - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; case 2: g_critical ("%s: failed to find user '%s'\n", __FUNCTION__, delete_user); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case 4: g_critical ("%s: user has active tasks\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } } -@@ -1671,22 +1674,22 @@ main (int argc, char** argv) +@@ -1759,22 +1762,22 @@ switch (manage_get_users (log_config, database, role)) { case 0: - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } } -@@ -1695,7 +1698,7 @@ main (int argc, char** argv) +@@ -1783,7 +1786,7 @@ { /* List the users and then exit. */ int ret = manage_get_scanners (log_config, database); - log_config_free (log_config); + log_config_free (); switch (ret) { case 0: -@@ -1720,7 +1723,7 @@ main (int argc, char** argv) +@@ -1806,7 +1809,7 @@ + { + /* List the slaves and then exit. */ + int ret = manage_get_slaves (log_config, database); +- log_config_free (log_config); ++ log_config_free (); + switch (ret) + { + case 0: +@@ -1831,7 +1834,7 @@ /* Delete the scanner and then exit. */ ret = manage_delete_scanner (log_config, database, delete_scanner); - log_config_free (log_config); + log_config_free (); switch (ret) { case 0: -@@ -1748,7 +1751,7 @@ main (int argc, char** argv) +@@ -1859,7 +1862,7 @@ /* Delete the scanner and then exit. */ ret = manage_verify_scanner (log_config, database, verify_scanner); - log_config_free (log_config); + log_config_free (); switch (ret) { case 0: -@@ -1783,26 +1786,26 @@ main (int argc, char** argv) +@@ -1894,26 +1897,26 @@ switch (manage_set_password (log_config, database, user, new_password)) { case 0: - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; case 1: g_critical ("%s: failed to find user\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } } -@@ -1885,24 +1888,24 @@ main (int argc, char** argv) +@@ -1996,24 +1999,24 @@ case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } fprintf (stderr, "Encryption succeeded.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; } -@@ -1916,24 +1919,24 @@ main (int argc, char** argv) +@@ -2027,24 +2030,24 @@ case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; case -1: default: g_critical ("%s: internal error\n", __FUNCTION__); fprintf (stderr, "Decryption failed.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_FAILURE; } fprintf (stderr, "Decryption succeeded.\n"); - log_config_free (log_config); + log_config_free (); return EXIT_SUCCESS; } -@@ -2005,12 +2008,12 @@ main (int argc, char** argv) +@@ -2116,12 +2119,12 @@ g_critical ("%s: failed to fork into background: %s\n", __FUNCTION__, strerror (errno)); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); break; default: /* Parent. */ - log_config_free (log_config); + log_config_free (); exit (EXIT_SUCCESS); break; } -@@ -2026,25 +2029,25 @@ main (int argc, char** argv) +@@ -2137,25 +2140,25 @@ break; case -2: g_critical ("%s: database is wrong version\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); break; case -3: g_critical ("%s: database must be initialised" " (with --update or --rebuild)\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); break; case -4: g_critical ("%s: --max-ips-per-target out of range\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); break; case -1: default: g_critical ("%s: failed to initialise OMP daemon\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); } -@@ -2054,7 +2057,7 @@ main (int argc, char** argv) +@@ -2165,7 +2168,7 @@ { g_critical ("%s: failed to register `atexit' cleanup function\n", __FUNCTION__); - log_config_free (log_config); + log_config_free (); exit (EXIT_FAILURE); } diff --git a/security/openvas8-manager/pkg-plist b/security/openvas8-manager/pkg-plist index f40d76d5ab3f..1f881d563a4e 100644 --- a/security/openvas8-manager/pkg-plist +++ b/security/openvas8-manager/pkg-plist @@ -1,89 +1,91 @@ etc/openvas/openvasmd_log.conf etc/openvas/pwpolicy.conf man/man8/openvasmd.8.gz sbin/greenbone-certdata-sync sbin/greenbone-scapdata-sync sbin/openvas-certdata-sync sbin/openvas-migrate-to-postgres sbin/openvas-portnames-update sbin/openvas-scapdata-sync sbin/openvasmd %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/html/omp.html share/openvas/cert/cert_bund_getbyname.xsl share/openvas/cert/cert_bund_update.xsl share/openvas/cert/cert_db_init.sql share/openvas/cert/dfn_cert_getbyname.xsl share/openvas/cert/dfn_cert_update.xsl share/openvas/openvas-lsc-rpm-creator.sh +share/openvas/openvasmd/global_alert_methods/2db07698-ec49-11e5-bcff-28d24461215b/alert share/openvas/openvasmd/global_alert_methods/4a398d42-87c0-11e5-a1c0-28d24461215b/alert +share/openvas/openvasmd/global_alert_methods/9d435134-15d3-11e6-bf5c-28d24461215b/alert share/openvas/openvasmd/global_alert_methods/cd1f5a34-6bdc-11e0-9827-002264764cea/alert share/openvas/openvasmd/global_alert_methods/f9d97653-f89b-41af-9ba1-0f6ee00e9c1a/alert share/openvas/openvasmd/global_report_formats/5057e5cc-b825-11e4-9d0e-28d24461215b/Anonymous_XML.xsl share/openvas/openvasmd/global_report_formats/5057e5cc-b825-11e4-9d0e-28d24461215b/generate share/openvas/openvasmd/global_report_formats/50c9950a-f326-11e4-800c-28d24461215b/Verinice_ITG.xsl share/openvas/openvasmd/global_report_formats/50c9950a-f326-11e4-800c-28d24461215b/classification-helpers.xsl share/openvas/openvasmd/global_report_formats/50c9950a-f326-11e4-800c-28d24461215b/generate share/openvas/openvasmd/global_report_formats/5ceff8ba-1f62-11e1-ab9f-406186ea4fc5/CPE.xsl share/openvas/openvasmd/global_report_formats/5ceff8ba-1f62-11e1-ab9f-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/6c248850-1f62-11e1-b082-406186ea4fc5/HTML.xsl share/openvas/openvasmd/global_report_formats/6c248850-1f62-11e1-b082-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/77bd6c4a-1f62-11e1-abf0-406186ea4fc5/ITG.xsl share/openvas/openvasmd/global_report_formats/77bd6c4a-1f62-11e1-abf0-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/9087b18c-626c-11e3-8892-406186ea4fc5/CSV_Hosts.xsl share/openvas/openvasmd/global_report_formats/9087b18c-626c-11e3-8892-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/910200ca-dc05-11e1-954f-406186ea4fc5/ARF.xsl share/openvas/openvasmd/global_report_formats/910200ca-dc05-11e1-954f-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/9ca6fe72-1f62-11e1-9e7c-406186ea4fc5/NBE.xsl share/openvas/openvasmd/global_report_formats/9ca6fe72-1f62-11e1-9e7c-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/9e5e5deb-879e-4ecc-8be6-a71cd0875cdd/generate share/openvas/openvasmd/global_report_formats/9e5e5deb-879e-4ecc-8be6-a71cd0875cdd/hostvisdot-summary.xsl share/openvas/openvasmd/global_report_formats/a3810a62-1f62-11e1-9219-406186ea4fc5/TXT.xsl share/openvas/openvasmd/global_report_formats/a3810a62-1f62-11e1-9219-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/a684c02c-b531-11e1-bdc2-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/a684c02c-b531-11e1-bdc2-406186ea4fc5/latex.xsl share/openvas/openvasmd/global_report_formats/a994b278-1f62-11e1-96ac-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/Verinice_ISM.xsl share/openvas/openvasmd/global_report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/classification.csv share/openvas/openvasmd/global_report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/classification.xsl share/openvas/openvasmd/global_report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/classification_generator.sh share/openvas/openvasmd/global_report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/generate share/openvas/openvasmd/global_report_formats/c1645568-627a-11e3-a660-406186ea4fc5/CSV_Results.xsl share/openvas/openvasmd/global_report_formats/c1645568-627a-11e3-a660-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/c402cc3e-b531-11e1-9163-406186ea4fc5/generate share/openvas/openvasmd/global_report_formats/c402cc3e-b531-11e1-9163-406186ea4fc5/latex.xsl share/openvas/openvasmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/HTML.xsl share/openvas/openvasmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/generate share/openvas/openvasmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/rnc.xsl share/openvas/openvasmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/OMP.xml share/openvas/openvasmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/generate share/openvas/openvasmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/RNC.xsl share/openvas/openvasmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/generate share/openvas/openvasmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/rnc.xsl share/openvas/openvasmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/OMP.xsl share/openvas/openvasmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/generate share/openvas/openvasmd/portnames_update.xsl share/openvas/openvasmd/wizards/delete_task_deep.xml share/openvas/openvasmd/wizards/get_tasks_deep.xml share/openvas/openvasmd/wizards/modify_task.xml share/openvas/openvasmd/wizards/quick_auth_scan.xml share/openvas/openvasmd/wizards/quick_first_scan.xml share/openvas/openvasmd/wizards/quick_task.xml share/openvas/openvasmd/wizards/reset_task.xml share/openvas/scap/cpe_getbyname.xsl share/openvas/scap/cpe_update.xsl share/openvas/scap/cpe_youngerthan.xsl share/openvas/scap/cve_getbyname.xsl share/openvas/scap/cve_update.xsl share/openvas/scap/cve_youngerthan.xsl share/openvas/scap/oval_timestamp.xsl share/openvas/scap/oval_update.xsl share/openvas/scap/oval_verify.xsl share/openvas/scap/ovaldef_getbyname.xsl share/openvas/scap/ovaldef_list_ids.xsl share/openvas/scap/scap_db_init.sql share/openvas/scap/xml_split @dir /var/lib/openvas/openvasmd/report_formats @dir /var/lib/openvas/openvasmd @dir /var/lib/openvas @dir /var/lib