cleanup

(Portage version: 2.1.2-r1)

9 files changed, 10 insertions, 170 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index d2ea2279a036..db049a1aeb85 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nessus-core
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.107 2007/01/05 08:37:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.108 2007/02/01 19:59:35 jokey Exp $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/nessus-core-2.0.7.patch, -files/patch_1.nessus-core.2.0.7,
+  -files/nessusd-r6, -nessus-core-2.2.7.ebuild, -nessus-core-2.2.8.ebuild:
+  cleanup
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   nessus-core-2.2.6.ebuild, nessus-core-2.2.7.ebuild,
diff --git a/net-analyzer/nessus-core/files/digest-nessus-core-2.2.7 b/net-analyzer/nessus-core/files/digest-nessus-core-2.2.7
deleted file mode 100644
index cc946e0570d8..000000000000
--- a/net-analyzer/nessus-core/files/digest-nessus-core-2.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2dd8c116b435d3ec698d3caed0b48859 nessus-core-2.2.7.tar.gz 673852
-RMD160 672bc31cc8283e3248831bb8564c6531d4b55eed nessus-core-2.2.7.tar.gz 673852
-SHA256 eb6d46cd6b4f872ec6f04b825eb40bbdb0b73bf1cbc1bbc7ebf004ac942a0eee nessus-core-2.2.7.tar.gz 673852
diff --git a/net-analyzer/nessus-core/files/digest-nessus-core-2.2.8 b/net-analyzer/nessus-core/files/digest-nessus-core-2.2.8
deleted file mode 100644
index ebdd11e6c3e6..000000000000
--- a/net-analyzer/nessus-core/files/digest-nessus-core-2.2.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7580ed539c38b6514d1a3cdf62cbe346 nessus-core-2.2.8.tar.gz 674132
-RMD160 dd81883b68df0d8e41b31ae89e0c4e48b9935695 nessus-core-2.2.8.tar.gz 674132
-SHA256 4efa050d0a319fa8523af6284462c45a82ec0940ed5bc20db0cb693dca75314b nessus-core-2.2.8.tar.gz 674132
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.0.7.patch b/net-analyzer/nessus-core/files/nessus-core-2.0.7.patch
deleted file mode 100644
index 0bdb3dd5818b..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.0.7.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/files/nessusd-r6 b/net-analyzer/nessus-core/files/nessusd-r6
deleted file mode 100644
index ca61af54c563..000000000000
--- a/net-analyzer/nessus-core/files/nessusd-r6
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r6,v 1.5 2005/04/01 00:58:21 vanquirius Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if ! `grep -q "cert_file=[^ ]" /etc/nessus/nessusd.conf`
-	then
-		eerror "No certificate found."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting nessusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
-	eend $? 
-}
-
-stop() {
-	ebegin "Stop nessusd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
-	eend $?
-}
diff --git a/net-analyzer/nessus-core/files/patch_1.nessus-core.2.0.7 b/net-analyzer/nessus-core/files/patch_1.nessus-core.2.0.7
deleted file mode 100644
index bf8d33ed15a6..000000000000
--- a/net-analyzer/nessus-core/files/patch_1.nessus-core.2.0.7
+++ /dev/null
@@ -1,21 +0,0 @@
---- nessus-core/nessus/prelude_output_orig.c	2003-07-21 09:16:58.000000000 +0800
-+++ nessus-core/nessus/prelude_output.c	2003-07-23 00:07:29.000000000 +0800
-@@ -612,7 +612,8 @@
-                 class->origin = cve;
-                 idmef_string_set(&class->name, ref_cve);
- 
--                len += strlen(ref_cve) + 1;
-+                /* len += strlen(ref_cve) + 1; */
-+		len = strlen(ref_cve) + strlen(CVE_URL) + 1;
-                 cve_url = malloc(len);
-                 if ( ! cve_url ) {
-                         if ( usage & OPT_KB_SRC )
-@@ -621,7 +622,7 @@
-                 }
- 
-                 sprintf(cve_url, "%s%s", CVE_URL, ref_cve);
--                cve_url[len] = '\0';
-+                cve_url[len-1] = '\0';
- 
-                 idmef_string_set(&class->url, cve_url);
- 
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.7.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.7.ebuild
deleted file mode 100644
index c0016d5cb8a4..000000000000
--- a/net-analyzer/nessus-core/nessus-core-2.2.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 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.7.ebuild,v 1.2 2007/01/05 08:37:52 flameeyes Exp $
-
-inherit toolchain-funcs eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcpd debug prelude"
-DEPEND="=net-analyzer/nessus-libraries-${PV}
-	=net-analyzer/libnasl-${PV}
-	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( =x11-libs/gtk+-2* )
-	prelude? ( dev-libs/libprelude )
-	!net-analyzer/nessus-client"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-
-	export CC="$(tc-getCC)"
-	econf `use_enable tcpd tcpwrappers` \
-		`use_enable debug` \
-		`use_enable X gtk` \
-		|| die "configure failed"
-	emake -j1 || die "emake failed"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		install || die "Install failed nessus-core"
-	cd "${S}"
-	dodoc README* UPGRADE_README CHANGES
-	dodoc doc/*.txt doc/ntp/*
-	insinto /etc/init.d
-	insopts -m 755
-	newins "${FILESDIR}"/nessusd-r7 nessusd
-	keepdir /var/lib/nessus/logs
-	keepdir /var/lib/nessus/users
-	# newer version is provided by nessus-libraries
-	# should be fixed upstream in version 2.2.6
-	rm "${D}"/usr/include/nessus/includes.h
-}
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.8.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.8.ebuild
deleted file mode 100644
index 47bde35b0fa0..000000000000
--- a/net-analyzer/nessus-core/nessus-core-2.2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 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.8.ebuild,v 1.2 2007/01/05 08:37:52 flameeyes Exp $
-
-inherit toolchain-funcs eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcpd debug prelude"
-DEPEND="=net-analyzer/nessus-libraries-${PV}
-	=net-analyzer/libnasl-${PV}
-	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( =x11-libs/gtk+-2* )
-	prelude? ( dev-libs/libprelude )
-	!net-analyzer/nessus-client"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-
-	export CC="$(tc-getCC)"
-	econf `use_enable tcpd tcpwrappers` \
-		`use_enable debug` \
-		`use_enable X gtk` \
-		|| die "configure failed"
-	emake -j1 || die "emake failed"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" \
-		install || die "Install failed nessus-core"
-	cd "${S}"
-	dodoc README* UPGRADE_README CHANGES
-	dodoc doc/*.txt doc/ntp/*
-	insinto /etc/init.d
-	insopts -m 755
-	newins "${FILESDIR}"/nessusd-r7 nessusd
-	keepdir /var/lib/nessus/logs
-	keepdir /var/lib/nessus/users
-	# newer version is provided by nessus-libraries
-	# should be fixed upstream in version 2.2.6
-	rm "${D}"/usr/include/nessus/includes.h
-}
diff --git a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild b/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
index 097a5e3930ef..d0eeab8f22dd 100644
--- a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3.1.ebuild,v 1.8 2006/02/18 19:50:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild,v 1.9 2007/02/01 19:59:35 jokey Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,8 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="tcpd gtk debug prelude"
 
-DEPEND="=net-analyzer/nessus-libraries-${PV}
-	=net-analyzer/libnasl-${PV}
+DEPEND="~net-analyzer/nessus-libraries-${PV}
+	~net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
 	gtk? ( =x11-libs/gtk+-2* )
 	prelude? ( dev-libs/libprelude )