summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2008-03-23 11:44:34 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2008-03-23 11:44:34 +0000
commite28f80f0a94a68d53c9ad37b051d7f5156000562 (patch)
treede753245f098e11fac03fdd1c6e71f430562a12a /net-analyzer
parentfix LINGUAS (diff)
downloadhistorical-e28f80f0a94a68d53c9ad37b051d7f5156000562.tar.gz
historical-e28f80f0a94a68d53c9ad37b051d7f5156000562.tar.bz2
historical-e28f80f0a94a68d53c9ad37b051d7f5156000562.zip
Remove old version
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/Manifest4
-rw-r--r--net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild228
-rw-r--r--net-analyzer/nagios/Manifest5
4 files changed, 8 insertions, 235 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 0d104157271b..f50c37c299bd 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# 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.116 2008/03/22 15:37:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.117 2008/03/23 11:44:34 dertobi123 Exp $
+
+ 23 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ -nagios-core-2.10-r1.ebuild:
+ Remove old version
22 Mar 2008; Raúl Porcel <armin76@gentoo.org> nagios-core-2.11.ebuild:
sparc stable wrt #213766
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 6257c213cf45..3cbb3eac1886 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -3,9 +3,7 @@ AUX 99_nagios.conf 350 RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 SHA1 fa4b
AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
AUX nagios 1459 RMD160 522be9fa5e31accbba9778ced996e23e6c261284 SHA1 8d8cf21a2e1c4e6b4ba52aa5db2e30b71798afa5 SHA256 beb6682352f42496ed527c7d60b33d0e9c3d1e74681a013dc73d128a0139acb1
DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
-DIST nagios-2.10.tar.gz 1740558 RMD160 87086848911072a5504dd61f11ece8f0cf39db5e SHA1 b519c1b332fcc814346eecb987f689113f4f0ab6 SHA256 d3e916bd11619259246e12a45aac8761e7318b54ed701472e8e49a03d939e5c8
DIST nagios-2.11.tar.gz 1741962 RMD160 2800e1447c788457e3d413636900e15a476f22c4 SHA1 2e1e529e3161418a1b839d4f10df11bb19cf6088 SHA256 0c4425401e0b9a8ba1d2e689fc8dd9a5016ee35ac5c66285d02eca393dd6cda5
-EBUILD nagios-core-2.10-r1.ebuild 6363 RMD160 97a20ccc87e8d6a783608aa7516874fe5da1afa8 SHA1 53bfa908479e554f51bd0285588d5a4de98d3587 SHA256 05b8af5dc6d97bfefc7d9d621dc5a795c289049bc8364655998f751f8da866b8
EBUILD nagios-core-2.11.ebuild 6718 RMD160 9ea2cfd4788010ae51c8434f9240d8ad21a28eca SHA1 d6160b5b8813ab6fb489456bcc0751a3a71a92d8 SHA256 704195c8aaedb66379d7ee4454f1810c10ec84ae037fbf8bfebe745146b6fbd4
-MISC ChangeLog 20626 RMD160 d415e279ec04efd9149dbbf2eeb3e7fb731301a6 SHA1 40a24b7d011e54e7dbba5f53e83404bb81409c31 SHA256 c1707fecdd524eea40cf881afe97d6a62b96988bccd5696d7e280938219d6782
+MISC ChangeLog 20738 RMD160 775eea19e233473866b9fae2e96c614f5eea9e13 SHA1 014fc11f902a089bf9dfd892f7b6aff82de06862 SHA256 bf51ecaeda700bfdd1a607e412ef545ccae54fccdb2c875bfc685b2535f3718e
MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
diff --git a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
deleted file mode 100644
index 1b747addac0f..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.10-r1.ebuild
+++ /dev/null
@@ -1,228 +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/nagios-core/nagios-core-2.10-r1.ebuild,v 1.6 2008/03/14 12:00:51 caleb Exp $
-
-inherit eutils apache-module 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/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="noweb perl debug vim-syntax"
-DEPEND="virtual/mailx
- !noweb? (
- >=media-libs/jpeg-6b-r3
- >=media-libs/libpng-1.2.5-r4
- >=media-libs/gd-1.8.3-r5
- ${APACHE2_DEPEND}
- perl? ( net-analyzer/traceroute )
- )
- perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
- vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- # Check if gd has been compiled with jpeg and png support
- if ! use noweb; 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}"
-
- epatch "${FILESDIR}"/2.x-series-nsca.patch
-
- 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 noweb; then
- myconf="${myconf} --with-command-grp=nagios"
- else
- myconf="${myconf} --with-command-grp=apache"
- fi
-
- econf ${myconf} \
- --prefix=/usr/nagios \
- --localstatedir=/var/nagios \
- --sysconfdir=/etc/nagios \
- --datadir=/usr/nagios/share \
- || die "./configure failed"
-
- emake CC=$(tc-getCC) nagios || die "make failed"
-
- if use !noweb ; then
- # Only compile the CGI's if "noweb" useflag is not set.
- make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
- fi
-
- emake -C contrib all || "contrib make filed"
-
-}
-
-src_install() {
- dodoc Changelog INSTALLING LEGAL README UPGRADING
- docinto contrib
- dodoc contrib/README
-
- if use noweb; then
- sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \
- -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \
- Makefile
- fi
-
- sed -i -e 's/^contactgroups$//g' Makefile
-
- make DESTDIR="${D}" install
- make DESTDIR="${D}" install-config
- make DESTDIR="${D}" install-commandmode
-
- docinto sample-configs
- dodoc "${D}"/etc/nagios/*
- rm "${D}"/etc/nagios/*
-
- newdoc "${WORKDIR}"/nagios-2.0b.cfg-sample nagios.cfg-sample
-
- #contribs are not configured by the configure script, we'll configure them overselves...
- find "${S}"/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
- s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
- s:/usr/local/nagios/etc:/etc/nagios:;
- s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
- insinto /usr/share/doc/${PF}/contrib
- doins -r contrib/eventhandlers
-
- doinitd "${FILESDIR}"/nagios
- newconfd "${FILESDIR}"/conf.d nagios
-
- chmod 644 "${S}"/contrib/*.cgi
- into /usr/nagios
- for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
- dobin "$bin"
- done
-
- # Apache Module
- if use !noweb; then
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}"/99_nagios.conf
-
- if use perl; then
- into /usr/nagios ; dosbin contrib/traceroute.cgi
- 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/nagios
- find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755
- find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755
- find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644
-
- keepdir /etc/nagios
- keepdir /var/nagios
- keepdir /var/nagios/archives
- keepdir /usr/nagios/share/ssi
- keepdir /var/nagios/rw
-
- if use noweb; then
- chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
- else
- chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
- 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"
-
- cat << EOF > "${T}"/55-nagios-core-revdep
-SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
-EOF
-
- insinto /etc/revdep-rebuild
- doins "${T}"/55-nagios-core-revdep
-}
-
-pkg_postinst() {
- einfo
- einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
- einfo
- einfo "Also, if you want nagios to start at boot time"
- einfo "remember to execute:"
- einfo " rc-update add nagios default"
- einfo
-
- if use !noweb; then
- einfo "This does not include cgis that are perl-dependent"
- einfo "Currently traceroute.cgi is perl-dependent"
- einfo "To have ministatus.cgi requires copying of ministatus.c"
- einfo "to cgi directory for compiling."
-
- einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-
- einfo
- einfo "That will make nagios's web front end visable via"
- einfo "http://localhost/nagios/"
- einfo
- einfo "Note that the user your webserver is running at needs"
- einfo "read-access to /etc/nagios. There are several possible"
- einfo "solutions to accomplish this, choose the one you are"
- einfo "most comfortable with:"
- einfo " usermod -G nagios apache"
- einfo "or"
- einfo " chown nagios:apache /etc/nagios"
-
- else
- einfo "Please note that you have installed Nagios without web interface."
- einfo "Please don't file any bugs about having no web interface when you do this."
- einfo "Thank you!"
- fi
-
- einfo
- einfo "If your kernel has /proc protection, nagios"
- einfo "will not be happy as it relies on accessing the proc"
- einfo "filesystem. You can fix this by adding nagios into"
- einfo "the group wheel, but this is not recomended."
- einfo
-
- einfo
- ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
- /etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index d6335baabb63..0e62abef6dd2 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,4 +1,3 @@
-EBUILD nagios-2.10.ebuild 855 RMD160 6adc681fe993f05a5de66358def668018d4b07b5 SHA1 fc9576f6bcbbb0488146cf8ac42135c438835a23 SHA256 8ad8759377576d11e0f5787fa7df5558c5d2baff6426d7328221dc804411c682
-EBUILD nagios-2.11.ebuild 857 RMD160 fc8902a4d850374bb32e139ecf6f52a0274be2fe SHA1 76d1a711bf44786dd3aafdd450c4c95a63b70ce3 SHA256 3d80221c83a2b9a8201db2a7c10a8a4bd532d7863c29f0d163549e61c81c4a51
-MISC ChangeLog 8526 RMD160 715ed0e360e4e29cf99e36f86783e878b4735102 SHA1 be544364914d793838a67fb90b4ce786cc19d527 SHA256 101d35d535e09c4be9600b2a2516eb15c602b3f02fd128a51280bca55700334d
+EBUILD nagios-2.11.ebuild 860 RMD160 fe518345af5a8133e5389a21c1ef369c08b197da SHA1 dcac829f2a5bc86c51cf7f06d3415ba6b515180e SHA256 c858ec62fea3bb5deddcc4b837c8e7d850c7e5df163c73f2926bf5abf26705c3
+MISC ChangeLog 8676 RMD160 e3dd9f07c68269c8003eac8ada9f5f65fb9f927a SHA1 441701aaf8a386832ffa1e44473e6dde2cb6ab9e SHA256 f3e463c8ca981066f5b20a811e3f2e1e14d335759478d33ee9470e485b71372e
MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d