Chagne ownership of /usr/nagios to root:root in nagios-2.9

Package-Manager: portage-2.1.2.9

3 files changed, 51 insertions, 31 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index f023e57a92b8..b08a4c1a9c17 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.102 2007/06/10 16:33:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.103 2007/08/01 21:00:26 marineam Exp $
+
+  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,
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index a317bf3e6ddb..6dff62aff0ac 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SHA1 5f376bd65bf74eeb3cc00efde4fadf7f8962d06c SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 RMD160 69c3916842953666037dcf258906c15a9ce0047a files/2.x-series-nsca.patch 767
@@ -38,14 +41,14 @@ EBUILD nagios-core-1.4.1.ebuild 7234 RMD160 c525d1a1ac628ad73adc38e43a2c7c47d2f4
 MD5 0a6d86e563534b51f626f6421d7ca90d nagios-core-1.4.1.ebuild 7234
 RMD160 c525d1a1ac628ad73adc38e43a2c7c47d2f45f9d nagios-core-1.4.1.ebuild 7234
 SHA256 a300320f0664d2c5ff22c75115f542829ae0e56e64bdd5ae8d4bfea6b6f20dde nagios-core-1.4.1.ebuild 7234
-EBUILD nagios-core-2.9-r1.ebuild 6067 RMD160 436276830648602db975cb6661728bd43d4bb8d2 SHA1 13ec4edbf516f19221027085118b197e1dfd6c3f SHA256 43cfbbf3d12563c61a01810d1950c5f8709ec9c320c461c09bf448d4a25ebdca
-MD5 5c7af6bf6aabeb31aefac1f7bb10f9bb nagios-core-2.9-r1.ebuild 6067
-RMD160 436276830648602db975cb6661728bd43d4bb8d2 nagios-core-2.9-r1.ebuild 6067
-SHA256 43cfbbf3d12563c61a01810d1950c5f8709ec9c320c461c09bf448d4a25ebdca nagios-core-2.9-r1.ebuild 6067
-MISC ChangeLog 18450 RMD160 96822d0ed0aeb6e55d7968c75d8b8fc5f883137a SHA1 66ff057653b4a0e55d5c88dbeb89605b4eaa8ca2 SHA256 9c7c8d44f27c2d74ed8e15f1861c7cab6e562aa79310a347a30de9d66b94ccfd
-MD5 eca65f8682b0c9189d333f7400a00b10 ChangeLog 18450
-RMD160 96822d0ed0aeb6e55d7968c75d8b8fc5f883137a ChangeLog 18450
-SHA256 9c7c8d44f27c2d74ed8e15f1861c7cab6e562aa79310a347a30de9d66b94ccfd ChangeLog 18450
+EBUILD nagios-core-2.9-r1.ebuild 6327 RMD160 b9779566877185e6319cffc161d4bd0873b5e3ee SHA1 58d2e13f5a1e5bbca893806026821dac9f867fd1 SHA256 0e9368096603d86e7a9f831e56e856ae9a1d974df34ec10469bd0b9b862d2d61
+MD5 6a810e8dc39b59b02c1a868ba75303af nagios-core-2.9-r1.ebuild 6327
+RMD160 b9779566877185e6319cffc161d4bd0873b5e3ee nagios-core-2.9-r1.ebuild 6327
+SHA256 0e9368096603d86e7a9f831e56e856ae9a1d974df34ec10469bd0b9b862d2d61 nagios-core-2.9-r1.ebuild 6327
+MISC ChangeLog 18671 RMD160 cdd5070adca9772ff8182c2e43209b3fe0479aeb SHA1 f731c316d03bb63e8b213acedcbf4c1e36fe34af SHA256 3961505297f30b01f129c9359968fc92ac4ff45cb6a26af750cb47fe50e6d828
+MD5 5dabf8b8396d241b73fae88f55c6a338 ChangeLog 18671
+RMD160 cdd5070adca9772ff8182c2e43209b3fe0479aeb ChangeLog 18671
+SHA256 3961505297f30b01f129c9359968fc92ac4ff45cb6a26af750cb47fe50e6d828 ChangeLog 18671
 MISC metadata.xml 963 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 SHA1 b63ecd87d1a48ec89bb8d1b571af2990e5c4a46d SHA256 1caad75fb2c860e761a2ef082cae698e6d34499b68af04c6bc214ca019bdab3d
 MD5 3ff3bf25684cb9eaa565aa602cb92759 metadata.xml 963
 RMD160 34a65fa482244335865f889d4ff500d6eaff4652 metadata.xml 963
@@ -59,3 +62,10 @@ SHA256 7e25c77577e6d3484161cabb5e76212de02538d6011b570be3b1c18742d97f18 files/di
 MD5 c32eacdee087c055105eec03d746e4c6 files/digest-nagios-core-2.9-r1 485
 RMD160 684a38bbd77f3bd8e23c7e30e1a60d5e2c8a6f2c files/digest-nagios-core-2.9-r1 485
 SHA256 5e151d8e95aab463d42379285e707b7ebc1ca804de9827be285cf7cecec0375b files/digest-nagios-core-2.9-r1 485
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFGsPR2iP+LossGzjARAh2GAJ9eXaG8eSdAZ/aZAIlLRacW/DImTgCgo/Qc
+0lWEb+zdCJOUVjXIehvGh8U=
+=gjwe
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild
index 1d8fb5e69c87..5d1d156152ca 100644
--- a/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9-r1.ebuild,v 1.3 2007/06/10 16:33:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild,v 1.4 2007/08/01 21:00:26 marineam Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -44,9 +44,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/2.x-series-nsca.patch
+	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"
@@ -86,7 +86,7 @@ src_compile() {
 
 	if use !noweb ; then
 		# Only compile the CGI's if "noweb" useflag is not set.
-		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
+		make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
 	fi
 
 	emake -C contrib all || "contrib make filed"
@@ -106,18 +106,18 @@ src_install() {
 
 	sed -i -e 's/^contactgroups$//g' Makefile
 
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
+	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/*
+	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:;
+	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
@@ -125,29 +125,34 @@ src_install() {
 	insinto /usr/share/doc/${PF}/contrib
 	doins -r contrib/eventhandlers
 
-	doinitd ${FILESDIR}/nagios
-	newconfd ${FILESDIR}/conf.d nagios
+	doinitd "${FILESDIR}"/nagios
+	newconfd "${FILESDIR}"/conf.d nagios
 
-	chmod 644 ${S}/contrib/*.cgi
+	chmod 644 "${S}"/contrib/*.cgi
 	into /usr/nagios
 	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin $bin
+		dobin "$bin"
 	done
 
 	# Apache Module
 	if use !noweb; then
-		insinto ${APACHE2_MODULES_CONFDIR}
-		doins ${FILESDIR}/99_nagios.conf
+		insinto "${APACHE2_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 usr/nagios var/nagios ; do
-		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
+	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
@@ -155,13 +160,13 @@ src_install() {
 	keepdir /var/nagios/rw
 
 	if use noweb; then
-		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+		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"
+		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"
+	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"