reinit the tree, so we can have metadata

6 files changed, 207 insertions, 0 deletions

diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
new file mode 100644
index 000000000000..b7e9588b0a89
--- /dev/null
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -0,0 +1,8 @@
+AUX openvas-libraries-7.0.4-libssh.patch 664 SHA256 73f8d299f7b8fa3f06f2c02d1588de5d51e34770fc378f11bbcdda739fbb510a SHA512 5306452c48a5db599b74e7a4dcaf28fb1848238fce7c33c8ccdaac18629e5bea2ad82c619620703309b5bb19fca9356da4518a7c3a180e038309f433a0896a40 WHIRLPOOL 62086af319a59f6419f51b78b55e27926a93587903d8ca51556f93376906b6247a8afead91f28aaaadee4cb6b9c55bfe21cc0d91954213a2f50e4f682d97eb9a
+AUX openvas-libraries-8.0.1-include.patch 3363 SHA256 354422ef88d41d9e86cb3d5d07597f62d4c43202bdd59c66257093ec722173d2 SHA512 f3427464c1d3cdc875d4ef56d831e3dabed6431ef75450d86d2ba977379579e0b9f15544a22d336c24849b5aef08824139a18c137f62081718e5663e141cf114 WHIRLPOOL 517396880bdac5f47f1596a911e9e4e4d557f25d336791b84ed146555d2792a091d4681d24596fdaf9d5ecde0d8fdbc7c834ad704d814144d13018ed43b2d44b
+AUX openvas-libraries-8.0.5-underlinking.patch 1966 SHA256 2abf4a13de78984273d16948aad9db87b9183d7bf4bc59d3d9612833a052dfda SHA512 ca917e7615aff2f056aac8fe15f5e7670e2df7e260886155dbe8331121ef8bb8809ca7bf3bea4baa5c159c7c5e0e5fac6459d3c34080a41893dd612b0662d55d WHIRLPOOL b2abc92d4da4041a453103361663a6824aef03de80b6a292e0c9a865c7d956da3ad9960e6892b0b11f8f9ca7ee0c59e5563382b03ee6a1efb4d448cac27bf47d
+DIST openvas-libraries-8.0.5.tar.gz 603947 SHA256 40dad0ea803d8ee7721f2385f2d2f8918b9e6733c8742efc1877210ade6501c1 SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b WHIRLPOOL 04e84e2083c277676e05235db81bd65ce4c8837adc8b3550fc6ff8db5ded8ccb0291141115504323db8792df085bcc2b17594a4620766bfec4bc39a79fb93109
+EBUILD openvas-libraries-8.0.5.ebuild 1256 SHA256 076e43b4185688697e8f231bf5419b38afeccab6ea89b718198b9670d9dd3a99 SHA512 21c1b7ea4a6ba63dd96124a83ed447517fa80ecc708fe13eb02cd6893726b0bfda50960d644edb280a1e11544ca0cc292db89d6548c98c6b91827152f3a82f70 WHIRLPOOL 7ea7b98e50160ed95b5fe51c358d63f64a56e4c749b81e357dc29d34695c9d5cbe2335782c0d8e067c3e4a12a9e34023903dd8d64dbbadee1b0778dd6e4e29eb
+MISC ChangeLog 3716 SHA256 b48491a26ab1a3e7c7a28a53fdc0b224bc8b869952710761318b5d6bd7c43b6c SHA512 5394ab94db36770e58bedff5cd60aa2f5087886d0ef9c1045c6531e86b0b39c2fe732803ec629b7c82b54c73d6b7b800d955994615b9ea46a99cd37a47959922 WHIRLPOOL 886ee43b97281be30fcfe1a0fd33204fcc251d4fb6443b5b50a5937cd93695ceacf67e42904d84432d5df716d2fb39b19aca24f8c42e4c306d849f86301c06d6
+MISC ChangeLog-2015 7519 SHA256 e96cb16adf7fd14070294d66738de330944d6d5c7573346e4ac9577bbb33a541 SHA512 4a076ae9fb142a9125bf0fd7e9c1620504f7421b765cfe2dfe35a03ac4a3297eb3a916a212044508180ce07423bb7a5a132df2715e0f9e9919ea24f5ba425f50 WHIRLPOOL bf960c6c8e3590fed69ccafc37ac1ded01bf920e22dd19d0f9ead24de09fea6e617f6072242512775749877f0889419ee433514e09bc8f26e8c3105fa899a0b6
+MISC metadata.xml 220 SHA256 49e2069f4751ed7f79a433d3b76bc345fcb099ac35f7b1b87b5d6764003c9586 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c WHIRLPOOL 4323fd2e46066082a73ed45401225ec2eba26ac29054bb573afa55f1b5753b020fc280453b03becf0a63dc3c0f9904e4d5c559a1afa68eb0d85b05fcf62174c2
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
new file mode 100644
index 000000000000..d89459fe2bd0
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
@@ -0,0 +1,16 @@
+https://www.mail-archive.com/openvas-discuss@wald.intevation.org/msg05828.html
+Fixes build issue with the newer version of libssh
+
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c
+--- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c	2014-04-14 19:15:40.000000000 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c	2014-05-23 00:13:56.791111974 +0200
+@@ -1861,7 +1861,8 @@
+     return NULL;
+   session = session_table[tbl_slot].session;
+ 
+-  banner = ssh_get_serverbanner (session);
++  //banner = ssh_get_serverbanner (session);
++  banner = (char*) ssh_get_serverbanner (session);
+   if (!banner)
+     return NULL;
+ 
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
new file mode 100644
index 000000000000..e03dd085e3b1
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
@@ -0,0 +1,70 @@
+ base/CMakeLists.txt | 2 ++
+ nasl/CMakeLists.txt | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index c2dccf5..4f17892 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -56,6 +56,7 @@ endif (MINGW)
+ 
+ if (BUILD_STATIC)
+   add_library (openvas_base_static STATIC ${FILES})
++  set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -63,6 +64,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_base_shared SHARED ${FILES})
++  set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base")
+   set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
+index 52fa5c6..afd18c2 100644
+--- a/nasl/CMakeLists.txt
++++ b/nasl/CMakeLists.txt
+@@ -41,7 +41,7 @@ endif (SNMP)
+ # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME!
+ # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h.
+ # Once the warnings have been addressed this flag should be removed.
+-set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing")
++set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}")
+ 
+ ## Compile the parser - note that there are (better) CMake macros to achieve
+ ## that
+@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc)
+ 
+ if (BUILD_STATIC)
+    add_library (openvas_nasl_static STATIC ${FILES})
+-
++   set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+    set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
+    set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+    set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+@@ -118,6 +118,7 @@ endif (BUILD_STATIC)
+ 
+ if (BUILD_SHARED)
+   add_library (openvas_nasl_shared SHARED ${FILES})
++  set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
+   set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
+   set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+   set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
+ base/gpgme_util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/base/gpgme_util.h b/base/gpgme_util.h
+index 56e1b85..ab4e9fa 100644
+--- a/base/gpgme_util.h
++++ b/base/gpgme_util.h
+@@ -33,7 +33,7 @@
+ #ifndef _OPENVAS_LIBRARIES_GPGME_UTIL_H
+ #define _OPENVAS_LIBRARIES_GPGME_UTIL_H
+ 
+-#include <gpgme.h>
++#include <gpgme/gpgme.h>
+ 
+ gpgme_ctx_t openvas_init_gpgme_ctx (void);
+ gpgme_ctx_t openvas_init_gpgme_sysconf_ctx (void);
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
new file mode 100644
index 000000000000..817815edb317
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
@@ -0,0 +1,45 @@
+ base/CMakeLists.txt | 10 +++++-----
+ misc/CMakeLists.txt |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index 07febee..40305b7 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -73,7 +73,7 @@ if (BUILD_SHARED)
+       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
+     target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS})
+   else (MINGW)
+-    target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
++    target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
+@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES})
+ 
+ # Link the test-hosts executable
+ # TODO: This is currently only built for BUILD_SHARED
+-if (BUILD_SHARED)
+-  add_executable (test-hosts test-hosts.c)
+-  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS})
+-endif (BUILD_SHARED)
++#if (BUILD_SHARED)
++#  add_executable (test-hosts test-hosts.c)
++#  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
++#endif (BUILD_SHARED)
+ 
+ ## Install
+ if (BUILD_STATIC)
+diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
+index 7aaca2c..e7a0870 100644
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -126,7 +126,7 @@ if (BUILD_SHARED)
+   else (MINGW)
+     target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
+                            ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
+-                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
++                           ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
+   endif (MINGW)
+ endif (BUILD_SHARED)
+ 
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/net-analyzer/openvas-libraries/metadata.xml
new file mode 100644
index 000000000000..38ce6c17a3f2
--- /dev/null
+++ b/net-analyzer/openvas-libraries/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hanno@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
new file mode 100644
index 000000000000..e279652477ff
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2191
+
+DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16
+	>=dev-libs/hiredis-0.10.1
+	dev-libs/libgcrypt:0
+	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
+	net-libs/gnutls
+	net-libs/libpcap
+	>=net-libs/libssh-0.5.0
+	net-analyzer/net-snmp
+	ldap? (	net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}"/${P}
+
+DOCS=( ChangeLog CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
+	"${FILESDIR}"/${PN}-8.0.1-include.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+	)
+	cmake-utils_src_configure
+}