7 files changed, 31 insertions, 109 deletions
diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index a7b874ad29df..b28cdf8e4b2e 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2011/04/22 10:39:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.117 2011/09/12 07:49:19 radhermit Exp $
+
+  12 Sep 2011; Tim Harder <radhermit@gentoo.org> -files/2.2.9-asneeded.patch,
+  -nessus-core-2.2.9.ebuild, nessus-core-2.2.9-r1.ebuild,
+  +files/nessus-core-2.2.9-open.patch, -files/nessus-core-2.3.1-gcc4.diff,
+  -files/nessusd-r8:
+  Respect CFLAGS, add pkgconfig build dependency, remove unnecessary patch, and
+  fix call to open. Remove old.
 
   22 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/2.2.9-asneeded.patch,
   nessus-core-2.2.9-r1.ebuild:
diff --git a/net-analyzer/nessus-core/files/2.2.9-asneeded.patch b/net-analyzer/nessus-core/files/2.2.9-asneeded.patch
deleted file mode 100644
index 581aba2c948d..000000000000
--- a/net-analyzer/nessus-core/files/2.2.9-asneeded.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/files/nessus-core-2.2.9-open.patch b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
new file mode 100644
index 000000000000..fe60ede62b29
--- /dev/null
+++ b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
@@ -0,0 +1,11 @@
+--- nessus-core/nessusd/detached.c.orig
++++ nessus-core/nessusd/detached.c
+@@ -408,7 +408,7 @@
+  char * target;
+ {
+  char * fname = detached_fname(globals);
+- int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC);
++ int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
+  if(f >= 0)
+  {
+   write(f, target, strlen(target));
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff b/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff
deleted file mode 100644
index 5d0447c216ed..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.3.1-gcc4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN nessus-core.orig/nessus/comm.c nessus-core/nessus/comm.c
---- nessus-core.orig/nessus/comm.c	2005-05-15 09:36:41.000000000 -0400
-+++ nessus-core/nessus/comm.c	2005-05-15 09:37:48.000000000 -0400
-@@ -96,6 +96,7 @@
- 	limit = PBAR_MAX;
- 	break;
-       default:
-+	;
-     }
-   }
- 
diff --git a/net-analyzer/nessus-core/files/nessusd-r8 b/net-analyzer/nessus-core/files/nessusd-r8
deleted file mode 100644
index 63cb61db710b..000000000000
--- a/net-analyzer/nessus-core/files/nessusd-r8
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r8,v 1.1 2006/02/04 14:57:30 vanquirius Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting nessusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D --quiet
-	eend $? 
-}
-
-stop() {
-	ebegin "Stop nessusd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
-	einfo "Waiting for the environment to be sane"
-	while [ -n "$RUNNING" ] ; do
-		sleep 1
-		RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
-	done
-	sleep 3
-	eend $?
-}
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 2992c83032ee..6cb11091bff0 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,10 +1,10 @@
 # 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.3 2011/04/22 10:39:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild,v 1.4 2011/09/12 07:49:19 radhermit Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils autotools
 
 DESCRIPTION="A remote security scanner for Linux (nessus-core)"
 HOMEPAGE="http://www.nessus.org/"
@@ -15,13 +15,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug gtk prelude tcpd"
 
-DEPEND="
+RDEPEND="
 	~net-analyzer/nessus-libraries-${PV}
 	~net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
 	gtk? ( x11-libs/gtk+:2 )
 	prelude? ( dev-libs/libprelude )
 	!net-analyzer/nessus-client"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S="${WORKDIR}"/${PN}
 
@@ -32,10 +34,12 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}"/${PV}-crash.patch \
-		"${FILESDIR}"/${PV}-asneeded.patch
-	sed \
-		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
-		-i nessus.tmpl.in
+		"${FILESDIR}"/${P}-open.patch
+
+	sed -i -e "/^LDFLAGS/s:$:${LDFLAGS}:g" nessus.tmpl.in || die
+	sed -i -e 's:CFLAGS="-g"; ::' configure.in || die
+
+	eautoreconf
 }
 
 src_configure() {
@@ -58,5 +62,5 @@ src_install() {
 	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
+	rm "${ED}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9.ebuild
deleted file mode 100644
index 2f3252e6c5a0..000000000000
--- a/net-analyzer/nessus-core/nessus-core-2.2.9.ebuild
+++ /dev/null
@@ -1,47 +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.9.ebuild,v 1.3 2007/04/28 18:57:39 tove 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 ~x86-fbsd"
-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/*
-	newinitd "${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
-}