As-needed fixes, #364397

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

4 files changed, 30 insertions, 8 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 995f77a6de4d..a7b874ad29df 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.115 2011/04/20 11:17:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.116 2011/04/22 10:39:47 jlec Exp $
+
+  22 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/2.2.9-asneeded.patch,
+  nessus-core-2.2.9-r1.ebuild:
+  As-needed fixes, #364397
 
   20 Apr 2011; Justin Lecher <jlec@gentoo.org> -nessus-core-2.3.1.ebuild:
   Dropped due to pending removal request, #169466
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index 0ef4f44e2bb4..4f34e89d2eb5 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.2.9-asneeded.patch 490 RMD160 52d082ae22a4be3b0fac70052a170d8e663138c5 SHA1 286b4e2e90bac4867ea1ef7669182cb0ac352573 SHA256 5ec7c8f3e21e653884aa665eed5296ea6b56e3287c138117f9185db1cba0f1c6
 AUX 2.2.9-crash.patch 418 RMD160 de57908f176d631c823e597fb75fc0f2cfc798be SHA1 c53e667f12ce6871b9dc1681395ecbbdf6d9287d SHA256 52a43e9d16005d2150f96885e0d91dc6992dc086288e7cf665d77d0ee7758baf
 AUX 2.2.9-gentoo.patch 1470 RMD160 4a21d14edba9690a01ff5bc9bf518498b2696280 SHA1 bc20beea692c649339f6e79dc22f0effe46eb481 SHA256 be28f8be6f36e5e7214c9053827d76a45bda40256a54ae6c8ce627914556ffbf
 AUX nessus-core-2.3.1-gcc4.diff 325 RMD160 595f11acb9b5a83ecff75924f50b3de4c51526a0 SHA1 b7e089d1fa575287ef1b945077d938d0f1cdda3f SHA256 020a160721bcf23142f38b4fe8d914ae7cfae830b8dafaa654604091017363e1
 AUX nessusd-r7 647 RMD160 35dffe93c92db49d5e32df848461813c7387d091 SHA1 7b5cd47b7251444fe80a6f98eeb72a72e8438ca0 SHA256 36ecfe6a2f71490e6123b1fbdae8a71cb3a24d503adb92ee50dd602b649b5262
 AUX nessusd-r8 655 RMD160 5aa32dccd94763954dff77dc55bdef711ff8a1b8 SHA1 703d74e2ee19ba7ab5e51618b6e3d4c6c35f6709 SHA256 634741d3cae1bec7a9eec6a0e04f086d71b5e13685e8c43a6583684ef01994fc
 DIST nessus-core-2.2.9.tar.gz 674390 RMD160 ba911192a78ee1c6ae1a5d64badff9d18ef666a8 SHA1 25385fd1cece40fd57e26afd42c88515b069c2ba SHA256 b725ace4ef619bc19b372eac9a60db7b083a3e155e11c65443618e52b56c847e
-EBUILD nessus-core-2.2.9-r1.ebuild 1470 RMD160 676d7cd3c91ea06bc16bc42f3debad0b313120bd SHA1 514b0100a5e29829ff31b025d9210b27dd2ff6e6 SHA256 6cde87f87cedaeccc7390acdb317f394855212bb9493b7ad70571b75f0819996
+EBUILD nessus-core-2.2.9-r1.ebuild 1509 RMD160 bab0b82fb7f2714529d9932a9669aad3af823870 SHA1 8d196fb2fc513f95a40f69bb1259f098fbd7b067 SHA256 7220cbc2b33f417934b1325c7cfbe96011d8cdb115f9b08c59a00e847541d90f
 EBUILD nessus-core-2.2.9.ebuild 1358 RMD160 78381fef8b45e5f9c78a2e8d58290238b36d83d4 SHA1 cb0e6de3f1c364cc194256b4df012d08c5066b5f SHA256 c7de3b480de2bb4679d3964b1055487345080135af4c316a95c2d1e0b030519a
-MISC ChangeLog 17631 RMD160 889fbba3cf20ee45deab9c186610c1d9ccf13046 SHA1 a176dd4bc94c239a2dfc1ebdecf92d6808bf1861 SHA256 198679332834d79f5a0e4d25dd910366aa65a878943255d7743d9fc7cec90af7
+MISC ChangeLog 17766 RMD160 8ff14bf9f04f3838d33c0cef5a730ece57d32636 SHA1 f595a5ef8adf9d7f9eefc4c753bd9af405a5c2f3 SHA256 e4507f42858701a04e784429e556c6734d843a56a6ceade6bfaa584ef7798309
 MISC metadata.xml 244 RMD160 dcd2bcdadd5f72b4674006adb8241495d91e23b7 SHA1 33de92ec7574e4f3d3b4c5bd0a368b42f80996be SHA256 ffab1a869f9dad1f7e917015ad31e5c00a2047997e76ba050a6898c71e11b991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2uwOAACgkQgAnW8HDreRZ/wgCgh6vD+/GkLhSRlIRsJo4bdr+U
-gCQAn2tyBElmzu2uO9Uf51IBP6yt5u5L
-=hoDP
+iEYEARECAAYFAk2xIrgACgkQgAnW8HDreRZ+uQCfb9uo+KhJFeDZ8iucqBuEGGuZ
+SyYAnjxTNFhDwOWUBDi5Xpm4ohVNEbfE
+=o4Yj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-core/files/2.2.9-asneeded.patch b/net-analyzer/nessus-core/files/2.2.9-asneeded.patch
new file mode 100644
index 000000000000..581aba2c948d
--- /dev/null
+++ b/net-analyzer/nessus-core/files/2.2.9-asneeded.patch
@@ -0,0 +1,16 @@
+ nessusd/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nessusd/Makefile b/nessusd/Makefile
+index 47a1e12..66641aa 100644
+--- a/nessusd/Makefile
++++ b/nessusd/Makefile
+@@ -3,7 +3,7 @@ include ../nessus.tmpl
+ LIBS =  `$(NASLCONFIG) --libs` `$(NESSUSCONFIG) --libs`  \
+ 	$(W_STATIC)  $(W_DYNAMIC) \
+ 	$(DL_LIB)  \
+-	$(COMPAT_LIB) $(LIBWRAP)
++	$(COMPAT_LIB) $(LIBWRAP) `pcap-config --libs`
+ NESSUS_INCLUDE=`sh ./cflags` 
+ OBJS = auth.o \
+        attack.o \
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
index c623b4190197..2992c83032ee 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild,v 1.2 2011/04/20 11:13:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild,v 1.3 2011/04/22 10:39:47 jlec Exp $
 
 EAPI="4"
 
@@ -31,7 +31,8 @@ src_prepare() {
 	tc-export CC
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-crash.patch
+		"${FILESDIR}"/${PV}-crash.patch \
+		"${FILESDIR}"/${PV}-asneeded.patch
 	sed \
 		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
 		-i nessus.tmpl.in