security/gvm: Update to 21.4.0

The following ports part of security gvm were updated

security/gvmd: Update to 21.4.0
security/gvm-libs: Update to 21.4.0
security/openvas: Update to 21.4.0
security/py-ospd-openvas: Update to 21.4.0
security/py-ospd: Update to 21.4.0
security/greenbone-security-assistant: Update to 21.4.0
security/py-python-gvm: Update to 21.5.2
security/py-gvm-tools: Update to 21.6.0

Notable Changes in this Release

- All components and the feed support CVSSv3/CVSSv3.1
- GSA contains a new calculator for these CVSS versions
- Rework of the login page in GSA to have a better entry point into our software
- Dropped support for Internet Explorer
- Dropped support for Microsoft Edge <= 18
- Removed auto false positive feature
- Removed GMP scanner support
- Dropped dynamic severity classes
- Removed support for Python 3.5 and lower

PR:		254630 254632
Reported by:	Eirik Oeverby <ltning-freebsd at anduin.net>

31 files changed, 334 insertions, 219 deletions

diff --git a/security/greenbone-security-assistant/Makefile b/security/greenbone-security-assistant/Makefile
index 9c42a37867c5..0e7a71360d10 100644
--- a/security/greenbone-security-assistant/Makefile
+++ b/security/greenbone-security-assistant/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	greenbone-security-assistant
 DISTVERSIONPREFIX=	v
-DISTVERSION=	20.8.1
-PORTREVISION=	1
+DISTVERSION=	21.4.0
 CATEGORIES=	security
 MASTER_SITES=   LOCAL/acm/gsa/:yarn_cache
 DISTFILES=	${PORTNAME}-cache${EXTRACT_SUFX}:yarn_cache
@@ -35,6 +34,8 @@ GROUPS=		${USERS}
 
 USE_RC_SUBR=	gsad
 
+LDFLAGS+=	-lm
+
 ETCDIR=		${PREFIX}/etc/gvm
 
 post-extract:
diff --git a/security/greenbone-security-assistant/distinfo b/security/greenbone-security-assistant/distinfo
index 8d7a82739f71..2d0c9226c748 100644
--- a/security/greenbone-security-assistant/distinfo
+++ b/security/greenbone-security-assistant/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1613667267
-SHA256 (greenbone-security-assistant-cache.tar.gz) = 54e91c17d834c20864b7b8bcd539afaae041ea377aea546db2d7cdc6c7e234c1
-SIZE (greenbone-security-assistant-cache.tar.gz) = 49197096
-SHA256 (greenbone-gsa-v20.8.1_GH0.tar.gz) = e295051d0d690a6026d94969d839ad68233e4fdb02feb5b6731507c6ae8318d1
-SIZE (greenbone-gsa-v20.8.1_GH0.tar.gz) = 2136158
+TIMESTAMP = 1623723470
+SHA256 (greenbone-security-assistant-cache.tar.gz) = 3984e5794dbdc46229ca5ef83828eca96d3a160a038d4e99f9af5f5529671d0a
+SIZE (greenbone-security-assistant-cache.tar.gz) = 61902870
+SHA256 (greenbone-gsa-v21.4.0_GH0.tar.gz) = d135e00b8f909f6a781e6b4addd1fa646265582702e35c2f67c400d9342973c3
+SIZE (greenbone-gsa-v21.4.0_GH0.tar.gz) = 2629071
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index bbd7594875cb..c18d7e016e7f 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gvm
-DISTVERSION=	20.8.1
+DISTVERSION=	21.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	-libs
 
@@ -18,6 +17,7 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libssh.so:security/libssh \
 		libhiredis.so:databases/hiredis \
+		libnet.so:net/libnet \
 		libgcrypt.so:security/libgcrypt
 RUN_DEPENDS=	doxygen>0:devel/doxygen
 
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
index deb77db61c4b..653641e4270b 100644
--- a/security/gvm-libs/distinfo
+++ b/security/gvm-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613666897
-SHA256 (greenbone-gvm-libs-v20.8.1_GH0.tar.gz) = e890d85a1f66961df76abef4d6d35a25ea67dd13bb02a591aae5fdf20f295fa4
-SIZE (greenbone-gvm-libs-v20.8.1_GH0.tar.gz) = 267872
+TIMESTAMP = 1623714221
+SHA256 (greenbone-gvm-libs-v21.4.0_GH0.tar.gz) = 2738e3c66ca17f7e5420d05fc047df082dd89c5aa426740899ab079544a90ccc
+SIZE (greenbone-gvm-libs-v21.4.0_GH0.tar.gz) = 289513
diff --git a/security/gvm-libs/files/patch-boreas_ping.c b/security/gvm-libs/files/patch-boreas_ping.c
index dda6a1fd38b2..6672c778a132 100644
--- a/security/gvm-libs/files/patch-boreas_ping.c
+++ b/security/gvm-libs/files/patch-boreas_ping.c
@@ -1,12 +1,12 @@
---- 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 @@
+--- boreas/ping.c	2021-04-15 09:22:56.000000000 -0500
++++ boreas/ping.c	2021-06-14 19:24:32.398090000 -0500
+@@ -26,9 +26,13 @@
  #include <errno.h>
  #include <glib.h>
  #include <ifaddrs.h> /* for getifaddrs() */
--#include <linux/sockios.h>
- #include <net/ethernet.h>
- #include <net/if.h> /* for if_nametoindex() */
++#if defined __linux__
+ #include <linux/sockios.h>
++#endif
  #include <netinet/icmp6.h>
 +#include <sys/types.h>
  #include <netinet/in.h>
@@ -14,14 +14,7 @@
  #include <netinet/ip6.h>
  #include <netinet/ip_icmp.h>
  #include <netinet/tcp.h>
--#include <netpacket/packet.h> /* for sockaddr_ll */
-+#ifdef AF_LINK
-+#   include <net/if_dl.h>
-+#endif
-+#ifdef AF_PACKET
-+#   include <netpacket/packet.h>
-+#endif
- #include <stdlib.h>
+@@ -36,7 +40,6 @@
  #include <sys/ioctl.h>
  #include <sys/socket.h>
  #include <sys/time.h>
@@ -29,109 +22,84 @@
  #include <unistd.h>
  
  #undef G_LOG_DOMAIN
-@@ -121,7 +126,7 @@
+@@ -105,7 +108,11 @@
    int cur_so_sendbuf = -1;
  
    /* Get the current size of the output queue size */
--  if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1)
++#ifdef __FreeBSD__
 +  if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1)
++#else
+   if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1)
++#endif
      {
        g_warning ("%s: ioctl error: %s", __func__, strerror (errno));
        usleep (100000);
-@@ -137,7 +142,7 @@
+@@ -121,7 +128,11 @@
        while (cur_so_sendbuf >= so_sndbuf)
          {
            usleep (100000);
--          if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1)
++#ifdef __FreeBSD__
 +          if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1)
++#else
+           if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1)
++#endif
              {
                g_warning ("%s: ioctl error: %s", __func__, strerror (errno));
                usleep (100000);
-@@ -224,12 +229,12 @@
+@@ -208,12 +219,23 @@
    static int init = -1;
  
    icmp = (struct icmphdr *) sendbuf;
--  icmp->type = ICMP_ECHO;
--  icmp->code = 0;
++#ifdef __FreeBSD__
 +  icmp->icmp_type = ICMP_ECHO;
 +  icmp->icmp_code = 0;
++#else
+   icmp->type = ICMP_ECHO;
+   icmp->code = 0;
++#endif
  
++
    len = 8 + datalen;
--  icmp->checksum = 0;
--  icmp->checksum = in_cksum ((u_short *) icmp, len);
++#ifdef __FreeBSD__
 +  icmp->icmp_cksum = 0;
 +  icmp->icmp_cksum = in_cksum ((u_short *) icmp, len);
++#else
+   icmp->checksum = 0;
+   icmp->checksum = in_cksum ((u_short *) icmp, len);
++#endif
  
    memset (&soca, 0, sizeof (soca));
    soca.sin_family = AF_INET;
-@@ -292,7 +297,7 @@
+@@ -276,7 +298,11 @@
      }
    else
      {
--      dst4.s_addr = dst6_p->s6_addr32[3];
++#ifdef __FreeBSD__
 +      dst4.s_addr = dst6_p->s6_addr[12];
++#else
+       dst4.s_addr = dst6_p->s6_addr32[3];
++#endif
        send_icmp_v4 (scanner->icmpv4soc, dst4_p);
      }
  }
-@@ -554,7 +559,7 @@
+@@ -538,7 +564,11 @@
      }
    else
      {
--      dst4.s_addr = dst6_p->s6_addr32[3];
++#ifdef __FreeBSD__
 +      dst4.s_addr = dst6_p->s6_addr[12];
++#else
+       dst4.s_addr = dst6_p->s6_addr32[3];
++#endif
        send_tcp_v4 (scanner, dst4_p);
      }
  }
-@@ -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;
-@@ -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. */
-@@ -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.hlen = 6;
-   arphdr.plen = 4;
-   arphdr.opcode = htons (1);
-@@ -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));
- 
-@@ -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);
-     }
- }
+@@ -588,7 +618,7 @@
+       /* Need to transform the IPv6 mapped IPv4 address back to an IPv4 string.
+        * We can not just use the host_value_str as it might be an IPv4 mapped
+        * IPv6 string. */
+-      if (inet_ntop (AF_INET, &(dst6_p->s6_addr32[3]), ipv4_str,
++      if (inet_ntop (AF_INET, &(dst6_p->s6_addr[12]), ipv4_str,
+                      sizeof (ipv4_str))
+           == NULL)
+         {
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
index 72fefb7a8dfc..ff47c7aa6159 100644
--- a/security/gvm-libs/pkg-plist
+++ b/security/gvm-libs/pkg-plist
@@ -14,6 +14,7 @@ include/gvm/base/settings.h
 include/gvm/base/strings.h
 include/gvm/base/version.h
 include/gvm/boreas/alivedetection.h
+include/gvm/boreas/arp.h
 include/gvm/boreas/boreas_error.h
 include/gvm/boreas/boreas_io.h
 include/gvm/boreas/cli.h
@@ -35,20 +36,20 @@ 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.1
+lib/libgvm_base.so.21
+lib/libgvm_base.so.21.4.0
 lib/libgvm_boreas.so
-lib/libgvm_boreas.so.20
-lib/libgvm_boreas.so.20.8.1
+lib/libgvm_boreas.so.21
+lib/libgvm_boreas.so.21.4.0
 lib/libgvm_gmp.so
-lib/libgvm_gmp.so.20
-lib/libgvm_gmp.so.20.8.1
+lib/libgvm_gmp.so.21
+lib/libgvm_gmp.so.21.4.0
 lib/libgvm_osp.so
-lib/libgvm_osp.so.20
-lib/libgvm_osp.so.20.8.1
+lib/libgvm_osp.so.21
+lib/libgvm_osp.so.21.4.0
 lib/libgvm_util.so
-lib/libgvm_util.so.20
-lib/libgvm_util.so.20.8.1
+lib/libgvm_util.so.21
+lib/libgvm_util.so.21.4.0
 libdata/pkgconfig/libgvm_base.pc
 libdata/pkgconfig/libgvm_boreas.pc
 libdata/pkgconfig/libgvm_gmp.pc
diff --git a/security/gvm/Makefile b/security/gvm/Makefile
index 52579b8a124b..5bcec70943b8 100644
--- a/security/gvm/Makefile
+++ b/security/gvm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gvm
-PORTVERSION=	20.8.1
+PORTVERSION=	21.4.0
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/security/gvm/files/pkg-message.in b/security/gvm/files/pkg-message.in
index de1cab584eac..e01bd8dfdaf6 100644
--- a/security/gvm/files/pkg-message.in
+++ b/security/gvm/files/pkg-message.in
@@ -3,6 +3,10 @@
   message: <<EOM
 GVM ports were installed
 
+If you are migrating to new version do not forget do the following:
+
+  # su -m gvm -c "gvmd --migrate"
+
 Basic instructions for configure your gvm infraestruture are following:
 
 1) Redis is a dependency of GVM. Please, configure redis-server for 
@@ -34,7 +38,19 @@ Basic instructions for configure your gvm infraestruture are following:
   # sysrc ospd_openvas_enable="YES"
   # sysrc gsad_enable="YES"
 
-5) The following steps are neccessary before of you can access to GVM web 
+5) Currently, ospd_openvas should run as a user without elevated privileges 
+   (gvm) and use sudo for run openvas scanner but it does not work properly. 
+   Like a workaround you must run redis as root and the same with ospd_openvas.
+
+   Add the following lines to /etc/rc.conf
+
+   redis_user="root"
+   ospd_openvas_user="root"
+
+   Take in mind it is not the best configuration for run ospd_openvas and
+   openvas. 
+
+6) The following steps are neccessary before of you can access to GVM web 
    interface (gsad):
 
   Start gvmd service. It will listen on /var/run/gvmd/gvmd.sock by default
@@ -64,7 +80,7 @@ Basic instructions for configure your gvm infraestruture are following:
    
   # su -m gvm -c "gvmd --modify-setting 78eceaec-3385-11ea-b237-28d24461215b --value <uuid_of_user>
 
-6) Start OSPD-OpenVAS Wrapper service. It will listen on /var/run/ospd/ospd.sock by default
+7) Start OSPD-OpenVAS Wrapper service. It will listen on /var/run/ospd/ospd.sock by default
 
   # service ospd_openvas start
 
@@ -77,11 +93,11 @@ Basic instructions for configure your gvm infraestruture are following:
   # su -m gvm -c "gvmd --verify-scanner=08b69003-5fc2-4037-a479-93b440211c73"
   Scanner version: OpenVAS x.x.x
 
-7) Start GVM web interface. It will listen on http://127.0.0.1 by default
+8) Start GVM web interface. It will listen on http://127.0.0.1 by default
 
   # service gsad start
 
-8) Some openvas scanner tasks  need access to /dev/bpf device. Add the 
+9) Some openvas scanner tasks  need access to /dev/bpf device. Add the 
    following lines to /etc/devfs.conf
 
    own     bpf     root:gvm
@@ -91,15 +107,15 @@ Basic instructions for configure your gvm infraestruture are following:
 
    # service devfs restart
 
-9) gvm log files are stores to /var/log/gvm directory
+10) gvm log files are stores to /var/log/gvm directory
 
-10) gsad can export results to PDF. It needs print/texlive-texmf port
+11) gsad can export results to PDF. It needs print/texlive-texmf port
   
   # pkg install texlive-texmf
 
   It will install 1G of data
 
-11) If you need more configure information you can look at the following links:
+12) If you need more configure information you can look at the following links:
 
    https://github.com/greenbone/gvmd/blob/master/INSTALL.md
    https://github.com/greenbone/openvas/blob/master/INSTALL.md
@@ -113,7 +129,7 @@ Basic instructions for configure your gvm infraestruture are following:
    # ospd-openvas -h
    # gsad -h
 
-12) Enjoy it
+13) Enjoy it
 EOM
 }
 ]
diff --git a/security/gvm/pkg-descr b/security/gvm/pkg-descr
index 9fe61740cc6c..6a2134585c9f 100644
--- a/security/gvm/pkg-descr
+++ b/security/gvm/pkg-descr
@@ -1,3 +1,15 @@
 This is the metaport to install GVM applications and libraries.
 
+When the OpenVAS project was created it only consisted of an engine for 
+scanning vulnerabilities. Shortly after Greenbone Networks was funded to 
+achieve professional support for vulnerability scanning. Greenbone started to
+lead the development, added several software components and turned OpenVAS into
+a vulnerability management solution still keeping the values of free software.
+
+After several years it became obvious that using OpenVAS as the brand name for
+the open source project and funding nearly all development of the project was
+not recognized from the outside. Therefore after the release of the OpenVAS 9 
+framework it got renamed to Greenbone Vulnerability Management (GVM) and 
+released as Greenbone Source Edition (GSE).
+
 WWW: https://www.openvas.org/
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index 71002058cb42..8e9888821059 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gvmd
-DISTVERSION=	20.8.1
-PORTREVISION=	1
+DISTVERSION=	21.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -38,12 +37,15 @@ GROUPS=		${USERS}
 
 USE_RC_SUBR=	gvmd
 
-SHEBANG_FILES=	tools/gvm-lsc-rpm-creator.sh \
-		tools/gvm-lsc-deb-creator.sh \
+SHEBANG_FILES=	tools/gvm-lsc-rpm-creator \
+		tools/gvm-lsc-deb-creator \
 		src/alert_methods/TippingPoint/report-convert.py \
 		src/alert_methods/SCP/alert \
 		src/alert_methods/SMB/alert
 
+post-patch:
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/manage_sql.c
+
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/lib/gvm/gvmd/gnupg
 	@${MKDIR} ${STAGEDIR}/var/log/gvm
diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo
index 71a05f30e89e..f5f1384ae619 100644
--- a/security/gvmd/distinfo
+++ b/security/gvmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613667146
-SHA256 (greenbone-gvmd-v20.8.1_GH0.tar.gz) = 65320093d660a687e260456df439842ed61ec8aa5841f8141b717aec3bfe504a
-SIZE (greenbone-gvmd-v20.8.1_GH0.tar.gz) = 1024660
+TIMESTAMP = 1623716907
+SHA256 (greenbone-gvmd-v21.4.0_GH0.tar.gz) = 60e433761fb35b1a1be9a180af2ab481795dcba1fbc52de3cc2aac986a5df552
+SIZE (greenbone-gvmd-v21.4.0_GH0.tar.gz) = 1014802
diff --git a/security/gvmd/files/patch-src_manage_migrators.c b/security/gvmd/files/patch-src_manage_migrators.c
new file mode 100644
index 000000000000..65ed147964c8
--- /dev/null
+++ b/security/gvmd/files/patch-src_manage_migrators.c
@@ -0,0 +1,27 @@
+--- src/manage_migrators.c	2021-06-15 13:01:15.511923000 -0500
++++ src/manage_migrators.c	2021-06-15 13:04:16.836317000 -0500
+@@ -2627,10 +2627,20 @@
+ 
+   sql ("ALTER TABLE results_trash DROP COLUMN IF EXISTS score;");
+ 
+-  /* Change the vt_severities table to a CVSS score */
+-  sql ("ALTER TABLE vt_severities ALTER COLUMN score"
+-       " SET DATA TYPE double precision;");
+-  sql ("UPDATE vt_severities SET score = round((score / 10.0)::numeric, 1);");
++ /* Change the vt_severities table to use a CVSS score
++   * if it already exists (migrating from a 21.04 development version) */
++  if (sql_int ("SELECT EXISTS (SELECT * FROM information_schema.tables"
++               "               WHERE table_catalog = '%s'"
++               "               AND table_schema = 'public'"
++               "               AND table_name = 'vt_severities')"
++               " ::integer;",
++               sql_database ()))
++    {
++      sql ("ALTER TABLE vt_severities ALTER COLUMN score"
++           " SET DATA TYPE double precision;");
++      sql ("UPDATE vt_severities"
++           " SET score = round((score / 10.0)::numeric, 1);");
++    }
+ 
+   /* Set the database version to 242. */
+ 
diff --git a/security/gvmd/files/patch-src_manage_sql.c b/security/gvmd/files/patch-src_manage_sql.c
index 0e08ecc642e2..fe750e08bd2b 100644
--- a/security/gvmd/files/patch-src_manage_sql.c
+++ b/security/gvmd/files/patch-src_manage_sql.c
@@ -1,5 +1,5 @@
---- src/manage_sql.c	2021-02-02 09:44:09.000000000 -0500
-+++ src/manage_sql.c	2021-02-18 13:49:16.256262000 -0500
+--- src/manage_sql.c	2021-04-16 02:27:18.000000000 -0500
++++ src/manage_sql.c	2021-06-14 19:33:56.599632000 -0500
 @@ -52,7 +52,6 @@
  #include <errno.h>
  #include <glib/gstdio.h>
@@ -8,7 +8,16 @@
  #include <pwd.h>
  #include <stdlib.h>
  #include <sys/socket.h>
-@@ -15277,8 +15276,6 @@
+@@ -9075,7 +9074,7 @@
+   g_debug ("   HTTP_GET %s", url);
+ 
+   cmd = (gchar **) g_malloc (5 * sizeof (gchar *));
+-  cmd[0] = g_strdup ("/usr/bin/wget");
++  cmd[0] = g_strdup ("%%LOCALBASE%%/bin/wget");
+   cmd[1] = g_strdup ("-O");
+   cmd[2] = g_strdup ("-");
+   cmd[3] = g_strdup (url);
+@@ -15262,8 +15261,6 @@
      }
  
    cleanup_iterator (&nvts);
diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist
index acc81f799c41..472a2c4e553e 100644
--- a/security/gvmd/pkg-plist
+++ b/security/gvmd/pkg-plist
@@ -2,8 +2,8 @@ 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.1
+lib/libgvm-pg-server.so.21
+lib/libgvm-pg-server.so.21.4.0
 sbin/greenbone-certdata-sync
 sbin/greenbone-feed-sync
 sbin/greenbone-scapdata-sync
@@ -12,8 +12,9 @@ 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/gvm-lsc-deb-creator
+share/gvm/gvm-lsc-exe-creator
+share/gvm/gvm-lsc-rpm-creator
 share/gvm/gvmd/global_alert_methods/159f79a5-fce8-4ec5-aa49-7d17a77739a3/alert
 share/gvm/gvmd/global_alert_methods/2db07698-ec49-11e5-bcff-28d24461215b/alert
 share/gvm/gvmd/global_alert_methods/4a398d42-87c0-11e5-a1c0-28d24461215b/alert
@@ -33,6 +34,7 @@ share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/genera
 share/gvm/gvmd/global_schema_formats/787a4a18-dabc-11df-9486-002264764cea/rnc.xsl
 share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/GMP.xsl
 share/gvm/gvmd/global_schema_formats/d6cf255e-947c-11e1-829a-406186ea4fc5/generate
+share/gvm/gvmd/template.nsis
 share/gvm/gvmd/wizards/delete_task_deep.xml
 share/gvm/gvmd/wizards/get_tasks_deep.xml
 share/gvm/gvmd/wizards/modify_task.xml
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index 97ef685ba0f1..6189a864338d 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openvas
-DISTVERSION=	20.8.1
+DISTVERSION=	21.4.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
diff --git a/security/openvas/distinfo b/security/openvas/distinfo
index 4ec365779ee2..fbb754c14b00 100644
--- a/security/openvas/distinfo
+++ b/security/openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613666970
-SHA256 (greenbone-openvas-scanner-v20.8.1_GH0.tar.gz) = 37856e754e70a597a0d8227625a0145c14575168ebf7441bcedc587c36823216
-SIZE (greenbone-openvas-scanner-v20.8.1_GH0.tar.gz) = 431985
+TIMESTAMP = 1623718693
+SHA256 (greenbone-openvas-scanner-v21.4.0_GH0.tar.gz) = 75ed559848d8dda20202d884e7695d6f3aa52333eae402e2236a8208666d8fb7
+SIZE (greenbone-openvas-scanner-v21.4.0_GH0.tar.gz) = 446945
diff --git a/security/openvas/files/patch-nasl_nasl_packet_forgery.c b/security/openvas/files/patch-nasl_nasl_packet_forgery.c
index 92e982031a74..af75a2f6e87e 100644
--- a/security/openvas/files/patch-nasl_nasl_packet_forgery.c
+++ b/security/openvas/files/patch-nasl_nasl_packet_forgery.c
@@ -1,15 +1,31 @@
---- 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 @@
+--- nasl/nasl_packet_forgery.c	2021-04-15 09:39:00.000000000 -0500
++++ nasl/nasl_packet_forgery.c	2021-06-14 20:22:38.283404000 -0500
+@@ -33,6 +33,12 @@
  #include "nasl_tree.h"
  #include "nasl_var.h"
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
++#ifdef __FreeBSD
++  #include <netinet/in.h>
++  #include <netinet/tcp.h>
++#endif
  #include <arpa/inet.h> /* for inet_aton */
  #include <ctype.h>     /* for isprint */
  #include <errno.h>     /* for errno */
-@@ -163,7 +165,7 @@
+@@ -52,6 +58,11 @@
+ #define UNFIX(n) ntohs (n)
+ #endif
+ 
++#ifdef __FreeBSD__
++#define TCP_MSS_DEFAULT TCP_MSS
++#define TCP_MSS_DESIRED TCP_MSS
++#endif
++
+ /*--------------[ cksum ]-----------------------------------------*/
+ 
+ /*
+@@ -163,7 +174,7 @@
    if (s != NULL)
      inet_aton (s, &pkt->ip_dst);
    else
@@ -18,7 +34,7 @@
  
    if (data != NULL)
      {
-@@ -1541,7 +1543,7 @@
+@@ -2086,7 +2097,7 @@
  
    if (dst == NULL || (IN6_IS_ADDR_V4MAPPED (dst) != 1))
      return NULL;
@@ -27,7 +43,7 @@
    for (i = 0; i < sizeof (sports) / sizeof (int); i++)
      {
        if (sports[i] == 0)
-@@ -1559,7 +1561,7 @@
+@@ -2104,7 +2115,7 @@
      port = plug_get_host_open_port (script_infos);
  
    if (islocalhost (&inaddr) > 0)
@@ -36,7 +52,7 @@
    else
      {
        bzero (&src, sizeof (src));
-@@ -1684,7 +1686,7 @@
+@@ -2229,7 +2240,7 @@
  
    if (dstip == NULL || (IN6_IS_ADDR_V4MAPPED (dstip) != 1))
      return NULL;
@@ -45,7 +61,7 @@
    soc = socket (AF_INET, SOCK_RAW, IPPROTO_RAW);
    if (soc < 0)
      return NULL;
-@@ -1824,7 +1826,7 @@
+@@ -2369,7 +2380,7 @@
          {
            struct in_addr src;
            bzero (&src, sizeof (src));
@@ -54,7 +70,7 @@
            interface = routethrough (&inaddr, &src);
          }
        else
-@@ -1973,7 +1975,7 @@
+@@ -2518,7 +2529,7 @@
          {
            struct in_addr src;
            bzero (&src, sizeof (src));
diff --git a/security/openvas/files/patch-nasl_nasl_packet_forgery_v6.c b/security/openvas/files/patch-nasl_nasl_packet_forgery_v6.c
index df4ecc59bc12..3cce52f14fe2 100644
--- a/security/openvas/files/patch-nasl_nasl_packet_forgery_v6.c
+++ b/security/openvas/files/patch-nasl_nasl_packet_forgery_v6.c
@@ -1,5 +1,5 @@
---- nasl/nasl_packet_forgery_v6.c	2020-08-11 07:00:25.000000000 -0500
-+++ nasl/nasl_packet_forgery_v6.c	2021-01-04 17:39:47.104902000 -0500
+--- nasl/nasl_packet_forgery_v6.c	2021-04-15 09:39:00.000000000 -0500
++++ nasl/nasl_packet_forgery_v6.c	2021-06-14 20:22:58.395635000 -0500
 @@ -36,6 +36,8 @@
   * 09/02/2010 Preeti Subramanian <spreeti@secpod.com>
   */
@@ -9,13 +9,25 @@
  #include <arpa/inet.h> /* for inet_aton */
  #include <ctype.h>     /* for isprint */
  #include <pcap.h>      /* for PCAP_ERRBUF_SIZE */
-@@ -44,9 +46,7 @@
- #include <sys/param.h>
+@@ -45,7 +47,8 @@
  #include <sys/time.h> /* for gettimeofday */
  #include <unistd.h>   /* for close */
--#ifdef __FreeBSD__
- #include <netinet/in.h>
--#endif
+ #ifdef __FreeBSD__
+-#include <netinet/in.h>
++#  include <netinet/in.h>
++#  include <netinet/tcp.h>
+ #endif
  
  #include "../misc/bpf_share.h"    /* for bpf_open_live */
- #include "../misc/pcap_openvas.h" /* for routethrough */
+@@ -73,6 +76,11 @@
+ #else
+ #define FIX(n) htons (n)
+ #define UNFIX(n) ntohs (n)
++#endif
++
++#ifdef __FreeBSD__
++#define TCP_MSS_DEFAULT TCP6_MSS
++#define TCP_MSS_DESIRED TCP6_MSS
+ #endif
+ 
+ /*--------------[ cksum ]-----------------------------------------*/
diff --git a/security/openvas/files/patch-tools_greenbone-nvt-sync.in b/security/openvas/files/patch-tools_greenbone-nvt-sync.in
index 8ff8914b457e..a2a18e9668e6 100644
--- a/security/openvas/files/patch-tools_greenbone-nvt-sync.in
+++ b/security/openvas/files/patch-tools_greenbone-nvt-sync.in
@@ -1,5 +1,5 @@
---- tools/greenbone-nvt-sync.in	2020-08-11 07:00:25.000000000 -0500
-+++ tools/greenbone-nvt-sync.in	2021-01-02 02:45:37.863324000 -0500
+--- tools/greenbone-nvt-sync.in	2021-04-15 09:39:00.000000000 -0500
++++ tools/greenbone-nvt-sync.in	2021-06-15 16:41:18.698165000 -0500
 @@ -87,10 +87,10 @@
  LOG_CMD="logger -t $SCRIPT_NAME"
  
@@ -13,7 +13,16 @@
      $LOG_CMD -p daemon.warning "The log facility is not working as expected. All messages will be written to the standard error stream."
    fi
  }
-@@ -428,7 +428,7 @@
+@@ -202,7 +202,7 @@
+   SYNC_TMP_DIR=/tmp
+   # If we have mktemp, create a temporary dir (safer)
+   if [ -n "`which mktemp`" ]; then
+-    SYNC_TMP_DIR=`mktemp -t -d greenbone-nvt-sync.XXXXXXXXXX` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; }
++    SYNC_TMP_DIR=`mktemp -d /tmp/greenbone-nvt-sync.XXXXXXXXXX` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; }
+     trap "rm -rf $SYNC_TMP_DIR" EXIT HUP INT TRAP TERM
+   fi
+ else
+@@ -437,7 +437,7 @@
          log_err "rsync failed, aborting synchronization."
          exit 1
        fi
@@ -22,7 +31,7 @@
        if [ $? -ne 0 ]  ; then
          if [ -n "$retried" ]
          then
-@@ -462,10 +462,10 @@
+@@ -471,10 +471,10 @@
  
  do_self_test ()
  {
@@ -35,3 +44,12 @@
    fi
  
    RSYNC_AVAIL=`command -v rsync`
+@@ -512,7 +512,7 @@
+     log_write "Feed is already current, skipping synchronization."
+   else
+     (
+-      chmod +660 $OPENVAS_FEED_LOCK_PATH
++      chmod 660 $OPENVAS_FEED_LOCK_PATH
+       flock -n 9
+       if [ $? -eq 1 ] ; then
+           log_warning "Another process related to the feed update is already running"
diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist
index c72f699843d4..b573b6dcac41 100644
--- a/security/openvas/pkg-plist
+++ b/security/openvas/pkg-plist
@@ -3,11 +3,11 @@ 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.1
+lib/libopenvas_misc.so.21
+lib/libopenvas_misc.so.21.4.0
 lib/libopenvas_nasl.so
-lib/libopenvas_nasl.so.20
-lib/libopenvas_nasl.so.20.8.1
+lib/libopenvas_nasl.so.21
+lib/libopenvas_nasl.so.21.4.0
 sbin/openvas
 share/man/man1/openvas-nasl-lint.1.gz
 share/man/man1/openvas-nasl.1.gz
@@ -21,4 +21,3 @@ share/man/man8/openvas.8.gz
 @dir(gvm,gvm,750) /var/lib/openvas
 @dir(gvm,gvm,750) /var/log/gvm
 @dir(gvm,gvm,750) /var/run/ospd
-
diff --git a/security/py-gvm-tools/Makefile b/security/py-gvm-tools/Makefile
index 23e1b363cd4a..7948a79f0de9 100644
--- a/security/py-gvm-tools/Makefile
+++ b/security/py-gvm-tools/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gvm-tools
-DISTVERSION=	21.1.0
+DISTVERSION=	21.6.0
 CATEGORIES=	security python
 MASTER_SITES=   CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-gvm-tools/distinfo b/security/py-gvm-tools/distinfo
index 9edb960d1f7d..ae174ea77ac0 100644
--- a/security/py-gvm-tools/distinfo
+++ b/security/py-gvm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613680518
-SHA256 (gvm-tools-21.1.0.tar.gz) = 622fe776403043aa3e033b79670def59c94d0ae920e03da34e498609d2795b65
-SIZE (gvm-tools-21.1.0.tar.gz) = 91161
+TIMESTAMP = 1623730192
+SHA256 (gvm-tools-21.6.0.tar.gz) = 8eaa1343d2ea24115cfc09f0b284aa8a809e0f5d87c614ba22ce8570d6c19468
+SIZE (gvm-tools-21.6.0.tar.gz) = 99903
diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile
index db75637c2475..091657b29555 100644
--- a/security/py-ospd-openvas/Makefile
+++ b/security/py-ospd-openvas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ospd-openvas
-DISTVERSION=	20.8.1
+DISTVERSION=	21.4.0
 CATEGORIES=	security python
 MASTER_SITES=   CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-ospd-openvas/distinfo b/security/py-ospd-openvas/distinfo
index 01ea79451c3a..3f852e6d3eeb 100644
--- a/security/py-ospd-openvas/distinfo
+++ b/security/py-ospd-openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613667218
-SHA256 (ospd-openvas-20.8.1.tar.gz) = 7292310c2e876ffb49e6384609675669d2580798f329d8a133cced97b76d9020
-SIZE (ospd-openvas-20.8.1.tar.gz) = 84152
+TIMESTAMP = 1623717986
+SHA256 (ospd-openvas-21.4.0.tar.gz) = cb3f711d557fde991b1b5a5648a1289b6fcd2ad32456af9028ed0992d49c2c1b
+SIZE (ospd-openvas-21.4.0.tar.gz) = 86530
diff --git a/security/py-ospd-openvas/files/ospd_openvas.in b/security/py-ospd-openvas/files/ospd_openvas.in
index 49d8bd8d562f..d4a203fd23af 100644
--- a/security/py-ospd-openvas/files/ospd_openvas.in
+++ b/security/py-ospd-openvas/files/ospd_openvas.in
@@ -19,12 +19,16 @@ rcvar=ospd_openvas_enable
 
 load_rc_config ${name}
 
+export PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
+
 : ${ospd_openvas_enable:=NO}
 : ${ospd_openvas_pidfile="/var/run/ospd/ospd-openvas.pid"}
 : ${ospd_openvas_config="/usr/local/etc/gvm/ospd.conf"}
-: ${ospd_openvas_flags="--lock-file-dir /var/run/ospd --unix-socket /var/run/ospd/ospd.sock"}
+: ${ospd_openvas_flags="--lock-file-dir /var/run/ospd --socket-mode 770 --unix-socket /var/run/ospd/ospd.sock"}
+: ${ospd_openvas_user="gvm"}
+
+ospd_openvas_group="gvm"
 
-ospd_openvas_user="gvm"
 pidfile=${ospd_openvas_pidfile}
 
 command=/usr/local/bin/ospd-openvas
diff --git a/security/py-ospd-openvas/pkg-plist b/security/py-ospd-openvas/pkg-plist
index d9c3e4203ef2..a47dff5fd3e7 100644
--- a/security/py-ospd-openvas/pkg-plist
+++ b/security/py-ospd-openvas/pkg-plist
@@ -1,31 +1,25 @@
 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-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/daemon%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/db%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/lock%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/nvticache%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/openvas%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/preferencehandler%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/ospd_openvas/__pycache__/vthelper%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ospd_openvas/__version__.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/daemon.py
 %%PYTHON_SITELIBDIR%%/ospd_openvas/db.py
diff --git a/security/py-ospd/Makefile b/security/py-ospd/Makefile
index 582645cc078d..cfe854fca14e 100644
--- a/security/py-ospd/Makefile
+++ b/security/py-ospd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ospd
-DISTVERSION=	20.8.2
+DISTVERSION=	21.4.0
 CATEGORIES=	security net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-ospd/distinfo b/security/py-ospd/distinfo
index a46617b9b176..f69098085077 100644
--- a/security/py-ospd/distinfo
+++ b/security/py-ospd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613667196
-SHA256 (ospd-20.8.2.tar.gz) = ca493c9696c6ecb406d5c34c6c24fae3544c141bc6efbf3a0fadb3a1ead52199
-SIZE (ospd-20.8.2.tar.gz) = 98388
+TIMESTAMP = 1623730136
+SHA256 (ospd-21.4.0.tar.gz) = 38eee96e95dcd8b509ed54d7ddeb121bc8bf6cecf84aabb466ca22f9c2d6eb55
+SIZE (ospd-21.4.0.tar.gz) = 98753
diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile
index 86c50c258287..b62e8bd56f09 100644
--- a/security/py-python-gvm/Makefile
+++ b/security/py-python-gvm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	python-gvm
-DISTVERSION=	21.1.3
+DISTVERSION=	21.5.2
 CATEGORIES=	security python
 MASTER_SITES=   CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo
index 2a9240b25564..8ea1067cd05c 100644
--- a/security/py-python-gvm/distinfo
+++ b/security/py-python-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613680583
-SHA256 (python-gvm-21.1.3.tar.gz) = 27d5542fd16a0b61218e3fd70ca29a3dc56ab0d33aec14ea5d090610950087a1
-SIZE (python-gvm-21.1.3.tar.gz) = 190090
+TIMESTAMP = 1623730251
+SHA256 (python-gvm-21.5.2.tar.gz) = 69f313d780dcaef321ef53a47df1fedaf525811531310d373de68acbc024636f
+SIZE (python-gvm-21.5.2.tar.gz) = 148933
diff --git a/security/py-python-gvm/files/patch-setup.py b/security/py-python-gvm/files/patch-setup.py
index a850c3784307..5993d7d8ebac 100644
--- a/security/py-python-gvm/files/patch-setup.py
+++ b/security/py-python-gvm/files/patch-setup.py
@@ -1,34 +1,68 @@
---- setup.py.orig	2021-01-04 18:38:41.394413000 -0500
-+++ setup.py	2021-01-04 18:38:57.320954000 -0500
-@@ -8,30 +8,7 @@
+--- setup.py	2021-06-01 04:03:35.971744800 -0500
++++ setup.py	2021-06-14 23:12:32.397135000 -0500
+@@ -9,64 +9,7 @@
+  'gvm.protocols.gmpv208.system',
   'gvm.protocols.gmpv214',
-  'gvm.protocols.gmpv7',
-  'gvm.protocols.gmpv8',
-- 'gvm.protocols.gmpv9',
+  'gvm.protocols.gmpv214.entities',
+- 'gvm.protocols.gmpv214.system',
 - 'tests',
 - 'tests.connections',
 - 'tests.protocols',
 - 'tests.protocols.gmp',
 - 'tests.protocols.gmpv208',
-- 'tests.protocols.gmpv208.testcmds',
-- 'tests.protocols.gmpv208.testtypes',
+- 'tests.protocols.gmpv208.entities',
+- 'tests.protocols.gmpv208.entities.alerts',
+- 'tests.protocols.gmpv208.entities.audits',
+- 'tests.protocols.gmpv208.entities.credentials',
+- 'tests.protocols.gmpv208.entities.filters',
+- 'tests.protocols.gmpv208.entities.groups',
+- 'tests.protocols.gmpv208.entities.hosts',
+- 'tests.protocols.gmpv208.entities.notes',
+- 'tests.protocols.gmpv208.entities.operating_systems',
+- 'tests.protocols.gmpv208.entities.overrides',
+- 'tests.protocols.gmpv208.entities.permissions',
+- 'tests.protocols.gmpv208.entities.policies',
+- 'tests.protocols.gmpv208.entities.port_lists',
+- 'tests.protocols.gmpv208.entities.report_formats',
+- 'tests.protocols.gmpv208.entities.reports',
+- 'tests.protocols.gmpv208.entities.results',
+- 'tests.protocols.gmpv208.entities.roles',
+- 'tests.protocols.gmpv208.entities.scan_configs',
+- 'tests.protocols.gmpv208.entities.scanners',
+- 'tests.protocols.gmpv208.entities.schedules',
+- 'tests.protocols.gmpv208.entities.secinfo',
+- 'tests.protocols.gmpv208.entities.tags',
+- 'tests.protocols.gmpv208.entities.targets',
+- 'tests.protocols.gmpv208.entities.tasks',
+- 'tests.protocols.gmpv208.entities.tickets',
+- 'tests.protocols.gmpv208.entities.tls_certificates',
+- 'tests.protocols.gmpv208.entities.users',
+- 'tests.protocols.gmpv208.entities.vulnerabilities',
+- 'tests.protocols.gmpv208.enums',
+- 'tests.protocols.gmpv208.system',
+- 'tests.protocols.gmpv208.system.aggregates',
+- 'tests.protocols.gmpv208.system.authentication',
+- 'tests.protocols.gmpv208.system.feed',
+- 'tests.protocols.gmpv208.system.help',
+- 'tests.protocols.gmpv208.system.system_reports',
+- 'tests.protocols.gmpv208.system.trashcan',
+- 'tests.protocols.gmpv208.system.user_settings',
+- 'tests.protocols.gmpv208.system.versions',
 - 'tests.protocols.gmpv214',
-- 'tests.protocols.gmpv214.testcmds',
-- 'tests.protocols.gmpv214.testtypes',
-- 'tests.protocols.gmpv7',
-- 'tests.protocols.gmpv7.testcmds',
-- 'tests.protocols.gmpv7.testtypes',
-- 'tests.protocols.gmpv8',
-- 'tests.protocols.gmpv8.testcmds',
-- 'tests.protocols.gmpv8.testtypes',
-- 'tests.protocols.gmpv9',
-- 'tests.protocols.gmpv9.testcmds',
-- 'tests.protocols.gmpv9.testtypes',
+- 'tests.protocols.gmpv214.entities',
+- 'tests.protocols.gmpv214.entities.notes',
+- 'tests.protocols.gmpv214.entities.overrides',
+- 'tests.protocols.gmpv214.entities.scanners',
+- 'tests.protocols.gmpv214.entities.targets',
+- 'tests.protocols.gmpv214.entities.users',
+- 'tests.protocols.gmpv214.enums',
+- 'tests.protocols.gmpv214.system',
+- 'tests.protocols.gmpv214.system.versions',
 - 'tests.protocols.osp',
 - 'tests.transforms',
 - 'tests.utils',
 - 'tests.xml']
-+ 'gvm.protocols.gmpv9']
++ 'gvm.protocols.gmpv214.system']
  
  package_data = \
  {'': ['*']}