openvas-manager: Initial build fixes

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openvas-manager: Initial build fixes
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 11 Oct 2016 21:13:49 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 11 23:13:49 2016 +0200
Changeset:	9b442fefc1edab3cca41cc26a35f3edcca6798a8

Modified Files:
	openvas-manager/Makefile
	openvas-manager/distinfo
	openvas-manager/patches/patch-CMakeLists.txt
	openvas-manager/patches/patch-src_CMakeLists.txt
Added Files:
	openvas-manager/patches/patch-doc_CMakeLists.txt
Removed Files:
	openvas-manager/patches/patch-src_attack.c

Log Message:
openvas-manager: Initial build fixes

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

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

diffstat:
 openvas-manager/Makefile                         |  1 +
 openvas-manager/distinfo                         |  6 ++---
 openvas-manager/patches/patch-CMakeLists.txt     | 31 +++---------------------
 openvas-manager/patches/patch-doc_CMakeLists.txt | 14 +++++++++++
 openvas-manager/patches/patch-src_CMakeLists.txt | 20 ++++++---------
 openvas-manager/patches/patch-src_attack.c       | 18 --------------
 6 files changed, 29 insertions(+), 61 deletions(-)

diffs:
diff --git a/openvas-manager/Makefile b/openvas-manager/Makefile
index ea6d2fa..2b194e5 100644
--- a/openvas-manager/Makefile
+++ b/openvas-manager/Makefile
@@ -16,5 +16,6 @@ USE_TOOLS+=	pkg-config
 
 CMAKE_ARGS+=	-DLOCALSTATEDIR:PATH=${VARBASE}
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../wip/openvas-libraries/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/openvas-manager/distinfo b/openvas-manager/distinfo
index 26803de..c68a4f7 100644
--- a/openvas-manager/distinfo
+++ b/openvas-manager/distinfo
@@ -4,6 +4,6 @@ SHA1 (openvas-manager-6.0.9.tar.gz) = bb8b1652e2c6539a80fe861584a844f1ae38c4ff
 RMD160 (openvas-manager-6.0.9.tar.gz) = c9c230ecf4ddce8c2ce1b3ae6cadd55d142e8081
 SHA512 (openvas-manager-6.0.9.tar.gz) = 1111ad3ef4e1286cc71129ecd552bac00386347c30b6e8b706a8fa989d58fff19fff2e1c5cbdfde921d83c5812358cb089e5bc45ae56bb5b87b3bfe5fab1ece8
 Size (openvas-manager-6.0.9.tar.gz) = 1954878 bytes
-SHA1 (patch-CMakeLists.txt) = 14ba35b3d347ee17954a40d1a5828e8cadc4411f
-SHA1 (patch-src_CMakeLists.txt) = 054e43b35ed3a933ea421f27260e28409fc66333
-SHA1 (patch-src_attack.c) = 841ced33c0cdc34ff3662b719e81810f8c3f6419
+SHA1 (patch-CMakeLists.txt) = 2c6a430a623fc8376462a67143af8f0f6ebef5ce
+SHA1 (patch-doc_CMakeLists.txt) = 2a8d8f6758c9a71fecab36fcea6dce7053dc4052
+SHA1 (patch-src_CMakeLists.txt) = 52a67a5bf5c1cfc8a502eca25c47cf93ca1498a1
diff --git a/openvas-manager/patches/patch-CMakeLists.txt b/openvas-manager/patches/patch-CMakeLists.txt
index 4e12702..a97c4a4 100644
--- a/openvas-manager/patches/patch-CMakeLists.txt
+++ b/openvas-manager/patches/patch-CMakeLists.txt
@@ -1,38 +1,13 @@
 $NetBSD$
 
-Bump minimum CMake version to 3.0 to get libbacktrace detection.
-Fix path for installing man-pages.
-
---- CMakeLists.txt.orig	2016-08-30 12:27:33.000000000 +0000
+--- CMakeLists.txt.orig	2016-08-25 12:15:46.000000000 +0000
 +++ CMakeLists.txt
-@@ -27,7 +27,7 @@ message ("-- Configuring the Scanner..."
+@@ -27,7 +27,7 @@ message ("-- Configuring the Manager..."
  
- project (openvas-scanner C)
+ project (openvas-manager C)
  
 -cmake_minimum_required (VERSION 2.6)
 +cmake_minimum_required (VERSION 3.0)
  
  if (POLICY CMP0005)
    cmake_policy (SET CMP0005 OLD)
-@@ -263,16 +263,18 @@ install (FILES ${CMAKE_BINARY_DIR}/tools
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-+include(GNUInstallDirs)
-+
- install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1
--          DESTINATION ${DATADIR}/man/man1 )
-+          DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
- 
- install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
--         DESTINATION ${DATADIR}/man/man8 )
-+         DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 )
- 
- install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8
-                ${CMAKE_SOURCE_DIR}/doc/openvas-nvt-sync.8
-                ${CMAKE_SOURCE_DIR}/doc/greenbone-nvt-sync.8
--         DESTINATION ${DATADIR}/man/man8 )
-+         DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 )
- 
- install (FILES ${CMAKE_BINARY_DIR}/doc/example_redis_2_4.conf
-                ${CMAKE_BINARY_DIR}/doc/example_redis_2_6.conf
diff --git a/openvas-manager/patches/patch-doc_CMakeLists.txt b/openvas-manager/patches/patch-doc_CMakeLists.txt
new file mode 100644
index 0000000..d9a70c3
--- /dev/null
+++ b/openvas-manager/patches/patch-doc_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- doc/CMakeLists.txt.orig	2015-08-03 05:52:11.000000000 +0000
++++ doc/CMakeLists.txt
+@@ -163,6 +163,8 @@ install (FILES omp.html
+          DESTINATION share/doc/openvas-manager/html/
+          COMPONENT doc)
+ 
++include(GNUInstallDirs)
++
+ install (FILES openvasmd.8
+-  DESTINATION share/man/man8/
++  DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/
+   COMPONENT doc)
diff --git a/openvas-manager/patches/patch-src_CMakeLists.txt b/openvas-manager/patches/patch-src_CMakeLists.txt
index acd05f0..ea3363a 100644
--- a/openvas-manager/patches/patch-src_CMakeLists.txt
+++ b/openvas-manager/patches/patch-src_CMakeLists.txt
@@ -1,20 +1,16 @@
 $NetBSD$
 
-Detect and link with libbacktrace (if linking is needed).
-
---- src/CMakeLists.txt.orig	2015-08-03 10:14:45.000000000 +0000
+--- src/CMakeLists.txt.orig	2015-12-08 07:09:32.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -112,10 +112,12 @@ if (NVT_TIMEOUT)
-   add_definitions (-DNVT_TIMEOUT=${NVT_TIMEOUT})
- endif (NVT_TIMEOUT)
+@@ -65,8 +65,10 @@ add_library (otp STATIC otp.c)
+ 
+ ## Program
  
 +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})
+ add_executable (openvasmd openvasmd.c ompd.c)
+-target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${Backtrace_LIBRARY})
  
- ## Tests
+ set_target_properties (openvasmd PROPERTIES LINKER_LANGUAGE C)
  
diff --git a/openvas-manager/patches/patch-src_attack.c b/openvas-manager/patches/patch-src_attack.c
deleted file mode 100644
index 11c64e5..0000000
--- a/openvas-manager/patches/patch-src_attack.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- 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));
Prev by Date: openvas-manager: Setup for Manager
Next by Date: openvas-manager: Fix build
Previous by Thread: openvas-manager: Setup for Manager
Next by Thread: openvas-manager: Fix build
Indexes:
Home | Main Index | Thread Index | Old Index