community/openvas-scanner: upgrade to 6.0.0

3 files changed, 77 insertions, 11 deletions

diff --git a/community/openvas-scanner/APKBUILD b/community/openvas-scanner/APKBUILD
index 8af59db317..892c2cdb4c 100644
--- a/community/openvas-scanner/APKBUILD
+++ b/community/openvas-scanner/APKBUILD
@@ -2,16 +2,17 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=openvas-scanner
 _pkgname=openvassd
-pkgver=5.1.3
-pkgrel=1
-pkgdesc="The OpenVAS scanning Daemon"
+pkgver=6.0.0
+pkgrel=0
+pkgdesc="OpenVAS remote network security scanner"
 url="http://www.openvas.org/"
 arch="all"
-license="GPL"
-depends="redis nmap coreutils libressl"
+license="GPL-2.0"
+depends="redis nmap coreutils openssl"
 checkdepends="cppcheck"
-makedepends="cmake openvas-libraries-dev glib-dev libgcrypt-dev
-	doxygen xmltoman graphviz libpcap-dev gpgme-dev"
+makedepends="cmake bison gvm-libs-dev glib-dev libgcrypt-dev
+	doxygen xmltoman graphviz libpcap-dev gpgme-dev
+	clang-dev libssh-dev libksba-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/$pkgname/archive/v$pkgver.tar.gz
 	$_pkgname.initd
@@ -19,7 +20,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/$pkgname/archive/v
 	$_pkgname.conf
 	$_pkgname.logrotate
 	greenbone-nvt-sync.cron
-	002-execinfo-musl-fix.patch"
+	execinfo-musl-fix.patch
+	malloc-trim.patch"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
@@ -40,7 +42,7 @@ check() {
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir" install
 	install -Dm644 "$srcdir/$_pkgname.logrotate" "$pkgdir/etc/logrotate.d/$_pkgname"
 	install -m755 -D "$srcdir"/$_pkgname.initd "$pkgdir"/etc/init.d/$_pkgname
 	install -m755 -D "$srcdir"/$_pkgname.confd "$pkgdir"/etc/conf.d/$_pkgname
@@ -66,10 +68,11 @@ package() {
 
 EOF
 }
-sha512sums="5712ab275058877cfd656e268ed09c81db6617ae247c17092f1fcd037f692f2018daf21b09b82401f99a7361bb485f0e0f7d63f8ff2387839cfdd5a3aaf8424e  openvas-scanner-5.1.3.tar.gz
+sha512sums="5d538476275ffc9f31f4f2934f2f57b741043728c9d107c07a88970f0d7a158baf3f40f1d8abb96dbb33f173c4fc21158be08c58de477857ff08cf897955c7b9  openvas-scanner-6.0.0.tar.gz
 fe8f81ac4d326611d077dc2c81d74f8e1e2c7b9e10eaaf3d30b2dcd8d2ede40ec060ff70678bda7445b5c1d8d758e164ab8bb9c06258afde2b10a0c241927cc3  openvassd.initd
 47304976c18f1a561aec8e21406864d086898153b307dcc8e92117c400c9379e448920c2bbebc4b0b18fbb65c19a3d00d4d3e24a1a9a81d788a59fdc40bc0154  openvassd.confd
 0d203cd2dfcf0b77ce8d2546235de16f23ea71c7e601db557fcd67e9c8dc460029494f1a146daadb44101ae194d7fa4d511a488bb69094e5470de9e10acf008b  openvassd.conf
 5934a31ef4b7267fd741c41bb97fe2e1e42735d2324cce07145de1942efae3f5e42e8652ec0c3482dd53477be420a58124eae943f254105547abf065febb9046  openvassd.logrotate
 da53e5c5e3ab70749249c2bf6c4fe0e0d17a2afb39d4519eb7fdf873c3fedf925183db050ab5395a3fe7f1ce79d95bf4f55c69611205d00dc519ce15418bd915  greenbone-nvt-sync.cron
-e7930a80b47213dbe3f4d4266ab9ad778f67c3b33a1e94578527d78335b2db05ced1ede893f656e6da98278c7c060a2ced8156a61dfbf15a74d7987ae1cdb745  002-execinfo-musl-fix.patch"
+c4bdd5bb78c729b08b491ccc1f083ce62699fbaf6f780ef51f1ba6e85261f362bc394ee0a831c63a2ae9b1bbeeb75e17032aff3abf5130b70b9e1f5026eb3dcc  execinfo-musl-fix.patch
+ae4f35ba0705eb16e98765f370a3225bbca6de4bcffeff20cde1d6d1a3487036ff5f683d9e38f0df3308770656876e240fc75c62ba9e2bb1d2e4998ac80e6395  malloc-trim.patch"
diff --git a/community/openvas-scanner/execinfo-musl-fix.patch b/community/openvas-scanner/execinfo-musl-fix.patch
new file mode 100644
index 0000000000..fb37acded7
--- /dev/null
+++ b/community/openvas-scanner/execinfo-musl-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/src/sighand.c b/src/sighand.c
+index ef698ee..c1deb6a 100644
+--- a/src/sighand.c
++++ b/src/sighand.c
+@@ -29,7 +29,10 @@
+ #include "utils.h"
+ 
+ #include <errno.h> /* for errno() */
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
++
+ #include <glib.h> /* for G_LOG_DOMAIN, for g_critical() */
+ #include <gvm/base/pidfile.h>
+ #include <signal.h>     /* for kill() */
+@@ -115,6 +118,7 @@ sighand_chld (pid_t pid)
+   waitpid (pid, &status, WNOHANG);
+ }
+ 
++#ifdef HAVE_EXECINFO_H
+ static void
+ print_trace ()
+ {
+@@ -133,12 +137,15 @@ print_trace ()
+ 
+   g_free (strings);
+ }
++#endif
+ 
+ void
+ sighand_segv (int given_signal)
+ {
+   signal (SIGSEGV, _exit);
++#ifdef HAVE_EXECINFO_H
+   print_trace ();
++#endif
+   make_em_die (SIGTERM);
+   /* Raise signal again, to exit with the correct return value,
+    * and to enable core dumping. */
diff --git a/community/openvas-scanner/malloc-trim.patch b/community/openvas-scanner/malloc-trim.patch
new file mode 100644
index 0000000000..367f9c2871
--- /dev/null
+++ b/community/openvas-scanner/malloc-trim.patch
@@ -0,0 +1,24 @@
+diff --git a/src/pluginscheduler.c b/src/pluginscheduler.c
+index 069b110..8e0f1f7 100644
+--- a/src/pluginscheduler.c
++++ b/src/pluginscheduler.c
+@@ -305,7 +305,9 @@ plugins_scheduler_init (const char *plugins_list, int autoload,
+       plugins_scheduler_free (ret);
+       return NULL;
+     }
++#ifdef __GLIBC__
+   malloc_trim (0);
++#endif
+   return ret;
+ }
+ 
+@@ -407,7 +409,9 @@ scheduler_phase_cleanup (plugins_scheduler_t sched, int start, int end)
+           element = element->next;
+         }
+     }
++#ifdef __GLIBC__
+   malloc_trim (0);
++#endif
+ }
+ 
+ struct scheduler_plugin *