Version bump, cleanup

7 files changed, 33 insertions, 48 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 49d88eb42d4f..f0f86a730c12 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.24 2003/10/22 06:21:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.25 2003/11/19 08:54:23 phosphan Exp $
+
+*nessus-core-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a-r1.ebuild, nessus-core-2.0.9.ebuild,
+  files/nessus-core-2.0.6a.patch, files/nessus-core-2.0.8a.patch:
+  Version bump, cleanup
 
   22 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
   nessus-core-2.0.8a.ebuild:
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index 7549c61456ec..b5cf09d2256f 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,8 +1,8 @@
 MD5 cd4a9e037af465522e589c9ab6304ba0 nessus-core-2.0.8a.ebuild 2055
 MD5 c543c8098fe41be92e923af6588ddf0d nessus-core-2.0.7.ebuild 1611
 MD5 834db601c98ee809f6f041e7ddc81343 nessus-core-2.0.7-r1.ebuild 2036
-MD5 8dea9b34e5eb46abf721dbce42ef944c nessus-core-2.0.9.ebuild 2056
-MD5 cb605f1c3b8c8e7b88c6fa67a020e076 ChangeLog 4105
+MD5 f359ec944f4d6a8a878f285ee43c9a92 nessus-core-2.0.9.ebuild 2055
+MD5 9f5e56cd3b676c8a59cbaea64d2f984b ChangeLog 4341
 MD5 23192ff5f68a5dcd5ac8483ee86a03eb files/digest-nessus-core-2.0.7-r1 138
 MD5 5c6426f630e46de4a016d442909c36bd files/digest-nessus-core-2.0.8a 139
 MD5 9679a5b09be067d39a0c15b4354fa1ab files/digest-nessus-core-2.0.7 69
diff --git a/net-analyzer/nessus-core/files/digest-nessus-core-2.0.6a-r1 b/net-analyzer/nessus-core/files/digest-nessus-core-2.0.6a-r1
deleted file mode 100644
index 22e441a7907c..000000000000
--- a/net-analyzer/nessus-core/files/digest-nessus-core-2.0.6a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2dd997d65d1785526fe9d87393ce0417 nessus-core-2.0.6a.tar.gz 648798
diff --git a/net-analyzer/nessus-core/files/digest-nessus-core-2.0.9 b/net-analyzer/nessus-core/files/digest-nessus-core-2.0.9
new file mode 100644
index 000000000000..3a48f2844dd7
--- /dev/null
+++ b/net-analyzer/nessus-core/files/digest-nessus-core-2.0.9
@@ -0,0 +1,2 @@
+MD5 7bdbdb663d87a894cf8f99b33a5eb8b5 nessus-core-2.0.9.tar.gz 648864
+MD5 67cebc91a36613efe6524cea3631290e patch_0.nessus-core.2.0.7 54443
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.0.6a.patch b/net-analyzer/nessus-core/files/nessus-core-2.0.6a.patch
deleted file mode 100644
index 00c6223632cb..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.0.6a.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- nessus-core/nessus/auth.c	2003-01-27 12:34:22.000000000 +0100
-+++ ../../../nessus-core-2.0.7/work/nessus-core/nessus/auth.c	2003-06-03 15:14:54.000000000 +0200
-@@ -88,19 +88,19 @@
- void network_printf(char * data, ...)
- {
-   va_list param;
--  int r, s;
--  char * buffer = emalloc(8192);
-+  int r, s = 16384;
-+  char * buffer = emalloc(s);
-   int len, n = 0;
-   signal(SIGPIPE, sighand_pipe);
-   va_start(param, data);
- 
--  s = 8192;
-+ 
-   for(;;)
-   {
-    r = vsnprintf(buffer, s, data, param);
-    if(r >= 0 && r < s)break;
-    s = r > s ? r + 1 : s * 2;
--   buffer = realloc(buffer, s);
-+   buffer = erealloc(buffer, s);
-   }
-   len = strlen(buffer);
-   while(n < len)
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.0.8a.patch b/net-analyzer/nessus-core/files/nessus-core-2.0.8a.patch
deleted file mode 100644
index 0bdb3dd5818b..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.0.8a.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nessus-core/nessusd/nessusd.c	2003-07-01 23:37:29.000000000 +0200
-+++ nessusd.new	2003-07-10 15:02:57.000000000 +0200
-@@ -800,7 +800,7 @@
-       {
-        char host_name[1024];
-         
--      hg_get_name_from_ip(addr.sin_addr, host_name, sizeof(host_name));
-+      hg_get_name_from_ip(address.sin_addr, host_name, sizeof(host_name));
-       if(!(hosts_ctl("nessusd", host_name, asciiaddr, STRING_UNKNOWN)))
-       {
-        shutdown(soc, 2);
diff --git a/net-analyzer/nessus-core/nessus-core-2.0.6a-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild
index b7e54d59f736..748588e1fa4a 100644
--- a/net-analyzer/nessus-core/nessus-core-2.0.6a-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild
@@ -1,27 +1,32 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.0.6a-r1.ebuild,v 1.2 2003/08/03 03:23:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.0.9.ebuild,v 1.1 2003/11/19 08:54:23 phosphan Exp $
 
 DESCRIPTION="A remote security scanner for Linux (nessus-core)"
 HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz
+	prelude? ( http://www.exaprobe.com/labs/downloads/Nessus_Patch/patch_0.nessus-core.2.0.7 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc -sparc alpha"
-IUSE="tcpd X gtk gtk2 debug"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="tcpd X gtk gtk2 debug prelude"
 
 DEPEND="=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
 	X? ( x11-base/xfree )
 	gtk? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )"
+	gtk2? ( =x11-libs/gtk+-2* )
+	prelude? ( dev-libs/libprelude )"
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PN}-${PV}.patch
+	use prelude && (
+		epatch ${DISTDIR}/patch_0.nessus-core.2.0.7
+		epatch ${FILESDIR}/patch_1.nessus-core.2.0.7
+	)
 }
 
 src_compile() {
@@ -34,12 +39,21 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-gtk"
 	fi
-	myconf="${myconf} `use_enable tcpd tcpwrappers`"
+	# no use_enable because of bug 31670
+	if [ `use tcpd` ]; then
+		myconf="${myconf} --enable-tcpwrappers"
+	fi
 	if [ `use debug` ]; then
 		myconf="${myconf} --enable-debug"
 	else
 		myconf="${myconf} --disable-debug"
 	fi
+	if [ `use prelude` ]; then
+		export LIBPRELUDE_CONFIG=/usr/bin/libprelude-config
+	fi
+	if [ `use prelude` ]; then
+		export LIBPRELUDE_CONFIG=/usr/bin/libprelude-config
+	fi
 	econf ${myconf} || die "configure failed"
 	emake || die "emake failed"