community/gvmd: upgrade to 9.0.0

3 files changed, 81 insertions, 56 deletions

diff --git a/community/gvmd/APKBUILD b/community/gvmd/APKBUILD
index df4fb6aebc..6b94bac328 100644
--- a/community/gvmd/APKBUILD
+++ b/community/gvmd/APKBUILD
@@ -1,16 +1,16 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gvmd
-pkgver=8.0.1
-pkgrel=2
+pkgver=9.0.0
+pkgrel=0
 pkgdesc="Greenbone Vulnerability Manager"
 url="http://www.openvas.org/"
 arch="all"
 license="GPL-2.0"
 depends="rsync sqlite libxslt sed gnutls-utils"
 makedepends="cmake gvm-libs-dev sqlite-dev clang-dev
-	libxslt-dev doxygen xmltoman perl-sql-translator
-	gpgme-dev libgcrypt-dev graphviz libical-dev "
+	libxslt-dev doxygen xmltoman perl-sql-translator glib-dev
+	gpgme-dev libgcrypt-dev graphviz libical-dev postgresql-dev"
 checkdepends="cppcheck"
 subpackages="$pkgname-doc $pkgname-openrc"
 replaces="gvm"
@@ -21,8 +21,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/gvmd/archive/v$pkg
 	greenbone-nvt-sync.conf
 	greenbone-certdata-sync.conf
 	greenbone-scapdata-sync.conf
-	sys-siglist.patch
-	fix-alpine-sql-syntax.patch"
+	added-missing-includes.patch
+	sys-siglist.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -48,12 +48,12 @@ package() {
 	done
 }
 
-sha512sums="5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8  gvmd-8.0.1.tar.gz
+sha512sums="ffb6a61eefd3cf6514fea4030275d24f0f5c23514498a4d828c5f5ffc5344bf20452cbc7a09cd750adc237c036f30f002036c94292822d50cd9cba4b5db07458  gvmd-9.0.0.tar.gz
 41e45352ef98f7183171c3889fcefe192e530be6b2eecd4e4dde4c0f333f3741481c744592285917da313262e6fb2665a75f813b38bca7a9330765bc5da8b5f3  gvmd.initd
 5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f  gvmd.confd
 0988482eb3223309eeafd1abc3f3dd94c08d2b273de00a546f598af5e8c90023410218d15e5cc289eeae611e4bc16e2536782b24c645854e8ffa51d19efb5550  gvmd.logrotate
 964779adc39cbed191bccf02ccc408a263860002d2dbddee755cf0d015336814b0b3c83f88a02cc0c5959657be5c49eb94380cd6ba15844e4b6088e49cd7a3f0  greenbone-nvt-sync.conf
 17df9386fc1dccf2fbe3b8d1fd499171f6681b61afe7b4c11ff9debc008798b31d1d02d59463031482d94e10833f0e71bde27cbbe422f23738c77b7c6ada79d2  greenbone-certdata-sync.conf
 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66  greenbone-scapdata-sync.conf
-4abf90aaf3a0da5cf3869b9b6eb2314bcd7376236e1d47f4ef37445b5ea98c89eeccb57056f71f6624d35167081f312c8fc8a60ac549584cc8aff350b683a90d  sys-siglist.patch
-8bfe0ef8efc288ebdbe83aa3c420a87d5514d7bae58d282ca34c7316db83fa1946a0a2228f3237192165ac4e8dbf414b1262be9986696c3ffb8e0652ec73efaf  fix-alpine-sql-syntax.patch"
+b5411a618e62e5a64fae3441d7f8a4db1fb7675200d8ce5f8208b09c6459b33920f3a65519c8d17781929917eeb4966e60701e64612c6cfcb77101130f779992  added-missing-includes.patch
+682ae0efb02c565ed28d67c3adc5d181fb0ac43d670573f0d9587cb6ff9d4dd89eaf1f43f0fab3928e447bee735958afec0f31c70f5ceffac3c68633469ff71a  sys-siglist.patch"
diff --git a/community/gvmd/added-missing-includes.patch b/community/gvmd/added-missing-includes.patch
new file mode 100644
index 0000000000..57977a4bab
--- /dev/null
+++ b/community/gvmd/added-missing-includes.patch
@@ -0,0 +1,25 @@
+diff --git a/src/gvmd.c b/src/gvmd.c
+index 419a585..3158bce 100644
+--- a/src/gvmd.c
++++ b/src/gvmd.c
+@@ -91,6 +91,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <glib/gmessages.h>
+ 
+ #include <gvm/base/pidfile.h>
+ #include <gvm/base/pwpolicy.h>
+diff --git a/src/sql_pg.c b/src/sql_pg.c
+index 06b2e1d..8803e83 100644
+--- a/src/sql_pg.c
++++ b/src/sql_pg.c
+@@ -33,7 +33,7 @@
+ #include <glib.h>
+ #include <inttypes.h>
+ #include <netinet/in.h>
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/community/gvmd/sys-siglist.patch b/community/gvmd/sys-siglist.patch
index 760b3e11f9..8d5ba9681f 100644
--- a/community/gvmd/sys-siglist.patch
+++ b/community/gvmd/sys-siglist.patch
@@ -1,83 +1,83 @@
-diff --git a/src/gmpd.c b/src/gmpd.c
-index 5d39430..1b0159f 100644
---- a/src/gmpd.c
-+++ b/src/gmpd.c
-@@ -569,7 +569,7 @@ serve_gmp (gvm_connection_t *client_connection,
+diff --git a/src/manage.c b/src/manage.c
+index a98a0c1..85e3147 100644
+--- a/src/manage.c
++++ b/src/manage.c
+@@ -3278,7 +3278,7 @@ handle_slave_task (task_t task, target_t target,
+               {
+                 g_debug ("%s: Received %s signal.",
+                          __FUNCTION__,
+-                         sys_siglist[get_termination_signal()]);
++                         strsignal(get_termination_signal()));
+               }
+             if (global_current_report)
+               {
+@@ -3300,7 +3300,7 @@ handle_slave_task (task_t task, target_t target,
          {
            g_debug ("%s: Received %s signal.",
                     __FUNCTION__,
--                   sys_siglist[get_termination_signal ()]);
-+                   strsignal(get_termination_signal ()));
- 
-           if (openvas_scanner_connected ())
+-                   sys_siglist[get_termination_signal()]);
++                   strsignal(get_termination_signal()));
+           if (global_current_report)
              {
+               set_report_scan_run_status (global_current_report,
 diff --git a/src/gvmd.c b/src/gvmd.c
-index bee8d65..6d35464 100644
+index 047977c..419a585 100644
 --- a/src/gvmd.c
 +++ b/src/gvmd.c
-@@ -932,7 +932,7 @@ setup_signal_handler (int signal, void (*handler) (int), int block)
+@@ -922,7 +922,7 @@ setup_signal_handler (int signal, void (*handler) (int), int block)
    if (sigaction (signal, &action, NULL) == -1)
      {
-       g_critical (
--        "%s: failed to register %s handler", __FUNCTION__, sys_siglist[signal]);
-+        "%s: failed to register %s handler", __FUNCTION__, strsignal(signal));
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(signal));
        exit (EXIT_FAILURE);
      }
  }
-@@ -963,7 +963,7 @@ setup_signal_handler_info (int signal,
+@@ -953,7 +953,7 @@ setup_signal_handler_info (int signal,
    if (sigaction (signal, &action, NULL) == -1)
      {
-       g_critical (
--        "%s: failed to register %s handler", __FUNCTION__, sys_siglist[signal]);
-+        "%s: failed to register %s handler", __FUNCTION__, strsignal(signal));
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(signal));
        exit (EXIT_FAILURE);
      }
  }
-@@ -1330,7 +1330,7 @@ serve_and_schedule ()
- 
+@@ -1258,7 +1258,7 @@ serve_and_schedule ()
        if (termination_signal)
          {
--          g_debug ("Received %s signal", sys_siglist[termination_signal]);
-+          g_debug ("Received %s signal", strsignal(termination_signal));
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
            cleanup ();
            /* Raise signal again, to exit with the correct return value. */
            setup_signal_handler (termination_signal, SIG_DFL, 0);
-@@ -1417,7 +1417,7 @@ serve_and_schedule ()
- 
+@@ -1347,7 +1347,7 @@ serve_and_schedule ()
        if (termination_signal)
          {
--          g_debug ("Received %s signal", sys_siglist[termination_signal]);
-+          g_debug ("Received %s signal", strsignal(termination_signal));
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
            cleanup ();
            /* Raise signal again, to exit with the correct return value. */
            setup_signal_handler (termination_signal, SIG_DFL, 0);
-diff --git a/src/manage.c b/src/manage.c
-index 3e66c1e..7d259c6 100644
---- a/src/manage.c
-+++ b/src/manage.c
-@@ -3812,7 +3812,7 @@ handle_slave_task (task_t task,
-               {
-                 g_debug ("%s: Received %s signal.",
-                          __FUNCTION__,
--                         sys_siglist[get_termination_signal ()]);
-+                         strsignal(get_termination_signal ()));
-               }
-             if (global_current_report)
-               {
-@@ -3832,7 +3832,7 @@ handle_slave_task (task_t task,
+diff --git a/src/gmpd.c b/src/gmpd.c
+index 3becfe3..e45897c 100644
+--- a/src/gmpd.c
++++ b/src/gmpd.c
+@@ -496,7 +496,7 @@ serve_gmp (gvm_connection_t *client_connection, const gchar *database,
          {
            g_debug ("%s: Received %s signal.",
                     __FUNCTION__,
--                   sys_siglist[get_termination_signal ()]);
-+                   strsignal(get_termination_signal ()));
-           if (global_current_report)
-             {
-               set_report_scan_run_status (global_current_report,
+-                   sys_siglist[get_termination_signal()]);
++                   strsignal(get_termination_signal()));
+ 
+           goto client_free;
+         }
 diff --git a/src/manage_sql.c b/src/manage_sql.c
-index ff88628..f21b0b5 100644
+index 5fbcea4..c7c516c 100644
 --- a/src/manage_sql.c
 +++ b/src/manage_sql.c
-@@ -18256,7 +18256,7 @@ cleanup_manage_process (gboolean cleanup)
+@@ -18421,7 +18421,7 @@ cleanup_manage_process (gboolean cleanup)
  void
  manage_cleanup_process_error (int signal)
  {