Fix bugs #157832, #156068, #141190 and #134344

Package-Manager: portage-2.1.2.7

4 files changed, 39 insertions, 28 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index f49c8a6d7a50..7f7bfc348764 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,13 @@
 # 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.97 2007/05/08 19:45:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.98 2007/05/08 21:36:14 dertobi123 Exp $
+
+  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)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 892611ac4ed9..33ddfe27d07b 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -10,10 +10,10 @@ AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
 RMD160 8b08c01284fc590a2291164589da42515d1a0586 files/conf.d 409
 SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a files/conf.d 409
-AUX nagios 1424 RMD160 b8dc7c6e86f8d77e31d0867a305018bc6e3cfe85 SHA1 0a23dec5ce44b5e6db1e2ed577e84595be2c620b SHA256 9c29d108e08e26bc1872fea6f92ecd7c5f539f06d01c2aff845706ceb6866841
-MD5 c04218d013f1cb55ce1d7b09242b8d4c files/nagios 1424
-RMD160 b8dc7c6e86f8d77e31d0867a305018bc6e3cfe85 files/nagios 1424
-SHA256 9c29d108e08e26bc1872fea6f92ecd7c5f539f06d01c2aff845706ceb6866841 files/nagios 1424
+AUX nagios 1459 RMD160 522be9fa5e31accbba9778ced996e23e6c261284 SHA1 8d8cf21a2e1c4e6b4ba52aa5db2e30b71798afa5 SHA256 beb6682352f42496ed527c7d60b33d0e9c3d1e74681a013dc73d128a0139acb1
+MD5 2f120511fbf8d89ea76566872e409ef5 files/nagios 1459
+RMD160 522be9fa5e31accbba9778ced996e23e6c261284 files/nagios 1459
+SHA256 beb6682352f42496ed527c7d60b33d0e9c3d1e74681a013dc73d128a0139acb1 files/nagios 1459
 AUX nagios-1.x-Makefile-asneeded.diff 5460 RMD160 589bc81bb2fe0148acb0d9e6c76d63b6ca6ae34c SHA1 ced005ab9d100af6cd84508cddc1d6d4450aa509 SHA256 679482075dfdecd58948ed479adf306ed02bff5cf661f605d01193b2a11ef503
 MD5 354f5aeb0e831ee8e218962eb85d07e4 files/nagios-1.x-Makefile-asneeded.diff 5460
 RMD160 589bc81bb2fe0148acb0d9e6c76d63b6ca6ae34c files/nagios-1.x-Makefile-asneeded.diff 5460
@@ -58,14 +58,14 @@ EBUILD nagios-core-2.8.ebuild 5938 RMD160 867b5f771079407b978944be68be405d190e52
 MD5 eabc544ae4329b6aa1fe2ecd862727e6 nagios-core-2.8.ebuild 5938
 RMD160 867b5f771079407b978944be68be405d190e5207 nagios-core-2.8.ebuild 5938
 SHA256 3bec88185bfabf2abcedc35b18146aa4195f591d9fc78649f23804db00b2906e nagios-core-2.8.ebuild 5938
-EBUILD nagios-core-2.9.ebuild 5945 RMD160 5af3b1545bcb7e90eda935c4b8c0ef47f72a8a06 SHA1 7b27daa1d259861f49eab46da328b82b286d171d SHA256 cb35b447e4ee5feb2cc8d9ca09faa3b853d88aeee4c38576893a3596da805abb
-MD5 d624493b7ac4166018a5de485cd23170 nagios-core-2.9.ebuild 5945
-RMD160 5af3b1545bcb7e90eda935c4b8c0ef47f72a8a06 nagios-core-2.9.ebuild 5945
-SHA256 cb35b447e4ee5feb2cc8d9ca09faa3b853d88aeee4c38576893a3596da805abb nagios-core-2.9.ebuild 5945
-MISC ChangeLog 17281 RMD160 5b86e208a0913f47ba18194b16b2b1a8a1358040 SHA1 d35e8ba0f98b873cb5b02e19e835dd63ebb1ad85 SHA256 7b58fe64691fabd3ddae568019014a2c1738bc812cdfc36337e1a562c71f5993
-MD5 e71614adf61e1279775fa67ebd4fc3cd ChangeLog 17281
-RMD160 5b86e208a0913f47ba18194b16b2b1a8a1358040 ChangeLog 17281
-SHA256 7b58fe64691fabd3ddae568019014a2c1738bc812cdfc36337e1a562c71f5993 ChangeLog 17281
+EBUILD nagios-core-2.9.ebuild 6217 RMD160 18e845459a36ecaf13f3722d7c1084c98b096490 SHA1 1f116863fb60e3dd3dfcfe5c0bd665c1641f749a SHA256 d09561eb11db8c671a095d20ac242a90e5dacf8bc088cc1e0d1cd7a5adcc0d99
+MD5 487059bde7ae7d5da8870a7ec44bf1b2 nagios-core-2.9.ebuild 6217
+RMD160 18e845459a36ecaf13f3722d7c1084c98b096490 nagios-core-2.9.ebuild 6217
+SHA256 d09561eb11db8c671a095d20ac242a90e5dacf8bc088cc1e0d1cd7a5adcc0d99 nagios-core-2.9.ebuild 6217
+MISC ChangeLog 17633 RMD160 95664d85e9c8343039a2f09c98521d465fb577a4 SHA1 6d1c01dfb7ead352a7d66669c7744c193fdc6c93 SHA256 a1db9aeb695759583ce0e01496cffa03e8bf344eeee9a51e45f088efd93bd8be
+MD5 da577c36c324e946186e6c7105570ead ChangeLog 17633
+RMD160 95664d85e9c8343039a2f09c98521d465fb577a4 ChangeLog 17633
+SHA256 a1db9aeb695759583ce0e01496cffa03e8bf344eeee9a51e45f088efd93bd8be ChangeLog 17633
 MISC metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 SHA1 19972fccad8732b7fd85e1b8c0f1077dc254432f SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 metadata.xml 1049
diff --git a/net-analyzer/nagios-core/files/nagios b/net-analyzer/nagios-core/files/nagios
index 3524730289d5..c78279db8ded 100644
--- a/net-analyzer/nagios-core/files/nagios
+++ b/net-analyzer/nagios-core/files/nagios
@@ -1,7 +1,7 @@
 #!/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/nagios,v 1.9 2007/02/03 07:04:42 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios,v 1.10 2007/05/08 21:36:14 dertobi123 Exp $
 
 opts="${opts} reload checkconfig"
 
@@ -35,7 +35,8 @@ start() {
 	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/nagios/bin/nagios \
-		--pidfile /var/nagios/nagios.lock -- -d /etc/nagios/nagios.cfg
+		-e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
+		-- -d /etc/nagios/nagios.cfg
 	eend $?
 }
 
diff --git a/net-analyzer/nagios-core/nagios-core-2.9.ebuild b/net-analyzer/nagios-core/nagios-core-2.9.ebuild
index feaaac7def95..d8f5a20e5390 100644
--- a/net-analyzer/nagios-core/nagios-core-2.9.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.9.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.ebuild,v 1.1 2007/05/08 19:45:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.9.ebuild,v 1.2 2007/05/08 21:36:14 dertobi123 Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -28,30 +28,26 @@ DEPEND="virtual/mailx
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then
-		if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
+	# 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" emerge gd"
+			eerror "# USE="jpeg png" emerge gd"
 			die "pkg_setup failed"
 		fi
 	fi
 
 	enewgroup nagios
-
-	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
-	else
-		enewuser nagios -1 /bin/bash /dev/null nagios,apache
-	fi
+	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"
 	# ppc64 needs this
 	gnuconfig_update
 }
@@ -199,6 +195,13 @@ pkg_postinst() {
 		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."