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>

1 files changed, 48 insertions, 80 deletions

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)
+         {