summaryrefslogtreecommitdiff
path: root/security/gvm-libs
diff options
context:
space:
mode:
Diffstat (limited to 'security/gvm-libs')
-rw-r--r--security/gvm-libs/Makefile2
-rw-r--r--security/gvm-libs/distinfo6
-rw-r--r--security/gvm-libs/files/patch-base_networking.c22
-rw-r--r--security/gvm-libs/files/patch-boreas_ping.c49
-rw-r--r--security/gvm-libs/files/patch-boreas_util.c22
-rw-r--r--security/gvm-libs/pkg-plist10
6 files changed, 72 insertions, 39 deletions
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index d43aaa385ede..940f3bba21e3 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gvm
-DISTVERSION= 20.8.0
+DISTVERSION= 20.8.1
DISTVERSIONPREFIX= v
CATEGORIES= security
PKGNAMESUFFIX= -libs
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
index e242438cc482..deb77db61c4b 100644
--- a/security/gvm-libs/distinfo
+++ b/security/gvm-libs/distinfo
@@ -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
diff --git a/security/gvm-libs/files/patch-base_networking.c b/security/gvm-libs/files/patch-base_networking.c
index d493408701cb..ecadeb94cb0b 100644
--- a/security/gvm-libs/files/patch-base_networking.c
+++ b/security/gvm-libs/files/patch-base_networking.c
@@ -1,6 +1,6 @@
---- 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 <errno.h> /* for errno, EAFNOSUPPORT */
#include <glib/gstdio.h>
#include <ifaddrs.h> /* for ifaddrs, freeifaddrs, getifaddrs */
@@ -17,11 +17,11 @@
-#include <netinet/in.h>
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-+//#ifdef __FreeBSD__
-+//#include <netinet/in.h>
-+//#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. */
@@ -38,7 +38,7 @@
/* Source Interface/Address related functions. */
-@@ -244,10 +246,19 @@
+@@ -250,10 +247,19 @@
if (ip4 == NULL || ip6 == NULL)
return;
@@ -62,7 +62,7 @@
}
/**
-@@ -262,7 +273,7 @@
+@@ -268,7 +274,7 @@
if (!addr6)
return;
if (IN6_IS_ADDR_V4MAPPED (addr6))
@@ -71,7 +71,7 @@
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 */
diff --git a/security/gvm-libs/files/patch-boreas_ping.c b/security/gvm-libs/files/patch-boreas_ping.c
index d05cacc7ab7c..dda6a1fd38b2 100644
--- a/security/gvm-libs/files/patch-boreas_ping.c
+++ b/security/gvm-libs/files/patch-boreas_ping.c
@@ -1,6 +1,10 @@
---- 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 <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() */
#include <netinet/icmp6.h>
@@ -18,14 +22,33 @@
+# include <netpacket/packet.h>
+#endif
#include <stdlib.h>
+ #include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/time.h>
-#include <sys/types.h>
#include <unistd.h>
#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;
@@ -41,7 +64,7 @@
memset (&soca, 0, sizeof (soca));
soca.sin_family = AF_INET;
-@@ -197,7 +203,7 @@
+@@ -292,7 +297,7 @@
}
else
{
@@ -50,7 +73,7 @@
send_icmp_v4 (scanner->icmpv4soc, dst4_p);
}
}
-@@ -431,7 +437,7 @@
+@@ -554,7 +559,7 @@
}
else
{
@@ -59,7 +82,7 @@
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)
{
@@ -68,7 +91,7 @@
struct arp_hdr arphdr;
int frame_length;
uint8_t *ether_frame;
-@@ -505,10 +511,10 @@
+@@ -637,10 +642,10 @@
}
/* Fill in sockaddr_ll.*/
@@ -83,16 +106,16 @@
/* 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 */
@@ -103,7 +126,7 @@
/* 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
{
diff --git a/security/gvm-libs/files/patch-boreas_util.c b/security/gvm-libs/files/patch-boreas_util.c
index 1de3346db51b..afdb21e5bc32 100644
--- a/security/gvm-libs/files/patch-boreas_util.c
+++ b/security/gvm-libs/files/patch-boreas_util.c
@@ -1,6 +1,6 @@
---- 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 */
@@ -10,6 +10,7 @@
#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() */
-#include <netpacket/packet.h> /* for sockaddr_ll */
@@ -21,8 +22,8 @@
+#endif
#include <stdlib.h>
#include <string.h>
- #include <sys/socket.h>
-@@ -109,22 +117,22 @@
+ #include <sys/ioctl.h>
+@@ -111,22 +118,22 @@
{
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
{
@@ -51,7 +52,7 @@
}
}
}
-@@ -508,7 +516,7 @@
+@@ -516,7 +523,7 @@
break;
case ARPV4:
{
@@ -60,3 +61,12 @@
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;
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
index 80090b6059e0..b371a4cb8420 100644
--- a/security/gvm-libs/pkg-plist
+++ b/security/gvm-libs/pkg-plist
@@ -36,19 +36,19 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-03 17:32:54 +0000