Link libnessus.so to -lcrypto and -lssl wrt #247931 by Diego E. Pettenò.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 36 insertions, 11 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index bc7a24489885..1d647d144ea9 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nessus-libraries
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.88 2010/05/26 16:26:06 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.89 2010/07/01 13:58:32 ssuominen Exp $
+
+  01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  nessus-libraries-2.2.9.ebuild,
+  +files/nessus-libraries-2.2.9-asneeded.patch:
+  Link libnessus.so to -lcrypto and -lssl wrt #247931 by Diego E. Pettenò.
 
   26 May 2010; Jonathan Callen <abcd@gentoo.org>
   nessus-libraries-2.3.1-r1.ebuild:
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-asneeded.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-asneeded.patch
new file mode 100644
index 000000000000..e428c4f6ff17
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-asneeded.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/247931
+
+--- libnessus/Makefile
++++ libnessus/Makefile
+@@ -101,7 +101,7 @@
+ 	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
+ libnessus.la: $(OBJS)
+ 	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
+-	-version-info ${PACKAGE_VERSION}
++	-version-info ${PACKAGE_VERSION} -lcrypto -lssl
+ 
+ install : libnessus.la
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild
index 8d91fa211e42..be7e7cffe812 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild
@@ -1,28 +1,35 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild,v 1.2 2007/04/11 13:41:07 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.9.ebuild,v 1.3 2010/07/01 13:58:32 ssuominen Exp $
 
-inherit toolchain-funcs
+EAPI=2
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
 HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 # Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
 DEPEND=">=dev-libs/openssl-0.9.6d"
-S="${WORKDIR}/${PN}"
 
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf --with-ssl=/usr/lib || die "econf failed"
-	emake || die "emake failed"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--with-ssl=/usr/$(get_libdir)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "failed to install"
+	emake DESTDIR="${D}" install || die
 	dodoc README*
 }