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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 33 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/Manifest b/net-analyzer/nessus-libraries/Manifest
index 6f71c572d987..2116040ff41a 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,29 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX nessus-libraries-2.2.9-asneeded.patch 444 RMD160 a0c556c14b72c253b8f47dfca7367fd1b5a49474 SHA1 5c5fb21c964bc906d33aff41530e6e1a0810d90f SHA256 db6c6b9f3eef5e03e3c37887f227d24688f812665a873abf80f2d68756685cda
 AUX nessus-libraries-2.3.1-ldflags.patch 1010 RMD160 382f930f6eec35405264f9cf0baffa29cd55a15b SHA1 a78554996cb28929aeed729b9ee088482cf99b59 SHA256 8c5cdd22850134641eee93045391f4c4566d44287cec7a7c81c6d219de3e24af
 DIST nessus-libraries-2.2.6.tar.gz 426911 RMD160 6fd4b60515fa17657a015a3a31d380ee5d2c23ba SHA1 7552cb5c48ace2e38537d8b58a1c7968172399cc SHA256 3389d0579aa28e6c2da86682cad994976e15938fd47bcf31ef6decc2841cbc67
 DIST nessus-libraries-2.2.9.tar.gz 426560 RMD160 a3ce920ff48fcb7879f7026e2b7d271151132787 SHA1 de1ce2c522d6127a436574a96b1a5ec9873b597c SHA256 5a3c32d6eab8ccc8a22ab5bb224228152e10731c06561f679c41b92263c7ef18
 DIST nessus-libraries-2.3.1.tar.gz 424748 RMD160 c219015f13e5b7ccba3856823605b2aa71d680d3 SHA1 f62214122bfd42db8057b87b357d7ed8f35b8d70 SHA256 04528fe8882b51da65860ab4fe823fada56f4009d7961ca92970ace32a796c27
 EBUILD nessus-libraries-2.2.6.ebuild 866 RMD160 8acf16d9583df4cfe17e445d39fde3f0308ab50d SHA1 4a0e68bd21c3ba4fecb6aba0cc9b385f982ebb56 SHA256 421fb52d3e3800636f1970d7d13eb6a7356f264b6fcfb372dbd8a55ba6cf6df7
-EBUILD nessus-libraries-2.2.9.ebuild 881 RMD160 9ad3427506117b3e027cdc8382c6aa8be90f64d4 SHA1 79828fd276d1c372d4b83aea81b7867b906e6fb9 SHA256 1575b20d6e00dee6fe5f2e833e96995e1687c1f46b711c52fd83a3c4981f1af2
+EBUILD nessus-libraries-2.2.9.ebuild 905 RMD160 222421bb9d28437b05a7d95c1b29872be5166604 SHA1 8b5e4d243135b02dc93f4f2a9cc7f4fc827f8430 SHA256 43bc880b103271befc6782835bab1df6b867e2eb1a6f60da37c49cb981a9ec27
 EBUILD nessus-libraries-2.3.1-r1.ebuild 1032 RMD160 31b73fecce5e169b8f5b209e0ce51d3d12b162ce SHA1 c4d61aa03cded7a4db19e6855eb51a66a2df6ad1 SHA256 cb1daea55ba0958f9b0ed6cfdb160e6c0ab3326d169e5be461258598261102a2
-MISC ChangeLog 12516 RMD160 52637a24da969d86f96d9980ce929644b417fc41 SHA1 e9626b7944439ba5960a7f96bdaf200690c7f9c7 SHA256 817e2d02598ef13e062fe7c4c5db237689349d2578a98a1f7d98d302882b40f7
+MISC ChangeLog 12733 RMD160 437e893fa7431a056e519850fc36a2146957ac93 SHA1 7de07fdfae565a9e823a068444bdbaffc18a10a3 SHA256 5d12f277d9e274183fa2e56b01136b2367c6d028359d9e50466c189ad86bab6f
 MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBCAAGBQJL/UujAAoJELHSF2kinlg4fVgP/RKT1MoignNsyEeBOacB+/YZ
-wrBE6f7l2zacrCLmUUJzdJ49x35iHXD3I8vclS8ij+VVyFaCOnIEHwoTQ0CCq0KM
-JrWsA1KPxHIs44hcj2aW/3/NCj83wwGRCimJaY5QhVLq3+i6K9mCByK6N2Y9u3SA
-8r/MKfa9/mUNm1H/pJX0LrIHJAjndgnYHQp1JjDLGIMz+hvuPq/HcrLzfKDyq95D
-pboVmWUemdNa5kHlwf0xgHp+5AguDxeOZpHfOn9GNGzLPkTcdUKCQHw+8Kf1vxC3
-MPYvU8XMJAP/7EADSxJkd8TQb0Qloj4jCBWuSII9QPxthoWhVfke3sKZLzLOkTnE
-bPrhzH81CJkjV7YyeObLmdDmGgJ8URYbzWLuASfuB21VTHSA5HrBxH229Mq/8WNP
-SN0TUPWAdp6PDkq5okBuAghmW+EsP7oTXEknKWKIK0BQ7xHZuctt+/QVrlc3MbYs
-jDGwcHadfxRHRqk1UHuUk2XCXP9dj+b+JC62rfQPc+TC7V+6D9x5j4ZAL8TpdXaj
-CnzPyH65Tl1deSBQBky0gnCIM8NJokSLflhW0R43nLT68v6LyGHWCDOTkbjzedvj
-k5t3ic0yVF+6O97uvycka/SzczCL4RUSj6VDU74CKr2Ba0X6OM6pyQp5Hlxl8V/w
-KRMJUUDgArPldbueLKLe
-=336z
------END PGP SIGNATURE-----
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*
 }