openvas-server bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 19 insertions, 101 deletions

diff --git a/net-analyzer/openvas-client/Manifest b/net-analyzer/openvas-client/Manifest
index 4f665be07e87..8b01330b7f4d 100644
--- a/net-analyzer/openvas-client/Manifest
+++ b/net-analyzer/openvas-client/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST openvas-client-1.0.2.tar.gz 720867 RMD160 1f8afb356549c35462218018ce201c06d1f4945d SHA1 c6853bc2be8eef1ac445d09f9ee7ff22126c7fc5 SHA256 5812b36a412dda12266917c36379119b695987bc36bb67148347f5b8afb55be1
-DIST openvas-client-1.0.3.tar.gz 694275 RMD160 1530cc08e8a5a82dc9e7ee4c6ab18d93d347daa7 SHA1 a8b89785eba6b23b8a1fa1ce07dea18318eeb062 SHA256 b1affacb83c750e214bcc368babb66d2c49cea8dd375d75b33a959f6946e151a
-DIST openvas-client-1.0.4.tar.gz 663683 RMD160 9c82e473124edc3c6f04524e585e939cc6f2420a SHA1 c7e478f72a5fde14efa6ad1f568ef691ddb5a397 SHA256 c547cefb77a2b3158a6eca3540863a30e99964485cb442b60a03734e52d3f6e8
-DIST openvas-client-2.0.0.tar.gz 629263 RMD160 ef8e04896bfbeea1277fbfd4cebca978d800ca45 SHA1 f3b22ab1717158ec71e7745b5bfd0f412bc1bbac SHA256 e191b52f5f453ec9516034d08355f39bc010b3823d18eb6a2ab8b8da54c113c8
-DIST openvas-client-2.0.1.tar.gz 629551 RMD160 aa966e1e9911b63e5fee48d947cda5f0b036dd0a SHA1 07ada2cb7538da072c27a3a1cf58f9c6152d5e64 SHA256 520ddc9524b0af8b3d00d9132a95b774d2e2676d2c7e2f85b4aac77f63eaad00
 DIST openvas-client-2.0.2.tar.gz 681137 RMD160 7bda055e5c55495084bea60d1bbd75438c36b1e2 SHA1 ef5486f75c4e3196bebcac64aacbc8d54f09e18c SHA256 61bede38d4b7bba3835fd0468eb4d66284ae7a6821bb7ddd90a93afb3f14d878
-EBUILD openvas-client-1.0.2.ebuild 785 RMD160 fa1b344d73abd56dc18a1adab4445976ae9ae355 SHA1 0259b099412100dd978ddade58fb7024c5193315 SHA256 0bd5d78d3504756e913e8385e6d50f45e6ccefdb915c1bd66dfc8a01eb3a95c8
-EBUILD openvas-client-1.0.3.ebuild 785 RMD160 450c9b9b9f950f9464b2adce0460091066abe4ad SHA1 0d95b3d13f06882f35654d06f72ead4a763d91e0 SHA256 4357b6d5c3df63cde695c5e546fdf080427fa7b5a894a2d7f02145fda3161345
-EBUILD openvas-client-1.0.4.ebuild 901 RMD160 53ff3aa805a503ab319da7cb60638683913ca480 SHA1 86340906716d59212c2fae932f90bee113571292 SHA256 287bf18a01716c419ae1d677b7437c3500c540245bc4aacbe0b840e07eecefe3
-EBUILD openvas-client-2.0.0.ebuild 874 RMD160 76c49773d6b97d87ec6320665282132caaefb959 SHA1 cbe0b5e998c4a1ff2fb2d7ed5a75fd7afcbe22db SHA256 040f919313e7915975bba70c7d6043da8b385621dcf635a3c6d6c8c410eae55d
-EBUILD openvas-client-2.0.1.ebuild 862 RMD160 0edcd3657ec6cc3fed50cf7c39f9b44204721574 SHA1 57e5de9c93afd4b53c8bb31d5929685331851b8c SHA256 debdf51294b9aa2f586cafbb562e971fbcef3c65dd4ed1f8ce63eedb00d00fe9
+DIST openvas-client-2.0.4.tar.gz 836329 RMD160 550f12d8f3168ae28a668f5d15965a53be491f4c SHA1 30b48c01df2231d80b32c10bd3d7d2a0003e6631 SHA256 096a32328ca0a8b85465a881a743904879ea7f700f467b677209606cffaf2b54
 EBUILD openvas-client-2.0.2.ebuild 882 RMD160 5826529442dc992f0401ee15ca34225173129893 SHA1 b3c8f738bbdef3ccd92dd987b9fe0926f529f889 SHA256 6c3fe805eadc03838b35b3cbd456e3fed0c681cc0f15d25033c05eacf40a532a
-MISC ChangeLog 1399 RMD160 ad1ff54cf308d47ddcd1321969bf2f56ea81ab69 SHA1 71fe4aa1319757ff62f1cd75b738724c3fcf21ae SHA256 5bc8ce53a35aee6a5555a866493072b17c4ab266d7629cd3477686b866888d2b
+EBUILD openvas-client-2.0.4.ebuild 1002 RMD160 b4b0d315bb5e0af099fe81b238013f0455da25b6 SHA1 2874403df477a1e2df498528b8a0aa53ffc4d3dc SHA256 0db6a225ba837c3c0d18199275e90704ce98afe747e0ea3ff126e25db2c63daf
+MISC ChangeLog 1554 RMD160 56f16b0197f23e77ef519ad7eecaf71ddcf7c756 SHA1 bf081241d8fa25f1560a270b888a26799503fdb0 SHA256 2c57667dfa462a6aaaaa174b279efd7e3b5c1f6d5948a7186ec44705b4af6673
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm0HlUACgkQr2QksT29OyDbhwCeJeFVrS9WDZlIi0JPV/ZyCDKc
-XzoAmwQm7IKfv6OnH6uxBld2N+vtvcNr
-=UYUi
+iEYEARECAAYFAkpqDQoACgkQr2QksT29OyBg5gCcDel2F7vwJvpimo8vUkV+Ib9T
+u0sAoIV0Hs5WFq4/oymIwc4VPaXElkzG
+=aZpB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-server/ChangeLog b/net-analyzer/openvas-server/ChangeLog
index 69aefb567cbd..6146bf20f119 100644
--- a/net-analyzer/openvas-server/ChangeLog
+++ b/net-analyzer/openvas-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/openvas-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/ChangeLog,v 1.9 2009/03/13 19:29:30 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/ChangeLog,v 1.10 2009/07/24 19:32:56 hanno Exp $
+
+*openvas-server-2.0.2 (24 Jul 2009)
+
+  24 Jul 2009; Hanno Boeck <hanno@gentoo.org> +openvas-server-2.0.2.ebuild:
+  Version bump.
 
 *openvas-server-2.0.1-r1 (13 Mar 2009)
 
diff --git a/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff b/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff
deleted file mode 100644
index d5e63ca2a317..000000000000
--- a/net-analyzer/openvas-server/files/openvas-server-2.0.0-ldflags.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur openvas-server-2.0.0/openvas.tmpl.in openvas-server-2.0.0-1/openvas.tmpl.in
---- openvas-server-2.0.0/openvas.tmpl.in	2008-12-16 14:03:12.000000000 +0100
-+++ openvas-server-2.0.0-1/openvas.tmpl.in	2008-12-20 23:32:16.000000000 +0100
-@@ -103,7 +103,7 @@
- # Some defines you may want to modify
- OPENVAS_DEFS=@DEFS@ $(USE_PTHREADS) $(DEBUG) $(USE_LIBWRAP)
- DEFS=  
--LDFLAGS=
-+LDFLAGS=@LDFLAGS@
- 
- # Your C compiler
- CC=@CC@
-diff -Naur openvas-server-2.0.0/ssl/Makefile openvas-server-2.0.0-1/ssl/Makefile
---- openvas-server-2.0.0/ssl/Makefile	2008-12-16 14:03:12.000000000 +0100
-+++ openvas-server-2.0.0-1/ssl/Makefile	2008-12-20 23:34:18.000000000 +0100
-@@ -36,7 +36,7 @@
- all : openvas-mkrand
- 
- openvas-mkrand: $(OBJS)
--	$(CC) $(OBJS) -o openvas-mkrand -lm
-+	$(CC) $(LDFLAGS) $(OBJS) -o openvas-mkrand -lm
- 
- openvas-mkrand.o: openvas-mkrand.c
- 	$(CC) $(CFLAGS) -c openvas-mkrand.c 
diff --git a/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff b/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff
deleted file mode 100644
index 2784838df7bb..000000000000
--- a/net-analyzer/openvas-server/files/openvas-server-2.0.0-remove-useless-gpgme.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- openvas-server-2.0.0/openvasd/otp_1_0.c.1	2008-12-20 23:26:48.000000000 +0100
-+++ openvas-server-2.0.0/openvasd/otp_1_0.c	2008-12-20 23:26:53.000000000 +0100
-@@ -34,7 +34,6 @@
- 
- #include "otp_1_0.h"
- 
--#include <gpgme.h>
- #include <glib.h>
- 
- /* Find the enum identifier for the client request which is given
diff --git a/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild b/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild
deleted file mode 100644
index 0a42f83d19f9..000000000000
--- a/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/openvas-server-2.0.0.ebuild,v 1.1 2008/12/20 23:55:03 hanno Exp $
-
-inherit eutils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-server)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/550/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tcpd gtk debug prelude"
-
-DEPEND=">=net-analyzer/openvas-libnasl-2.0.0
-	tcpd? ( sys-apps/tcp-wrappers )
-	gtk? ( =x11-libs/gtk+-2* )
-	prelude? ( dev-libs/libprelude )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-remove-useless-gpgme.diff" || die "epatch failed"
-	epatch "${FILESDIR}/${P}-ldflags.diff" || die "epatch failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable tcpd tcpwrappers) \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		|| die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	dodoc TODO CHANGES || die
-	dodoc doc/*.txt || die
-
-	doinitd "${FILESDIR}"/openvasd || die "doinitd failed"
-	keepdir /var/lib/openvas/logs
-	keepdir /var/lib/openvas/users
-}
diff --git a/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild b/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild
index f6eacd627f55..6738ef6c267a 100644
--- a/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild
+++ b/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/openvas-server-1.0.2.ebuild,v 1.1 2008/08/29 09:05:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-server/openvas-server-2.0.2.ebuild,v 1.1 2009/07/24 19:32:56 hanno Exp $
 
 DESCRIPTION="A remote security scanner for Linux (openvas-server)"
 HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/485/${P}.tar.gz"
+SRC_URI="http://wald.intevation.org/frs/download.php/593/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="tcpd gtk debug prelude"
 
-DEPEND=">=net-analyzer/openvas-libraries-1.0.2
-	>=net-analyzer/openvas-libnasl-1.0.1
+DEPEND=">=net-analyzer/openvas-libnasl-2.0.1
 	tcpd? ( sys-apps/tcp-wrappers )
 	gtk? ( =x11-libs/gtk+-2* )
 	prelude? ( dev-libs/libprelude )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf \
@@ -29,7 +29,7 @@ src_install() {
 	einstall || die "einstall failed"
 
 	dodoc TODO CHANGES || die
-	dodoc doc/*.txt doc/ntp/* || die
+	dodoc doc/*.txt || die
 
 	doinitd "${FILESDIR}"/openvasd || die "doinitd failed"
 	keepdir /var/lib/openvas/logs