openvas-scanner: Fix build

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 11 21:23:21 2016 +0200
Changeset:	edbca1b6c64f47435bf99b028da9e677c52abe78

Modified Files:
	openvas-scanner/PLIST
	openvas-scanner/distinfo
Added Files:
	openvas-scanner/patches/patch-CMakeLists.txt
	openvas-scanner/patches/patch-src_CMakeLists.txt
	openvas-scanner/patches/patch-src_attack.c

Log Message:
openvas-scanner: Fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=edbca1b6c64f47435bf99b028da9e677c52abe78

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openvas-scanner/PLIST                            | 70 ++++--------------------
 openvas-scanner/distinfo                         |  3 +
 openvas-scanner/patches/patch-CMakeLists.txt     | 13 +++++
 openvas-scanner/patches/patch-src_CMakeLists.txt | 18 ++++++
 openvas-scanner/patches/patch-src_attack.c       | 16 ++++++
 5 files changed, 62 insertions(+), 58 deletions(-)

diffs:
diff --git a/openvas-scanner/PLIST b/openvas-scanner/PLIST
index 6e62499..75c5bc9 100644
--- a/openvas-scanner/PLIST
+++ b/openvas-scanner/PLIST
@@ -1,59 +1,13 @@
 @comment $NetBSD$
-bin/openvas-nasl
-bin/openvas-nasl-lint
-include/openvas/base/array.h
-include/openvas/base/credentials.h
-include/openvas/base/cvss.h
-include/openvas/base/drop_privileges.h
-include/openvas/base/gpgme_util.h
-include/openvas/base/nvti.h
-include/openvas/base/nvticache.h
-include/openvas/base/openvas_compress.h
-include/openvas/base/openvas_file.h
-include/openvas/base/openvas_hosts.h
-include/openvas/base/openvas_networking.h
-include/openvas/base/openvas_string.h
-include/openvas/base/osp.h
-include/openvas/base/pidfile.h
-include/openvas/base/pwpolicy.h
-include/openvas/base/settings.h
-include/openvas/misc/arglists.h
-include/openvas/misc/bpf_share.h
-include/openvas/misc/ftp_funcs.h
-include/openvas/misc/internal_com.h
-include/openvas/misc/kb.h
-include/openvas/misc/network.h
-include/openvas/misc/nvt_categories.h
-include/openvas/misc/openvas_auth.h
-include/openvas/misc/openvas_logging.h
-include/openvas/misc/openvas_proctitle.h
-include/openvas/misc/openvas_server.h
-include/openvas/misc/openvas_uuid.h
-include/openvas/misc/pcap_openvas.h
-include/openvas/misc/plugutils.h
-include/openvas/misc/popen.h
-include/openvas/misc/prefs.h
-include/openvas/misc/radius.h
-include/openvas/misc/www_funcs.h
-include/openvas/nasl/nasl.h
-include/openvas/omp/omp.h
-include/openvas/omp/xml.h
-lib/libopenvas_base.so
-lib/libopenvas_base.so.8
-lib/libopenvas_base.so.${PKGVERSION}
-lib/libopenvas_misc.so
-lib/libopenvas_misc.so.8
-lib/libopenvas_misc.so.${PKGVERSION}
-lib/libopenvas_nasl.so
-lib/libopenvas_nasl.so.8
-lib/libopenvas_nasl.so.${PKGVERSION}
-lib/libopenvas_omp.so
-lib/libopenvas_omp.so.8
-lib/libopenvas_omp.so.${PKGVERSION}
-lib/pkgconfig/libopenvas_base.pc
-lib/pkgconfig/libopenvas_misc.pc
-lib/pkgconfig/libopenvas_nasl.pc
-lib/pkgconfig/libopenvas_omp.pc
-man/man1/openvas-nasl.1
-@pkgdir share/openvas
-@pkgdir etc/openvas/gnupg
+bin/openvas-mkcert-client
+sbin/greenbone-nvt-sync
+sbin/openvas-mkcert
+sbin/openvas-nvt-sync
+sbin/openvassd
+share/doc/openvas-scanner/example_redis_2_4.conf
+share/doc/openvas-scanner/example_redis_2_6.conf
+share/man/man1/openvas-mkcert-client.1
+share/man/man8/greenbone-nvt-sync.8
+share/man/man8/openvas-mkcert.8
+share/man/man8/openvas-nvt-sync.8
+share/man/man8/openvassd.8
diff --git a/openvas-scanner/distinfo b/openvas-scanner/distinfo
index 6e4b7fb..be63159 100644
--- a/openvas-scanner/distinfo
+++ b/openvas-scanner/distinfo
@@ -4,3 +4,6 @@ SHA1 (openvas-scanner-5.0.7.tar.gz) = ca5ba1a65ff34a8cb8c014cb09129434e319d689
 RMD160 (openvas-scanner-5.0.7.tar.gz) = 985332a803577eb9a1a7f964f776a5f672d802d3
 SHA512 (openvas-scanner-5.0.7.tar.gz) = 302adb2933dc7467dd189da632631f67c763e0b163b10502807922a6734fa693c8bf3f591d0ddba67cd335c57e60148c308c01cec64cac28cb9dca0345ffbb33
 Size (openvas-scanner-5.0.7.tar.gz) = 238419 bytes
+SHA1 (patch-CMakeLists.txt) = 78ff7d2e3e999781c2898dda5ad66b797b0774f6
+SHA1 (patch-src_CMakeLists.txt) = 6d5a6afeeb7aced5a68137de90b135ac8a82de89
+SHA1 (patch-src_attack.c) = c941bb559bacb11cd8871a3456a4d75266870c81
diff --git a/openvas-scanner/patches/patch-CMakeLists.txt b/openvas-scanner/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..a79ffc8
--- /dev/null
+++ b/openvas-scanner/patches/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-08-30 12:27:33.000000000 +0000
++++ CMakeLists.txt
+@@ -27,7 +27,7 @@ message ("-- Configuring the Scanner..."
+ 
+ project (openvas-scanner C)
+ 
+-cmake_minimum_required (VERSION 2.6)
++cmake_minimum_required (VERSION 3.0)
+ 
+ if (POLICY CMP0005)
+   cmake_policy (SET CMP0005 OLD)
diff --git a/openvas-scanner/patches/patch-src_CMakeLists.txt b/openvas-scanner/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000..6368659
--- /dev/null
+++ b/openvas-scanner/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/CMakeLists.txt.orig	2015-08-03 10:14:45.000000000 +0000
++++ src/CMakeLists.txt
+@@ -112,10 +112,12 @@ if (NVT_TIMEOUT)
+   add_definitions (-DNVT_TIMEOUT=${NVT_TIMEOUT})
+ endif (NVT_TIMEOUT)
+ 
++find_package(Backtrace)
++
+ target_link_libraries (openvassd ${LIBOPENVAS_NASL_LDFLAGS}
+                        ${LIBOPENVAS_BASE_LDFLAGS} ${LIBOPENVAS_MISC_LDFLAGS}
+                        ${LIBOPENVAS_OMP_LDFLAGS} ${GLIB_LDFLAGS}
+-                       ${GCRYPT_LDFLAGS})
++                       ${GCRYPT_LDFLAGS} ${Backtrace_LIBRARY})
+ 
+ ## Tests
+ 
diff --git a/openvas-scanner/patches/patch-src_attack.c b/openvas-scanner/patches/patch-src_attack.c
new file mode 100644
index 0000000..4b263be
--- /dev/null
+++ b/openvas-scanner/patches/patch-src_attack.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/attack.c.orig	2016-08-25 12:07:28.000000000 +0000
++++ src/attack.c
+@@ -647,7 +647,11 @@ attack_start (struct attack_start_args *
+     {
+       char *txt_ip;
+       struct in_addr inaddr;
++#if defined(__NetBSD__)
++      memcpy(&inaddr.s_addr, &hostip->s6_addr[12], 4);
++#else
+       inaddr.s_addr = hostip->s6_addr32[3];
++#endif
+ 
+       if (IN6_IS_ADDR_V4MAPPED (hostip))
+         txt_ip = g_strdup (inet_ntoa (inaddr));