From 6d3caece5cada2bb965dc18617f6ba8764d58a57 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Tue, 6 Sep 2016 08:46:17 +0000
Subject: community/openvas-scanner: upgrade to 5.0.7

---
 .../openvas-scanner/002-execinfo-musl-fix.patch    | 24 ++++++++++------------
 community/openvas-scanner/APKBUILD                 | 18 ++++++++--------
 2 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'community/openvas-scanner')

diff --git a/community/openvas-scanner/002-execinfo-musl-fix.patch b/community/openvas-scanner/002-execinfo-musl-fix.patch
index 8fd2164221..e52522a633 100644
--- a/community/openvas-scanner/002-execinfo-musl-fix.patch
+++ b/community/openvas-scanner/002-execinfo-musl-fix.patch
@@ -1,19 +1,18 @@
 diff --git a/src/sighand.c b/src/sighand.c
-index 1ebf206..985e470 100644
+index 5b6ba2a..04a1ade 100644
 --- a/src/sighand.c
 +++ b/src/sighand.c
-@@ -30,7 +30,10 @@
+@@ -30,7 +30,9 @@
  #include <errno.h>      /* for errno() */
  #include <sys/wait.h>   /* for wait() */
  #include <sys/socket.h> /* for shutdown() */
-+
 +#ifdef HAVE_EXECINFO_H
  #include <execinfo.h>
 +#endif
  
  #include "log.h"
  #include "sighand.h"
-@@ -112,6 +115,7 @@ sighand_chld (pid_t pid)
+@@ -113,6 +115,7 @@ sighand_chld (pid_t pid)
    waitpid (pid, &status, WNOHANG);
  }
  
@@ -21,20 +20,19 @@ index 1ebf206..985e470 100644
  static void
  print_trace ()
  {
-@@ -126,13 +130,16 @@ print_trace ()
-      log_write ("%s\n", symbols[i]);
-   g_free (symbols);
+@@ -140,12 +143,15 @@ print_trace ()
+   ret = backtrace (array, 10);
+   backtrace_symbols_fd (array, ret, fd);
  }
 +#endif
  
  void
- sighand_segv ()
+ sighand_segv (int given_signal)
  {
    signal (SIGSEGV, _exit);
-   log_write ("SIGSEGV occured !");
-+  #ifdef HAVE_EXECINFO_H
++#ifdef HAVE_EXECINFO_H
    print_trace ();
-+  #endif  
++#endif
    make_em_die (SIGTERM);
-   log_close ();
-   _exit (0);
+   /* Raise signal again, to exit with the correct return value,
+    * and to enable core dumping. */
diff --git a/community/openvas-scanner/APKBUILD b/community/openvas-scanner/APKBUILD
index 09b3f3af50..669d71150f 100644
--- a/community/openvas-scanner/APKBUILD
+++ b/community/openvas-scanner/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=openvas-scanner
 _pkgname=openvassd
-pkgver=5.0.5
-_pkgid=2266
-pkgrel=3
+pkgver=5.0.7
+_pkgid=2367
+pkgrel=0
 pkgdesc="The OpenVAS scanning Daemon"
 url="http://www.openvas.org/"
 arch="all"
@@ -74,27 +74,27 @@ package() {
 EOF
 } 
 
-md5sums="8eb30120fa8f5aea3a55c729ca9d4939  openvas-scanner-5.0.5.tar.gz
+md5sums="cb0a7b24e469e484d57941d1895586ac  openvas-scanner-5.0.7.tar.gz
 2343f34f83401016cb01f564e9c6c222  openvassd.initd
 2fe5c960c0e5e8db0e438de417a70e7a  openvassd.confd
 9fbfafb3f5001240d2d869ac3d365adf  openvassd.conf
 a9e8ef884da6a0b33d3b29867d2ffcea  openvassd.logrotate
 99ec960c1646038b41dbac7a8073500c  openvas-nvt-sync.cron
 4ccb1c805294a2ceff8c73bceaa8c064  001-cmakelist-fortify.patch
-12dc0fb6e1c1410ade5762744afaab71  002-execinfo-musl-fix.patch"
-sha256sums="108d8aba9f53ae58b187cb2e297fc5a3e77ac5c2cd9db421fb20598fdfb2ad0a  openvas-scanner-5.0.5.tar.gz
+480472ca0b08e104742930f5a93da235  002-execinfo-musl-fix.patch"
+sha256sums="70a3d9dd025fc7a3c275d58e0f0de3eb7c095ee5ba1bd9148d2e113a7e3a4f28  openvas-scanner-5.0.7.tar.gz
 a842a6d29c5bf82296d771cfd44e152616277ed412b66f8a4ade81ac593d5615  openvassd.initd
 3664ee9dad3627259dafb9494d4a794ccd184a1aeaba06b3b283a7eccd1ee0b8  openvassd.confd
 c01dc363c4423dfa791690b6cef50df8ff46af02bbf008ac07575351ab94e0b3  openvassd.conf
 c4623fe22f777e722915b6a4cf19030fa54a1fb18fe2ee074e3fb2a2fe6b81ed  openvassd.logrotate
 d3666d4cb7b639530a312b1dc49867b3b0de41209ea659924428df2d486cea40  openvas-nvt-sync.cron
 11bf3922c6ae25a5ed9fbc0b5c567c8106058ed424ba2c4c50959c44fee8dfd9  001-cmakelist-fortify.patch
-b5583f364f5b538634759c1df8f3bcd6b4218adcab2e9d18bdfd1904605ecf6d  002-execinfo-musl-fix.patch"
-sha512sums="e439c8abb39e397a9d3842846c09fe7cb13c57294f528ae738bed8f962ac776a10a87d0299145be33b88307a7ab8dcb519808e897457bedba5cf0d02918483c9  openvas-scanner-5.0.5.tar.gz
+22f5779baba6b380e90138a89b5440f6ebbbbcd1c1ae284cf58ba136f9013e50  002-execinfo-musl-fix.patch"
+sha512sums="302adb2933dc7467dd189da632631f67c763e0b163b10502807922a6734fa693c8bf3f591d0ddba67cd335c57e60148c308c01cec64cac28cb9dca0345ffbb33  openvas-scanner-5.0.7.tar.gz
 528fc356c485daf3456e0e8f20ecd7bc93c772dd7afc8ec9d7a485cf89156f433fb4ae29a8b3cac7f126c8fa1ac4ca7f1cc4a10bd2388358fdd2e06a04a3c2e4  openvassd.initd
 a47cf3add7a0e14175ccbae1c24c0e63ea7daf92ffa3e4d1bb988a2342e9b1ebfb597f0d20075ad22219dc2970d69e92bf8a3608cc156d4b5ca84723879bac71  openvassd.confd
 0d203cd2dfcf0b77ce8d2546235de16f23ea71c7e601db557fcd67e9c8dc460029494f1a146daadb44101ae194d7fa4d511a488bb69094e5470de9e10acf008b  openvassd.conf
 5934a31ef4b7267fd741c41bb97fe2e1e42735d2324cce07145de1942efae3f5e42e8652ec0c3482dd53477be420a58124eae943f254105547abf065febb9046  openvassd.logrotate
 92f1700ba15e04f0d830ac04db8c61bffb06104692fd91386a7f67ad8cc4bd1ea92651207a615c4bc56abc3a6c4f2fcf54fad52779fe5c6169d38f98b83513ea  openvas-nvt-sync.cron
 0e0087477ec313709c1d84480e9f2896628807010d039eb066627229e7f694434b66ae7f7cd44d379e714bd7ff23458bc46f721e953c2603d568fc350d2f0572  001-cmakelist-fortify.patch
-5e63b56fc64867c5973eb3593afcf677dc4da900b20d0f82fa24659010da290c0cfc00fe1e67cd2fadd4c58af3df2059120edeef344eedf213ab8a87a0376e49  002-execinfo-musl-fix.patch"
+e7930a80b47213dbe3f4d4266ab9ad778f67c3b33a1e94578527d78335b2db05ced1ede893f656e6da98278c7c060a2ced8156a61dfbf15a74d7987ae1cdb745  002-execinfo-musl-fix.patch"
-- 
cgit v1.2.3