Fix apache eclass handling, patch by Jakub Moc in #209655

Package-Manager: portage-2.1.4.4

4 files changed, 256 insertions, 15 deletions

diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 9ce5ce851e28..79c745523db6 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,11 +1,11 @@
 AUX fail2ban-0.8.0-regexp.patch 854 RMD160 24caae16d90adcf39577bd641ff6a09857908f73 SHA1 c5f47134328744a1597b8fcb67105ec82d61a14c SHA256 6019024dbf067f8a78618eb728f3afef90daa75bbcd201be2119c323c1afd6d1
-AUX fail2ban-logrotate 169 RMD160 fe231cb9569030203821f30349898ac47ab79e90 SHA1 b3144c7f06a9d62547b6c9957c0fb9503df4a093 SHA256 ab25b23fc6b76af215ebcceb03b0b66cc10e19fb94882dc6ff3ca207ca978b49
+AUX fail2ban-logrotate 163 RMD160 8b64b7af9c0ee6bb9064f5858c0e58cda0609958 SHA1 287a067a369b1da6ddfee855e4950d6b222e2ba2 SHA256 6a668bc9383371f258eae6008b925a18d587e6120edd4a7add3e1a20ac3ca4b0
 AUX fail2ban.conf.d 217 RMD160 7d8b079d1b569caf1d822af0ec8a040723f492c5 SHA1 9592b732be3d96699c9872add7287e82260f37c0 SHA256 e35f1f820bfe5ecaac2696d60155c348d84af428e8c615e97b900c24a587d233
 DIST fail2ban-0.6.2.tar.bz2 25068 RMD160 6c829fc84d8e41c4daf4b9b1a7e2dd71a54eab01 SHA1 edfecbfac3050ead95d274b05b132890cdc302b7 SHA256 0009aa0ee055f900e157ee04d58f5cb3dfad9659197ee114643c48533e7744c4
 DIST fail2ban-0.8.0.tar.bz2 55726 RMD160 16c033a9fbd10a468ac62d6ba31becf5966a5647 SHA1 b48c8ed269dfc6b2901573ac83c9680abb09e342 SHA256 ef60f601a8766128910f08ca5e731782d7ca17c014dcf6ab54982e7ae59bd5f6
 DIST fail2ban-0.8.1.tar.bz2 58321 RMD160 7f695e2efc4af3fe21657a4d1613cd7beeb623ad SHA1 89eee4c31357581dd5d5da7ea4cf28d2717d470a SHA256 3c3adc67c5f2b4fc72c9ea22e52c4cdfd9f901f6c238616416444560f56f6403
 EBUILD fail2ban-0.6.2-r1.ebuild 1280 RMD160 2624e486fcf757f9a90564c775051ba751551c2c SHA1 78f753d0740c3b5f95da72d10fcbe9ce4bbc671d SHA256 260de4a5981fa2df7fdfb03d9df66bbda6751f746451158bd1f73f7ac43c907a
 EBUILD fail2ban-0.8.0-r1.ebuild 1584 RMD160 22586071378b53c45874994abec4cb8e8082f142 SHA1 825498e63f2cc1696e97c2f021ea54000dd629ba SHA256 c08e0a90f881f1c0b1807dea7c3a2bbd3a5899c0c276c5bbe037aa39dba33427
-EBUILD fail2ban-0.8.1.ebuild 1735 RMD160 1e521a38eef6af2d39e4cc8baad79cc847764d2e SHA1 b09123d27e9ddb802b255265fe7339adaaa8e978 SHA256 8d81a8a552ee7d9cb8158a89c33b7474779f3f321dc3f5bac643ff1f17adccc8
-MISC ChangeLog 6239 RMD160 6c0dfe8263b4ef9ea20244407a67c889c76a7d86 SHA1 00d238a889dc916ab06883ce571e9bc77673d6b5 SHA256 524bcac748243f90b261219fd4ca8a3b47cb38fb0b61fc1fb969870cdbcb3346
+EBUILD fail2ban-0.8.1.ebuild 1733 RMD160 8763a1159d0c09b8eb4b6e5cdbbde7c33848394d SHA1 429dd48418945440d4ed788b1cbd83d17d482cbd SHA256 6343b265e4f03cf5d7d8a38212cbe36cc6fc12713ee51c8d21a46bd5e23aaf1d
+MISC ChangeLog 6366 RMD160 1723adafbee92287db1e19b46aeaacd5ad8814c6 SHA1 d55b3ff8ff7c37ecbc643b873f7f620a4353eded SHA256 ec1a670feb8e4ca61176c1858c47b151e6e48b7bc61d81d5e5b45ee227d6ca91
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index d612d69d5361..d83922779bc7 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.110 2008/01/31 19:55:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.111 2008/02/27 20:30:12 dertobi123 Exp $
+
+*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:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 34645542f9ab..a228f7c06520 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SHA1 5f376bd65bf74eeb3cc00efde4fadf7f8962d06c SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3
 AUX 99_nagios.conf 350 RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 SHA1 fa4b438c1d06f2d00cd2bff4fefc448a59d1cdec SHA256 2e8448d5e38969f0eee4306611e9592e9cec93506ad055cd27ef8e211cfe9f71
 AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
@@ -15,12 +12,6 @@ DIST nagios-2.10.tar.gz 1740558 RMD160 87086848911072a5504dd61f11ece8f0cf39db5e
 EBUILD nagios-core-1.4.1-r1.ebuild 7232 RMD160 959cc561d97e64ef1665471b6d9039e5df0203c4 SHA1 71717c81b199262723829aac615c646b6f4c101b SHA256 5a89679e169881c1b73015f982bc3c0d0d3fec9edfeae1c53671f1f90b140741
 EBUILD nagios-core-1.4.1.ebuild 7227 RMD160 6a92a4e40edca8390e6b725e563aafd1c7672579 SHA1 2ec3c4775cf6bbde6022c8d3f7fc4b8a08717dae SHA256 faac722b77572c538cd222894779cc2c9c3957d7c89bce51eeaa14840d6e9a0a
 EBUILD nagios-core-2.10-r1.ebuild 6365 RMD160 415694b502271d58d1dadbfbcfa3b652f0246fdb SHA1 1ea0142b08e0ad0b75ca746619f01bbf24585ad3 SHA256 3a832bc85c44541ae11151bed3ac5f06e290c43fe9a6afea5120b45402e111c6
-MISC ChangeLog 19697 RMD160 82e5ce44873af7edef8d41d86fca44aae8355afe SHA1 0fd10f5f08764bcf2b313a481e866869f92bb418 SHA256 cc56584b290c730edbde6cf742d17127295af9d2a9181c42ff0e070ef006ed96
+EBUILD nagios-core-2.10-r2.ebuild 6768 RMD160 398820497ae8656d529fcc9d69d371efaca28e2b SHA1 1da3d477ab68202e034151f54d3459eb0494ec84 SHA256 35e74208362b94dbed01f1b4f2b316f380b3cc4cf6bb357bb1140884d6b45d1b
+MISC ChangeLog 19885 RMD160 bb5a34eb4a69afb5f23d20c74ebdc141d8727bc0 SHA1 9feb6bc5f0379cceb90b405777c1590e22b0d7df SHA256 0c1b88b68bae953c22956ee40123d7f98c44a3c7a452d7f28dd9e5d088788b8a
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkeiJ8cACgkQmPFBzbX68WFBJwCggoNFdUR04+M2lZu2596TkQsb
-h8YAn1Ro6xTsmzv0e+0RhFsuXmMknEu5
-=ibNs
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/nagios-core-2.10-r2.ebuild b/net-analyzer/nagios-core/nagios-core-2.10-r2.ebuild
new file mode 100644
index 000000000000..16318de568e2
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.10-r2.ebuild
@@ -0,0 +1,244 @@
+# 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-r2.ebuild,v 1.1 2008/02/27 20:30:12 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
+	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug 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
+		perl? ( net-analyzer/traceroute )
+	)
+	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}"
+
+	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 apache2 ; then
+		myconf="${myconf} --with-command-grp=apache"
+	else
+		myconf="${myconf} --with-command-grp=nagios"
+	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 web ; then
+		# Only compile the CGI's if "web" useflag is 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 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
+
+	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 web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			doins "${FILESDIR}"/99_nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache-2.x webserver"
+			ewarn "out-of-the-box. Since you are not using apache, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+
+		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 apache2 ; then
+		chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	else
+		chown -R nagios:nagios "${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() {
+	elog
+	elog "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
+	elog
+	elog "Also, 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 ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			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\""
+			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
+
+	elog
+	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
+}
+
+pkg_prerm() {
+	[[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
+}