4 files changed, 42 insertions, 30 deletions

diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index 09137110d128..59f681be8023 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gvmd
-DISTVERSION=	22.4.2
+DISTVERSION=	22.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/security/gvmd/distinfo b/security/gvmd/distinfo
index 3e4c6ca3c264..4ab415dfe22d 100644
--- a/security/gvmd/distinfo
+++ b/security/gvmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680418166
-SHA256 (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 14c76641af72e48874a730c4792ad76199165bb0518f59742609590cd420719e
-SIZE (greenbone-gvmd-v22.4.2_GH0.tar.gz) = 1027009
+TIMESTAMP = 1695264047
+SHA256 (greenbone-gvmd-v22.9.0_GH0.tar.gz) = 5825ccc68385f2d51a0756a515afe5b15b3eeba19221e07ff16f894933d78cc9
+SIZE (greenbone-gvmd-v22.9.0_GH0.tar.gz) = 1040655
diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c
index f126c86db8e7..d0b589c108be 100644
--- a/security/gvmd/files/patch-src_gvmd.c
+++ b/security/gvmd/files/patch-src_gvmd.c
@@ -1,35 +1,44 @@
---- src/gvmd.c	2022-07-21 02:20:24.000000000 -0500
-+++ src/gvmd.c	2022-07-31 19:20:20.775975000 -0500
-@@ -1558,6 +1558,7 @@
+--- src/gvmd.c	2023-09-08 08:33:54.000000000 -0500
++++ src/gvmd.c	2023-09-20 22:04:48.265160000 -0500
+@@ -1558,6 +1558,9 @@
    struct sockaddr_un address_unix;
    struct sockaddr_storage address_tls;
    int address_size;
++#if defined(__FreeBSD__)
 +  socklen_t addrlen;
++#endif
  
    memset (&address_tls, 0, sizeof (struct sockaddr_storage));
    memset (&address_unix, 0, sizeof (struct sockaddr_un));
-@@ -1571,9 +1572,8 @@
+@@ -1571,10 +1574,14 @@
        /* UNIX file socket. */
  
        address_unix.sun_family = AF_UNIX;
--      strncpy (address_unix.sun_path,
--               address_str_unix,
--               sizeof (address_unix.sun_path) - 1);
-+      strcpy (address_unix.sun_path,
++#if defined(__FreeBSD__)
++      strcpy (address_unix.sun_path,                                    
 +               address_str_unix);
- 
++#else
+       strncpy (address_unix.sun_path,
+                address_str_unix,
+                sizeof (address_unix.sun_path) - 1);
+-
++#endif
        g_debug ("%s: address_unix.sun_path: %s",
                 __func__,
-@@ -1594,7 +1594,7 @@
+                address_unix.sun_path);
+@@ -1594,7 +1601,11 @@
          }
  
        address = (struct sockaddr *) &address_unix;
--      address_size = sizeof (address_unix);
++#if defined(__FreeBSD__)
 +      addrlen = sizeof(struct sockaddr_un);
++#else
+       address_size = sizeof (address_unix);
++#endif
  
        /* Ensure the path of the socket exists. */
  
-@@ -1610,8 +1610,8 @@
+@@ -1610,8 +1621,9 @@
      }
    else if (address_str_tls)
      {
@@ -37,10 +46,11 @@
 -      struct sockaddr_in6 *addr6;
 +      struct sockaddr_in *addr4 = (struct sockaddr_in *) &address_tls;
 +      struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address_tls;
++
        int port, optval;
  
        /* TLS TCP socket. */
-@@ -1636,17 +1636,17 @@
+@@ -1636,17 +1648,21 @@
              port = htons (GVMD_PORT);
          }
  
@@ -50,32 +60,39 @@
          {
            address_tls.ss_family = AF_INET6;
            addr6->sin6_port = port;
-+	  addrlen = sizeof (*addr6);
++#if defined(__FreeBSD__)
++          addrlen = sizeof (*addr6);
++#endif
          }
        else if (inet_pton (AF_INET, address_str_tls, &addr4->sin_addr) > 0)
          {
            address_tls.ss_family = AF_INET;
            addr4->sin_port = port;
-+	  addrlen = sizeof (*addr4);
++#if defined(__FreeBSD__)
++          addrlen = sizeof (*addr4);
++#endif
          }
        else
          {
-@@ -1687,7 +1687,7 @@
+@@ -1687,7 +1703,11 @@
        return -1;
      }
  
--  if (bind (*soc, address, address_size) == -1)
++#if defined(__FreeBSD__)
 +  if (bind (*soc, address, addrlen) == -1)
++#else
+   if (bind (*soc, address, address_size) == -1)
++#endif
      {
        g_warning ("Failed to bind manager socket: %s", strerror (errno));
        return -1;
-@@ -2326,7 +2326,9 @@
+@@ -2378,7 +2398,9 @@
  
    /* Set process title. */
  
 +#if !defined(__FreeBSD__)
    setproctitle_init (argc, argv, env);
 +#endif
-   setproctitle ("gvmd: Initializing");
+   setproctitle ("Initializing");
  
    /* Setup initial signal handlers. */
diff --git a/security/gvmd/pkg-plist b/security/gvmd/pkg-plist
index 37931dd865e4..d2437df84a91 100644
--- a/security/gvmd/pkg-plist
+++ b/security/gvmd/pkg-plist
@@ -3,10 +3,7 @@ bin/gvm-manage-certs
 @sample etc/gvm/pwpolicy.conf.sample
 lib/libgvm-pg-server.so
 lib/libgvm-pg-server.so.22
-lib/libgvm-pg-server.so.22.4.2
-sbin/greenbone-certdata-sync
-sbin/greenbone-feed-sync
-sbin/greenbone-scapdata-sync
+lib/libgvm-pg-server.so.22.9.0
 sbin/gvmd
 share/doc/gvm/example-gvm-manage-certs.conf
 share/doc/gvm/html/gmp.html
@@ -34,6 +31,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/global_schema_formats/rnc.xsl
 share/gvm/gvmd/template.nsis
 share/gvm/gvmd/wizards/delete_task_deep.xml
 share/gvm/gvmd/wizards/get_tasks_deep.xml
@@ -45,8 +43,6 @@ share/gvm/gvmd/wizards/reset_task.xml
 share/gvm/scap/cpe_getbyname.xsl
 share/gvm/scap/cve_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