Date: Thu, 17 Mar 2016 12:57:26 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411278 - in head: . security security/openvas-cli security/openvas-cli/files security/openvas-client security/openvas-libnasl security/openvas-libraries security/openvas-libraries/file... Message-ID: <201603171257.u2HCvQdo009582@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Mar 17 12:57:25 2016 New Revision: 411278 URL: https://svnweb.freebsd.org/changeset/ports/411278 Log: Update OpenVAS ports from version 2 to version 8. All components have been renamed and rearranged. The graphical user interface provided by security/openvas-client has been discontinued. Instead there is now a web interface provided by security/greenbone-security-assistant and a command-line interface provided by security/openvas-client. Added: head/security/openvas-cli/ head/security/openvas-cli/Makefile (contents, props changed) head/security/openvas-cli/distinfo (contents, props changed) head/security/openvas-cli/files/ head/security/openvas-cli/files/patch-CMakeLists.txt (contents, props changed) head/security/openvas-cli/files/patch-doc-CMakeLists.txt (contents, props changed) head/security/openvas-cli/pkg-descr (contents, props changed) head/security/openvas-cli/pkg-plist (contents, props changed) head/security/openvas-libraries/files/patch-CMakeLists.txt (contents, props changed) head/security/openvas-libraries/files/patch-base-openvas_networking.c (contents, props changed) head/security/openvas-libraries/files/patch-base-openvas_networking.h (contents, props changed) head/security/openvas-libraries/files/patch-misc-openvas_server.h (contents, props changed) head/security/openvas-libraries/files/patch-misc-pcap.c (contents, props changed) head/security/openvas-libraries/files/patch-misc-pcap_openvas.h (contents, props changed) head/security/openvas-libraries/files/patch-nasl-capture_packet.c (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_builtin_openvas_tcp_scanner.c (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_builtin_synscan.c (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery.c (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery_v6.c (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_raw.h (contents, props changed) head/security/openvas-libraries/files/patch-nasl-nasl_socket.c (contents, props changed) head/security/openvas-manager/ head/security/openvas-manager/Makefile (contents, props changed) head/security/openvas-manager/distinfo (contents, props changed) head/security/openvas-manager/files/ head/security/openvas-manager/files/openvasmd.in (contents, props changed) head/security/openvas-manager/files/patch-CMakeLists.txt (contents, props changed) head/security/openvas-manager/files/patch-doc-CMakeLists.txt (contents, props changed) head/security/openvas-manager/files/patch-src-CMakeLists.txt (contents, props changed) head/security/openvas-manager/files/patch-src-manage_migrators.c (contents, props changed) head/security/openvas-manager/files/patch-src-manage_sql.c (contents, props changed) head/security/openvas-manager/files/patch-src-manage_sqlite3.c (contents, props changed) head/security/openvas-manager/files/patch-src-omp.c (contents, props changed) head/security/openvas-manager/files/patch-src-openvasmd.c (contents, props changed) head/security/openvas-manager/pkg-descr (contents, props changed) head/security/openvas-manager/pkg-plist (contents, props changed) head/security/openvas-scanner/ - copied from r411277, head/security/openvas-server/ head/security/openvas-scanner/files/openvassd.in - copied, changed from r411272, head/security/openvas-server/files/openvasd.in head/security/openvas-scanner/files/patch-CMakeLists.txt (contents, props changed) head/security/openvas-scanner/files/patch-src_CMakeLists.txt (contents, props changed) head/security/openvas-scanner/files/patch-src_attack.c (contents, props changed) head/security/openvas-scanner/files/patch-tools_greenbone-nvt-sync.in (contents, props changed) head/security/openvas-scanner/files/patch-tools_openvas-nvt-sync.in (contents, props changed) Deleted: head/security/openvas-client/ head/security/openvas-libnasl/ head/security/openvas-libraries/files/patch-configure head/security/openvas-libraries/files/patch-libopenvas-Makefile head/security/openvas-libraries/files/patch-libopenvas-ftp_funcs.c head/security/openvas-libraries/files/patch-libopenvas-ids_send.c head/security/openvas-libraries/files/patch-libopenvas-network.c head/security/openvas-libraries/files/patch-libopenvas-network.h head/security/openvas-libraries/files/patch-libopenvas-pcap.c head/security/openvas-libraries/files/patch-libopenvas-popen.c head/security/openvas-libraries/files/patch-libopenvas_openvas__server.c head/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in head/security/openvas-plugins/ head/security/openvas-scanner/files/openvasd.in head/security/openvas-scanner/files/patch-openvas.tmpl.in head/security/openvas-scanner/files/patch-openvasd-Makefile head/security/openvas-server/ Modified: head/MOVED head/UPDATING head/security/Makefile head/security/openvas-libraries/Makefile head/security/openvas-libraries/distinfo head/security/openvas-libraries/pkg-descr head/security/openvas-libraries/pkg-plist head/security/openvas-scanner/Makefile head/security/openvas-scanner/distinfo head/security/openvas-scanner/pkg-descr head/security/openvas-scanner/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Thu Mar 17 12:55:36 2016 (r411277) +++ head/MOVED Thu Mar 17 12:57:25 2016 (r411278) @@ -8230,3 +8230,7 @@ print/cups-image|print/cups|2016-03-11|M print/cups-pstoraster|print/cups-filters|2016-03-11|Obsolete russian/MT||2016-03-13|Has expired: Reached it's EOL in September 2015 www/MT||2016-03-13|Has expired: Reached it's EOL in September 2015 +security/openvas-libnasl|security/openvas-libraries|2016-03-17|Merged +security/openvas-server|security/openvas-scanner|2016-03-17|Renamed +security/openvas-plugins|security/openvas-scanner|2016-03-17|Merged +security/openvas-client||2016-03-17|Discontinued, try security/greenbone-security-assistant Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Mar 17 12:55:36 2016 (r411277) +++ head/UPDATING Thu Mar 17 12:57:25 2016 (r411278) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160317: + AFFECTS: security/openvas-client + AUTHOR: tijl@FreeBSD.org + + The OpenVAS ports have been updated from version 2 to version 8. All + components have been renamed and rearranged. The old OpenVAS client + no longer exists. Instead there is a web interface provided by + security/greenbone-security-assistant or a command-line interface + provided by security/openvas-cli. + 20160311: AFFECTS: print/hplip AUTHOR: tijl@FreeBSD.org Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Thu Mar 17 12:55:36 2016 (r411277) +++ head/security/Makefile Thu Mar 17 12:57:25 2016 (r411278) @@ -176,6 +176,7 @@ SUBDIR += gpgdir SUBDIR += gpgme SUBDIR += gputty + SUBDIR += greenbone-security-assistant SUBDIR += gringotts SUBDIR += gsasl SUBDIR += gsfv @@ -411,11 +412,10 @@ SUBDIR += openssl SUBDIR += openssl-devel SUBDIR += openssl_tpm_engine - SUBDIR += openvas-client - SUBDIR += openvas-libnasl + SUBDIR += openvas-cli SUBDIR += openvas-libraries - SUBDIR += openvas-plugins - SUBDIR += openvas-server + SUBDIR += openvas-manager + SUBDIR += openvas-scanner SUBDIR += openvpn SUBDIR += openvpn-admin SUBDIR += openvpn-auth-ldap Added: head/security/openvas-cli/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/Makefile Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +PORTNAME= openvas-cli +PORTVERSION= 1.4.3 +CATEGORIES= security +MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/ + +MAINTAINER= ports@FreeBSD.org +COMMENT= OpenVAS command-line interface and Nagios plugin + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ + libopenvas_base.so:${PORTSDIR}/security/openvas-libraries + +CFLAGS+= -Wno-missing-field-initializers +USES= cmake:outsource gnome pkgconfig +USE_GNOME= glib20 libxslt:run + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios + ${MV} ${STAGEDIR}${PREFIX}/bin/check_omp \ + ${STAGEDIR}${PREFIX}/libexec/nagios + +.include <bsd.port.mk> Added: head/security/openvas-cli/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/distinfo Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,2 @@ +SHA256 (openvas-cli-1.4.3.tar.gz) = 69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978 +SIZE (openvas-cli-1.4.3.tar.gz) = 108228 Added: head/security/openvas-cli/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/files/patch-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2015-10-12 12:46:59 UTC ++++ CMakeLists.txt +@@ -134,7 +134,7 @@ if (NOT LIBDIR) + endif (NOT LIBDIR) + + if (NOT LOCALSTATEDIR) +- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var") ++ set (LOCALSTATEDIR "/var") + endif (NOT LOCALSTATEDIR) + + if (NOT DATADIR) +@@ -202,7 +202,7 @@ configure_file (VERSION.in VERSION) + if (MINGW) + set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2") + else (MINGW) +- 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") + endif (MINGW) + + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") Added: head/security/openvas-cli/files/patch-doc-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/files/patch-doc-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,8 @@ +--- doc/CMakeLists.txt.orig 2015-10-12 12:46:59 UTC ++++ doc/CMakeLists.txt +@@ -97,4 +97,4 @@ else (XMLMANTOHTML_EXECUTABLE) + endif (XMLMANTOHTML_EXECUTABLE) + + install (FILES omp.8 +- DESTINATION ${DATADIR}/man/man8 ) ++ DESTINATION man/man8 ) Added: head/security/openvas-cli/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/pkg-descr Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,8 @@ +The Open Vulnerability Assessment System (OpenVAS) is a framework of several +services and tools offering a comprehensive and powerful vulnerability +scanning and vulnerability management solution. + +This package contains a command-line tool to control the OpenVAS Manager and +a Nagios plugin. + +WWW: http://www.openvas.org/ Added: head/security/openvas-cli/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-cli/pkg-plist Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,4 @@ +bin/omp +bin/omp-dialog +libexec/nagios/check_omp +man/man8/omp.8.gz Modified: head/security/openvas-libraries/Makefile ============================================================================== --- head/security/openvas-libraries/Makefile Thu Mar 17 12:55:36 2016 (r411277) +++ head/security/openvas-libraries/Makefile Thu Mar 17 12:57:25 2016 (r411278) @@ -2,28 +2,36 @@ # $FreeBSD$ PORTNAME= openvas-libraries -PORTVERSION= 2.0.3 -PORTREVISION= 8 +PORTVERSION= 8.0.7 CATEGORIES= security -MASTER_SITES= http://wald.intevation.org/frs/download.php/600/ +MASTER_SITES= http://wald.intevation.org/frs/download.php/2291/ MAINTAINER= ports@FreeBSD.org -COMMENT= Libraries for OpenVAS +COMMENT= OpenVAS libraries -LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING.GPLv2 -GNU_CONFIGURE= yes -USES= libtool pkgconfig +LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ + libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \ + libgnutls.so:${PORTSDIR}/security/gnutls \ + libgpgme.so:${PORTSDIR}/security/gpgme \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libksba.so:${PORTSDIR}/security/libksba \ + libssh.so:${PORTSDIR}/security/libssh + +USES= bison cmake:outsource gnome pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 -MAKE_JOBS_UNSAFE= yes -CONFIGURE_ARGS= --localstatedir=/var -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= LDAP RADIUS +OPTIONS_DEFAULT=LDAP + +LDAP_CMAKE_OFF= -DBUILD_WITHOUT_LDAP=1 +LDAP_USE= OPENLDAP=yes -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenvas*.so +RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1 +RADIUS_LIB_DEPENDS= libfreeradius-client.so:${PORTSDIR}/net/freeradius-client .include <bsd.port.mk> Modified: head/security/openvas-libraries/distinfo ============================================================================== --- head/security/openvas-libraries/distinfo Thu Mar 17 12:55:36 2016 (r411277) +++ head/security/openvas-libraries/distinfo Thu Mar 17 12:57:25 2016 (r411278) @@ -1,2 +1,2 @@ -SHA256 (openvas-libraries-2.0.3.tar.gz) = 9847e99b92bf2269c5157c69799de127fadcb83af19bfb7320c1c91036a6cc62 -SIZE (openvas-libraries-2.0.3.tar.gz) = 482097 +SHA256 (openvas-libraries-8.0.7.tar.gz) = 144b77dc54d501d88e6c3456dade71e20938fd52f9bb9fadc032564131366187 +SIZE (openvas-libraries-8.0.7.tar.gz) = 609210 Added: head/security/openvas-libraries/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,51 @@ +--- CMakeLists.txt.orig 2015-12-21 09:35:15 UTC ++++ CMakeLists.txt +@@ -166,7 +166,7 @@ if (NOT LIBDIR) + endif (NOT LIBDIR) + + if (NOT LOCALSTATEDIR) +- set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var") ++ set (LOCALSTATEDIR "/var") + endif (NOT LOCALSTATEDIR) + + if (NOT INCLUDEDIR) +@@ -272,7 +272,7 @@ if (NOT MINGW) + message (STATUS "Looking for ksba... ${KSBA}") + + message (STATUS "Looking for netsnmp...") +- find_library (SNMP snmp) ++ find_library (SNMP netsnmp) + message (STATUS "Looking for netsnmp... ${SNMP}") + if (SNMP) + execute_process (COMMAND net-snmp-config --libs +@@ -303,7 +303,7 @@ if (NOT MINGW) + + endif (NOT MINGW) + +-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") + + +@@ -344,16 +344,16 @@ add_subdirectory (doc) + ## Install + + install (FILES doc/openvas-nasl.1 +- DESTINATION ${DATADIR}/man/man1 ) ++ DESTINATION man/man1 ) + + install (FILES ${CMAKE_BINARY_DIR}/libopenvas_base.pc +- DESTINATION ${LIBDIR}/pkgconfig) ++ DESTINATION libdata/pkgconfig) + install (FILES ${CMAKE_BINARY_DIR}/libopenvas_omp.pc +- DESTINATION ${LIBDIR}/pkgconfig) ++ DESTINATION libdata/pkgconfig) + install (FILES ${CMAKE_BINARY_DIR}/libopenvas_misc.pc +- DESTINATION ${LIBDIR}/pkgconfig) ++ DESTINATION libdata/pkgconfig) + install (FILES ${CMAKE_BINARY_DIR}/libopenvas_nasl.pc +- DESTINATION ${LIBDIR}/pkgconfig) ++ DESTINATION libdata/pkgconfig) + + install (DIRECTORY DESTINATION ${OPENVAS_LOG_DIR}) + install (DIRECTORY DESTINATION ${OPENVAS_DATA_DIR}) Added: head/security/openvas-libraries/files/patch-base-openvas_networking.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-base-openvas_networking.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,52 @@ +--- base/openvas_networking.c.orig 2015-12-08 07:07:23 UTC ++++ base/openvas_networking.c +@@ -38,13 +38,13 @@ + /* Global variables */ + + /* Source interface name eg. eth1. */ +-char global_source_iface[IFNAMSIZ] = { '\0' }; ++char global_source_iface[IFNAMSIZ]; + + /* Source IPv4 address. */ +-struct in_addr global_source_addr = { .s_addr = 0 }; ++struct in_addr global_source_addr; + + /* Source IPv6 address. */ +-struct in6_addr global_source_addr6 = { .s6_addr32 = { 0, 0, 0, 0 } }; ++struct in6_addr global_source_addr6; + + /* Source Interface/Address related functions. */ + +@@ -230,10 +230,19 @@ ipv4_as_ipv6 (const struct in_addr *ip4, + if (ip4 == NULL || ip6 == NULL) + return; + +- ip6->s6_addr32[0] = 0; +- ip6->s6_addr32[1] = 0; +- ip6->s6_addr32[2] = htonl (0xffff); +- memcpy (&ip6->s6_addr32[3], ip4, sizeof (struct in_addr)); ++ ip6->s6_addr[0] = 0; ++ ip6->s6_addr[1] = 0; ++ ip6->s6_addr[2] = 0; ++ ip6->s6_addr[3] = 0; ++ ip6->s6_addr[4] = 0; ++ ip6->s6_addr[5] = 0; ++ ip6->s6_addr[6] = 0; ++ ip6->s6_addr[7] = 0; ++ ip6->s6_addr[8] = 0; ++ ip6->s6_addr[9] = 0; ++ ip6->s6_addr[10] = 0xff; ++ ip6->s6_addr[11] = 0xff; ++ memcpy (&ip6->s6_addr[12], ip4, sizeof (struct in_addr)); + } + + char * +@@ -246,7 +255,7 @@ addr6_as_str (const struct in6_addr *add + + str = g_malloc0 (INET6_ADDRSTRLEN); + if (IN6_IS_ADDR_V4MAPPED (addr6)) +- inet_ntop (AF_INET, &addr6->s6_addr32[3], str, INET6_ADDRSTRLEN); ++ inet_ntop (AF_INET, &addr6->s6_addr[12], str, INET6_ADDRSTRLEN); + else + inet_ntop (AF_INET6, addr6, str, INET6_ADDRSTRLEN); + return str; Added: head/security/openvas-libraries/files/patch-base-openvas_networking.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-base-openvas_networking.h Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- base/openvas_networking.h.orig 2015-12-08 07:07:23 UTC ++++ base/openvas_networking.h +@@ -28,6 +28,7 @@ + #include <string.h> + #include <arpa/inet.h> + #include <net/if.h> ++#include <netinet/in.h> + #include <sys/types.h> + #include <ifaddrs.h> + #include <netdb.h> Added: head/security/openvas-libraries/files/patch-misc-openvas_server.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-misc-openvas_server.h Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- misc/openvas_server.h.orig 2015-08-03 10:14:29 UTC ++++ misc/openvas_server.h +@@ -48,6 +48,7 @@ extern "C" + #ifdef _WIN32 + #include <winsock2.h> + #else ++#include <netinet/in.h> + #include <netinet/ip.h> + #endif + Added: head/security/openvas-libraries/files/patch-misc-pcap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-misc-pcap.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,52 @@ +--- misc/pcap.c.orig 2015-08-03 10:14:29 UTC ++++ misc/pcap.c +@@ -631,13 +631,12 @@ getinterfaces (int *howmany) + static struct interface_info mydevs[1024]; + int numinterfaces = 0; + int sd; +- int len; ++ size_t n; + char *p; + char buf[10240]; + struct ifconf ifc; + struct ifreq *ifr; + struct sockaddr_in *sin; +- char *bufp; + + /* Dummy socket for ioctl. */ + sd = socket (AF_INET, SOCK_DGRAM, 0); +@@ -655,12 +654,8 @@ getinterfaces (int *howmany) + log_legacy_write + ("getinterfaces: SIOCGIFCONF claims you have no network interfaces!"); + +- len = sizeof (struct ifmap); +- +- for (bufp = buf; bufp && *bufp && (bufp < (buf + ifc.ifc_len)); +- bufp += sizeof (ifr->ifr_name) + len) ++ for (ifr = (struct ifreq *) buf; (char *) ifr < buf + ifc.ifc_len; ) + { +- ifr = (struct ifreq *) bufp; + sin = (struct sockaddr_in *) &ifr->ifr_addr; + memcpy (&(mydevs[numinterfaces].addr), (char *) &(sin->sin_addr), + sizeof (struct in_addr)); +@@ -670,6 +665,7 @@ getinterfaces (int *howmany) + strncpy (mydevs[numinterfaces].name, ifr->ifr_name, 63); + mydevs[numinterfaces].name[63] = '\0'; + numinterfaces++; ++ mydevs[numinterfaces].name[0] = '\0'; + if (numinterfaces == 1023) + { + log_legacy_write +@@ -677,7 +673,11 @@ getinterfaces (int *howmany) + " Things may not work right."); + break; + } +- mydevs[numinterfaces].name[0] = '\0'; ++ n = offsetof(struct ifreq, ifr_addr) + ifr->ifr_addr.sa_len; ++ if (n < sizeof(*ifr)) ++ ifr++; ++ else ++ ifr = (struct ifreq *)((char *)ifr + n); + } + + // If output parameter given, set value Added: head/security/openvas-libraries/files/patch-misc-pcap_openvas.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-misc-pcap_openvas.h Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- misc/pcap_openvas.h.orig 2015-08-03 10:14:29 UTC ++++ misc/pcap_openvas.h +@@ -26,6 +26,7 @@ + #ifndef OPENVAS_PCAP_H + #define OPENVAS_PCAP_H + ++#include <netinet/in.h> + #include <pcap.h> + + int v6_is_local_ip (struct in6_addr *); Added: head/security/openvas-libraries/files/patch-nasl-capture_packet.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-capture_packet.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- nasl/capture_packet.c.orig 2015-08-03 10:14:31 UTC ++++ nasl/capture_packet.c +@@ -17,6 +17,7 @@ + * + */ + ++#include <sys/socket.h> /* for AF_INET6 */ + #include <arpa/inet.h> /* for inet_ntoa */ + #include <string.h> /* for bcopy */ + #include <glib.h> /* for gfree */ Added: head/security/openvas-libraries/files/patch-nasl-nasl_builtin_openvas_tcp_scanner.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_builtin_openvas_tcp_scanner.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,11 @@ +--- nasl/nasl_builtin_openvas_tcp_scanner.c.orig 2015-08-03 10:14:31 UTC ++++ nasl/nasl_builtin_openvas_tcp_scanner.c +@@ -473,7 +473,7 @@ banner_grab(const struct in6_addr *pia, + #endif + if(IN6_IS_ADDR_V4MAPPED(pia)) + { +- sa.sin_addr.s_addr = pia->s6_addr32[3]; ++ memcpy(&sa.sin_addr.s_addr, &pia->s6_addr[12], 4); + sa.sin_family = AF_INET; + sa.sin_port = htons(port); + len = sizeof(struct sockaddr_in); Added: head/security/openvas-libraries/files/patch-nasl-nasl_builtin_synscan.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_builtin_synscan.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,20 @@ +--- nasl/nasl_builtin_synscan.c.orig 2015-08-03 10:14:31 UTC ++++ nasl/nasl_builtin_synscan.c +@@ -692,7 +692,7 @@ scan (struct arglist * env, char* hostna + if (IN6_IS_ADDR_V4MAPPED (dst6)) + { + family = AF_INET; +- dst.s_addr = dst6->s6_addr32[3]; ++ memcpy(&dst.s_addr, &dst6->s6_addr[12], 4); + soc = rawsocket (AF_INET); + } + else +@@ -797,7 +797,7 @@ plugin_run_synscan (lex_ctxt * lexic) + struct timeval tv; + #endif + +- inaddr.s_addr = dst6->s6_addr32[3]; ++ memcpy(&inaddr.s_addr, &dst6->s6_addr[12], 4); + dst = &inaddr; + + if (islocalhost (dst)) Added: head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,56 @@ +--- nasl/nasl_packet_forgery.c.orig 2015-08-03 10:14:31 UTC ++++ nasl/nasl_packet_forgery.c +@@ -146,7 +146,7 @@ forge_ip_packet (lex_ctxt * lexic) + if (s != NULL) + inet_aton (s, &pkt->ip_dst); + else +- pkt->ip_dst.s_addr = dst_addr->s6_addr32[3]; ++ memcpy(&pkt->ip_dst.s_addr, &dst_addr->s6_addr[12], 4); + + if (data != NULL) + { +@@ -1400,7 +1400,7 @@ nasl_tcp_ping (lex_ctxt * lexic) + + if (dst == NULL || (IN6_IS_ADDR_V4MAPPED (dst) != 1)) + return NULL; +- inaddr.s_addr = dst->s6_addr32[3]; ++ memcpy(&inaddr.s_addr, &dst->s6_addr[12], 4); + for (i = 0; i < sizeof (sports) / sizeof (int); i++) + { + if (sports[i] == 0) +@@ -1422,7 +1422,7 @@ nasl_tcp_ping (lex_ctxt * lexic) + port = plug_get_host_open_port (script_infos); + + if (islocalhost (&inaddr) > 0) +- src.s_addr = dst->s6_addr32[3]; ++ memcpy(&src.s_addr, &dst->s6_addr[12], 4); + else + { + bzero (&src, sizeof (src)); +@@ -1536,7 +1536,7 @@ nasl_send_packet (lex_ctxt * lexic) + + if (dstip == NULL || (IN6_IS_ADDR_V4MAPPED (dstip) != 1)) + return NULL; +- inaddr.s_addr = dstip->s6_addr32[3]; ++ memcpy(&inaddr.s_addr, &dstip->s6_addr[12], 4); + soc = socket (AF_INET, SOCK_RAW, IPPROTO_RAW); + if (soc < 0) + return NULL; +@@ -1656,7 +1656,7 @@ nasl_pcap_next (lex_ctxt * lexic) + { + struct in_addr src; + bzero (&src, sizeof (src)); +- inaddr.s_addr = dst->s6_addr32[3]; ++ memcpy(&inaddr.s_addr, &dst->s6_addr[12], 4); + interface = routethrough (&inaddr, &src); + } + else +@@ -1791,7 +1791,7 @@ nasl_send_capture (lex_ctxt * lexic) + { + struct in_addr src; + bzero (&src, sizeof (src)); +- inaddr.s_addr = dst->s6_addr32[3]; ++ memcpy(&inaddr.s_addr, &dst->s6_addr[12], 4); + interface = routethrough (&inaddr, &src); + } + else Added: head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery_v6.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_packet_forgery_v6.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- nasl/nasl_packet_forgery_v6.c.orig 2015-08-03 10:14:31 UTC ++++ nasl/nasl_packet_forgery_v6.c +@@ -43,6 +43,7 @@ + #include <string.h> /* for bcopy */ + #include <sys/time.h> /* for gettimeofday */ + #include <unistd.h> /* for close */ ++#include <netinet/in.h> + #include <netinet/icmp6.h> /* ICMPv6 */ + + #include "bpf_share.h" /* for bpf_open_live */ Added: head/security/openvas-libraries/files/patch-nasl-nasl_raw.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_raw.h Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,11 @@ +--- nasl/nasl_raw.h.orig 2015-08-03 10:14:31 UTC ++++ nasl/nasl_raw.h +@@ -43,6 +43,8 @@ + + #include <netinet/tcp.h> + #include <netinet/udp.h> ++#include <netinet/in.h> ++#include <netinet/ip.h> + #include <netinet/ip_icmp.h> + + #endif Added: head/security/openvas-libraries/files/patch-nasl-nasl_socket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-libraries/files/patch-nasl-nasl_socket.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,20 @@ +--- nasl/nasl_socket.c.orig 2015-12-08 07:07:22 UTC ++++ nasl/nasl_socket.c +@@ -266,7 +266,7 @@ tryagain: + if (IN6_IS_ADDR_V4MAPPED (p)) + { + bzero (&daddr, sizeof (daddr)); +- daddr.sin_addr.s_addr = p->s6_addr32[3]; ++ memcpy(&daddr.sin_addr.s_addr, &p->s6_addr[12], 4); + daddr.sin_family = AF_INET; + daddr.sin_port = htons (dport); + unblock_socket (sock); +@@ -504,7 +504,7 @@ nasl_open_sock_udp (lex_ctxt * lexic) + if (IN6_IS_ADDR_V4MAPPED (ia)) + { + bzero (&soca, sizeof (soca)); +- soca.sin_addr.s_addr = ia->s6_addr32[3]; ++ memcpy(&soca.sin_addr.s_addr, &ia->s6_addr[12], 4); + soca.sin_port = htons (port); + soca.sin_family = AF_INET; + Modified: head/security/openvas-libraries/pkg-descr ============================================================================== --- head/security/openvas-libraries/pkg-descr Thu Mar 17 12:55:36 2016 (r411277) +++ head/security/openvas-libraries/pkg-descr Thu Mar 17 12:57:25 2016 (r411278) @@ -1,6 +1,7 @@ -OpenVAS stands for Open Vulnerability Assessment System and is a network -security scanner with associated tools like a graphical user fontend. The core -is a server component with a set of network vulnerability tests (NVTs) to -detect security problems in remote systems and applications. +The Open Vulnerability Assessment System (OpenVAS) is a framework of several +services and tools offering a comprehensive and powerful vulnerability +scanning and vulnerability management solution. + +This package contains core libraries. WWW: http://www.openvas.org/ Modified: head/security/openvas-libraries/pkg-plist ============================================================================== --- head/security/openvas-libraries/pkg-plist Thu Mar 17 12:55:36 2016 (r411277) +++ head/security/openvas-libraries/pkg-plist Thu Mar 17 12:57:25 2016 (r411278) @@ -1,40 +1,64 @@ -bin/libopenvas-config -include/openvas/arglists.h -include/openvas/bpf_share.h -include/openvas/certificate.h -include/openvas/ftp_funcs.h -include/openvas/harglists.h -include/openvas/hash_table_file.h -include/openvas/hg_utils.h -include/openvas/hosts_gatherer.h -include/openvas/kb.h -include/openvas/libopenvas.h -include/openvas/libvers.h -include/openvas/network.h -include/openvas/ntp.h -include/openvas/nvti.h -include/openvas/openvas_auth.h -include/openvas/openvas_logging.h -include/openvas/openvas_server.h -include/openvas/openvas_ssh_login.h -include/openvas/pcap_openvas.h -include/openvas/plugutils.h -include/openvas/popen.h -include/openvas/proctitle.h -include/openvas/rand.h -include/openvas/resolve.h -include/openvas/scanners_utils.h -include/openvas/services1.h -include/openvas/share_fd.h -include/openvas/store.h -include/openvas/system.h -include/openvas/www_funcs.h -lib/libopenvas.a -lib/libopenvas.so -lib/libopenvas.so.2 -lib/libopenvas.so.2.0.3 -lib/libopenvas_hg.a -lib/libopenvas_hg.so -lib/libopenvas_hg.so.2 -lib/libopenvas_hg.so.2.0.3 -man/man1/libopenvas-config.1.gz +bin/openvas-nasl +bin/openvas-nasl-lint +include/openvas/base/array.h +include/openvas/base/credentials.h +include/openvas/base/cvss.h +include/openvas/base/drop_privileges.h +include/openvas/base/gpgme_util.h +include/openvas/base/nvti.h +include/openvas/base/nvticache.h +include/openvas/base/openvas_compress.h +include/openvas/base/openvas_file.h +include/openvas/base/openvas_hosts.h +include/openvas/base/openvas_networking.h +include/openvas/base/openvas_string.h +include/openvas/base/osp.h +include/openvas/base/pidfile.h +include/openvas/base/pwpolicy.h +include/openvas/base/settings.h +include/openvas/misc/arglists.h +include/openvas/misc/bpf_share.h +include/openvas/misc/ftp_funcs.h +include/openvas/misc/internal_com.h +include/openvas/misc/kb.h +include/openvas/misc/network.h +include/openvas/misc/nvt_categories.h +include/openvas/misc/openvas_auth.h +include/openvas/misc/openvas_logging.h +include/openvas/misc/openvas_proctitle.h +include/openvas/misc/openvas_server.h +include/openvas/misc/openvas_uuid.h +include/openvas/misc/pcap_openvas.h +include/openvas/misc/plugutils.h +include/openvas/misc/popen.h +include/openvas/misc/prefs.h +include/openvas/misc/radius.h +include/openvas/misc/www_funcs.h +include/openvas/nasl/nasl.h +include/openvas/omp/omp.h +include/openvas/omp/xml.h +lib/libopenvas_base.so +lib/libopenvas_base.so.8 +lib/libopenvas_base.so.8.0.7 +lib/libopenvas_misc.so +lib/libopenvas_misc.so.8 +lib/libopenvas_misc.so.8.0.7 +lib/libopenvas_nasl.so +lib/libopenvas_nasl.so.8 +lib/libopenvas_nasl.so.8.0.7 +lib/libopenvas_omp.so +lib/libopenvas_omp.so.8 +lib/libopenvas_omp.so.8.0.7 +libdata/pkgconfig/libopenvas_base.pc +libdata/pkgconfig/libopenvas_misc.pc +libdata/pkgconfig/libopenvas_nasl.pc +libdata/pkgconfig/libopenvas_omp.pc +man/man1/openvas-nasl.1.gz +@dir(,,700) etc/openvas/gnupg +@dir share/openvas +@dir /var/cache/openvas +@dir(,,700) /var/lib/openvas/gnupg +@dir /var/lib/openvas/plugins +@dir /var/lib/openvas +@dir /var/lib +@dir /var/log/openvas Added: head/security/openvas-manager/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/Makefile Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= openvas-manager +PORTVERSION= 6.0.8 +CATEGORIES= security +MASTER_SITES= http://wald.intevation.org/frs/download.php/2295/ + +MAINTAINER= ports@FreeBSD.org +COMMENT= OpenVAS manager + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgpgme.so:${PORTSDIR}/security/gpgme \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libopenvas_base.so:${PORTSDIR}/security/openvas-libraries + +USES= cmake:outsource execinfo gnome pkgconfig sqlite +USE_GNOME= glib20 +USE_RC_SUBR= openvasmd + +OPTIONS_DEFINE= DOCS + +post-install: + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> Added: head/security/openvas-manager/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/distinfo Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,2 @@ +SHA256 (openvas-manager-6.0.8.tar.gz) = 498f72a047841d55102ed50a16b0a096f66a5c951010cfaa3241689d693c11d7 +SIZE (openvas-manager-6.0.8.tar.gz) = 1946231 Added: head/security/openvas-manager/files/openvasmd.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/openvasmd.in Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: openvasmd +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following to /etc/rc.conf[.local] to enable this service +# +# openvasmd_enable="YES" +# + +. /etc/rc.subr + +name=openvasmd +rcvar=openvasmd_enable +command="%%PREFIX%%/sbin/openvasmd" +pidfile=/var/run/openvasmd.pid +extra_commands="reload" + +: ${openvasmd_enable=NO} + +load_rc_config $name +run_rc_command "$1" Added: head/security/openvas-manager/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2015-12-21 09:42:05 UTC ++++ CMakeLists.txt +@@ -153,7 +153,7 @@ if (NOT LIBDIR) + 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 + + ## 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") Added: head/security/openvas-manager/files/patch-doc-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-doc-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,9 @@ +--- doc/CMakeLists.txt.orig 2015-08-03 05:52:11 UTC ++++ doc/CMakeLists.txt +@@ -164,5 +164,5 @@ install (FILES omp.html + COMPONENT doc) + + install (FILES openvasmd.8 +- DESTINATION share/man/man8/ ++ DESTINATION man/man8/ + COMPONENT doc) Added: head/security/openvas-manager/files/patch-src-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-CMakeLists.txt Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2015-12-08 07:09:32 UTC ++++ src/CMakeLists.txt +@@ -66,7 +66,7 @@ add_library (otp STATIC otp.c) + ## 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) + Added: head/security/openvas-manager/files/patch-src-manage_migrators.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-manage_migrators.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- src/manage_migrators.c.orig 2015-08-03 05:52:13 UTC ++++ src/manage_migrators.c +@@ -122,6 +122,7 @@ + /* time.h in glibc2 needs this for strptime. */ + #define _XOPEN_SOURCE + ++#include <sys/wait.h> + #include <time.h> + #include <stdlib.h> + #include <string.h> Added: head/security/openvas-manager/files/patch-src-manage_sql.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-manage_sql.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,49 @@ +--- src/manage_sql.c.orig 2016-02-26 13:38:52 UTC ++++ src/manage_sql.c +@@ -58,6 +58,7 @@ + #include <unistd.h> + #include <sys/time.h> + #include <grp.h> ++#include <libgen.h> + + #include <openvas/base/openvas_string.h> + #include <openvas/base/openvas_file.h> +@@ -940,7 +941,7 @@ iso_time_internal (time_t *epoch_time, c + 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 + 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 + 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"); + } + Added: head/security/openvas-manager/files/patch-src-manage_sqlite3.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-manage_sqlite3.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,10 @@ +--- src/manage_sqlite3.c.orig 2015-12-08 07:09:32 UTC ++++ src/manage_sqlite3.c +@@ -31,6 +31,7 @@ + #include "manage_acl.h" + #include "tracef.h" + ++#include <sys/wait.h> + #include <sqlite3.h> + #include <time.h> + Added: head/security/openvas-manager/files/patch-src-omp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-omp.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,17 @@ +--- src/omp.c.orig 2016-02-26 13:38:52 UTC ++++ src/omp.c +@@ -16340,11 +16340,11 @@ omp_xml_handle_end_element (/*@unused@*/ + "<timezone_abbrev>%s</timezone_abbrev>", + iso, + (next_time == 0 ? "over" : iso_time_tz (&next_time, timezone, NULL)), +- schedule_iterator_period (&schedules), +- schedule_iterator_period_months (&schedules), ++ (long) schedule_iterator_period (&schedules), ++ (long) schedule_iterator_period_months (&schedules), + simple_period, + simple_period_unit, +- schedule_iterator_duration (&schedules), ++ (long) schedule_iterator_duration (&schedules), + simple_duration, + simple_duration_unit, + schedule_iterator_timezone (&schedules) Added: head/security/openvas-manager/files/patch-src-openvasmd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvas-manager/files/patch-src-openvasmd.c Thu Mar 17 12:57:25 2016 (r411278) @@ -0,0 +1,351 @@ +--- src/openvasmd.c.orig 2015-12-08 07:09:32 UTC ++++ src/openvasmd.c +@@ -629,7 +629,7 @@ cleanup () + } + #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_ + 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_ + 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_ + { + g_critical ("%s: failed to register `atexit' cleanup function\n", + __FUNCTION__); +- log_config_free (log_config); ++ log_config_free (); + exit (EXIT_FAILURE); + } + +@@ -1468,25 +1468,25 @@ main (int argc, char** argv) + 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 +1524,7 @@ main (int argc, char** argv) + 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 +1576,7 @@ main (int argc, char** argv) + 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 +1606,22 @@ main (int argc, char** argv) + 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__); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603171257.u2HCvQdo009582>