Index: head/security/greenbone-security-assistant/Makefile =================================================================== --- head/security/greenbone-security-assistant/Makefile (revision 565984) +++ head/security/greenbone-security-assistant/Makefile (revision 565985) @@ -1,65 +1,64 @@ # $FreeBSD$ PORTNAME= greenbone-security-assistant DISTVERSIONPREFIX= v -DISTVERSION= 20.8.0 -PORTREVISION= 1 +DISTVERSION= 20.8.1 CATEGORIES= security MASTER_SITES= LOCAL/acm/gsa/:yarn_cache DISTFILES= ${PORTNAME}-cache${EXTRACT_SUFX}:yarn_cache MAINTAINER= acm@FreeBSD.org COMMENT= Libraries module for the GVM solution LICENSE= AGPLv3+ BUILD_DEPENDS= node:www/node \ yarn:www/yarn LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libmicrohttpd.so:www/libmicrohttpd RUN_DEPENDS= doxygen>0:devel/doxygen \ ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} USES= cmake gettext-runtime gnome pkgconfig python USE_GNOME= glib20 libxml2 USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= gsa CMAKE_ARGS+= -DINSTALLER_ARGS="--offline" USERS= gvm GROUPS= ${USERS} USE_RC_SUBR= gsad ETCDIR= ${PREFIX}/etc/gvm post-extract: @${MV} ${WRKSRC}/gsad/src/gsad_log_conf.cmake_in ${WRKSRC}/gsad/src/gsad_log.conf.sample post-patch: ${ECHO_CMD} 'yarn-offline-mirror "${WRKDIR}/yarn-offline-cache"' >> \ ${WRKSRC}/.yarnrc ${REINPLACE_CMD} -e 's|$${GVM_LOG_DIR}|/var/log/gvm|g' ${WRKSRC}/gsad/src/gsad_log.conf.sample post-install: @${MKDIR} ${STAGEDIR}/var/run/gvm @${MKDIR} ${STAGEDIR}${ETCDIR} @${INSTALL_DATA} ${WRKSRC}/gsad/src/gsad_log.conf.sample ${STAGEDIR}${ETCDIR} @${ECHO_CMD} "@sample etc/gvm/gsad_log.conf.sample" >> ${TMPPLIST} @${ECHO_CMD} "sbin/gsad" >> ${TMPPLIST} >> ${TMPPLIST} @${ECHO_CMD} "share/gvm/gsad/web/index.html" >> ${TMPPLIST} @${ECHO_CMD} "share/gvm/gsad/web/robots.txt" >> ${TMPPLIST} @cd ${WRKSRC}/gsa/build && \ ${FIND} -s img locales static -not -type d \ -exec ${ECHO_CMD} "share/gvm/gsad/web/{}" \; >> ${TMPPLIST} @${ECHO_CMD} "share/man/man8/gsad.8.gz" >> ${TMPPLIST} @${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gvm" >> ${TMPPLIST} .include Index: head/security/greenbone-security-assistant/distinfo =================================================================== --- head/security/greenbone-security-assistant/distinfo (revision 565984) +++ head/security/greenbone-security-assistant/distinfo (revision 565985) @@ -1,5 +1,5 @@ -TIMESTAMP = 1609922298 +TIMESTAMP = 1613667267 SHA256 (greenbone-security-assistant-cache.tar.gz) = 54e91c17d834c20864b7b8bcd539afaae041ea377aea546db2d7cdc6c7e234c1 SIZE (greenbone-security-assistant-cache.tar.gz) = 49197096 -SHA256 (greenbone-gsa-v20.8.0_GH0.tar.gz) = 8f9f6d985a592b805aeba8c73cba7efaaa497f67a0a9dc8264590d2f41e98ddc -SIZE (greenbone-gsa-v20.8.0_GH0.tar.gz) = 2131696 +SHA256 (greenbone-gsa-v20.8.1_GH0.tar.gz) = e295051d0d690a6026d94969d839ad68233e4fdb02feb5b6731507c6ae8318d1 +SIZE (greenbone-gsa-v20.8.1_GH0.tar.gz) = 2136158 Index: head/security/gvm/Makefile =================================================================== --- head/security/gvm/Makefile (revision 565984) +++ head/security/gvm/Makefile (revision 565985) @@ -1,39 +1,38 @@ # $FreeBSD$ PORTNAME= gvm -PORTVERSION= 20.8.0 -PORTREVISION= 2 +PORTVERSION= 20.8.1 CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Greenbone vulnerability management (metaport) USES= metaport python:3.6+ # Install GVM libraries RUN_DEPENDS+= ${LOCALBASE}/lib/libgvm_base.so:security/gvm-libs # Install GVM Manager RUN_DEPENDS+= ${LOCALBASE}/sbin/gvmd:security/gvmd # Install Scanner wrapper for OSP RUN_DEPENDS+= ${LOCALBASE}/bin/ospd-openvas:security/py-ospd-openvas@${PY_FLAVOR} # Install OpenVAS Scanner RUN_DEPENDS+= ${LOCALBASE}/sbin/openvas:security/openvas # Install GVM Web Interface RUN_DEPENDS+= ${LOCALBASE}/sbin/gsad:security/greenbone-security-assistant SUB_FILES= pkg-message OPTIONS_DEFINE= PYTHON-GVM GVM-TOOLS OPTIONS_DEFAULT= PYTHON-GVM GVM-TOOLS PYTHON-GVM_DESC= Install GVM python API library GVM-TOOLS_DESC= Install GVM tools PYTHON-GVM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gvm>=0:security/py-python-gvm@${PY_FLAVOR} GVM-TOOLS_RUN_DEPENDS= gvm-cli:security/py-gvm-tools@${PY_FLAVOR} .include Index: head/security/gvm-libs/Makefile =================================================================== --- head/security/gvm-libs/Makefile (revision 565984) +++ head/security/gvm-libs/Makefile (revision 565985) @@ -1,44 +1,44 @@ # $FreeBSD$ PORTNAME= gvm -DISTVERSION= 20.8.0 +DISTVERSION= 20.8.1 DISTVERSIONPREFIX= v CATEGORIES= security PKGNAMESUFFIX= -libs MAINTAINER= acm@FreeBSD.org COMMENT= libraries module for the GVM solution LICENSE= GPLv2+ BUILD_DEPENDS= doxygen>0:devel/doxygen LIB_DEPENDS= libgpgme.so:security/gpgme \ libgnutls.so:security/gnutls \ libuuid.so:misc/e2fsprogs-libuuid \ libssh.so:security/libssh \ libhiredis.so:databases/hiredis \ libgcrypt.so:security/libgcrypt RUN_DEPENDS= doxygen>0:devel/doxygen USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} USES= cmake gnome pkgconfig USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes OPTIONS_DEFINE= LDAP RADIUS LDAP_CMAKE_ON= -DBUILD_WITH_LDAP=1 LDAP_CMAKE_OFF= -DBUILD_WITH_LDAP=0 LDAP_USE= OPENLDAP=yes RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1 RADIUS_CMAKE_OFF=-DBUILD_WITH_RADIUS=0 RADIUS_LIB_DEPENDS= libfreeradius-client.so:net/freeradius-client post-patch: @${REINPLACE_CMD} -e 's|2.25.0|1.45.6|g' ${WRKSRC}/util/libgvm_util.pc.in @${REINPLACE_CMD} -e 's|uuid>=2.25.0|uuid>=1.45.6|g' ${WRKSRC}/util/CMakeLists.txt .include Index: head/security/gvm-libs/distinfo =================================================================== --- head/security/gvm-libs/distinfo (revision 565984) +++ head/security/gvm-libs/distinfo (revision 565985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609528750 -SHA256 (greenbone-gvm-libs-v20.8.0_GH0.tar.gz) = 83331f27e33675f83925194a34fe3d3aae4537b3fcb3d16252153b066d28e9ef -SIZE (greenbone-gvm-libs-v20.8.0_GH0.tar.gz) = 265661 +TIMESTAMP = 1613666897 +SHA256 (greenbone-gvm-libs-v20.8.1_GH0.tar.gz) = e890d85a1f66961df76abef4d6d35a25ea67dd13bb02a591aae5fdf20f295fa4 +SIZE (greenbone-gvm-libs-v20.8.1_GH0.tar.gz) = 267872 Index: head/security/gvm-libs/files/patch-base_networking.c =================================================================== --- head/security/gvm-libs/files/patch-base_networking.c (revision 565984) +++ head/security/gvm-libs/files/patch-base_networking.c (revision 565985) @@ -1,87 +1,87 @@ ---- base/networking.c 2020-12-30 23:53:55.170376000 -0500 -+++ base/networking.c 2020-12-31 00:06:29.941646000 -0500 -@@ -30,28 +30,30 @@ +--- base/networking.c 2021-02-01 10:20:11.000000000 -0500 ++++ base/networking.c 2021-02-18 12:05:06.746722000 -0500 +@@ -30,18 +30,15 @@ #include /* for errno, EAFNOSUPPORT */ #include #include /* for ifaddrs, freeifaddrs, getifaddrs */ +#include #include /* for IFNAMSIZ */ +#include #include /* for uint32_t, uint8_t */ #include /* for atoi, strtol */ #include /* for memcpy, bzero, strchr, strlen, strcmp, strncpy */ #include /* for AF_INET, AF_INET6, AF_UNSPEC, sockaddr_storage */ #include /* for close */ -#ifdef __FreeBSD__ -#include -#define s6_addr32 __u6_addr.__u6_addr32 -#endif -+//#ifdef __FreeBSD__ -+//#include -+//#define s6_addr32 __u6_addr.__u6_addr32 -+//#endif - +- + #undef G_LOG_DOMAIN + /** + * @brief GLib log domain. +@@ -51,13 +48,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. */ -@@ -244,10 +246,19 @@ +@@ -250,10 +247,19 @@ 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)); } /** -@@ -262,7 +273,7 @@ +@@ -268,7 +274,7 @@ if (!addr6) return; 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); } -@@ -808,11 +819,11 @@ +@@ -814,11 +820,11 @@ if (IN6_IS_ADDR_V4MAPPED (&addr6)) { /* addr is 0.0.0.0 */ - if (addr6_p->s6_addr32[3] == 0) + if (addr6_p->s6_addr[12] == 0) return 1; /* addr starts with 127.0.0.1 */ - if ((addr6_p->s6_addr32[3] & htonl (0xFF000000)) + if ((addr6_p->s6_addr[12] & htonl (0xFF000000)) == htonl (0x7F000000)) return 1; } Index: head/security/gvm-libs/files/patch-boreas_ping.c =================================================================== --- head/security/gvm-libs/files/patch-boreas_ping.c (revision 565984) +++ head/security/gvm-libs/files/patch-boreas_ping.c (revision 565985) @@ -1,114 +1,137 @@ ---- boreas/ping.c 2020-12-31 00:53:07.116404000 -0500 -+++ boreas/ping.c 2020-12-31 02:11:16.635441000 -0500 -@@ -29,15 +29,21 @@ +--- boreas/ping.c 2021-02-01 10:20:11.000000000 -0500 ++++ boreas/ping.c 2021-02-18 13:33:38.298849000 -0500 +@@ -26,20 +26,25 @@ + #include + #include + #include /* for getifaddrs() */ +-#include #include #include /* for if_nametoindex() */ #include +#include #include +#include #include #include #include -#include /* for sockaddr_ll */ +#ifdef AF_LINK +# include +#endif +#ifdef AF_PACKET +# include +#endif #include + #include #include #include -#include #include #undef G_LOG_DOMAIN -@@ -138,12 +144,12 @@ - struct icmphdr *icmp; +@@ -121,7 +126,7 @@ + int cur_so_sendbuf = -1; + /* Get the current size of the output queue size */ +- if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1) ++ if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1) + { + g_warning ("%s: ioctl error: %s", __func__, strerror (errno)); + usleep (100000); +@@ -137,7 +142,7 @@ + while (cur_so_sendbuf >= so_sndbuf) + { + usleep (100000); +- if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1) ++ if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1) + { + g_warning ("%s: ioctl error: %s", __func__, strerror (errno)); + usleep (100000); +@@ -224,12 +229,12 @@ + static int init = -1; + icmp = (struct icmphdr *) sendbuf; - icmp->type = ICMP_ECHO; - icmp->code = 0; + icmp->icmp_type = ICMP_ECHO; + icmp->icmp_code = 0; len = 8 + datalen; - icmp->checksum = 0; - icmp->checksum = in_cksum ((u_short *) icmp, len); + icmp->icmp_cksum = 0; + icmp->icmp_cksum = in_cksum ((u_short *) icmp, len); memset (&soca, 0, sizeof (soca)); soca.sin_family = AF_INET; -@@ -197,7 +203,7 @@ +@@ -292,7 +297,7 @@ } else { - dst4.s_addr = dst6_p->s6_addr32[3]; + dst4.s_addr = dst6_p->s6_addr[12]; send_icmp_v4 (scanner->icmpv4soc, dst4_p); } } -@@ -431,7 +437,7 @@ +@@ -554,7 +559,7 @@ } else { - dst4.s_addr = dst6_p->s6_addr32[3]; + dst4.s_addr = dst6_p->s6_addr[12]; send_tcp_v4 (scanner, dst4_p); } } -@@ -445,7 +451,7 @@ +@@ -568,7 +573,7 @@ static void send_arp_v4 (int soc, struct in_addr *dst_p) { - struct sockaddr_ll soca; + struct sockaddr_dl soca; struct arp_hdr arphdr; int frame_length; uint8_t *ether_frame; -@@ -505,10 +511,10 @@ +@@ -637,10 +642,10 @@ } /* Fill in sockaddr_ll.*/ - soca.sll_ifindex = ifaceindex; - soca.sll_family = AF_PACKET; - memcpy (soca.sll_addr, src_mac, 6 * sizeof (uint8_t)); - soca.sll_halen = 6; + soca.sdl_index = ifaceindex; + soca.sdl_family = AF_LINK; + memcpy (soca.sdl_data, src_mac, 6 * sizeof (uint8_t)); + soca.sdl_alen = 6; /* Fill ARP header.*/ /* IP addresses. */ -@@ -520,7 +526,7 @@ +@@ -652,7 +657,7 @@ * Protocol address length is length of IPv4. * OpCode is ARP request. */ arphdr.htype = htons (1); - arphdr.ptype = htons (ETH_P_IP); -+ arphdr.ptype = htons(AF_INET); ++ arphdr.ptype = htons (AF_INET); arphdr.hlen = 6; arphdr.plen = 4; arphdr.opcode = htons (1); -@@ -535,8 +541,8 @@ +@@ -667,8 +672,8 @@ memcpy (ether_frame, dst_mac, 6 * sizeof (uint8_t)); memcpy (ether_frame + 6, src_mac, 6 * sizeof (uint8_t)); /* ethernet type code */ - ether_frame[12] = ETH_P_ARP / 256; - ether_frame[13] = ETH_P_ARP % 256; + ether_frame[12] = AF_ARP / 256; + ether_frame[13] = AF_ARP % 256; /* ARP header. ETH_HDRLEN = 14, ARP_HDRLEN = 28 */ memcpy (ether_frame + 14, &arphdr, 28 * sizeof (uint8_t)); -@@ -592,7 +598,7 @@ +@@ -733,7 +738,7 @@ } else { - dst4.s_addr = dst6_p->s6_addr32[3]; + dst4.s_addr = dst6_p->s6_addr[12]; send_arp_v4 (scanner->arpv4soc, dst4_p); } } Index: head/security/gvm-libs/files/patch-boreas_util.c =================================================================== --- head/security/gvm-libs/files/patch-boreas_util.c (revision 565984) +++ head/security/gvm-libs/files/patch-boreas_util.c (revision 565985) @@ -1,62 +1,72 @@ ---- boreas/util.c 2020-12-30 23:52:07.849996000 -0500 -+++ boreas/util.c 2020-12-31 01:36:37.600382000 -0500 -@@ -21,12 +21,20 @@ +--- boreas/util.c 2021-02-01 10:20:11.000000000 -0500 ++++ boreas/util.c 2021-02-18 13:25:46.406205000 -0500 +@@ -21,13 +21,20 @@ #include "../base/networking.h" /* for range_t */ +#include +#include +#include #include #include #include /* for getifaddrs() */ +-#include #include #include /* for if_nametoindex() */ -#include /* for sockaddr_ll */ +#ifdef AF_LINK +# include +#endif +#ifdef AF_PACKET +# include +#endif #include #include - #include -@@ -109,22 +117,22 @@ + #include +@@ -111,22 +118,22 @@ { for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if ((ifa->ifa_addr) && (ifa->ifa_addr->sa_family == AF_PACKET) + if ((ifa->ifa_addr) && (ifa->ifa_addr->sa_family == AF_LINK) && !(ifa->ifa_flags & (IFF_LOOPBACK))) { if (interface_provided) { if (g_strcmp0 (interface, ifa->ifa_name) == 0) { - struct sockaddr_ll *s = - (struct sockaddr_ll *) ifa->ifa_addr; - memcpy (mac, s->sll_addr, 6 * sizeof (uint8_t)); + struct sockaddr_dl *s = + (struct sockaddr_dl *) ifa->ifa_addr; + memcpy (mac, s->sdl_data, 6 * sizeof (uint8_t)); } } else { - struct sockaddr_ll *s = (struct sockaddr_ll *) ifa->ifa_addr; - memcpy (mac, s->sll_addr, 6 * sizeof (uint8_t)); + struct sockaddr_dl *s = (struct sockaddr_dl *) ifa->ifa_addr; + memcpy (mac, s->sdl_data, 6 * sizeof (uint8_t)); } } } -@@ -508,7 +516,7 @@ +@@ -516,7 +523,7 @@ break; case ARPV4: { - soc = socket (PF_PACKET, SOCK_RAW, htons (ETH_P_ALL)); + soc = socket (PF_LINK, SOCK_RAW, 0); if (soc < 0) { g_warning ("%s: failed to open ARPV4 socket: %s", __func__, +@@ -628,7 +635,7 @@ + so_sndbuf_empty (int soc, int *err) + { + int cur_so_sendbuf = -1; +- if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1) ++ if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1) + { + g_warning ("%s: ioctl error: %s", __func__, strerror (errno)); + *err = -1; Index: head/security/gvm-libs/pkg-plist =================================================================== --- head/security/gvm-libs/pkg-plist (revision 565984) +++ head/security/gvm-libs/pkg-plist (revision 565985) @@ -1,56 +1,56 @@ include/gvm/base/array.h include/gvm/base/credentials.h include/gvm/base/cvss.h include/gvm/base/drop_privileges.h include/gvm/base/hosts.h include/gvm/base/logging.h include/gvm/base/networking.h include/gvm/base/nvti.h include/gvm/base/pidfile.h include/gvm/base/prefs.h include/gvm/base/proctitle.h include/gvm/base/pwpolicy.h include/gvm/base/settings.h include/gvm/base/strings.h include/gvm/base/version.h include/gvm/boreas/alivedetection.h include/gvm/boreas/boreas_error.h include/gvm/boreas/boreas_io.h include/gvm/boreas/cli.h include/gvm/boreas/ping.h include/gvm/boreas/sniffer.h include/gvm/boreas/util.h include/gvm/gmp/gmp.h include/gvm/osp/osp.h include/gvm/util/authutils.h include/gvm/util/compressutils.h include/gvm/util/fileutils.h include/gvm/util/gpgmeutils.h include/gvm/util/kb.h include/gvm/util/ldaputils.h include/gvm/util/nvticache.h include/gvm/util/radiusutils.h include/gvm/util/serverutils.h include/gvm/util/sshutils.h include/gvm/util/uuidutils.h include/gvm/util/xmlutils.h lib/libgvm_base.so lib/libgvm_base.so.20 -lib/libgvm_base.so.20.8.0 +lib/libgvm_base.so.20.8.1 lib/libgvm_boreas.so lib/libgvm_boreas.so.20 -lib/libgvm_boreas.so.20.8.0 +lib/libgvm_boreas.so.20.8.1 lib/libgvm_gmp.so lib/libgvm_gmp.so.20 -lib/libgvm_gmp.so.20.8.0 +lib/libgvm_gmp.so.20.8.1 lib/libgvm_osp.so lib/libgvm_osp.so.20 -lib/libgvm_osp.so.20.8.0 +lib/libgvm_osp.so.20.8.1 lib/libgvm_util.so lib/libgvm_util.so.20 -lib/libgvm_util.so.20.8.0 +lib/libgvm_util.so.20.8.1 libdata/pkgconfig/libgvm_base.pc libdata/pkgconfig/libgvm_boreas.pc libdata/pkgconfig/libgvm_gmp.pc libdata/pkgconfig/libgvm_osp.pc libdata/pkgconfig/libgvm_util.pc Index: head/security/gvmd/Makefile =================================================================== --- head/security/gvmd/Makefile (revision 565984) +++ head/security/gvmd/Makefile (revision 565985) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= gvmd -DISTVERSION= 20.8.0 +DISTVERSION= 20.8.1 DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Greenbone Vulnerability Manager central management service LICENSE= AGPLv3+ BUILD_DEPENDS= doxygen>0:devel/doxygen LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libgnutls.so:security/gnutls \ libgpgme.so:security/gpgme \ libical.so:devel/libical RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ doxygen>0:devel/doxygen \ p5-XML-Twig>=0:textproc/p5-XML-Twig \ snmpget:net-mgmt/net-snmp \ rsync:net/rsync \ wget:ftp/wget \ gpg:security/gnupg \ xml:textproc/xmlstarlet \ sshpass:security/sshpass \ socat:net/socat \ zip:archivers/zip USE_GITHUB= yes GH_ACCOUNT= greenbone USES= cmake gnome pkgconfig pgsql python samba:run USE_GNOME= glib20 libxslt:build USE_LDCONFIG= yes USERS= gvm GROUPS= ${USERS} USE_RC_SUBR= gvmd post-install: @${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg @${MKDIR} ${STAGEDIR}/var/log/gvm @${MKDIR} ${STAGEDIR}/var/run/gvm .include Index: head/security/gvmd/distinfo =================================================================== --- head/security/gvmd/distinfo (revision 565984) +++ head/security/gvmd/distinfo (revision 565985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609399929 -SHA256 (greenbone-gvmd-v20.8.0_GH0.tar.gz) = 2e09df899234fbb8e4e3593c63e94ed6ad0c984c59246a74c76f601499e2a40a -SIZE (greenbone-gvmd-v20.8.0_GH0.tar.gz) = 1016622 +TIMESTAMP = 1613667146 +SHA256 (greenbone-gvmd-v20.8.1_GH0.tar.gz) = 65320093d660a687e260456df439842ed61ec8aa5841f8141b717aec3bfe504a +SIZE (greenbone-gvmd-v20.8.1_GH0.tar.gz) = 1024660 Index: head/security/gvmd/files/patch-src_manage_sql.c =================================================================== --- head/security/gvmd/files/patch-src_manage_sql.c (revision 565984) +++ head/security/gvmd/files/patch-src_manage_sql.c (revision 565985) @@ -1,19 +1,19 @@ ---- src/manage_sql.c 2020-08-11 10:05:36.000000000 -0500 -+++ src/manage_sql.c 2021-01-04 17:08:05.732803000 -0500 -@@ -51,7 +51,6 @@ - #include +--- src/manage_sql.c 2021-02-02 09:44:09.000000000 -0500 ++++ src/manage_sql.c 2021-02-18 13:49:16.256262000 -0500 +@@ -52,7 +52,6 @@ #include #include + #include -#include #include #include #include -@@ -15276,7 +15275,7 @@ +@@ -15277,8 +15276,6 @@ + } cleanup_iterator (&nvts); - +- - malloc_trim (0); -+ // malloc_trim (0); } /** Index: head/security/gvmd/pkg-plist =================================================================== --- head/security/gvmd/pkg-plist (revision 565984) +++ head/security/gvmd/pkg-plist (revision 565985) @@ -1,54 +1,54 @@ bin/gvm-manage-certs @sample etc/gvm/gvmd_log.conf.sample @sample etc/gvm/pwpolicy.conf.sample lib/libgvm-pg-server.so lib/libgvm-pg-server.so.20 -lib/libgvm-pg-server.so.20.08.0 +lib/libgvm-pg-server.so.20.08.1 sbin/greenbone-certdata-sync sbin/greenbone-feed-sync sbin/greenbone-scapdata-sync sbin/gvmd share/doc/gvm/example-gvm-manage-certs.conf share/doc/gvm/html/gmp.html share/gvm/cert/cert_bund_getbyname.xsl share/gvm/cert/dfn_cert_getbyname.xsl share/gvm/gvm-lsc-deb-creator.sh share/gvm/gvm-lsc-rpm-creator.sh share/gvm/gvmd/global_alert_methods/159f79a5-fce8-4ec5-aa49-7d17a77739a3/alert share/gvm/gvmd/global_alert_methods/2db07698-ec49-11e5-bcff-28d24461215b/alert share/gvm/gvmd/global_alert_methods/4a398d42-87c0-11e5-a1c0-28d24461215b/alert share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/alert share/gvm/gvmd/global_alert_methods/5b39c481-9137-4876-b734-263849dd96ce/report-convert.py share/gvm/gvmd/global_alert_methods/9d435134-15d3-11e6-bf5c-28d24461215b/alert share/gvm/gvmd/global_alert_methods/c427a688-b653-40ab-a9d0-d6ba842a9d63/alert share/gvm/gvmd/global_alert_methods/cd1f5a34-6bdc-11e0-9827-002264764cea/alert share/gvm/gvmd/global_alert_methods/f9d97653-f89b-41af-9ba1-0f6ee00e9c1a/alert share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/HTML.xsl share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/generate share/gvm/gvmd/global_schema_formats/02052818-dab6-11df-9be4-002264764cea/rnc.xsl share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/GMP.xml share/gvm/gvmd/global_schema_formats/18e826fc-dab6-11df-b913-002264764cea/generate share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/RNC.xsl share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/generate share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/rnc.xsl share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/GMP.xsl share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/generate share/gvm/gvmd/wizards/delete_task_deep.xml share/gvm/gvmd/wizards/get_tasks_deep.xml share/gvm/gvmd/wizards/modify_task.xml share/gvm/gvmd/wizards/quick_auth_scan.xml share/gvm/gvmd/wizards/quick_first_scan.xml share/gvm/gvmd/wizards/quick_task.xml share/gvm/gvmd/wizards/reset_task.xml share/gvm/scap/cpe_getbyname.xsl share/gvm/scap/cve_getbyname.xsl share/gvm/scap/ovaldef_getbyname.xsl share/man/man1/gvm-manage-certs.1.gz share/man/man8/greenbone-certdata-sync.8.gz share/man/man8/greenbone-scapdata-sync.8.gz share/man/man8/gvmd.8.gz @dir(gvm,gvm,750) /var/lib/gvm/gvmd/gnupg @dir(gvm,gvm,750) /var/lib/gvm/gvmd @dir(gvm,gvm,750) /var/lib/gvm @dir(gvm,gvm,750) /var/run/gvm @dir(gvm,gvm,750) /var/log/gvm Index: head/security/openvas/Makefile =================================================================== --- head/security/openvas/Makefile (revision 565984) +++ head/security/openvas/Makefile (revision 565985) @@ -1,39 +1,40 @@ # $FreeBSD$ PORTNAME= openvas -DISTVERSION= 20.8.0 -PORTREVISION= 1 +DISTVERSION= 20.8.1 DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= acm@FreeBSD.org COMMENT= Open vulnerability assessment scanner LICENSE= GPLv2+ BUILD_DEPENDS= flex:textproc/flex LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libgcrypt.so:security/libgcrypt \ libpcap.so.1:net/libpcap \ libksba.so:security/libksba \ libgpgme.so:security/gpgme \ libssh.so:security/libssh \ libgnutls.so:security/gnutls \ libnetsnmp.so:net-mgmt/net-snmp RUN_DEPENDS= redis-server:databases/redis \ snmpget:net-mgmt/net-snmp \ rsync:net/rsync \ ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= greenbone USES= bison cmake gnome pkgconfig python:3.5+ USE_GNOME= glib20 USERS= gvm GROUPS= ${USERS} + +WRKSRC= ${WRKDIR}/${PORTNAME}-scanner-${DISTVERSION} post-install: @${MKDIR} ${STAGEDIR}/var/run/ospd .include Index: head/security/openvas/distinfo =================================================================== --- head/security/openvas/distinfo (revision 565984) +++ head/security/openvas/distinfo (revision 565985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609452424 -SHA256 (greenbone-openvas-v20.8.0_GH0.tar.gz) = fe0e03d59012bf93614f76afc40d783aa5be4d8879bbe418dddc9745a4d19ccb -SIZE (greenbone-openvas-v20.8.0_GH0.tar.gz) = 423880 +TIMESTAMP = 1613666970 +SHA256 (greenbone-openvas-v20.8.1_GH0.tar.gz) = 37856e754e70a597a0d8227625a0145c14575168ebf7441bcedc587c36823216 +SIZE (greenbone-openvas-v20.8.1_GH0.tar.gz) = 431985 Index: head/security/openvas/files/patch-nasl_nasl_packet_forgery.c =================================================================== --- head/security/openvas/files/patch-nasl_nasl_packet_forgery.c (revision 565984) +++ head/security/openvas/files/patch-nasl_nasl_packet_forgery.c (revision 565985) @@ -1,65 +1,65 @@ ---- nasl/nasl_packet_forgery.c 2020-08-11 07:00:25.000000000 -0500 -+++ nasl/nasl_packet_forgery.c 2021-01-04 17:38:44.560650000 -0500 +--- nasl/nasl_packet_forgery.c 2021-02-18 13:56:34.845872000 -0500 ++++ nasl/nasl_packet_forgery.c 2021-02-18 14:01:16.510985000 -0500 @@ -33,6 +33,8 @@ #include "nasl_tree.h" #include "nasl_var.h" +#include +#include #include /* for inet_aton */ #include /* for isprint */ #include /* for errno */ -@@ -136,7 +138,7 @@ +@@ -163,7 +165,7 @@ 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) { -@@ -1283,7 +1285,7 @@ +@@ -1541,7 +1543,7 @@ 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) -@@ -1301,7 +1303,7 @@ +@@ -1559,7 +1561,7 @@ 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)); -@@ -1411,7 +1413,7 @@ +@@ -1684,7 +1686,7 @@ 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; -@@ -1540,7 +1542,7 @@ +@@ -1824,7 +1826,7 @@ { struct in_addr src; bzero (&src, sizeof (src)); - inaddr.s_addr = dst->s6_addr32[3]; -+ memcpy(&inaddr.s_addr, &dst->s6_addr[12], 4); ++ memcpy(&inaddr.s_addr, &dst->s6_addr[12], 4); interface = routethrough (&inaddr, &src); } else -@@ -1680,7 +1682,7 @@ +@@ -1973,7 +1975,7 @@ { 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 Index: head/security/openvas/pkg-plist =================================================================== --- head/security/openvas/pkg-plist (revision 565984) +++ head/security/openvas/pkg-plist (revision 565985) @@ -1,23 +1,23 @@ bin/greenbone-nvt-sync bin/openvas-nasl bin/openvas-nasl-lint @sample %%ETCDIR%%/openvas_log.conf.sample lib/libopenvas_misc.so lib/libopenvas_misc.so.20 -lib/libopenvas_misc.so.20.8.0 +lib/libopenvas_misc.so.20.8.1 lib/libopenvas_nasl.so lib/libopenvas_nasl.so.20 -lib/libopenvas_nasl.so.20.8.0 +lib/libopenvas_nasl.so.20.8.1 sbin/openvas share/man/man1/openvas-nasl-lint.1.gz share/man/man1/openvas-nasl.1.gz share/man/man8/greenbone-nvt-sync.8.gz share/man/man8/openvas.8.gz @dir %%ETCDIR%%/gnupg @dir %%DATADIR%% @dir(gvm,gvm,750) /var/lib/openvas/gnupg @dir(gvm,gvm,750) /var/lib/openvas/plugins @dir(gvm,gvm,750) /var/lib/openvas @dir(gvm,gvm,750) /var/log/gvm @dir(gvm,gvm,750) /var/run/ospd Index: head/security/py-ospd-openvas/Makefile =================================================================== --- head/security/py-ospd-openvas/Makefile (revision 565984) +++ head/security/py-ospd-openvas/Makefile (revision 565985) @@ -1,37 +1,36 @@ # $FreeBSD$ PORTNAME= ospd-openvas -DISTVERSION= 20.8.0 -PORTREVISION= 1 +DISTVERSION= 20.8.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= acm@FreeBSD.org COMMENT= Scanner wrapper for OSP (Open Scanner Protocol) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ospd>=0:security/py-ospd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ openvas:security/openvas USES= python:3.6+ USE_PYTHON= distutils NO_ARCH= yes USERS= gvm GROUPS= ${USERS} USE_RC_SUBR= ${PORTNAME:S/-/_/} SUB_LIST= PYTHON_CMD=${PYTHON_CMD} post-install: @${MKDIR} ${STAGEDIR}/var/run/ospd .include Index: head/security/py-ospd-openvas/distinfo =================================================================== --- head/security/py-ospd-openvas/distinfo (revision 565984) +++ head/security/py-ospd-openvas/distinfo (revision 565985) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609578115 -SHA256 (ospd-openvas-20.8.0.tar.gz) = 2d1566f09283d3ecce372f9b9ec2e830e59a53a6fcfb26149192355403e01861 -SIZE (ospd-openvas-20.8.0.tar.gz) = 78385 +TIMESTAMP = 1613667218 +SHA256 (ospd-openvas-20.8.1.tar.gz) = 7292310c2e876ffb49e6384609675669d2580798f329d8a133cced97b76d9020 +SIZE (ospd-openvas-20.8.1.tar.gz) = 84152 Index: head/security/py-ospd-openvas/pkg-plist =================================================================== --- head/security/py-ospd-openvas/pkg-plist (revision 565984) +++ head/security/py-ospd-openvas/pkg-plist (revision 565985) @@ -1,32 +1,38 @@ bin/ospd-openvas +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/requires.txt +%%PYTHON_SITELIBDIR%%/ospd_openvas-20.8.1-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/ospd_openvas/__init__.py %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper.cpython-37.opt-1.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper.cpython-37.pyc %%PYTHON_SITELIBDIR%%/ospd_openvas/__version__.py %%PYTHON_SITELIBDIR%%/ospd_openvas/daemon.py %%PYTHON_SITELIBDIR%%/ospd_openvas/db.py %%PYTHON_SITELIBDIR%%/ospd_openvas/errors.py %%PYTHON_SITELIBDIR%%/ospd_openvas/lock.py %%PYTHON_SITELIBDIR%%/ospd_openvas/nvticache.py %%PYTHON_SITELIBDIR%%/ospd_openvas/openvas.py %%PYTHON_SITELIBDIR%%/ospd_openvas/preferencehandler.py %%PYTHON_SITELIBDIR%%/ospd_openvas/vthelper.py @dir(gvm,gvm,750) /var/run/ospd