net-analyzer/openvas-libraries: Import fedora patches, make ldap support optional

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 64 insertions, 5 deletions

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index f52ee1553d1f..c5a6937eadf7 100644
--- a/net-analyzer/openvas-libraries/ChangeLog
+++ b/net-analyzer/openvas-libraries/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-libraries
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.17 2014/09/28 15:15:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.18 2014/09/28 16:48:59 jlec Exp $
+
+  28 Sep 2014; Justin Lecher <jlec@gentoo.org> openvas-libraries-7.0.4.ebuild,
+  +files/openvas-libraries-7.0.4-bsdsource.patch,
+  +files/openvas-libraries-7.0.4-libssh.patch:
+  Import fedora patches, make ldap support optional
 
 *openvas-libraries-7.0.4 (28 Sep 2014)
 
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
new file mode 100644
index 000000000000..6df661f5db75
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
@@ -0,0 +1,32 @@
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c
+--- openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c	2014-05-24 01:11:33.049417462 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c	2014-05-24 17:01:25.409361461 +0200
+@@ -24,7 +24,7 @@
+ *
+ */
+ 
+-#define _BSD_SOURCE 1
++#define _DEFAULT_SOURCE 1
+ 
+ #include <unistd.h>      /* for close() */
+ #include <stdlib.h>      /* for rand() */
+diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_raw.h openvas-libraries-7.0.1.new/nasl/nasl_raw.h
+--- openvas-libraries-7.0.1.orig/nasl/nasl_raw.h	2014-05-24 01:11:33.287412716 +0200
++++ openvas-libraries-7.0.1.new/nasl/nasl_raw.h	2014-05-24 17:02:33.829967589 +0200
+@@ -20,12 +20,12 @@
+ #ifndef OPENVAS_RAW_H
+ #define OPENVAS_RAW_H
+ #ifdef __linux__
+-#ifndef __BSD_SOURCE
+-#define __BSD_SOURCE
++#ifndef __DEFAULT_SOURCE
++#define __DEFAULT_SOURCE
+ #endif
+ 
+-#ifndef _BSD_SOURCE
+-#define _BSD_SOURCE
++#ifndef _DEFAULT_SOURCE
++#define _DEFAULT_SOURCE
+ #endif
+ 
+ #ifndef __FAVOR_BSD
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/openvas-libraries-7.0.4.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild
index 68c3cfe22b69..acf7e10d129e 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild,v 1.1 2014/09/28 15:15:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.4.ebuild,v 1.2 2014/09/28 16:48:59 jlec Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://wald.intevation.org/frs/download.php/1722/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
+IUSE="ldap"
 
 RDEPEND="
 	>=dev-libs/glib-2.12
@@ -21,8 +21,8 @@ RDEPEND="
 	net-libs/libpcap
 	app-crypt/gpgme
 	!net-analyzer/openvas-libnasl
-	net-nds/openldap
-	net-libs/libssh"
+	net-libs/libssh
+	ldap? (	net-nds/openldap )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
@@ -31,10 +31,16 @@ DEPEND="${RDEPEND}
 
 DOCS="ChangeLog CHANGES README"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libssh.patch
+	"${FILESDIR}"/${P}-bsdsource.patch
+	)
+
 src_configure() {
 	local mycmakeargs=(
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(cmake-utils_use_build ldap WITH_LDAP)
 	)
 	cmake-utils_src_configure
 }