security/gvmd: update to 22.4.0

ChangeLog:	https://github.com/greenbone/gvmd/releases/tag/v22.4.0

3 files changed, 49 insertions, 20 deletions

diff --git a/security/gvmd/files/patch-CMakeLists.txt b/security/gvmd/files/patch-CMakeLists.txt
index e1798ca3cb50..eb62a6e33d5f 100644
--- a/security/gvmd/files/patch-CMakeLists.txt
+++ b/security/gvmd/files/patch-CMakeLists.txt
@@ -1,5 +1,14 @@
---- CMakeLists.txt.orig	2022-02-22 05:52:13.000000000 -0500
-+++ CMakeLists.txt	2022-05-02 18:07:40.263764000 -0500
+--- CMakeLists.txt	2022-07-21 02:20:24.000000000 -0500
++++ CMakeLists.txt	2022-07-31 19:24:14.544647000 -0500
+@@ -53,7 +53,7 @@
+ 
+ # Set dev version if this is a development version and not a full release,
+ # unset (put value 0 or delete line) before a full release and reset after.
+-set (PROJECT_DEV_VERSION 1)
++set (PROJECT_DEV_VERSION 0)
+ 
+ # If PROJECT_DEV_VERSION is set, the version string will be set to:
+ #   "major.minor.patch~dev${PROJECT_DEV_VERSION}${GIT_REVISION}"
 @@ -110,7 +110,7 @@
  endif (SYSCONF_INSTALL_DIR)
  
@@ -45,9 +54,9 @@
  
  ## Documentation
  
-@@ -296,10 +296,10 @@
+@@ -294,10 +294,10 @@
  
- install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})
+ install (DIRECTORY DESTINATION ${GVMD_STATE_DIR})
  
 -install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf
 +install (FILES ${CMAKE_BINARY_DIR}/src/gvmd_log.conf.sample
diff --git a/security/gvmd/files/patch-src_CMakeLists.txt b/security/gvmd/files/patch-src_CMakeLists.txt
index 5e6801a41ca9..5afd6d919d93 100644
--- a/security/gvmd/files/patch-src_CMakeLists.txt
+++ b/security/gvmd/files/patch-src_CMakeLists.txt
@@ -1,15 +1,25 @@
---- src/CMakeLists.txt	2020-08-11 10:05:36.000000000 -0500
-+++ src/CMakeLists.txt	2021-01-04 19:53:06.893137000 -0500
-@@ -227,7 +227,7 @@
+--- src/CMakeLists.txt	2022-07-21 02:20:24.000000000 -0500
++++ src/CMakeLists.txt	2022-07-31 19:00:06.378204000 -0500
+@@ -32,7 +32,9 @@
+ pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=22.4)
+ pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
+ pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ pkg_check_modules (LIBBSD REQUIRED libbsd)
++endif()
+ pkg_check_modules (LIBICAL REQUIRED libical>=1.00)
+ 
+ message (STATUS "Looking for PostgreSQL...")
+@@ -271,7 +273,7 @@
                         ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
-                        ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
+                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
                         ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} ${LIBGVM_OSP_LDFLAGS} ${LIBGVM_GMP_LDFLAGS}
--                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS})
-+                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} -lexecinfo)
+-                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT})
++                       ${LIBICAL_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${OPT_THEIA_TGT} -lexecinfo)
  target_link_libraries (manage-test cgreen m
                         ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${LINKER_HARDENING_FLAGS} ${LINKER_DEBUG_FLAGS}
-                        ${PostgreSQL_LIBRARIES} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
-@@ -441,5 +441,7 @@
+                        ${PostgreSQL_LIBRARIES} ${LIBBSD_LDFLAGS} ${GLIB_LDFLAGS} ${GTHREAD_LDFLAGS}
+@@ -489,5 +491,7 @@
                     COMMAND ctags ${C_FILES})
  add_custom_target (tags COMMENT "Building tags files...")
  add_dependencies (tags etags ctags)
diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c
index 49ea71bfe998..f126c86db8e7 100644
--- a/security/gvmd/files/patch-src_gvmd.c
+++ b/security/gvmd/files/patch-src_gvmd.c
@@ -1,6 +1,6 @@
---- src/gvmd.c	2020-08-11 10:05:36.000000000 -0500
-+++ src/gvmd.c	2021-01-03 16:50:30.707314000 -0500
-@@ -1362,6 +1362,7 @@
+--- 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 @@
    struct sockaddr_un address_unix;
    struct sockaddr_storage address_tls;
    int address_size;
@@ -8,7 +8,7 @@
  
    memset (&address_tls, 0, sizeof (struct sockaddr_storage));
    memset (&address_unix, 0, sizeof (struct sockaddr_un));
-@@ -1375,9 +1376,8 @@
+@@ -1571,9 +1572,8 @@
        /* UNIX file socket. */
  
        address_unix.sun_family = AF_UNIX;
@@ -20,7 +20,7 @@
  
        g_debug ("%s: address_unix.sun_path: %s",
                 __func__,
-@@ -1398,7 +1398,7 @@
+@@ -1594,7 +1594,7 @@
          }
  
        address = (struct sockaddr *) &address_unix;
@@ -29,7 +29,7 @@
  
        /* Ensure the path of the socket exists. */
  
-@@ -1414,8 +1414,8 @@
+@@ -1610,8 +1610,8 @@
      }
    else if (address_str_tls)
      {
@@ -40,7 +40,7 @@
        int port, optval;
  
        /* TLS TCP socket. */
-@@ -1440,17 +1440,17 @@
+@@ -1636,17 +1636,17 @@
              port = htons (GVMD_PORT);
          }
  
@@ -60,7 +60,7 @@
          }
        else
          {
-@@ -1491,7 +1491,7 @@
+@@ -1687,7 +1687,7 @@
        return -1;
      }
  
@@ -69,3 +69,13 @@
      {
        g_warning ("Failed to bind manager socket: %s", strerror (errno));
        return -1;
+@@ -2326,7 +2326,9 @@
+ 
+   /* Set process title. */
+ 
++#if !defined(__FreeBSD__)
+   setproctitle_init (argc, argv, env);
++#endif
+   setproctitle ("gvmd: Initializing");
+ 
+   /* Setup initial signal handlers. */