Version bump

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 17 insertions, 8 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 79cb2037d157..d45696801694 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.134 2008/12/01 17:06:22 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.135 2008/12/02 17:48:30 dertobi123 Exp $
+
+*nagios-core-3.0.6 (02 Dec 2008)
+
+  02 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-core-3.0.5-r1.ebuild, +nagios-core-3.0.6.ebuild:
+  Version bump
 
   01 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   files/lighttpd_nagios3.conf:
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.5-r1.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild
index 26288f34a5d4..0b96988b6acb 100644
--- a/net-analyzer/nagios-core/nagios-core-3.0.5-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.5-r1.ebuild,v 1.1 2008/11/28 20:27:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild,v 1.1 2008/12/02 17:48:30 dertobi123 Exp $
 
 EAPI="1"
 
@@ -9,8 +9,7 @@ inherit eutils depend.apache toolchain-funcs
 MY_P=${PN/-core}-${PV}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
 HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-CVE-2008-5028.patch.bz2"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -50,8 +49,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${WORKDIR}/${MY_P}-CVE-2008-5028.patch"
-
 	local strip="$(echo '$(MAKE) strip-post-install')"
 	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
 }
diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index b8d2a56e6a50..9d7ec5101a8c 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.74 2008/11/06 17:55:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.75 2008/12/02 17:49:44 dertobi123 Exp $
+
+*nagios-3.0.6 (02 Dec 2008)
+
+  02 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-3.0.5.ebuild, +nagios-3.0.6.ebuild:
+  Version bump
 
 *nagios-3.0.5 (06 Nov 2008)
 
diff --git a/net-analyzer/nagios/nagios-3.0.5.ebuild b/net-analyzer/nagios/nagios-3.0.6.ebuild
index bb10084b3ff4..c947150426d2 100644
--- a/net-analyzer/nagios/nagios-3.0.5.ebuild
+++ b/net-analyzer/nagios/nagios-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.0.5.ebuild,v 1.1 2008/11/06 17:55:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-3.0.6.ebuild,v 1.1 2008/12/02 17:49:44 dertobi123 Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
 nagios packages"