Respecting LDFLAGS, linking correctly, #247931 & #343339; More config options added

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 128 insertions, 3 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index 0644a73d1e7b..5da7636908b8 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,14 @@
 # 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.91 2010/09/06 18:35:14 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.92 2011/04/20 07:17:11 jlec Exp $
+
+*nessus-libraries-2.2.9-r1 (20 Apr 2011)
+
+  20 Apr 2011; Justin Lecher <jlec@gentoo.org>
+  +nessus-libraries-2.2.9-r1.ebuild,
+  +files/nessus-libraries-2.2.9-linking.patch:
+  Respecting LDFLAGS, linking correctly, #247931 & #343339; More config options
+  added
 
   06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   -nessus-libraries-2.2.6.ebuild:
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index 9255a3b82380..ceb30729f0ea 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nessus-libraries-2.2.9-asneeded.patch 444 RMD160 a0c556c14b72c253b8f47dfca7367fd1b5a49474 SHA1 5c5fb21c964bc906d33aff41530e6e1a0810d90f SHA256 db6c6b9f3eef5e03e3c37887f227d24688f812665a873abf80f2d68756685cda
+AUX nessus-libraries-2.2.9-linking.patch 2009 RMD160 8ac7834f2ed7ee97b8d72a790356a2136e3dabc4 SHA1 30e804f646685b4e1516bc07059f5a011279f322 SHA256 24428548259153da84932c782707b1183869ece1543ef3b35ef291f4a8f58b88
 AUX nessus-libraries-2.3.1-ldflags.patch 1424 RMD160 4cf59110cb43a73ed8f59b33b864aaf9743b5d0d SHA1 6810494fc8bef34e77ec282f8adf99cf46ec0843 SHA256 ce8b9ebff69c678f8488b2dd75240a1837a67c67dd6e3ea9aa9e7875ebfba1bb
 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.9-r1.ebuild 1143 RMD160 f0d34323630fa2ecc46351f6f3771ad781b899d1 SHA1 c5b0fc0c5d0bb53b2ee0eae2e993fd03525ec2ee SHA256 98139ffdcf399f506b4601789f5746a0ac959a673f0e5a6378e73b5a65e43284
 EBUILD nessus-libraries-2.2.9.ebuild 905 RMD160 222421bb9d28437b05a7d95c1b29872be5166604 SHA1 8b5e4d243135b02dc93f4f2a9cc7f4fc827f8430 SHA256 43bc880b103271befc6782835bab1df6b867e2eb1a6f60da37c49cb981a9ec27
 EBUILD nessus-libraries-2.3.1-r2.ebuild 1031 RMD160 65326f03fbff2da1eaddb16721461020019edbe9 SHA1 1e27d975d99ae86513d9927ac7cd84c6d3242f85 SHA256 8ea24e5b535e2c63b3aca54b165932ea844cbdae79bf55daa629699f20e5782d
-MISC ChangeLog 13099 RMD160 e4ac18bfe961ba7f4342e5c6f6ffe7e04f48a204 SHA1 4fdb882cf1f78cf173c0eba07bf5db6bc870a049 SHA256 97d816bf8cac8fe5d581f5635a67c5addaadbc49b5ef7e47e2bbf198fe5df815
+MISC ChangeLog 13356 RMD160 6de0ae66e562baff192baa31ea0e5c7ffe5901b2 SHA1 cad1932fafff9f6700b89ed4af725ccd781aee1d SHA256 2e44d37145d4555219a4e144841447f61883c96da61c5f8e74137610ad027c50
 MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2uiHwACgkQgAnW8HDreRYWjwCfS+xuDcUZ9URMlzGsF1a/rzCJ
+j0gAn12ql0ri0CgsThW8TlQefrIHNOlR
+=I/5b
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
new file mode 100644
index 000000000000..41cd2b21c938
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
@@ -0,0 +1,61 @@
+ Makefile                   |    4 ++--
+ libhosts_gatherer/Makefile |    2 +-
+ libnessus/Makefile         |    4 ++--
+ libnessus/kb.c             |    1 +
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 938d1b2..672d8cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,8 @@ include nessus.tmpl
+ ALLDEPS = nessus.tmpl nessus-config
+ 
+ all: $(ALLDEPS) $(PCAP_MAKE)
+-	cd libnessus && ${MAKE}
+-	cd libhosts_gatherer && ${MAKE}
++	${MAKE} -C libnessus
++	${MAKE} -C libhosts_gatherer
+ 
+ nessus-config: nessus-config.pre Makefile nessus.tmpl
+ 	@echo Creating $@ ...
+diff --git a/libhosts_gatherer/Makefile b/libhosts_gatherer/Makefile
+index e2a647c..7d628d8 100644
+--- a/libhosts_gatherer/Makefile
++++ b/libhosts_gatherer/Makefile
+@@ -22,7 +22,7 @@ install : libhosts_gatherer.la
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	
+ libhosts_gatherer.la : $(OBJS)
+-	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 	        
+ hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
+diff --git a/libnessus/Makefile b/libnessus/Makefile
+index c5a96db..211f57a 100644
+--- a/libnessus/Makefile
++++ b/libnessus/Makefile
+@@ -100,8 +100,8 @@ kb.o: kb.c
+ snprintf.o : snprintf.c
+ 	$(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}
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
++	-version-info ${PACKAGE_VERSION} `pcap-config --libs` `pkg-config --libs openssl`
+ 
+ install : libnessus.la
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+diff --git a/libnessus/kb.c b/libnessus/kb.c
+index 921c1a1..cbfd840 100644
+--- a/libnessus/kb.c
++++ b/libnessus/kb.c
+@@ -20,6 +20,7 @@
+  */ 
+ 
+ #include <includes.h>
++#include <fnmatch.h>
+ #define HASH_MAX 65537 
+ 
+ 
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..1c92dccb1b19
--- /dev/null
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/04/20 07:17:11 jlec Exp $
+
+EAPI=4
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt debug static-libs"
+
+# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
+DEPEND="
+	dev-libs/openssl
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch
+	sed \
+		-e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" \
+		-i nessus.tmpl.in
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable crypt cypher) \
+		$(use_enable debug) \
+		$(use_enable debug debug-ssl) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--with-ssl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-nessuspcap
+}