Index: head/security/greenbone-security-assistant8/Makefile =================================================================== --- head/security/greenbone-security-assistant8/Makefile (revision 447444) +++ head/security/greenbone-security-assistant8/Makefile (revision 447445) @@ -1,29 +1,34 @@ # $FreeBSD$ PORTNAME?= greenbone-security-assistant8 PORTVERSION?= 6.0.12 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES?= http://wald.intevation.org/frs/download.php/2442/ DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION} DIST_SUBDIR= openvas${OPENVAS_VER} MAINTAINER= acm@FreeBSD.org COMMENT?= OpenVAS 8 web interface LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING.GPL LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries \ libmicrohttpd.so:www/libmicrohttpd CONFLICTS?= ${PORTNAME:S/${OPENVAS_VER}/9/}-* USES= cmake:outsource gettext gnome pkgconfig USE_GNOME= glib20 libxml2 libxslt USE_RC_SUBR= gsad +ETCDIR= ${PREFIX}/etc/openvas OPENVAS_VER?= 8 + +post-install: + ${MV} ${STAGEDIR}${ETCDIR}/gsad_log.conf ${STAGEDIR}${ETCDIR}/gsad_log.conf.sample .include Index: head/security/greenbone-security-assistant8/files/gsad.in =================================================================== --- head/security/greenbone-security-assistant8/files/gsad.in (revision 447444) +++ head/security/greenbone-security-assistant8/files/gsad.in (revision 447445) @@ -1,24 +1,27 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: gsad # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service # -# gsad_enable="YES" +# gsad_enable (bool): Set to NO by default. +# Set it to YES to enable gsad. +# gsad_flags (params): Set params used to start gsad. # . /etc/rc.subr name=gsad -rcvar=gsad_enable +rcvar=${name}_enable command="%%PREFIX%%/sbin/gsad" pidfile=/var/run/gsad.pid -: ${gsad_enable=NO} +: ${gsad_enable="NO"} +: ${gsad_flags="--listen=127.0.0.1 --port=8080 --http-only"} load_rc_config $name run_rc_command "$1" Index: head/security/greenbone-security-assistant8/pkg-plist =================================================================== --- head/security/greenbone-security-assistant8/pkg-plist (revision 447444) +++ head/security/greenbone-security-assistant8/pkg-plist (revision 447445) @@ -1,191 +1,191 @@ -etc/openvas/gsad_log.conf +@sample etc/openvas/gsad_log.conf.sample man/man8/gsad.8.gz sbin/gsad share/locale/de/LC_MESSAGES/gsad_xsl.mo share/locale/ru/LC_MESSAGES/gsad_xsl.mo share/locale/zh_CN/LC_MESSAGES/gsad_xsl.mo share/openvas/gsa/classic/cpe-icons.xml share/openvas/gsa/classic/favicon.gif share/openvas/gsa/classic/graphics.xsl share/openvas/gsa/classic/gsa-login.css share/openvas/gsa/classic/gsa-style.css share/openvas/gsa/classic/gsad.xsl share/openvas/gsa/classic/help.xsl share/openvas/gsa/classic/help_de.xsl share/openvas/gsa/classic/help_ru.xsl share/openvas/gsa/classic/help_zh_CN.xsl share/openvas/gsa/classic/img/agent.png share/openvas/gsa/classic/img/alert_sign.png share/openvas/gsa/classic/img/alterable.png share/openvas/gsa/classic/img/ascending.png share/openvas/gsa/classic/img/ascending_inactive.png share/openvas/gsa/classic/img/bullet.png share/openvas/gsa/classic/img/bullet2.png share/openvas/gsa/classic/img/charts/severity-bar-chart.png share/openvas/gsa/classic/img/clone.png share/openvas/gsa/classic/img/clone_inactive.png share/openvas/gsa/classic/img/cpe/a:apache:http_server.png share/openvas/gsa/classic/img/cpe/a:drupal:drupal.png share/openvas/gsa/classic/img/cpe/a:gnu.png share/openvas/gsa/classic/img/cpe/a:google.png share/openvas/gsa/classic/img/cpe/a:mysql:mysql.png share/openvas/gsa/classic/img/cpe/a:openbsd:openssh.png share/openvas/gsa/classic/img/cpe/a:otrs:otrs.png share/openvas/gsa/classic/img/cpe/a:php:php.png share/openvas/gsa/classic/img/cpe/a:postgresql:postgresql.png share/openvas/gsa/classic/img/cpe/a:snort:snort.png share/openvas/gsa/classic/img/cpe/a:sourcefire.png share/openvas/gsa/classic/img/cpe/a:typo3:typo3.png share/openvas/gsa/classic/img/cpe/a:wordpress:wordpress.png share/openvas/gsa/classic/img/cpe/other.png share/openvas/gsa/classic/img/deb.png share/openvas/gsa/classic/img/delete.png share/openvas/gsa/classic/img/delete_inactive.png share/openvas/gsa/classic/img/delete_note.png share/openvas/gsa/classic/img/delta.png share/openvas/gsa/classic/img/delta_inactive.png share/openvas/gsa/classic/img/delta_second.png share/openvas/gsa/classic/img/descending.png share/openvas/gsa/classic/img/descending_inactive.png share/openvas/gsa/classic/img/details.png share/openvas/gsa/classic/img/details_inactive.png share/openvas/gsa/classic/img/disable.png share/openvas/gsa/classic/img/download.png share/openvas/gsa/classic/img/edit.png share/openvas/gsa/classic/img/edit_inactive.png share/openvas/gsa/classic/img/enable.png share/openvas/gsa/classic/img/enchantress.png share/openvas/gsa/classic/img/exe.png share/openvas/gsa/classic/img/feedback.png share/openvas/gsa/classic/img/first.png share/openvas/gsa/classic/img/first_inactive.png share/openvas/gsa/classic/img/fold.png share/openvas/gsa/classic/img/gsa_splash.png share/openvas/gsa/classic/img/help.png share/openvas/gsa/classic/img/indicator_js.png share/openvas/gsa/classic/img/indicator_operation_failed.png share/openvas/gsa/classic/img/indicator_operation_ok.png share/openvas/gsa/classic/img/key.png share/openvas/gsa/classic/img/last.png share/openvas/gsa/classic/img/last_inactive.png share/openvas/gsa/classic/img/list.png share/openvas/gsa/classic/img/list_inactive.png share/openvas/gsa/classic/img/new.png share/openvas/gsa/classic/img/new_note.png share/openvas/gsa/classic/img/new_override.png share/openvas/gsa/classic/img/next.png share/openvas/gsa/classic/img/next_inactive.png share/openvas/gsa/classic/img/note.png share/openvas/gsa/classic/img/os_aix.png share/openvas/gsa/classic/img/os_apple.png share/openvas/gsa/classic/img/os_centos.png share/openvas/gsa/classic/img/os_cisco.png share/openvas/gsa/classic/img/os_conflict.png share/openvas/gsa/classic/img/os_cyclades.png share/openvas/gsa/classic/img/os_debian.png share/openvas/gsa/classic/img/os_fedora.png share/openvas/gsa/classic/img/os_freebsd.png share/openvas/gsa/classic/img/os_gentoo.png share/openvas/gsa/classic/img/os_gos.png share/openvas/gsa/classic/img/os_hp.png share/openvas/gsa/classic/img/os_junos.png share/openvas/gsa/classic/img/os_linux.png share/openvas/gsa/classic/img/os_mandriva.png share/openvas/gsa/classic/img/os_netbsd.png share/openvas/gsa/classic/img/os_netgear.png share/openvas/gsa/classic/img/os_novell.png share/openvas/gsa/classic/img/os_openbsd.png share/openvas/gsa/classic/img/os_paloalto.png share/openvas/gsa/classic/img/os_redhat.png share/openvas/gsa/classic/img/os_slackware.png share/openvas/gsa/classic/img/os_sun.png share/openvas/gsa/classic/img/os_suse.png share/openvas/gsa/classic/img/os_trustix.png share/openvas/gsa/classic/img/os_ubuntu.png share/openvas/gsa/classic/img/os_ucs.png share/openvas/gsa/classic/img/os_unknown.png share/openvas/gsa/classic/img/os_vmware.png share/openvas/gsa/classic/img/os_windows.png share/openvas/gsa/classic/img/override.png share/openvas/gsa/classic/img/overrides_disabled.png share/openvas/gsa/classic/img/overrides_enabled.png share/openvas/gsa/classic/img/p_bar.png share/openvas/gsa/classic/img/p_bar_bg.png share/openvas/gsa/classic/img/p_bar_done.png share/openvas/gsa/classic/img/p_bar_error.png share/openvas/gsa/classic/img/p_bar_gray.png share/openvas/gsa/classic/img/p_bar_new.png share/openvas/gsa/classic/img/p_bar_request.png share/openvas/gsa/classic/img/previous.png share/openvas/gsa/classic/img/previous_inactive.png share/openvas/gsa/classic/img/prognosis.png share/openvas/gsa/classic/img/prognosis_inactive.png share/openvas/gsa/classic/img/provide_view.png share/openvas/gsa/classic/img/refresh.png share/openvas/gsa/classic/img/restore.png share/openvas/gsa/classic/img/restore_inactive.png share/openvas/gsa/classic/img/resume.png share/openvas/gsa/classic/img/resume_inactive.png share/openvas/gsa/classic/img/rpm.png share/openvas/gsa/classic/img/scheduled.png share/openvas/gsa/classic/img/scheduled_inactive.png share/openvas/gsa/classic/img/sensor.png share/openvas/gsa/classic/img/solution_type.png share/openvas/gsa/classic/img/st_mitigate.png share/openvas/gsa/classic/img/st_nonavailable.png share/openvas/gsa/classic/img/st_vendorfix.png share/openvas/gsa/classic/img/st_willnotfix.png share/openvas/gsa/classic/img/st_workaround.png share/openvas/gsa/classic/img/start.png share/openvas/gsa/classic/img/start_inactive.png share/openvas/gsa/classic/img/stop.png share/openvas/gsa/classic/img/stop_inactive.png share/openvas/gsa/classic/img/style/dropdown_arrow.png share/openvas/gsa/classic/img/style/dropdown_arrow_green.png share/openvas/gsa/classic/img/style/highlight_green.png share/openvas/gsa/classic/img/style/logo_l.png share/openvas/gsa/classic/img/style/logo_m.png share/openvas/gsa/classic/img/style/logo_r.png share/openvas/gsa/classic/img/style/menu_pointy.png share/openvas/gsa/classic/img/style/top_menu_buttons.png share/openvas/gsa/classic/img/style/window_dec_a.png share/openvas/gsa/classic/img/style/window_dec_a_error.png share/openvas/gsa/classic/img/style/window_dec_b.png share/openvas/gsa/classic/img/style/window_dec_b_error.png share/openvas/gsa/classic/img/style/window_dec_c.png share/openvas/gsa/classic/img/style/window_dec_c_error.png share/openvas/gsa/classic/img/tag.png share/openvas/gsa/classic/img/trashcan.png share/openvas/gsa/classic/img/trashcan_inactive.png share/openvas/gsa/classic/img/trend_down.png share/openvas/gsa/classic/img/trend_less.png share/openvas/gsa/classic/img/trend_more.png share/openvas/gsa/classic/img/trend_nochange.png share/openvas/gsa/classic/img/trend_up.png share/openvas/gsa/classic/img/unfold.png share/openvas/gsa/classic/img/upload.png share/openvas/gsa/classic/img/verify.png share/openvas/gsa/classic/img/verify_inactive.png share/openvas/gsa/classic/img/view_other.png share/openvas/gsa/classic/img/wizard.png share/openvas/gsa/classic/js/d3.tip.js share/openvas/gsa/classic/js/d3.v3.min.js share/openvas/gsa/classic/js/gsa_bar_chart.js share/openvas/gsa/classic/js/gsa_bubble_chart.js share/openvas/gsa/classic/js/gsa_donut_chart.js share/openvas/gsa/classic/js/gsa_graphics_base.js share/openvas/gsa/classic/js/gsa_line_chart.js share/openvas/gsa/classic/login/favicon.gif share/openvas/gsa/classic/login/gsa-login.css share/openvas/gsa/classic/login/img/gsa_splash.png share/openvas/gsa/classic/login/img/style/window_dec_a.png share/openvas/gsa/classic/login/img/style/window_dec_b.png share/openvas/gsa/classic/login/img/style/window_dec_c.png share/openvas/gsa/classic/login/login.html share/openvas/gsa/classic/omp-doc.xsl share/openvas/gsa/classic/omp.xsl share/openvas/gsa/classic/os.xml share/openvas/gsa/classic/rnc.xsl share/openvas/gsa/classic/wizard.xsl share/openvas/gsa/classic/zones.xml share/openvas/gsa/language_names.tsv Index: head/security/greenbone-security-assistant9/files/gsad.in =================================================================== --- head/security/greenbone-security-assistant9/files/gsad.in (revision 447444) +++ head/security/greenbone-security-assistant9/files/gsad.in (revision 447445) @@ -1,24 +1,27 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: gsad # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service # -# gsad_enable="YES" +# gsad_enable (bool): Set to NO by default. +# Set it to YES to enable gsad. +# gsad_flags (params): Set params used to start gsad. # . /etc/rc.subr name=gsad -rcvar=gsad_enable +rcvar=${name}_enable command="%%PREFIX%%/sbin/gsad" pidfile=/var/run/gsad.pid -: ${gsad_enable=NO} +: ${gsad_enable="NO"} +: ${gsad_flags="--listen=127.0.0.1 --port=8080 --http-only"} load_rc_config $name run_rc_command "$1" Index: head/security/greenbone-security-assistant9/pkg-plist =================================================================== --- head/security/greenbone-security-assistant9/pkg-plist (revision 447444) +++ head/security/greenbone-security-assistant9/pkg-plist (revision 447445) @@ -1,274 +1,273 @@ -etc/openvas/gsad_log.conf -etc/rc.d/gsad +@sample etc/openvas/gsad_log.conf.sample man/man8/gsad.8.gz sbin/gsad share/openvas/gsa/classic/cpe-icons.xml share/openvas/gsa/classic/css/gsa-base.css share/openvas/gsa/classic/css/gsa-login.css share/openvas/gsa/classic/css/gsa-style.css share/openvas/gsa/classic/css/images/ui-bg_diagonals-thick_18_aa0000_40x40.png share/openvas/gsa/classic/css/images/ui-bg_diagonals-thick_30_666666_40x40.png share/openvas/gsa/classic/css/images/ui-bg_flat_10_000000_40x100.png share/openvas/gsa/classic/css/images/ui-bg_glass_65_ffffff_1x400.png share/openvas/gsa/classic/css/images/ui-bg_highlight-hard_35_66c430_1x100.png share/openvas/gsa/classic/css/images/ui-bg_highlight-soft_100_519032_1x100.png share/openvas/gsa/classic/css/images/ui-bg_highlight-soft_100_87d050_1x100.png share/openvas/gsa/classic/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png share/openvas/gsa/classic/css/images/ui-bg_highlight-soft_75_fdc300_1x100.png share/openvas/gsa/classic/css/images/ui-icons_222222_256x240.png share/openvas/gsa/classic/css/images/ui-icons_519032_256x240.png share/openvas/gsa/classic/css/images/ui-icons_87d050_256x240.png share/openvas/gsa/classic/css/images/ui-icons_aa0000_256x240.png share/openvas/gsa/classic/css/images/ui-icons_fdc300_256x240.png share/openvas/gsa/classic/css/images/ui-icons_ffffff_256x240.png share/openvas/gsa/classic/css/jquery-ui.structure.min.css share/openvas/gsa/classic/css/jquery-ui.theme.min.css share/openvas/gsa/classic/css/select2.min.css share/openvas/gsa/classic/graphics.xsl share/openvas/gsa/classic/gsad.xsl share/openvas/gsa/classic/help.xsl share/openvas/gsa/classic/help_de.xsl share/openvas/gsa/classic/help_ru.xsl share/openvas/gsa/classic/help_zh_CN.xsl share/openvas/gsa/classic/img/add_to_assets.svg share/openvas/gsa/classic/img/agent.svg share/openvas/gsa/classic/img/alert.svg share/openvas/gsa/classic/img/alert_sign.svg share/openvas/gsa/classic/img/allinfo.svg share/openvas/gsa/classic/img/alterable.svg share/openvas/gsa/classic/img/ascending.svg share/openvas/gsa/classic/img/ascending_inactive.svg share/openvas/gsa/classic/img/asset.svg share/openvas/gsa/classic/img/bullet.svg share/openvas/gsa/classic/img/bullet2.svg share/openvas/gsa/classic/img/calendar.svg share/openvas/gsa/classic/img/cert_bund_adv.svg share/openvas/gsa/classic/img/charts/severity-bar-chart.png share/openvas/gsa/classic/img/clone.svg share/openvas/gsa/classic/img/clone_inactive.svg share/openvas/gsa/classic/img/config.svg share/openvas/gsa/classic/img/cpe.svg share/openvas/gsa/classic/img/cpe/a:apache:http_server.svg share/openvas/gsa/classic/img/cpe/a:drupal:drupal.svg share/openvas/gsa/classic/img/cpe/a:gnu.svg share/openvas/gsa/classic/img/cpe/a:google.svg share/openvas/gsa/classic/img/cpe/a:mysql:mysql.svg share/openvas/gsa/classic/img/cpe/a:openbsd:openssh.svg share/openvas/gsa/classic/img/cpe/a:otrs:otrs.svg share/openvas/gsa/classic/img/cpe/a:php:php.svg share/openvas/gsa/classic/img/cpe/a:postgresql:postgresql.svg share/openvas/gsa/classic/img/cpe/a:snort:snort.svg share/openvas/gsa/classic/img/cpe/a:sourcefire.svg share/openvas/gsa/classic/img/cpe/a:typo3:typo3.svg share/openvas/gsa/classic/img/cpe/a:wordpress:wordpress.svg share/openvas/gsa/classic/img/cpe/other.svg share/openvas/gsa/classic/img/credential.svg share/openvas/gsa/classic/img/cve.svg share/openvas/gsa/classic/img/cvss_calculator.svg share/openvas/gsa/classic/img/dashboard.svg share/openvas/gsa/classic/img/deb.svg share/openvas/gsa/classic/img/delete.svg share/openvas/gsa/classic/img/delete_inactive.svg share/openvas/gsa/classic/img/delete_note.svg share/openvas/gsa/classic/img/delta.svg share/openvas/gsa/classic/img/delta_inactive.svg share/openvas/gsa/classic/img/delta_second.svg share/openvas/gsa/classic/img/descending.svg share/openvas/gsa/classic/img/descending_inactive.svg share/openvas/gsa/classic/img/details.svg share/openvas/gsa/classic/img/details_inactive.svg share/openvas/gsa/classic/img/dfn_cert_adv.svg share/openvas/gsa/classic/img/disable.svg share/openvas/gsa/classic/img/download.svg share/openvas/gsa/classic/img/edit.svg share/openvas/gsa/classic/img/edit_inactive.svg share/openvas/gsa/classic/img/enable.svg share/openvas/gsa/classic/img/enchantress.svg share/openvas/gsa/classic/img/exe.svg share/openvas/gsa/classic/img/favicon.gif share/openvas/gsa/classic/img/feed.svg share/openvas/gsa/classic/img/feedback.svg share/openvas/gsa/classic/img/filter.svg share/openvas/gsa/classic/img/first.svg share/openvas/gsa/classic/img/first_inactive.svg share/openvas/gsa/classic/img/fold.svg share/openvas/gsa/classic/img/greenbone.svg share/openvas/gsa/classic/img/group.svg share/openvas/gsa/classic/img/gsa.svg share/openvas/gsa/classic/img/gsa_splash.svg share/openvas/gsa/classic/img/help.svg share/openvas/gsa/classic/img/host.svg share/openvas/gsa/classic/img/indicator_js.svg share/openvas/gsa/classic/img/indicator_operation_failed.svg share/openvas/gsa/classic/img/indicator_operation_ok.svg share/openvas/gsa/classic/img/key.svg share/openvas/gsa/classic/img/last.svg share/openvas/gsa/classic/img/last_inactive.svg share/openvas/gsa/classic/img/ldap.svg share/openvas/gsa/classic/img/list.svg share/openvas/gsa/classic/img/list_inactive.svg share/openvas/gsa/classic/img/loading.gif share/openvas/gsa/classic/img/login-label.png share/openvas/gsa/classic/img/my_setting.svg share/openvas/gsa/classic/img/new.svg share/openvas/gsa/classic/img/new_note.svg share/openvas/gsa/classic/img/new_override.svg share/openvas/gsa/classic/img/next.svg share/openvas/gsa/classic/img/next_inactive.svg share/openvas/gsa/classic/img/note.svg share/openvas/gsa/classic/img/nvt.svg share/openvas/gsa/classic/img/os.svg share/openvas/gsa/classic/img/os_aix.svg share/openvas/gsa/classic/img/os_apple.svg share/openvas/gsa/classic/img/os_arubanetworks.svg share/openvas/gsa/classic/img/os_centos.svg share/openvas/gsa/classic/img/os_checkpoint.svg share/openvas/gsa/classic/img/os_cisco.svg share/openvas/gsa/classic/img/os_conflict.svg share/openvas/gsa/classic/img/os_cyclades.svg share/openvas/gsa/classic/img/os_debian.svg share/openvas/gsa/classic/img/os_fedora.svg share/openvas/gsa/classic/img/os_fortinet.svg share/openvas/gsa/classic/img/os_freebsd.svg share/openvas/gsa/classic/img/os_gentoo.svg share/openvas/gsa/classic/img/os_gos.svg share/openvas/gsa/classic/img/os_hp.svg share/openvas/gsa/classic/img/os_huawai.svg share/openvas/gsa/classic/img/os_ipfire.svg share/openvas/gsa/classic/img/os_junos.svg share/openvas/gsa/classic/img/os_linux.svg share/openvas/gsa/classic/img/os_mandriva.svg share/openvas/gsa/classic/img/os_mcafee.svg share/openvas/gsa/classic/img/os_netbsd.svg share/openvas/gsa/classic/img/os_netgear.svg share/openvas/gsa/classic/img/os_novell.svg share/openvas/gsa/classic/img/os_openbsd.svg share/openvas/gsa/classic/img/os_paloalto.svg share/openvas/gsa/classic/img/os_redhat.svg share/openvas/gsa/classic/img/os_ruggedcom.svg share/openvas/gsa/classic/img/os_slackware.svg share/openvas/gsa/classic/img/os_sourcefire.svg share/openvas/gsa/classic/img/os_sun.svg share/openvas/gsa/classic/img/os_suse.svg share/openvas/gsa/classic/img/os_synology.svg share/openvas/gsa/classic/img/os_trustix.svg share/openvas/gsa/classic/img/os_ubuntu.svg share/openvas/gsa/classic/img/os_ucs.svg share/openvas/gsa/classic/img/os_unknown.svg share/openvas/gsa/classic/img/os_vmware.svg share/openvas/gsa/classic/img/os_windows.svg share/openvas/gsa/classic/img/ovaldef.svg share/openvas/gsa/classic/img/override.svg share/openvas/gsa/classic/img/overrides_disabled.svg share/openvas/gsa/classic/img/overrides_enabled.svg share/openvas/gsa/classic/img/p_bar.png share/openvas/gsa/classic/img/p_bar_bg.png share/openvas/gsa/classic/img/p_bar_done.png share/openvas/gsa/classic/img/p_bar_error.png share/openvas/gsa/classic/img/p_bar_gray.png share/openvas/gsa/classic/img/p_bar_new.png share/openvas/gsa/classic/img/p_bar_request.png share/openvas/gsa/classic/img/pause.svg share/openvas/gsa/classic/img/performance.svg share/openvas/gsa/classic/img/permission.svg share/openvas/gsa/classic/img/port_list.svg share/openvas/gsa/classic/img/previous.svg share/openvas/gsa/classic/img/previous_inactive.svg share/openvas/gsa/classic/img/prognosis.svg share/openvas/gsa/classic/img/prognosis_inactive.svg share/openvas/gsa/classic/img/provide_view.svg share/openvas/gsa/classic/img/radius.svg share/openvas/gsa/classic/img/refresh.svg share/openvas/gsa/classic/img/remove_from_assets.svg share/openvas/gsa/classic/img/report.svg share/openvas/gsa/classic/img/report_format.svg share/openvas/gsa/classic/img/restore.svg share/openvas/gsa/classic/img/restore_inactive.svg share/openvas/gsa/classic/img/result.svg share/openvas/gsa/classic/img/resume.svg share/openvas/gsa/classic/img/resume_inactive.svg share/openvas/gsa/classic/img/role.svg share/openvas/gsa/classic/img/rpm.svg share/openvas/gsa/classic/img/scan.svg share/openvas/gsa/classic/img/scanner.svg share/openvas/gsa/classic/img/schedule.svg share/openvas/gsa/classic/img/scheduled.svg share/openvas/gsa/classic/img/scheduled_inactive.svg share/openvas/gsa/classic/img/sensor.svg share/openvas/gsa/classic/img/slave.svg share/openvas/gsa/classic/img/solution_type.svg share/openvas/gsa/classic/img/st_mitigate.svg share/openvas/gsa/classic/img/st_nonavailable.svg share/openvas/gsa/classic/img/st_vendorfix.svg share/openvas/gsa/classic/img/st_willnotfix.svg share/openvas/gsa/classic/img/st_workaround.svg share/openvas/gsa/classic/img/start.svg share/openvas/gsa/classic/img/start_inactive.svg share/openvas/gsa/classic/img/stop.svg share/openvas/gsa/classic/img/stop_inactive.svg share/openvas/gsa/classic/img/style/dropdown_arrow.png share/openvas/gsa/classic/img/style/dropdown_arrow_black.png share/openvas/gsa/classic/img/style/dropdown_arrow_green.png share/openvas/gsa/classic/img/style/menu_pointy.png share/openvas/gsa/classic/img/style/window_dec_a.png share/openvas/gsa/classic/img/style/window_dec_a_error.png share/openvas/gsa/classic/img/style/window_dec_b.png share/openvas/gsa/classic/img/style/window_dec_b_error.png share/openvas/gsa/classic/img/style/window_dec_c.png share/openvas/gsa/classic/img/style/window_dec_c_error.png share/openvas/gsa/classic/img/tag.svg share/openvas/gsa/classic/img/target.svg share/openvas/gsa/classic/img/task.svg share/openvas/gsa/classic/img/trashcan.svg share/openvas/gsa/classic/img/trashcan_inactive.svg share/openvas/gsa/classic/img/trend_down.svg share/openvas/gsa/classic/img/trend_less.svg share/openvas/gsa/classic/img/trend_more.svg share/openvas/gsa/classic/img/trend_nochange.svg share/openvas/gsa/classic/img/trend_up.svg share/openvas/gsa/classic/img/unfold.svg share/openvas/gsa/classic/img/upload.svg share/openvas/gsa/classic/img/user.svg share/openvas/gsa/classic/img/verify.svg share/openvas/gsa/classic/img/verify_inactive.svg share/openvas/gsa/classic/img/view_other.svg share/openvas/gsa/classic/img/vul_report.svg share/openvas/gsa/classic/img/wizard.svg share/openvas/gsa/classic/js/d3.layout.cloud.js share/openvas/gsa/classic/js/d3.tip.js share/openvas/gsa/classic/js/d3.v3.js share/openvas/gsa/classic/js/greenbone-ui.js share/openvas/gsa/classic/js/greenbone.js share/openvas/gsa/classic/js/gsa_bar_chart.js share/openvas/gsa/classic/js/gsa_bubble_chart.js share/openvas/gsa/classic/js/gsa_chart_helpers.js share/openvas/gsa/classic/js/gsa_cloud_chart.js share/openvas/gsa/classic/js/gsa_dashboard.js share/openvas/gsa/classic/js/gsa_donut_chart.js share/openvas/gsa/classic/js/gsa_gantt_chart.js share/openvas/gsa/classic/js/gsa_graphics_base.js share/openvas/gsa/classic/js/gsa_h_bar_chart.js share/openvas/gsa/classic/js/gsa_line_chart.js share/openvas/gsa/classic/js/gsa_polyfill.js share/openvas/gsa/classic/js/gsa_topology_chart.js share/openvas/gsa/classic/js/i18next-2.3.4.js share/openvas/gsa/classic/js/i18next-languagedetector-0.2.2.js share/openvas/gsa/classic/js/i18next-xhr-0.5.3.js share/openvas/gsa/classic/js/jquery-2.1.4.js share/openvas/gsa/classic/js/jquery-ui.js share/openvas/gsa/classic/js/moment-timezone-with-data.js share/openvas/gsa/classic/js/moment.js share/openvas/gsa/classic/js/select2.js share/openvas/gsa/classic/js/xml2json.js share/openvas/gsa/classic/login/gsa-login.css share/openvas/gsa/classic/login/img/gsa_splash.svg share/openvas/gsa/classic/login/img/style/window_dec_a.png share/openvas/gsa/classic/login/img/style/window_dec_b.png share/openvas/gsa/classic/login/img/style/window_dec_c.png share/openvas/gsa/classic/omp-doc.xsl share/openvas/gsa/classic/omp.xsl share/openvas/gsa/classic/os.xml share/openvas/gsa/classic/rnc.xsl share/openvas/gsa/classic/wizard.xsl share/openvas/gsa/classic/zones.xml share/openvas/gsa/language_names.tsv Index: head/security/openvas8-manager/Makefile =================================================================== --- head/security/openvas8-manager/Makefile (revision 447444) +++ head/security/openvas8-manager/Makefile (revision 447445) @@ -1,39 +1,56 @@ # $FreeBSD$ PORTNAME?= openvas8-manager PORTVERSION?= 6.0.11 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES?= http://wald.intevation.org/frs/download.php/2445/ DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION} DIST_SUBDIR= openvas${OPENVAS_VER} MAINTAINER= acm@FreeBSD.org COMMENT?= OpenVAS 8 manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= p5-SQL-Translator>=0:databases/p5-SQL-Translator LIB_DEPENDS= libgnutls.so:security/gnutls \ libgpgme.so:security/gpgme \ libgcrypt.so:security/libgcrypt \ libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries +RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS?= ${PORTNAME:S/${OPENVAS_VER}/9/}-* -USES= cmake:outsource execinfo gnome pkgconfig sqlite -USE_GNOME= glib20 +USES= cmake:outsource execinfo gnome pkgconfig +USE_GNOME= glib20 libxslt:run +PGSQL_USES= pgsql +SQLITE3_USES= sqlite +PGSQL_CMAKE_ON+=-DBACKEND:STRING="POSTGRESQL" +SQLITE3_CMAKE_ON+=-DBACKEND:STRING="SQLITE3" USE_RC_SUBR= openvasmd DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/${OPENVAS_VER}//} +ETCDIR= ${PREFIX}/etc/openvas REINPLACE_ARGS= -i '' OPENVAS_VER?= 8 OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT=DOCS SQLITE3 +OPTIONS_SUB= yes +OPTIONS_SINGLE_DATABASE=SQLITE3 PGSQL +OPTIONS_SINGLE= DATABASE +DATABASE_DESC= Database support post-patch: @${REINPLACE_CMD} -e '1d' ${WRKSRC}/tools/extra/xml_split + @${REINPLACE_CMD} -e 's|OPENVAS_STATE_DIR|OPENVAS_LIB_INSTALL_DIR|g' ${WRKSRC}/src/manage_pg.c post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/postgres-HOWTO ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${ETCDIR}/openvasmd_log.conf ${STAGEDIR}${ETCDIR}/openvasmd_log.conf.sample + ${MV} ${STAGEDIR}${ETCDIR}/pwpolicy.conf ${STAGEDIR}${ETCDIR}/pwpolicy.conf.sample .include Index: head/security/openvas8-manager/files/patch-CMakeLists.txt =================================================================== --- head/security/openvas8-manager/files/patch-CMakeLists.txt (revision 447444) +++ head/security/openvas8-manager/files/patch-CMakeLists.txt (revision 447445) @@ -1,20 +1,29 @@ ---- CMakeLists.txt.orig 2015-12-21 09:42:05 UTC -+++ CMakeLists.txt -@@ -153,7 +153,7 @@ if (NOT LIBDIR) +--- CMakeLists.txt 2017-06-21 05:04:50.000000000 -0500 ++++ CMakeLists.txt 2017-08-04 00:45:04.904399000 -0500 +@@ -153,7 +153,7 @@ endif (NOT LIBDIR) if (NOT LOCALSTATEDIR) - set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var") + set (LOCALSTATEDIR "/var") endif (NOT LOCALSTATEDIR) if (NOT DATADIR) -@@ -284,7 +284,7 @@ configure_file (tools/openvas-migrate-to +@@ -196,6 +196,8 @@ + + set (OPENVAS_NVT_DIR "${OPENVAS_STATE_DIR}/plugins/") + ++set (OPENVAS_LIB_INSTALL_DIR "${LIBDIR}") ++ + message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}") + + ## Dependency checks +@@ -284,7 +286,7 @@ ## Program -set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") +set (HARDENING_FLAGS "-Wformat -Wformat-security -Wl,-z,relro -Wl,-z,now") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64") Index: head/security/openvas8-manager/files/patch-src-CMakeLists.txt =================================================================== --- head/security/openvas8-manager/files/patch-src-CMakeLists.txt (revision 447444) +++ head/security/openvas8-manager/files/patch-src-CMakeLists.txt (revision 447445) @@ -1,11 +1,20 @@ ---- src/CMakeLists.txt.orig 2015-12-08 07:09:32 UTC -+++ src/CMakeLists.txt -@@ -66,7 +66,7 @@ add_library (otp STATIC otp.c) +--- src/CMakeLists.txt 2015-12-08 02:09:32.000000000 -0500 ++++ src/CMakeLists.txt 2017-08-04 00:48:57.665021000 -0500 +@@ -66,7 +66,7 @@ ## Program add_executable (openvasmd openvasmd.c ompd.c) -target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} -lexecinfo) set_target_properties (openvasmd PROPERTIES LINKER_LANGUAGE C) +@@ -159,7 +159,7 @@ + + if (BACKEND STREQUAL POSTGRESQL) + install (TARGETS manage-pg-server +- LIBRARY DESTINATION "${OPENVAS_STATE_DIR}/openvasmd/pg/") ++ LIBRARY DESTINATION "${OPENVAS_LIB_INSTALL_DIR}/openvasmd/pg/") + endif (BACKEND STREQUAL POSTGRESQL) + + ## Static analysis Index: head/security/openvas8-manager/files/patch-src-manage_sql.c =================================================================== --- head/security/openvas8-manager/files/patch-src-manage_sql.c (revision 447444) +++ head/security/openvas8-manager/files/patch-src-manage_sql.c (revision 447445) @@ -1,49 +1,76 @@ ---- src/manage_sql.c.orig 2016-02-26 13:38:52 UTC -+++ src/manage_sql.c +--- src/manage_sql.c 2017-06-19 08:14:58.000000000 -0500 ++++ src/manage_sql.c 2017-08-05 19:47:05.407323000 -0500 @@ -58,6 +58,7 @@ #include #include #include +#include #include #include -@@ -940,7 +941,7 @@ iso_time_internal (time_t *epoch_time, c +@@ -950,7 +951,7 @@ static char time_string[100]; tm = localtime (epoch_time); - if (timezone == 0) + if (tm->tm_gmtoff == 0) { if (strftime (time_string, 98, "%FT%TZ", tm) == 0) return NULL; -@@ -42378,12 +42379,12 @@ modify_schedule (const char *schedule_id +@@ -24386,7 +24387,7 @@ + { + return sql_int ("SELECT count (DISTINCT port) FROM results" + " WHERE report = %llu AND port != ''" +- " AND port NOT LIKE 'general/%';", ++ " AND port NOT LIKE 'general/%%';", + report); + } + +@@ -24401,7 +24402,7 @@ + { + return sql_int ("SELECT count (DISTINCT port) FROM results" + " WHERE report = %llu AND host = '%s'" +- " AND port NOT LIKE 'general/%';", ++ " AND port NOT LIKE 'general/%%';", + report, + host); + } +@@ -33237,7 +33238,7 @@ + " WHERE config_preferences.config = %llu" + " AND config_preferences.type = '%s'" + " AND (config_preferences.name = nvt_preferences.name" +- " OR config_preferences.name LIKE 'timeout.%')" ++ " OR config_preferences.name LIKE 'timeout.%%')" + " AND config_preferences.name != 'max_checks'" + " AND config_preferences.name != 'max_hosts'" + " UNION" +@@ -43502,12 +43503,12 @@ if (duration == -1) duration_string = NULL; else - duration_string = g_strdup_printf ("%li", duration); + duration_string = g_strdup_printf ("%li", (long)duration); if (first_time == -1) first_time_string = NULL; else - first_time_string = g_strdup_printf ("%li", first_time); + first_time_string = g_strdup_printf ("%li", (long)first_time); if ((period_months == -1) || (period_months == 0)) { -@@ -42395,12 +42396,12 @@ modify_schedule (const char *schedule_id +@@ -43519,12 +43520,12 @@ else { period_months_string = g_strdup ("0"); - period_string = g_strdup_printf ("%li", period); + period_string = g_strdup_printf ("%li", (long)period); } } else { - period_months_string = g_strdup_printf ("%li", period_months); + period_months_string = g_strdup_printf ("%li", (long)period_months); period_string = g_strdup ("0"); } Index: head/security/openvas8-manager/files/patch-src-sql_pg.c =================================================================== --- head/security/openvas8-manager/files/patch-src-sql_pg.c (nonexistent) +++ head/security/openvas8-manager/files/patch-src-sql_pg.c (revision 447445) @@ -0,0 +1,17 @@ +--- src/sql_pg.c 2017-08-04 00:41:59.376627000 -0500 ++++ src/sql_pg.c 2017-08-04 00:42:16.863937000 -0500 +@@ -27,12 +27,12 @@ + #include "tracef.h" + + #include +-#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + + #include Property changes on: head/security/openvas8-manager/files/patch-src-sql_pg.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/openvas8-manager/files/patch-tools+greenbone-scapdata-sync.in =================================================================== --- head/security/openvas8-manager/files/patch-tools+greenbone-scapdata-sync.in (revision 447444) +++ head/security/openvas8-manager/files/patch-tools+greenbone-scapdata-sync.in (revision 447445) @@ -1,60 +1,123 @@ ---- tools/greenbone-scapdata-sync.in.orig 2015-12-08 07:09:31 UTC -+++ tools/greenbone-scapdata-sync.in -@@ -962,7 +962,7 @@ update_scap_db_private () { +--- tools/greenbone-scapdata-sync.in 2015-12-08 02:09:31.000000000 -0500 ++++ tools/greenbone-scapdata-sync.in 2017-08-05 22:00:27.817110000 -0500 +@@ -297,7 +297,7 @@ then + log_err "Could not determine credentials, aborting synchronization." + rm -rf $FEED_INFO_TEMP_DIR +- exit -1 ++ exit 1 + fi + + # --protocol=29 is a workaround for a known bug in rsync 3.0.3 +@@ -321,12 +321,12 @@ + then + log_err "rsync failed, aborting synchronization." + rm -rf $FEED_INFO_TEMP_DIR +- exit -1 ++ exit 1 + fi + else + log_err "Could not find access key, aborting synchronization." + rm -rf $FEED_INFO_TEMP_DIR +- exit -1 ++ exit 1 + fi + + FEED_VERSION_SERVER=`cat $FEED_INFO_TEMP_DIR/timestamp` +@@ -335,7 +335,7 @@ + then + log_err "Could not determine server feed version." + rm -rf $FEED_INFO_TEMP_DIR +- exit -1 ++ exit 1 + fi + + # Check against FEED_VERSION +@@ -962,11 +962,11 @@ + then for ovalfile in $oval_files_sorted_private do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then -@@ -1090,12 +1090,12 @@ update_scap_db() { +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f "%Y-%m-%dT%H:%M:%S" $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -1068,8 +1068,8 @@ + fi + + # TODO: This is not quite accurate as it uses the timestamp of the non-private data. +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | date +%s -f -` +- ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` ++ + reset_sql_tries + until [ "$try_sql" -eq 0 ] + do +@@ -1090,12 +1090,12 @@ CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" if [ -e $CPEBASE ] then - filedate=`stat -c "%Y" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then log_info "Updating CPEs" - filesize=`stat -c "%s" "$CPEBASE"` + filesize=`stat -f "%z" "$CPEBASE"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1152,13 +1152,13 @@ update_scap_db() { +@@ -1152,13 +1152,13 @@ then for cvefile in `ls $SCAP_DIR/nvdcve-2.0-*.xml` do - filedate=`stat -c "%Y" "$cvefile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$cvefile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then log_info "Updating $cvefile" - filesize=`stat -c "%s" "$cvefile"` + filesize=`stat -f "%z" "$cvefile"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1228,7 +1228,7 @@ update_scap_db() { +@@ -1228,11 +1228,11 @@ for ovalfile in $oval_files_sorted do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then -@@ -1469,7 +1469,7 @@ then +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f '%Y-%m-%dT%H:%M:%S' $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -1284,7 +1284,7 @@ + update_cvss + update_placeholders + +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | env TZ="UTC" date +%s -f -` ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` + + reset_sql_tries + until [ "$try_sql" -eq 0 ] +@@ -1469,7 +1469,7 @@ exit 1 fi -if [ $(id -u) -ne $(stat -c %u $SCAP_DB) ] +if [ $(id -u) -ne $(stat -f %u $SCAP_DB) ] then log_err "Not synchronizing or updating the database since the current user is not the owner of the database." echo "Not synchronizing or updating the database since the current user is not the owner of the database." Index: head/security/openvas8-manager/files/patch-tools+openvas-scapdata-sync.in =================================================================== --- head/security/openvas8-manager/files/patch-tools+openvas-scapdata-sync.in (revision 447444) +++ head/security/openvas8-manager/files/patch-tools+openvas-scapdata-sync.in (revision 447445) @@ -1,52 +1,107 @@ ---- tools/openvas-scapdata-sync.in.orig 2015-08-03 05:52:10 UTC -+++ tools/openvas-scapdata-sync.in -@@ -885,7 +885,7 @@ update_sec_db_private () { +--- tools/openvas-scapdata-sync.in 2017-05-02 02:32:45.000000000 -0500 ++++ tools/openvas-scapdata-sync.in 2017-08-05 22:40:11.310734000 -0500 +@@ -63,7 +63,7 @@ + + # Delay between retries + if [ -z "$SQL_RETRY_DELAY" ]; then +- SQL_RETRY_DELAY="10m" # allowed unit suffixes: see sleep command ++ SQL_RETRY_DELAY="600" # allowed unit suffixes: see sleep command + fi + + TIMESTAMP="$SCAP_DIR/timestamp" +@@ -885,11 +885,11 @@ then for ovalfile in $oval_files_sorted_private do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then -@@ -1012,13 +1012,13 @@ update_sec_db () { +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f "%Y-%m-%dT%H:%M:%S" $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -958,7 +958,7 @@ + DIR_STR_LENGTH=$((`echo "$SCAP_DIR" | wc -c` + 1)) + + oval_files_shortened="" +- if [ 0 != "$xmlcount" ] ++ if [ "$xmlcount" -ne 0 ] + then + for ovalfile in $oval_files_sorted_private + do +@@ -968,7 +968,7 @@ + fi + + oval_files_clause="" +- if [ ! -z "$oval_files_shortened" ] ++ if [ "$oval_files_shortened" != "" ] + then + oval_files_clause="AND (xml_file NOT IN ($oval_files_shortened))" + fi +@@ -993,7 +993,7 @@ + fi + + # TODO: This is not quite accurate as it uses the timestamp of the non-private data. +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | date +%s -f -` ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` + + reset_sql_tries + until [ "$try_sql" -eq 0 ] +@@ -1012,13 +1012,13 @@ CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" if [ -e $CPEBASE ] then - filedate=`stat -c "%Y" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then echo "[i] Updating CPEs" - filesize=`stat -c "%s" "$CPEBASE"` + filesize=`stat -f "%z" "$CPEBASE"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then echo "[i] File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1075,13 +1075,13 @@ update_sec_db () { +@@ -1075,13 +1075,13 @@ then for cvefile in `ls $SCAP_DIR/nvdcve-2.0-*.xml` do - filedate=`stat -c "%Y" "$cvefile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$cvefile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then echo "[i] Updating $cvefile" - filesize=`stat -c "%s" "$cvefile"` + filesize=`stat -f "%z" "$cvefile"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then echo "[i] File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1151,7 +1151,7 @@ update_sec_db () { +@@ -1151,11 +1151,11 @@ for ovalfile in $oval_files_sorted do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -f "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f '%Y-%m-%dT%H:%M:%S' $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -1206,7 +1206,7 @@ + update_cvss + update_placeholders + +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | env TZ="UTC" date +%s -f -` ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` + reset_sql_tries + until [ "$try_sql" -eq 0 ] + do Index: head/security/openvas8-manager/pkg-plist =================================================================== --- head/security/openvas8-manager/pkg-plist (revision 447444) +++ head/security/openvas8-manager/pkg-plist (revision 447445) @@ -1,91 +1,93 @@ -etc/openvas/openvasmd_log.conf -etc/openvas/pwpolicy.conf +@sample etc/openvas/openvasmd_log.conf.sample +@sample etc/openvas/pwpolicy.conf.sample +%%PGSQL%%lib/openvasmd/pg/libmanage-pg-server.so 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 +%%PORTDOCS%%%%DOCSDIR%%/postgres-HOWTO 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 Index: head/security/openvas8-scanner/Makefile =================================================================== --- head/security/openvas8-scanner/Makefile (revision 447444) +++ head/security/openvas8-scanner/Makefile (revision 447445) @@ -1,37 +1,39 @@ # Created by: Tomoyuki Sakurai # $FreeBSD$ PORTNAME?= openvas8-scanner PORTVERSION?= 5.0.8 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES?= http://wald.intevation.org/frs/download.php/2436/ DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION} DIST_SUBDIR= openvas${OPENVAS_VER} MAINTAINER= acm@FreeBSD.org COMMENT?= OpenVAS 8 scanner LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries RUN_DEPENDS= redis-server:databases/redis \ curl:ftp/curl \ - rsync:net/rsync + rsync:net/rsync \ + nmap:security/nmap CONFLICTS?= ${PORTNAME:S/${OPENVAS_VER}/9/}-* USES= cmake:outsource execinfo gettext-runtime gnome pkgconfig USE_GNOME= glib20 USE_RC_SUBR= openvassd DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/${OPENVAS_VER}//} OPENVAS_VER?= 8 OPTIONS_DEFINE= DOCS post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} .include Index: head/security/openvas8-scanner/files/openvassd.in =================================================================== --- head/security/openvas8-scanner/files/openvassd.in (revision 447444) +++ head/security/openvas8-scanner/files/openvassd.in (revision 447445) @@ -1,25 +1,28 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: openvassd # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service # -# openvassd_enable="YES" +# openvassd_enable (bool): Set to NO by default. +# Set it to YES to enable openvassd. +# openvassd_flags (params): Set params used to start openvassd. # . /etc/rc.subr name=openvassd -rcvar=openvassd_enable +rcvar=${name}_enable command="%%PREFIX%%/sbin/openvassd" pidfile=/var/run/openvassd.pid extra_commands="reload" : ${openvassd_enable=NO} +: ${openvassd_flags="--listen=127.0.0.1"} load_rc_config $name run_rc_command "$1" Index: head/security/openvas9-manager/files/openvasmd.in =================================================================== --- head/security/openvas9-manager/files/openvasmd.in (revision 447444) +++ head/security/openvas9-manager/files/openvasmd.in (revision 447445) @@ -1,25 +1,28 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: openvasmd # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service # -# openvasmd_enable="YES" +# openvasmd_enable (bool): Set to NO by default. +# Set it to YES to enable bareos_dir. +# openvasmd_flags (params): Set params used to start openvasmd. # . /etc/rc.subr name=openvasmd -rcvar=openvasmd_enable +rcvar=${name}_enable command="%%PREFIX%%/sbin/openvasmd" pidfile=/var/run/openvasmd.pid extra_commands="reload" -: ${openvasmd_enable=NO} +: ${openvasmd_enable="NO"} +: ${openvasmd_flags="--listen=127.0.0.1"} load_rc_config $name run_rc_command "$1" Index: head/security/openvas9-manager/files/patch-src-manage_sql.c =================================================================== --- head/security/openvas9-manager/files/patch-src-manage_sql.c (revision 447444) +++ head/security/openvas9-manager/files/patch-src-manage_sql.c (revision 447445) @@ -1,49 +1,76 @@ ---- src/manage_sql.c.orig 2016-02-26 13:38:52 UTC -+++ src/manage_sql.c -@@ -58,6 +58,7 @@ +--- src/manage_sql.c 2017-06-20 01:32:02.000000000 -0500 ++++ src/manage_sql.c 2017-08-05 21:19:08.663354000 -0500 +@@ -57,6 +57,7 @@ #include #include #include +#include #include #include -@@ -940,7 +941,7 @@ iso_time_internal (time_t *epoch_time, c +@@ -1061,7 +1062,7 @@ static char time_string[100]; tm = localtime (epoch_time); - if (timezone == 0) + if (tm->tm_gmtoff == 0) { if (strftime (time_string, 98, "%FT%TZ", tm) == 0) return NULL; -@@ -42378,12 +42379,12 @@ modify_schedule (const char *schedule_id +@@ -25384,7 +25385,7 @@ + { + return sql_int ("SELECT count (DISTINCT port) FROM results" + " WHERE report = %llu AND port != ''" +- " AND port NOT %s 'general/%';", ++ " AND port NOT %s 'general/%%';", + report, + sql_ilike_op ()); + } +@@ -25400,7 +25401,7 @@ + { + return sql_int ("SELECT count (DISTINCT port) FROM results" + " WHERE report = %llu AND host = '%s'" +- " AND port NOT %s 'general/%';", ++ " AND port NOT %s 'general/%%';", + report, + host, + sql_ilike_op ()); +@@ -35110,7 +35111,7 @@ + " WHERE config_preferences.config = %llu" + " AND config_preferences.type = '%s'" + " AND (config_preferences.name = nvt_preferences.name" +- " OR config_preferences.name LIKE 'timeout.%')" ++ " OR config_preferences.name LIKE 'timeout.%%')" + " AND config_preferences.name != 'max_checks'" + " AND config_preferences.name != 'max_hosts'" + " UNION" +@@ -47821,12 +47822,12 @@ if (duration == -1) duration_string = NULL; else - duration_string = g_strdup_printf ("%li", duration); + duration_string = g_strdup_printf ("%li", (long)duration); if (first_time == -1) first_time_string = NULL; else - first_time_string = g_strdup_printf ("%li", first_time); + first_time_string = g_strdup_printf ("%li", (long)first_time); if ((period_months == -1) || (period_months == 0)) { -@@ -42395,12 +42396,12 @@ modify_schedule (const char *schedule_id +@@ -47838,12 +47839,12 @@ else { period_months_string = g_strdup ("0"); - period_string = g_strdup_printf ("%li", period); + period_string = g_strdup_printf ("%li", (long)period); } } else { - period_months_string = g_strdup_printf ("%li", period_months); + period_months_string = g_strdup_printf ("%li", (long)period_months); period_string = g_strdup ("0"); } Index: head/security/openvas9-manager/files/patch-src-sql_pg.c =================================================================== --- head/security/openvas9-manager/files/patch-src-sql_pg.c (nonexistent) +++ head/security/openvas9-manager/files/patch-src-sql_pg.c (revision 447445) @@ -0,0 +1,18 @@ +--- src/sql_pg.c 2017-08-06 01:12:18.411221000 -0500 ++++ src/sql_pg.c 2017-08-06 01:13:41.241337000 -0500 +@@ -26,13 +26,13 @@ + #include "sql.h" + + #include +-#include ++#include + #include + #include + #include + #include + #include +-#include ++#include + #include + #include + Property changes on: head/security/openvas9-manager/files/patch-src-sql_pg.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in =================================================================== --- head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in (revision 447444) +++ head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in (revision 447445) @@ -1,60 +1,106 @@ ---- tools/greenbone-scapdata-sync.in.orig 2016-11-10 04:58:06.000000000 -0500 -+++ tools/greenbone-scapdata-sync.in 2017-07-29 00:09:17.272096000 -0500 -@@ -1080,7 +1080,7 @@ +--- tools/greenbone-scapdata-sync.in 2016-11-10 04:58:06.000000000 -0500 ++++ tools/greenbone-scapdata-sync.in 2017-08-05 22:42:35.986283000 -0500 +@@ -1080,11 +1080,11 @@ then for ovalfile in $oval_files_sorted_private do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -c "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f "%Y-%m-%dT%H:%M:%S" $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -1153,7 +1153,7 @@ + DIR_STR_LENGTH=$((`echo "$SCAP_DIR" | wc -c` + 1)) + + oval_files_shortened="" +- if [ 0 != "$xmlcount" ] ++ if [ "$xmlcount" -ne 0 ] + then + for ovalfile in $oval_files_sorted_private + do +@@ -1163,7 +1163,7 @@ + fi + + oval_files_clause="" +- if [ ! -z "$oval_files_shortened" ] ++ if [ "$oval_files_shortened" =! "" ] + then + oval_files_clause="AND (xml_file NOT IN ($oval_files_shortened))" + fi +@@ -1186,7 +1186,7 @@ + fi + + # TODO: This is not quite accurate as it uses the timestamp of the non-private data. +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | date +%s -f -` ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` + + reset_sql_tries + until [ "$try_sql" -eq 0 ] @@ -1208,12 +1208,12 @@ CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" if [ -e $CPEBASE ] then - filedate=`stat -c "%Y" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -c "%m" "$CPEBASE" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then log_info "Updating CPEs" - filesize=`stat -c "%s" "$CPEBASE"` + filesize=`stat -f "%z" "$CPEBASE"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" @@ -1271,13 +1271,13 @@ for cvefile in $SCAP_DIR/nvdcve-2.0-*.xml do [ -e "$cvefile" ] || break # no file found - filedate=`stat -c "%Y" "$cvefile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -c "%m" "$cvefile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then log_info "Updating $cvefile" - filesize=`stat -c "%s" "$cvefile"` + filesize=`stat -f "%z" "$cvefile"` if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1347,7 +1347,7 @@ +@@ -1347,11 +1347,11 @@ for ovalfile in $oval_files_sorted do - filedate=`stat -c "%Y" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` + filedate=`stat -c "%m" "$ovalfile" | cut -d " " -f 1 | tr -d "-"` filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] || [ 1 = "$REBUILD_OVAL" ] then +- oval_timestamp=`xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | date "+%s" -f -` ++ oval_timestamp=`date -j -f '%Y-%m-%dT%H:%M:%S' $(xsltproc "$SCAP_RES_DIR/oval_timestamp.xsl" "$ovalfile" | cut -d "." -f1) +%s` + + if [ 1 = "$REBUILD_OVAL" ] + then +@@ -1403,7 +1403,7 @@ + update_cvss + update_placeholders + +- LAST_UPDATE_TIMESTAMP=`sed 's/^\(.\{8\}\)/\1 /' $TIMESTAMP | env TZ="UTC" date +%s -f -` ++ LAST_UPDATE_TIMESTAMP=`date -j -f '%Y%m%d%H%M%S' $(sed 's/$/00/g' $TIMESTAMP) +%s` + + reset_sql_tries + until [ "$try_sql" -eq 0 ] @@ -1635,7 +1635,7 @@ then if [ -f "$SCAP_DB" ] then - if [ "$(id -u)" -ne "$(stat -c %u $SCAP_DB)" ] + if [ "$(id -u)" -ne "$(stat -f %u $SCAP_DB)" ] then log_err "Not synchronizing or updating the database since the current user is not the owner of the database." echo "Not synchronizing or updating the database since the current user is not the owner of the database." Index: head/security/openvas9-manager/pkg-plist =================================================================== --- head/security/openvas9-manager/pkg-plist (revision 447444) +++ head/security/openvas9-manager/pkg-plist (revision 447445) @@ -1,112 +1,116 @@ bin/openvas-manage-certs -etc/openvas/openvasmd_log.conf -etc/openvas/pwpolicy.conf -etc/rc.d/openvasmd +@sample etc/openvas/openvasmd_log.conf.sample +@sample etc/openvas/pwpolicy.conf.sample +%%PGSQL%%lib/openvasmd/pg/libmanage-pg-server.so +%%PGSQL%%lib/openvasmd/pg/libmanage-pg-server.so.0 +%%PGSQL%%lib/openvasmd/pg/libmanage-pg-server.so.7.0.2 man/man8/database-statistics-sqlite.8.gz man/man8/greenbone-certdata-sync.8.gz man/man8/greenbone-scapdata-sync.8.gz man/man8/openvas-migrate-to-postgres.8.gz man/man8/openvas-portnames-update.8.gz man/man8/openvasmd.8.gz -sbin/database-statistics-sqlite +%%SQLITE3%%sbin/database-statistics-sqlite sbin/greenbone-certdata-sync sbin/greenbone-scapdata-sync sbin/openvas-migrate-to-postgres sbin/openvas-portnames-update sbin/openvasmd -sbin/openvasmd-sqlite +%%SQLITE3%%sbin/openvasmd-sqlite +%%PGSQL%%sbin/openvasmd-pg %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/example-openvas-manage-certs.conf %%PORTDOCS%%%%DOCSDIR%%/html/omp.html +%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/postgres-HOWTO share/man/man1/openvas-manage-certs.1 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_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/report_formats/5057e5cc-b825-11e4-9d0e-28d24461215b/Anonymous_XML.xsl share/openvas/openvasmd/report_formats/5057e5cc-b825-11e4-9d0e-28d24461215b/generate share/openvas/openvasmd/report_formats/5057e5cc-b825-11e4-9d0e-28d24461215b/report_format.xml share/openvas/openvasmd/report_formats/50c9950a-f326-11e4-800c-28d24461215b/Verinice_ITG.xsl share/openvas/openvasmd/report_formats/50c9950a-f326-11e4-800c-28d24461215b/classification-helpers.xsl share/openvas/openvasmd/report_formats/50c9950a-f326-11e4-800c-28d24461215b/generate share/openvas/openvasmd/report_formats/50c9950a-f326-11e4-800c-28d24461215b/report_format.xml share/openvas/openvasmd/report_formats/5ceff8ba-1f62-11e1-ab9f-406186ea4fc5/CPE.xsl share/openvas/openvasmd/report_formats/5ceff8ba-1f62-11e1-ab9f-406186ea4fc5/generate share/openvas/openvasmd/report_formats/5ceff8ba-1f62-11e1-ab9f-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/6c248850-1f62-11e1-b082-406186ea4fc5/HTML.xsl share/openvas/openvasmd/report_formats/6c248850-1f62-11e1-b082-406186ea4fc5/generate share/openvas/openvasmd/report_formats/6c248850-1f62-11e1-b082-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/77bd6c4a-1f62-11e1-abf0-406186ea4fc5/ITG.xsl share/openvas/openvasmd/report_formats/77bd6c4a-1f62-11e1-abf0-406186ea4fc5/generate share/openvas/openvasmd/report_formats/77bd6c4a-1f62-11e1-abf0-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/9087b18c-626c-11e3-8892-406186ea4fc5/CSV_Hosts.xsl share/openvas/openvasmd/report_formats/9087b18c-626c-11e3-8892-406186ea4fc5/generate share/openvas/openvasmd/report_formats/9087b18c-626c-11e3-8892-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/910200ca-dc05-11e1-954f-406186ea4fc5/ARF.xsl share/openvas/openvasmd/report_formats/910200ca-dc05-11e1-954f-406186ea4fc5/generate share/openvas/openvasmd/report_formats/910200ca-dc05-11e1-954f-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/9ca6fe72-1f62-11e1-9e7c-406186ea4fc5/NBE.xsl share/openvas/openvasmd/report_formats/9ca6fe72-1f62-11e1-9e7c-406186ea4fc5/generate share/openvas/openvasmd/report_formats/9ca6fe72-1f62-11e1-9e7c-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/9e5e5deb-879e-4ecc-8be6-a71cd0875cdd/generate share/openvas/openvasmd/report_formats/9e5e5deb-879e-4ecc-8be6-a71cd0875cdd/hostvisdot-summary.xsl share/openvas/openvasmd/report_formats/9e5e5deb-879e-4ecc-8be6-a71cd0875cdd/report_format.xml share/openvas/openvasmd/report_formats/a3810a62-1f62-11e1-9219-406186ea4fc5/TXT.xsl share/openvas/openvasmd/report_formats/a3810a62-1f62-11e1-9219-406186ea4fc5/generate share/openvas/openvasmd/report_formats/a3810a62-1f62-11e1-9219-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/a684c02c-b531-11e1-bdc2-406186ea4fc5/generate share/openvas/openvasmd/report_formats/a684c02c-b531-11e1-bdc2-406186ea4fc5/latex.xsl share/openvas/openvasmd/report_formats/a684c02c-b531-11e1-bdc2-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/a994b278-1f62-11e1-96ac-406186ea4fc5/generate share/openvas/openvasmd/report_formats/a994b278-1f62-11e1-96ac-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/Verinice_ISM.xsl share/openvas/openvasmd/report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/classification.xsl share/openvas/openvasmd/report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/generate share/openvas/openvasmd/report_formats/c15ad349-bd8d-457a-880a-c7056532ee15/report_format.xml share/openvas/openvasmd/report_formats/c1645568-627a-11e3-a660-406186ea4fc5/CSV_Results.xsl share/openvas/openvasmd/report_formats/c1645568-627a-11e3-a660-406186ea4fc5/generate share/openvas/openvasmd/report_formats/c1645568-627a-11e3-a660-406186ea4fc5/report_format.xml share/openvas/openvasmd/report_formats/c402cc3e-b531-11e1-9163-406186ea4fc5/generate share/openvas/openvasmd/report_formats/c402cc3e-b531-11e1-9163-406186ea4fc5/latex.xsl share/openvas/openvasmd/report_formats/c402cc3e-b531-11e1-9163-406186ea4fc5/report_format.xml 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 @dir /var/lib/openvas @dir /var/lib