bump for nagios-3

Package-Manager: portage-2.1.5_rc6

5 files changed, 322 insertions, 558 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index f50c37c299bd..83d5f2712088 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,562 +1,11 @@
 # 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.117 2008/03/23 11:44:34 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.118 2008/04/27 18:41:24 dertobi123 Exp $
 
-  23 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  -nagios-core-2.10-r1.ebuild:
-  Remove old version
+*nagios-core-3.0.1 (27 Apr 2008)
 
-  22 Mar 2008; Raúl Porcel <armin76@gentoo.org> nagios-core-2.11.ebuild:
-  sparc stable wrt #213766
-
-  21 Mar 2008; Markus Meier <maekke@gentoo.org> nagios-core-2.11.ebuild:
-  amd64/x86 stable, security bug #213766
-
-  19 Mar 2008; Markus Rothe <corsair@gentoo.org> nagios-core-2.11.ebuild:
-  Stable on ppc64; bug #213766
-
-  14 Mar 2008; Caleb Tennis <caleb@gentoo.org> nagios-core-2.10-r1.ebuild:
-  amd64 stable
-
-*nagios-core-2.11 (14 Mar 2008)
-
-  14 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  -files/nagios-1.x-Makefile-asneeded.diff, -files/nagios.conf,
-  -files/submit_check_result_via_nsca.patch, -nagios-core-1.4.1.ebuild,
-  -nagios-core-1.4.1-r1.ebuild, -nagios-core-2.10-r2.ebuild,
-  +nagios-core-2.11.ebuild:
-  Version bump
-
-*nagios-core-2.10-r2 (27 Feb 2008)
-
-  27 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  +nagios-core-2.10-r2.ebuild:
-  Fix apache eclass handling, patch by Jakub Moc in #209655
-
-  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> nagios-core-1.4.1.ebuild,
-  nagios-core-1.4.1-r1.ebuild, nagios-core-2.10-r1.ebuild:
-  fix depend.apache usage wrt #208033
-
-  21 Jan 2008; Raúl Porcel <armin76@gentoo.org> nagios-core-2.10-r1.ebuild:
-  sparc stable wrt #205335
-
-  13 Jan 2008; Brent Baude <ranger@gentoo.org> nagios-core-2.10-r1.ebuild:
-  Marking nagios-core-2.10-r1 ppc64 for bug 205335
-
-  12 Jan 2008; Dawid Węgliński <cla@gentoo.org>
-  nagios-core-2.10-r1.ebuild:
-  Stable on x86 (bug #205335)
-
-*nagios-core-2.10-r1 (01 Jan 2008)
-
-  01 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  -nagios-core-2.10.ebuild, +nagios-core-2.10-r1.ebuild:
-  Add vim-syntax USE, bug #202969
-
-  25 Nov 2007; Benedikt Böhm <hollow@gentoo.org> nagios-core-1.4.1.ebuild,
-  nagios-core-1.4.1-r1.ebuild, nagios-core-2.10.ebuild:
-  fix depend.apache eclass usage
-
-*nagios-core-2.10 (22 Oct 2007)
-
-  22 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  -nagios-core-2.9-r1.ebuild, +nagios-core-2.10.ebuild:
-  Version bump
-
-  01 Aug 2007; Michael Marineau <marineam@gentoo.org>
-  nagios-core-2.9-r1.ebuild:
-  Change ownership of /usr/nagios to root:root to play nice with grsec trusted
-  path execution and properly quote a handful of variables.
-
-  10 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  -nagios-core-2.3.1-r1.ebuild, -nagios-core-2.4-r1.ebuild,
-  -nagios-core-2.5-r1.ebuild, -nagios-core-2.8.ebuild,
-  -nagios-core-2.9.ebuild, nagios-core-2.9-r1.ebuild:
-  Migrate to econf, bug #160185 and #119520
-
-  06 Jun 2007; Markus Ullmann <jokey@gentoo.org> nagios-core-2.9-r1.ebuild:
-  Fix whitespaces
-
-*nagios-core-2.9-r1 (06 Jun 2007)
-
-  06 Jun 2007; Markus Ullmann <jokey@gentoo.org> +nagios-core-2.9-r1.ebuild:
-  Fix revdep-rebuild bug #146667
-
-  12 May 2007; Luca Longinotti <chtekk@gentoo.org> nagios-core-1.4.1.ebuild,
-  nagios-core-1.4.1-r1.ebuild, nagios-core-2.3.1-r1.ebuild,
-  nagios-core-2.4-r1.ebuild, nagios-core-2.5-r1.ebuild,
-  nagios-core-2.8.ebuild, nagios-core-2.9.ebuild:
-  Apache 1.X masking (fix ebuilds to not require apache-1*).
-
-  08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> files/nagios,
-  nagios-core-2.9.ebuild:
-  Added info on how to get read-access for Apache on /etc/nagios, bug #134344
-  Fixed prestripped binaries, patch by Jakub Moc, bug #141190
-  Use a valid home-directory for nagios by Wolfram Schlich, bug #156068
-  Check for png support in GD, bug #157832
-
-*nagios-core-2.9 (08 May 2007)
-
-  08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  +nagios-core-2.9.ebuild:
-  Version bump to 2.9
-
-  22 Apr 2007; <pva@gentoo.org> nagios-core-1.4.1.ebuild,
-  nagios-core-1.4.1-r1.ebuild, nagios-core-2.3.1-r1.ebuild,
-  nagios-core-2.4-r1.ebuild, nagios-core-2.5-r1.ebuild,
-  nagios-core-2.8.ebuild:
-  Use do{conf,init}d, bug #174266.
-
-*nagios-core-2.8 (12 Mar 2007)
-
-  12 Mar 2007; Martin Jackson <mjolnir@gentoo.org> +nagios-core-2.8.ebuild:
-  Version bump to 2.8, by popular demand (#159571)
-
-  03 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
-  -nagios-core-2.3.1.ebuild, -nagios-core-2.4.ebuild,
-  -nagios-core-2.5.ebuild:
-  Clean up old ebuilds
-
-*nagios-core-2.5-r1 (03 Feb 2007)
-
-  03 Feb 2007; Martin Jackson <mjolnir@gentoo.org>  +nagios-core-2.5-r1.ebuild,
-  +files/digest-nagios-core-2.5-r1, +nagios-core-2.4-r1.ebuild, 
-  +files/digest-nagios-core-2.4-r1, +nagios-core-2.3.1-r1.ebuild, 
-  +files/digest-nagios-core-2.3.1-r1, +nagios-core-1.4.1-r1.ebuild,
-  +files/digest-nagios-core-1.4.1-r1:
-
-  Adding use firewall to init script to fix #150593.  Revbumps for all versions.
-
-  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> nagios-core-1.4.1.ebuild:
-  dev-db/mysql => virtual/mysql
-
-  21 Oct 2006; Thomas Cort <tcort@gentoo.org> nagios-core-2.5.ebuild:
-  Added ~alpha keyword wrt Bug #110130.
-
-*nagios-core-2.5 (18 Jul 2006)
-
-  18 Jul 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-2.5.ebuild:
-  * Version bump
-
-  02 Jun 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.4.1.ebuild,
-  nagios-core-2.3.1.ebuild, nagios-core-2.4.ebuild:
-  Fixed binary package install (again). bug #134023.
-
-  02 Jun 2006; Eldad Zack <eldad@gentoo.org> -nagios-core-1.4.ebuild,
-  -nagios-core-2.3.ebuild:
-  Purged security affected version wrt bug #133487.
-
-*nagios-core-2.4 (01 Jun 2006)
-
-  01 Jun 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-2.4.ebuild:
-  * Version bump
-
-  16 May 2006; Markus Rothe <corsair@gentoo.org> nagios-core-1.4.1.ebuild:
-  Stable on ppc64; bug #133487
-
-  16 May 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  nagios-core-1.4.1.ebuild:
-  Stable on sparc wrt security #133487
-
-  16 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nagios-core-1.4.1.ebuild:
-  Stable on x86 wrt bug #133487.
-
-*nagios-core-2.3.1 (16 May 2006)
-*nagios-core-1.4.1 (16 May 2006)
-
-  16 May 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-1.4.1.ebuild, +nagios-core-2.3.1.ebuild:
-  * Version bump for yet another security issue (See bug #133487)
-
-  12 May 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.4.ebuild,
-  nagios-core-2.3.ebuild:
-  Fixed enewuser behaviour, Closes Bug #133127. Thanks to Christian Gut
-  <cycloon@is-root.org>.
-
-  07 May 2006; Markus Rothe <corsair@gentoo.org> nagios-core-1.4.ebuild:
-  Stable on ppc64
-
-  06 May 2006; Eldad Zack <eldad@gentoo.org>
-  +files/nagios-1.x-Makefile-asneeded.diff, nagios-core-1.4.ebuild:
-  fixed nagios to compile with --as-needed. Closes bug #130806. Thanks to
-  Patrizio Bassi <hetfield666@gmail.com> for reporting.
-
-  06 May 2006; Eldad Zack <eldad@gentoo.org> -nagios-core-1.2-r4.ebuild,
-  -nagios-core-1.3.ebuild, -nagios-core-2.0.ebuild, -nagios-core-2.1.ebuild,
-  -nagios-core-2.2.ebuild:
-  removed versions wrt security #132159
-
-  05 May 2006; Lance Albertson <ramereth@gentoo.org> nagios-core-1.4.ebuild:
-  * Marked stable on x86 (bug #132159)
-
-  05 May 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  nagios-core-1.4.ebuild:
-  Stable on sparc wrt security #132159
-
-*nagios-core-2.3 (03 May 2006)
-*nagios-core-1.4 (03 May 2006)
-
-  03 May 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-1.4.ebuild, +nagios-core-2.3.ebuild:
-  * Version bump
-
-  17 Apr 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r4.ebuild,
-  nagios-core-1.3.ebuild, nagios-core-2.0.ebuild, nagios-core-2.1.ebuild,
-  nagios-core-2.2.ebuild:
-  Moved keepdir into src_install. Closes bug #130144. Thanks to Milan Dadok
-  <dadok@kvados.cz> for reporting.
-
-*nagios-core-2.2 (08 Apr 2006)
-
-  08 Apr 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-2.2.ebuild:
-  * Version bump
-
-*nagios-core-2.1 (03 Apr 2006)
-
-  03 Apr 2006; Lance Albertson <ramereth@gentoo.org>
-  -nagios-core-2.0_rc1.ebuild, -nagios-core-2.0_rc2.ebuild,
-  +nagios-core-2.1.ebuild:
-  * Version bump
-  * Remove older release candidates
-
-*nagios-core-2.0 (08 Feb 2006)
-
-  08 Feb 2006; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-2.0.ebuild:
-  * Version bump
-
-  28 Jan 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r4.ebuild,
-  nagios-core-1.3.ebuild, nagios-core-2.0_rc1.ebuild,
-  nagios-core-2.0_rc2.ebuild:
-  Removed binary files from the tree. (Bug #120671)
-
-  24 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org> Manifest:
-  Digest fixed.
-
-  19 Jan 2006; Markus Rothe <corsair@gentoo.org> nagios-core-2.0_rc2.ebuild:
-  added gnuconfig_update for ppc64: bug #119520
-
-  11 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  nagios-core-1.3.ebuild:
-  Stable on sparc
-
-*nagios-core-2.0_rc2 (11 Jan 2006)
-
-  11 Jan 2006; Lance Albertson <ramereth@gentoo.org> nagios-core-1.3.ebuild,
-  +nagios-core-2.0_rc2.ebuild:
-  * Stable on x86
-  * Version bump
-  * Fix copyright header
-
-  29 Dec 2005; Lance Albertson <ramereth@gentoo.org>
-  nagios-core-2.0_rc1.ebuild:
-  * Fixed typo, resolves bug #117105
-
-*nagios-core-2.0_rc1 (27 Dec 2005)
-
-  27 Dec 2005; Lance Albertson <ramereth@gentoo.org>
-  +nagios-core-2.0_rc1.ebuild, -nagios-core-2.0b_p4.ebuild,
-  -nagios-core-2.0b_p5.ebuild:
-  * Version bump
-  * Special NOTE: Removing old beta ebuilds to force the correct version naming
-  scheme on users. 2.0b_p# should have been 2.0_beta# from the beginning and was
-  never fixed.
-
-  17 Dec 2005; Markus Rothe <corsair@gentoo.org>
-  nagios-core-2.0b_p5.ebuild, nagios-core-1.3.ebuild:
-  Added ~ppc64
-
-  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
-  -files/digest-nagios-core-2.0b_p1, -files/digest-nagios-core-2.0b_p2:
-  * Fix missing digests, silly me
-
-*nagios-core-2.0b_p5 (19 Nov 2005)
-*nagios-core-1.3 (19 Nov 2005)
-
-  19 Nov 2005; Lance Albertson <ramereth@gentoo.org> files/nagios,
-  +nagios-core-1.3.ebuild, -nagios-core-2.0b_p1.ebuild,
-  -nagios-core-2.0b_p2.ebuild, +nagios-core-2.0b_p5.ebuild:
-  * Fixed bug #77814 for 1.3
-  * Fixed bug #97669 by adding a 'after mysql postgresql' in the init script
-  * Version bump for 1.3 and 2.0b5
-  * Changed how we delt with contrib files
-    - Compile all contrib files
-    - Install them in the correct place
-    - Move misc contrib files to default share/docs location
-  * Added a chmod of /etc/nagios for security reasons
-  * Removed older 2.x ebuilds
-
-  15 Oct 2005; <soulse@gentoo.org> +files/nagios-2.0b.cfg-sample.gz,
-  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
-  nagios-core-2.0b_p4.ebuild:
-  Fixed ebuilds as per bug #103945 thanks to David Sparks <daves@activestate.com>
-
-  15 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild:
-  Fixed ebuild as per bug #99128 thanks to k_berbach@gmx.de and
-  richardc@bifco.com
-
-  10 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild,
-  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
-  nagios-core-2.0b_p4.ebuild:
-  Apache DEPEND problem fixed.
-
-  08 Oct 2005; <soulse@gentoo.org> -nagios-core-1.2-r2.ebuild,
-  -nagios-core-1.2-r3.ebuild:
-  Obsolete ebuilds removed
-
-  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  nagios-core-1.2-r4.ebuild:
-  Stable on sparc wrt #103060
-
-  01 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r2.ebuild,
-  nagios-core-1.2-r3.ebuild, nagios-core-1.2-r4.ebuild:
-  Chown before user:group creation problem fixed
-
-*nagios-core-2.0b_p4 (28 Sep 2005)
-
-  28 Sep 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
-  +nagios-core-2.0b_p4.ebuild:
-  * revbump for 2.0b_p4
-  * updated metadata.xml
-
-  26 Sep 2005; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild,
-  nagios-core-1.2-r4.ebuild:
-  x86 stable
-
-  19 Sep 2005; <soulse@gentoo.org> nagios-core-2.0b_p1.ebuild,
-  nagios-core-2.0b_p2.ebuild:
-  Nagios /var/nagios/rw/nagios.cmd false right fixed. As per bug #89160 thanks
-  to Romang <zataz@zataz.net>.
-
-  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
-  nagios-core-2.0b_p2.ebuild:
-  Fix bug 88859. Thanks to John Lange <john.lange@open-it.ca> and Marco
-  Morales <soulse@gmail.com>.
-
-  01 Mar 2005; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r4.ebuild:
-  Changed /var/nagios/rw permissions as per suggested in nagios manual to 2770.
-  Thanks to Urs Joss <tschenturs@gmx.ch>. Closes #76011.
-
-*nagios-core-2.0b_p2 (24 Feb 2005)
-
-  24 Feb 2005; Daniel Black <dragonheart@gentoo.org>
-  -files/2.0b_p1-submit_check_result_via_nsca.patch,
-  +files/2.x-series-nsca.patch, nagios-core-2.0b_p1.ebuild,
-  +nagios-core-2.0b_p2.ebuild:
-  Version bump as per bug #83116. Thanks to Allen Parker <allenp@efn.org>
-
-*nagios-core-2.0b_p1 (28 Jan 2005)
-
-  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
-  +files/2.0b_p1-submit_check_result_via_nsca.patch,
-  +nagios-core-2.0b_p1.ebuild:
-  Version bump as per bug #74481. Still masked due to apache bug #76457
-
-*nagios-core-1.2-r4 (25 Jan 2005)
-
-  25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
-  +nagios-core-1.2-r4.ebuild:
-  uses depend.apache.eclass now. Bug #77781 refers
-
-  28 Nov 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
-  Removed -o option from start-stop-daemon, as it was causing errors to start or
-  stop slip by unnoticed.
-
-  22 Nov 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild:
-  Fixed nagios.cmd permission problem, as suggested by Shawn Kovalchick
-  <bamapookie@speakeasy.net>. Closes #61485.
-
-  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
-  nagios-core-1.2-r3.ebuild:
-  Added an einfo about sample-configs. Closes #69415.
-
-  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-core-1.2-r2.ebuild:
-  Stable on sparc.
-
-  20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
-  nagios-core-1.2-r3.ebuild:
-  Fixed several binary package problems. Closes bug #63502.
-
-  20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
-  nagios-core-1.2-r3.ebuild:
-  Moved apache module installations from pkg_postinst to src_install where it
-  belongs. Closes #67000.
-
-  20 Oct 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
-  Added reload function to init.d script, based on a suggestion by Jason Frank
-  <jfrank@kc.rr.com>. Fixed init.d script to check the configuration before
-  start/restart/reload. Closes bug #67955.
-
-*nagios-core-1.2-r3 (20 Aug 2004)
-
-  20 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml, +files/conf.d,
-  +files/submit_check_result_via_nsca.patch, +nagios-core-1.2-r3.ebuild:
-  Distributed monitoring friendly - Thanks to Marcel Pommer <marsellus@gmx.net>
-  for pointing out the issues involved. Closes bug #60642.
-
-  16 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild:
-  x86 stable
-
-  10 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
-  nagios-core-1.2-r2.ebuild:
-  Changed DEPEND on mail-client/mailx to virtual/mailx. Closes #56393.
-
-  04 Aug 2004; Jon Hood <squinky86@gentoo.org> -files/nagios.cfg-sample,
-  +files/nagios.cfg-sample.gz, nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
-  nagios-core-1.2-r2.ebuild:
-  QA updates, move enewuser, remove oversized files in FILESDIR, #58526.
-
-  24 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild:
-  Removed redundant configure directive used for db support. Bug #57429.
-
-*nagios-core-1.2-r2 (10 Jul 2004)
-
-  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +nagios-core-1.2-r2.ebuild:
-  Fixed external command file permissions. Closes #56490.
-
-  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild:
-  added missing noweb to IUSE
-
-  05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r6.ebuild,
-  nagios-core-1.2-r1.ebuild:
-  x86 marked stable.
-
-  05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r6.ebuild,
-  nagios-core-1.2-r1.ebuild:
-  Added missing make || die. Added include path for postgresql, closes #45614.
-
-  04 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
-  nagios-core-1.2-r1.ebuild:
-  Fix chown of /var/nagios/rw for when there is no apache group. Closes #51939.
-  Thanks to katerina <kllba@operamail.com>.
-
-  03 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
-  nagios-core-1.2-r1.ebuild, nagios-core-1.2.ebuild:
-  Added a check in pkg_setup to test whether gd was compiled with jpeg. closes
-  #12483.
-
-  01 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r1.ebuild:
-  Prioritized mysql over postgresql, in case both USE flags are enabled. Closes
-  #53439.
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
-  nagios-core-1.2-r1.ebuild, nagios-core-1.2.ebuild:
-  Fix use invocation
-
-  30 May 2004; Robin H. Johnson <robbat2@gentoo.org>
-  nagios-core-1.1-r4.ebuild, nagios-core-1.1-r5.ebuild,
-  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
-  nagios-core-1.2.ebuild:
-  mailx move
-
-*nagios-core-1.2-r1 (17 Apr 2004)
-
-  17 Apr 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.2-r1.ebuild:
-  Fixed installation instructions at the end of the installation. Closes #46519.
-
-  21 Mar 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.1-r4.ebuild:
-  Adding categories to dependencies. See bug 45110 for details.
-
-  21 Mar 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.1-r4.ebuild,
-  nagios-core-1.1-r5.ebuild:
-  QA: IUSE variable was incorrect, set propper USE flags tests.
-
-*nagios-core-1.2 (27 Feb 2004)
-
-  27 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
-  nagios-core-1.2.ebuild:
-  New upstream version. Closes bug #43022
-
-  17 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild:
-  Corrected apache2 handling and shell error.
-
-*nagios-core-1.1-r6 (15 Feb 2004)
-
-  15 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild:
-  Corrected buggy noweb use flag stuff
-
-  11 Feb 2004; rob holland <tigger@gentoo.org> :
-  new nagios ebuild by mbowman@gentoo.org with slight adjustment by me. Closes
-  #39926
-
-  30 Jan 2004; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r4.ebuild:
-  Changing touch keep to keepdir. closes 39812
-
-*nagios-core-1.1-r5 (27 Jan 2004)
-
-  27 Jan 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
-  nagios-core-1.1-r5.ebuild:
-  More or less re-wrote the ebuild. Introducing new USE flag: "noweb". "noweb"
-  disables the installation of web interface. Very useful for distributed monitoring.
-  It also closes bug #20617 and #23669.
-
-  Because of the new "noweb" USE flag I removed the "gd" flag.
-
-  These ebuilds are unmaintained so i'm making myself the maintainer for now.
-
-  27 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r4.ebuild:
-  marking x86 stable
-
-  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r3.ebuild,
-  nagios-core-1.1-r4.ebuild:
-  adding RESTRICT="nomirror"
-
-*nagios-core-1.1-r4 (20 Jul 2003)
-  20 Jul 2003; <klieber@gentoo.org> nagios-core-1.1-r4 :
-  added /contrib/ directory closing #24865
-
-*nagios-core-1.1-r3 (19 Jul 2003)
-  19 Jul 2003; <klieber@gentoo.org> nagios-core-1.1-r3 :
-  added extra optional dependency information per #23669
-
-*nagios-core-1.1-r2	(20 Jun 2003)
-  20 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1-r2 :
-  Fix for broken init script.
-
-*nagios-core-1.1-r1	(17 Jun 2003)
-  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1-r1 :
-  Another small fix for install time user/group addition. Fix for bug
-  #16175
-  
-*nagios-core-1.1	(10 Jun 2003)
-  10 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1 :
-  Version bump with small patches added in. Apache2 useflag support
-  also added in.
-
-*nagios-core-1.0-r1	(11 Feb 2003)
-  11 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0-r1 :
-  Added an annotated nagios.cfg-sample file, so people don't break
-  their nagios install by changing paths that shouldnt be changed.
-  This addresses bug #14731
-
-  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0 :
-  Changed ~x86 to x86 and added sparc and ppc keywords
-
-*nagios-core-1.0	(13 Jan 2003)
-  13 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0 :
-  Updated to new version.
-
-*nagios-core-1.0_beta6	(19 Nov 2002)
-  19 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
-  Opps, didnt fix that ebuild fully properly last time... Lets try that
-  again.
-
-*nagios-core-1.0_beta6	(7 Nov 2002)
-  7 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
-  Minor ebuild fixes. Not enough to warrent revision number.
-
-*nagios-core-1.0_beta6	(1 Nov 2002)
-  1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
-  Initial import. Ebuild submitted by Dean Bailey <alron@gentoo.org>.
-  Christian - Manny Calavera - Neumair <christian-neumair@web.de> also
-  had submitted a bug report about nagios.
+  27 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/99_nagios3.conf, +files/lighttpd_nagios3.conf, +files/nagios3,
+  +nagios-core-3.0.1.ebuild:
+  bump for nagios-3
 
diff --git a/net-analyzer/nagios-core/files/99_nagios3.conf b/net-analyzer/nagios-core/files/99_nagios3.conf
new file mode 100644
index 000000000000..074f9ce5e4a9
--- /dev/null
+++ b/net-analyzer/nagios-core/files/99_nagios3.conf
@@ -0,0 +1,15 @@
+<IfDefine NAGIOS>
+	ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
+	<Directory "/usr/lib/nagios/cgi-bin/">
+		AllowOverride AuthConfig
+		Options ExecCGI
+		Order allow,deny
+		Allow from all
+	</Directory>
+	Alias /nagios /usr/share/nagios/htdocs
+	<Directory "/usr/share/nagios/htdocs">
+		AllowOverride AuthConfig
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfDefine>
diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios3.conf b/net-analyzer/nagios-core/files/lighttpd_nagios3.conf
new file mode 100644
index 000000000000..2e5a84ad9f4c
--- /dev/null
+++ b/net-analyzer/nagios-core/files/lighttpd_nagios3.conf
@@ -0,0 +1,23 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_auth")
+
+auth.require = ( "/nagios" =>
+  (
+    "method"  => "digest",
+    "realm"   => "nagios",
+    "require" => "valid-user",
+  )
+)
+
+$HTTP["url"] =~ "^/nagios/cgi-bin/" {
+  dir-listing.activate = "disable"
+  cgi.assign = (
+    ".pl"  => "/usr/bin/perl",
+    ".cgi" => ""
+  )
+}
+
+alias.url += (
+  "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin",
+  "/nagios"         => "/usr/share/nagios/htdocs"
+)
diff --git a/net-analyzer/nagios-core/files/nagios3 b/net-analyzer/nagios-core/files/nagios3
new file mode 100644
index 000000000000..83b9332b47df
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios3
@@ -0,0 +1,57 @@
+#!/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/nagios-core/files/nagios3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $
+
+opts="${opts} reload checkconfig"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	killall -HUP nagios &>/dev/null
+	eend $?
+}
+
+checkconfig() {
+	# Silent Check
+	/usr/sbin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0
+
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/nagios -v /etc/nagios/nagios.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting nagios"
+	touch /var/nagios/nagios.log /var/nagios/status.sav
+	chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
+	rm -f /var/nagios/rw/nagios.cmd
+	start-stop-daemon --quiet --start --startas /usr/sbin/nagios \
+		-e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
+		-- -d /etc/nagios/nagios.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nagios"
+	start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
+	rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
+	eend $?
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting nagios"
+	svc_stop
+	svc_start
+	eend $?
+}
+
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.1.ebuild
new file mode 100644
index 000000000000..5783cdd4320c
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-3.0.1.ebuild
@@ -0,0 +1,220 @@
+# 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.1.ebuild,v 1.1 2008/04/27 18:41:24 dertobi123 Exp $
+
+EAPI="1"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug lighttpd perl +web vim-syntax"
+DEPEND="virtual/mailx
+	web? (
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/gd-1.8.3-r5
+		lighttpd? ( www-servers/lighttpd )
+	)
+	perl? ( >=dev-lang/perl-5.6.1-r7 )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Check if gd has been compiled with jpeg and png support
+	if use web; then
+		if ! built_with_use media-libs/gd jpeg png; then
+			eerror "Your gd has been compiled without jpeg and/or png support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg png" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local strip="$(echo '$(MAKE) strip-post-install')"
+	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_compile() {
+	local myconf
+
+	if use perl ; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --enable-DEBUG0"
+		myconf="${myconf} --enable-DEBUG1"
+		myconf="${myconf} --enable-DEBUG2"
+		myconf="${myconf} --enable-DEBUG3"
+		myconf="${myconf} --enable-DEBUG4"
+		myconf="${myconf} --enable-DEBUG5"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-grp=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-grp=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-grp=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		|| die "./configure failed"
+
+
+	emake CC=$(tc-getCC) nagios || die "make failed"
+
+	if use web ; then
+		# Only compile the CGI's if "web" useflag is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL README UPGRADING
+
+	if ! use web ; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
+			Makefile
+	fi
+
+	sed -i -e 's/^contactgroups$//g' Makefile
+
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-config
+	emake DESTDIR="${D}" install-commandmode
+
+	doinitd "${FILESDIR}"/nagios3 nagios
+	newconfd "${FILESDIR}"/conf.d nagios
+
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			doins "${FILESDIR}"/99_nagios3.conf
+	    elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios3.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+
+	fi
+
+	for dir in etc/nagios var/nagios ; do
+		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
+	done
+
+	chown -R root:root "${D}"/usr/lib/nagios
+	find "${D}"/usr/lib/nagios -type d -print0 | xargs -0 chmod 755
+	find "${D}"/usr/lib/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /var/nagios/rw
+	keepdir /var/nagios/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+	else
+		if use apache2 ; then
+			chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		elif use lighttpd ; then
+			chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		fi
+	fi
+
+	chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
+	chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
+}
+
+pkg_postinst() {
+	elog "If you want nagios to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add nagios default"
+	elog
+
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "To have ministatus.cgi requires copying of ministatus.c"
+		elog "to cgi directory for compiling."
+
+		elog "Note that the user your webserver is running at needs"
+		elog "read-access to /etc/nagios."
+		elog
+
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G nagios apache"
+				elog "or"
+				elog "	chown nagios:apache /etc/nagios"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+			elif use lighttpd ; then
+				elog "  usermod -G nagios lighttpd "
+				elog "or"
+				elog "  chown nagios:lighttpd /etc/nagios"
+			fi
+			elog
+			elog "That will make nagios's web front end visable via"
+			elog "http://localhost/nagios/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the nagios group!"
+		fi
+
+	else
+		elog "Please note that you have installed Nagios without web interface."
+		elog "Please don't file any bugs about having no web interface when you do this."
+		elog "Thank you!"
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
+
+pkg_prerm() {
+	[[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
+}