community/gvmd: upgrade to 8.0.0, renamed from gvm

11 files changed, 118 insertions, 247 deletions

diff --git a/community/gvm/000-sys-siglist.patch b/community/gvm/000-sys-siglist.patch
deleted file mode 100644
index 478bad5ec4..0000000000
--- a/community/gvm/000-sys-siglist.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/src/manage_sql.c b/src/manage_sql.c
-index 0ad35e7..c84d722 100644
---- a/src/manage_sql.c
-+++ b/src/manage_sql.c
-@@ -15920,7 +15920,7 @@ cleanup_manage_process (gboolean cleanup)
- void
- manage_cleanup_process_error (int signal)
- {
--  g_debug ("Received %s signal.\n", sys_siglist[signal]);
-+  g_debug ("Received %s signal.\n", strsignal(signal));
-   if (sql_is_open ())
-     {
-       if (current_scanner_task)
-diff --git a/src/openvasmd.c b/src/openvasmd.c
-index 891a747..d3feba1 100644
---- a/src/openvasmd.c
-+++ b/src/openvasmd.c
-@@ -780,7 +780,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\n",
--                  __FUNCTION__, sys_siglist[signal]);
-+                  __FUNCTION__, strsignal(signal));
-       exit (EXIT_FAILURE);
-     }
- }
-@@ -811,7 +811,7 @@ setup_signal_handler_info (int signal,
-   if (sigaction (signal, &action, NULL) == -1)
-     {
-       g_critical ("%s: failed to register %s handler\n",
--                  __FUNCTION__, sys_siglist[signal]);
-+                  __FUNCTION__, strsignal(signal));
-       exit (EXIT_FAILURE);
-     }
- }
-@@ -1238,7 +1238,7 @@ serve_and_schedule ()
-       if (termination_signal)
-         {
-           g_debug ("Received %s signal.\n",
--                   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);
-@@ -1248,7 +1248,7 @@ serve_and_schedule ()
- 
-       if (sighup_update_nvt_cache)
-         {
--          g_debug ("Received %s signal.\n", sys_siglist[SIGHUP]);
-+          g_debug ("Received %s signal.\n", strsignal(SIGHUP));
-           sighup_update_nvt_cache = 0;
-           fork_update_nvt_cache ();
-         }
-@@ -1307,7 +1307,7 @@ serve_and_schedule ()
-       if (termination_signal)
-         {
-           g_debug ("Received %s signal.\n",
--                   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);
-@@ -1317,7 +1317,7 @@ serve_and_schedule ()
- 
-       if (sighup_update_nvt_cache)
-         {
--          g_debug ("Received %s signal.\n", sys_siglist[SIGHUP]);
-+          g_debug ("Received %s signal.\n", strsignal(SIGHUP));
-           sighup_update_nvt_cache = 0;
-           fork_update_nvt_cache ();
-         }
-
-diff --git a/src/manage.c b/src/manage.c
-index 706dcb9..eee888a 100644
---- a/src/manage.c
-+++ b/src/manage.c
-@@ -3520,7 +3520,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 (current_report)
-               {
-@@ -3541,7 +3541,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 (current_report)
-             {
-               set_report_scan_run_status (current_report,
-diff --git a/src/ompd.c b/src/ompd.c
-index 92d24d6..13b7760 100644
---- a/src/ompd.c
-+++ b/src/ompd.c
-@@ -587,7 +587,7 @@ serve_omp (openvas_connection_t *client_connection, const gchar *database,
-         {
-           g_debug ("%s: Received %s signal.",
-                    __FUNCTION__,
--                   sys_siglist[get_termination_signal()]);
-+                   strsignal(get_termination_signal()));
- 
-           if (openvas_scanner_connected ())
-             {
diff --git a/community/gvm/001-sys-siglist.patch b/community/gvm/001-sys-siglist.patch
deleted file mode 100644
index 7978f0550f..0000000000
--- a/community/gvm/001-sys-siglist.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/manage_sql.c b/src/manage_sql.c
-index e316374..83d00e9 100644
---- a/src/manage_sql.c
-+++ b/src/manage_sql.c
-@@ -12709,7 +12709,7 @@ void
- manage_cleanup_process_error (int signal)
- {
-   g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Received %s signal.\n",
--         sys_siglist[signal]);
-+         strsignal(signal));
-   if (sql_is_open ())
-     {
-       if (current_scanner_task)
-diff --git a/src/openvasmd.c b/src/openvasmd.c
-index 808a8f1..c9981ad 100644
---- a/src/openvasmd.c
-+++ b/src/openvasmd.c
-@@ -661,7 +661,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\n",
--                  __FUNCTION__, sys_siglist[signal]);
-+                  __FUNCTION__, strsignal(signal));
-       exit (EXIT_FAILURE);
-     }
- }
-@@ -1025,7 +1025,7 @@ serve_and_schedule ()
-       if (termination_signal)
-         {
-           g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Received %s signal.\n",
--                 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);
-@@ -1036,7 +1036,7 @@ serve_and_schedule ()
-       if (sighup_update_nvt_cache)
-         {
-           g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Received %s signal.\n",
--                 sys_siglist[SIGHUP]);
-+                 strsignal(SIGHUP));
-           sighup_update_nvt_cache = 0;
-           fork_update_nvt_cache ();
-         }
-@@ -1095,7 +1095,7 @@ serve_and_schedule ()
-       if (termination_signal)
-         {
-           g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Received %s signal.\n",
--                 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/community/gvm/002-fortify-source.patch b/community/gvm/002-fortify-source.patch
deleted file mode 100644
index 539fa7eef5..0000000000
--- a/community/gvm/002-fortify-source.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 203f8b9..403e091 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,7 +284,7 @@ configure_file (tools/openvas-migrate-to-postgres.in tools/openvas-migrate-to-po
- 
- ## Program
- 
--set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
-+set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
- 
- set (CMAKE_C_FLAGS_DEBUG        "${CMAKE_C_FLAGS_DEBUG} -Werror")
- set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_FILE_OFFSET_BITS=64")
diff --git a/community/gvm/003-sqlite-insert.patch b/community/gvm/003-sqlite-insert.patch
deleted file mode 100644
index da51fa496a..0000000000
--- a/community/gvm/003-sqlite-insert.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/manage_sql.c b/src/manage_sql.c
-index e316374..4aedd83 100644
---- a/src/manage_sql.c
-+++ b/src/manage_sql.c
-@@ -11016,7 +11016,7 @@ check_db_settings ()
-          " ('a6ac88c5-729c-41ba-ac0a-deea4a3441f2', NULL,"
-          "  'Details Export File Name',"
-          "  'File name format string for the export of resource details.',"
--         "  '%T-%U');");
-+         "  '%%T-%%U');");
- 
-   if (sql_int ("SELECT count(*) FROM settings"
-                " WHERE uuid = '0872a6ed-4f85-48c5-ac3f-a5ef5e006745'"
-@@ -11027,7 +11027,7 @@ check_db_settings ()
-          " ('0872a6ed-4f85-48c5-ac3f-a5ef5e006745', NULL,"
-          "  'List Export File Name',"
-          "  'File name format string for the export of resource lists.',"
--         "  '%T-%D');");
-+         "  '%%T-%%D');");
- 
-   if (sql_int ("SELECT count(*) FROM settings"
-                " WHERE uuid = 'e1a2ae0b-736e-4484-b029-330c9e15b900'"
-@@ -11038,7 +11038,7 @@ check_db_settings ()
-          " ('e1a2ae0b-736e-4484-b029-330c9e15b900', NULL,"
-          "  'Report Export File Name',"
-          "  'File name format string for the export of reports.',"
--         "  '%T-%U');");
-+         "  '%%T-%%U');");
- 
- }
- 
diff --git a/community/gvm/backport-r29476.patch b/community/gvm/backport-r29476.patch
deleted file mode 100644
index 8fa21c4128..0000000000
--- a/community/gvm/backport-r29476.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openvas-manager-7.0/src/openvasmd.c	2017-08-30 21:03:46 UTC (rev 29475)
-+++ openvas-manager-7.0/src/openvasmd.c	2017-08-30 21:25:35 UTC (rev 29476)
-@@ -661,8 +661,8 @@
-           {
-             if (openvas_server_new (GNUTLS_CLIENT,
-                                     CACERT,
--                                    SCANNERCERT,
--                                    SCANNERKEY,
-+                                    CLIENTCERT,
-+                                    CLIENTKEY,
-                                     &client_connection->session,
-                                     &client_connection->credentials))
-               exit (EXIT_FAILURE);
diff --git a/community/gvm/gvm.logrotate b/community/gvm/gvm.logrotate
deleted file mode 100644
index 69cfa26b19..0000000000
--- a/community/gvm/gvm.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-# logrotate for openvas-manager
-/var/log/openvas/openvasmd.log {
-        rotate 4
-        weekly
-        compress
-        delaycompress
-        missingok
-	postrotate
-	    /bin/kill -HUP `pidof openvasmd`
-	endscript
-}
diff --git a/community/gvm/APKBUILD b/community/gvmd/APKBUILD
index 871e9e3f30..6fb9846d96 100644
--- a/community/gvm/APKBUILD
+++ b/community/gvmd/APKBUILD
@@ -1,24 +1,24 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=gvm
-pkgver=7.0.3
-pkgrel=1
-pkgdesc="A layer between the OpenVAS Scanner and various client applications"
+pkgname=gvmd
+pkgver=8.0.0
+pkgrel=0
+pkgdesc="Greenbone Vulnerability Manager"
 url="http://www.openvas.org/"
 arch="all"
-license="GPL"
+license="GPL-2.0"
 depends="rsync sqlite libxslt sed gnutls-utils"
-makedepends="cmake openvas-libraries-dev sqlite-dev
+makedepends="cmake gvm-libs-dev sqlite-dev clang-dev
 	libxslt-dev doxygen xmltoman perl-sql-translator
-	gpgme-dev libgcrypt-dev graphviz"
+	gpgme-dev libgcrypt-dev graphviz libical-dev "
 checkdepends="cppcheck"
-subpackages="$pkgname-doc"
-replaces="openvas-manager"
-source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/gvmd/releases/download/v$pkgver/openvas-manager-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-openrc"
+replaces="gvm"
+source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/gvmd/archive/v$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
-	000-sys-siglist.patch"
+	sys-siglist.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -44,8 +44,8 @@ package() {
 	install -Dm755 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 }
 
-sha512sums="c382b8791a66cc73c1f0da190a11a4addd22afee93abfe96718aba6c5e4488c3ccf33e17cb0aaf8dc376efe2b0264fef4195d5292d97387d2a24d515e3a4d325  gvm-7.0.3.tar.gz
-932ba8dd818faf5158472da4d1305c6f6c84834334721aa358e2e9f1d7419cdd6e366f4e9ea9b19412e00010f919dc9155346ed0566eca533e973abe80f3ee67  gvm.initd
-5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f  gvm.confd
-a86f156ca822b7b9844dc1cb1cb65c0d2bc146fa4dde64fec851b13b3eaa54fd984946b9336a2ffd0efbaf1c2053ab417067519fb18b807c5c1ce66cf1ee4a9b  gvm.logrotate
-c5a799b230f2702d2abcaaa8ab7279567c939dfa300a7eec71dd5b2274740fe96d6efde9034f720c8f16fc1e1770be42257b94b25c36968bef3d0694d0241598  000-sys-siglist.patch"
+sha512sums="bb116691c7c737a11bb8a0d016edc358e6c20ab32b3cccc960cfcf2ad877d5332a0394bcc9d8fcaf1b5de9adaf03ee674143af98ce12f7fd5f3b76c2d863cf52  gvmd-8.0.0.tar.gz
+41e45352ef98f7183171c3889fcefe192e530be6b2eecd4e4dde4c0f333f3741481c744592285917da313262e6fb2665a75f813b38bca7a9330765bc5da8b5f3  gvmd.initd
+5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f  gvmd.confd
+0988482eb3223309eeafd1abc3f3dd94c08d2b273de00a546f598af5e8c90023410218d15e5cc289eeae611e4bc16e2536782b24c645854e8ffa51d19efb5550  gvmd.logrotate
+4abf90aaf3a0da5cf3869b9b6eb2314bcd7376236e1d47f4ef37445b5ea98c89eeccb57056f71f6624d35167081f312c8fc8a60ac549584cc8aff350b683a90d  sys-siglist.patch"
diff --git a/community/gvm/gvm.confd b/community/gvmd/gvmd.confd
index 261836037d..261836037d 100644
--- a/community/gvm/gvm.confd
+++ b/community/gvmd/gvmd.confd
diff --git a/community/gvm/gvm.initd b/community/gvmd/gvmd.initd
index d0045d5b2e..021f7937ad 100644
--- a/community/gvm/gvm.initd
+++ b/community/gvmd/gvmd.initd
@@ -3,10 +3,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-name="OpenVAS Manager"
-command=/usr/bin/openvasmd
+name="Greenbone Vulnerability Manager"
+command=/usr/bin/gvmd
 command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}"
-pidfile="/run/openvasmd.pid"
+pidfile="/run/gvmd.pid"
 
 depend() {
 	after bootmisc
diff --git a/community/gvmd/gvmd.logrotate b/community/gvmd/gvmd.logrotate
new file mode 100644
index 0000000000..c7708289d0
--- /dev/null
+++ b/community/gvmd/gvmd.logrotate
@@ -0,0 +1,11 @@
+# logrotate for gvmd
+/var/log/gvm/gvmd.log {
+    rotate 4
+    weekly
+    compress
+    delaycompress
+    missingok
+    postrotate
+    /bin/kill -HUP `pidof gvmd`
+    endscript
+}
diff --git a/community/gvmd/sys-siglist.patch b/community/gvmd/sys-siglist.patch
new file mode 100644
index 0000000000..760b3e11f9
--- /dev/null
+++ b/community/gvmd/sys-siglist.patch
@@ -0,0 +1,88 @@
+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,
+         {
+           g_debug ("%s: Received %s signal.",
+                    __FUNCTION__,
+-                   sys_siglist[get_termination_signal ()]);
++                   strsignal(get_termination_signal ()));
+ 
+           if (openvas_scanner_connected ())
+             {
+diff --git a/src/gvmd.c b/src/gvmd.c
+index bee8d65..6d35464 100644
+--- a/src/gvmd.c
++++ b/src/gvmd.c
+@@ -932,7 +932,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));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -963,7 +963,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));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -1330,7 +1330,7 @@ serve_and_schedule ()
+ 
+       if (termination_signal)
+         {
+-          g_debug ("Received %s signal", sys_siglist[termination_signal]);
++          g_debug ("Received %s 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 ()
+ 
+       if (termination_signal)
+         {
+-          g_debug ("Received %s signal", sys_siglist[termination_signal]);
++          g_debug ("Received %s 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,
+         {
+           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,
+diff --git a/src/manage_sql.c b/src/manage_sql.c
+index ff88628..f21b0b5 100644
+--- a/src/manage_sql.c
++++ b/src/manage_sql.c
+@@ -18256,7 +18256,7 @@ cleanup_manage_process (gboolean cleanup)
+ void
+ manage_cleanup_process_error (int signal)
+ {
+-  g_debug ("Received %s signal", sys_siglist[signal]);
++  g_debug ("Received %s signal", strsignal(signal));
+   if (sql_is_open ())
+     {
+       if (current_scanner_task)