net-analyzer/openvas-libraries: Version Bump

fixes gnutls-3 support and compilation problems

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=544664
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=555544
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=556788

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>

3 files changed, 102 insertions, 0 deletions

diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index d285cb7d70b7..5f5fb5420e26 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,3 +1,4 @@
 DIST openvas-libraries-7.0.10.tar.gz 581409 SHA256 5093d08182cec065ee8945599a1295080bb1657d95a3f587dff3e4d0bbc1c339 SHA512 9796e9ae51b8f2ba69fcda7d5f782b70ec8c6a346403628d6d37d255c3c1eb90f5a4fdc38fd9436a3232060155b90ebbfd7b626f4777d3204048f1c8c0e6c53c WHIRLPOOL 45753cbcff0cb7fc5bcffbaa3d7a65401d8a4531cb14155e9a76ed91fc59e166c8339a91e5f2d8ba8839ac7d5d7be273dc61ebe124b5b3f5cbb99f9df444e2a2
 DIST openvas-libraries-8.0.3.tar.gz 600412 SHA256 552c7f4de11e5f4678a39c27837db168f4063778e9806d999cfad36f8504d870 SHA512 88afc8828eca45bfa74f6a1b14e4381d837e965b8b69e32eecb794814142cbca75078da1a753a42fc1ace5fb51b200c4f05cd03ad2d7c1450ba70db84c3fb21c WHIRLPOOL 665410157656f53462795b867405ec3f826921613eb3cfb142d68354eaf428110689a86def836bf6fa472aed0dcf5d2850658f1ca2b29a46bcda96bd52fc656e
 DIST openvas-libraries-8.0.4.tar.gz 601421 SHA256 e8219e358185e60097f12e9a579b5ecfcd8c92f551195839dec85253a2d8e6f5 SHA512 69dcfa1902ed4f445cd775579f52411715454f2e62363c099d353466e4bc73889ff0f74f1f2a67509ec0106d152891ba42ffad1fe87c6ecd16c5085cd1e62f77 WHIRLPOOL 1e4bcbf55961b9733c969c7b06c507f822ca6f073bcb498a9d72f76fe4d0efa0ea4f8ac08fdfa1f04e16b4f52289e5485087dd7c28d81b99db18f91bc4671f7b
+DIST openvas-libraries-8.0.5.tar.gz 603947 SHA256 40dad0ea803d8ee7721f2385f2d2f8918b9e6733c8742efc1877210ade6501c1 SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b WHIRLPOOL 04e84e2083c277676e05235db81bd65ce4c8837adc8b3550fc6ff8db5ded8ccb0291141115504323db8792df085bcc2b17594a4620766bfec4bc39a79fb93109
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..3bd1208b55a7
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
@@ -0,0 +1,39 @@
+ base/CMakeLists.txt | 4 ++--
+ misc/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index 07febee..512e813 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)
+ 
+@@ -89,7 +89,7 @@ add_custom_indent_targets (${FILES})
+ # 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})
++  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
+ endif (BUILD_SHARED)
+ 
+ ## Install
+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/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
new file mode 100644
index 000000000000..6e7215bcb44f
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}