Updated ebuild. Should address bug 332451

9 files changed, 285 insertions, 0 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
new file mode 100644
index 0000000..1e43d77
--- /dev/null
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for net-analyzer/pnp4nagios
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*pnp4nagios-0.6.5 (12 Aug 2010)
+*pnp4nagios-0.6.4 (12 Aug 2010)
+*pnp4nagios-0.4.12 (12 Aug 2010)
+
+  12 Aug 2010; Dane Smith (c1pher) <smithdanea@gmail.com>
+  +files/98_pnp4nagios.conf, +pnp4nagios-0.4.12.ebuild,
+  +pnp4nagios-0.6.4.ebuild, +files/pnp4nagios-0.6.4-makefile.patch,
+  +pnp4nagios-0.6.5.ebuild, +files/npcd, +metadata.xml:
+  Fixed ebuild for pnp4nagios-0.6.4 wrt bug 332451
+
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
new file mode 100644
index 0000000..897fdc9
--- /dev/null
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -0,0 +1,12 @@
+AUX 98_pnp4nagios.conf 1025 RMD160 13ada7bbf3ad9b14bccf0d9cd0f0f0a72e4ea807 SHA1 6e080ddf657bccb1beeceb7a80222f5c06c41eb6 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f
+AUX npcd 766 RMD160 af98e0bc7eae1f348a7d1f6b0f92911f29645b3a SHA1 079b67f8d1ca1bb091dc8fc80d399f1850846b97 SHA256 2a335ee60d3fd872645367c7687905c427f8cc9941b9a5b7939df2d7e029d7d1
+AUX pnp4nagios-0.6.4-makefile.patch 669 RMD160 df887ad562dd1505dcc7836934c2472e2f25b621 SHA1 14ed707e21b3a268bb6ba335489781cc32faf946 SHA256 f2ca0bf8cf6e465a8f3e42105763a5f9bfcbb5103f9b7aeafcdf8d99631d6d6d
+DIST pnp-0.4.12.tar.gz 311844 RMD160 a5e0a6370d2fd7743841c37e4751674b0c239e90 SHA1 2e7084e41020d9f12d4448a72c58c11ea05dcce4 SHA256 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
+DIST pnp4nagios-0.6.4.tar.gz 1093669 RMD160 bc72bd4bc6055f1d1e1cc1598565430fc96bb6f9 SHA1 af8bfee194f00da04e40e60e7f7b06921f712874 SHA256 4f031d70b99fb73956f90887d7aacd8630bfb45f926bfc77ef27a4800d972203
+DIST pnp4nagios-0.6.5.tar.gz 1868229 RMD160 c4ec91994e4aeb9d1b53f756d95e1b138366a9bf SHA1 4aedba9e4074758d2f3956ff890f01e328d9f597 SHA256 f7718b4c642a7f8566209e2560e0020450e312141607f7cf3b87aaf48a01f0db
+EBUILD pnp4nagios-0.4.12.ebuild 1412 RMD160 3de1c660fa6b5bb7fd803f08a17aa1e7112cbd52 SHA1 61fd48f71b7767ba7fa737814a0a0c944379adc5 SHA256 0000ff62c2da25c089c0e9361710bfbbe7bfe7a5db83760537d9148dd139f29e
+EBUILD pnp4nagios-0.6.4.ebuild 1491 RMD160 9c29f910f27fd5c390441620f6c6a9f1d7574a00 SHA1 225bebb049af87ee13a83c390dc81cc735259af8 SHA256 ddac28965b3ce87fdaf9a8b2e2489c3f7295d9f1489fb01dd8e5fe33005fc39f
+EBUILD pnp4nagios-0.6.5.ebuild 1414 RMD160 40f3cee6adc8e820debb21a1dc20a717e4a4a217 SHA1 24de3f63b5ff5aebf8a1722489524ad5e5fcd1a1 SHA256 1c102e069782c2147a2794e7856f4192c7500214937db87f9f2536a906bbf6cc
+MISC ChangeLog 512 RMD160 27d1f6b58f520210870df4c118e7efc47c4377fa SHA1 f6412d483fb0ca593ad15b0ba324ef5d4df94e3e SHA256 9bbaeeb8c4360ce6471b8b1536d84903495822db5ef50d6f3813a52d3c400014
+MISC ChangeLog.new~ 420 RMD160 b3a89cec65b8d6152e04ce10bc5da2bc5a3bc255 SHA1 e837f8c6c696d57bb64c519b28f73c60a78fdd94 SHA256 c89e941a376464383c0f3f7d763d406433633bd4e15f95ae8f64d6db6f191f74
+MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
new file mode 100644
index 0000000..4879779
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
@@ -0,0 +1,22 @@
+<IfDefine PNP>
+        Alias /pnp4nagios /usr/share/pnp/
+        <Directory /usr/share/pnp>
+                AllowOverride AuthConfig
+                Order allow,deny
+                Allow from all
+                <IfModule mod_rewrite.c>
+                        # Turn on URL rewriting
+                        RewriteEngine On
+                        Options FollowSymLinks
+                        # Installation directory
+                        RewriteBase /pnp4nagios
+                        # Protect application and system files from being viewed
+                        RewriteRule ^(application|modules|system) - [F,L]
+                        # Allow any files or directories that exist to be displayed directly
+                        RewriteCond %{REQUEST_FILENAME} !-f
+                        RewriteCond %{REQUEST_FILENAME} !-d
+                        # Rewrite all other URLs to index.php/URL
+                        RewriteRule .* index.php/$0 [PT,L]
+                </IfModule>
+        </Directory>
+</IfDefine>
diff --git a/net-analyzer/pnp4nagios/files/npcd b/net-analyzer/pnp4nagios/files/npcd
new file mode 100644
index 0000000..72f24b9
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/npcd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/files/npcd,v 1.1 2009/10/27 19:40:43 dertobi123 Exp $
+
+opts="${opts} reload"
+
+depend() {
+	need net nagios
+}
+
+start() {
+	ebegin "Starting npcd"
+	start-stop-daemon --start --exec /usr/bin/npcd \
+		-- -f /etc/pnp/npcd.cfg \
+		-d
+	eend $? "Failed to Start npcd"
+}
+
+stop() {
+	ebegin "Stopping npcd"
+	start-stop-daemon --stop --quiet -n npcd
+	eend $? "Failed to Stop npcd"
+}
+
+reload() {
+        ebegin "Reloading npcd"
+        kill -HUP `pgrep npcd`
+        eend $? "Failed to reload npcd"
+}
+
+restart() {
+	ebegin "Restarting npcd"
+	svc_stop
+	svc_start
+	eend $? "Failed to Restart npcd"
+}
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.4-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.4-makefile.patch
new file mode 100644
index 0000000..7e1b1ad
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.4-makefile.patch
@@ -0,0 +1,20 @@
+--- src/Makefile.in	2010-06-03 10:00:23.000000000 -0400
++++ src/Makefile.in.new	2010-08-12 12:02:10.000000000 -0400
+@@ -82,7 +82,7 @@
+ #
+ ###############################
+ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
+-	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) npcd.c $(NPCDOBJS) -lpthread -o npcd
+ 
+ ###############################
+ #
+@@ -90,7 +90,7 @@
+ #
+ ###############################
+ npcdmod.o: npcdmod.c
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC
++	$(CC) $(MOD_CFLAGS) $(CFLAGS) $(MOD_LDFLAGS) $(LDFLAGS) -fPIC npcdmod.c $(LIBS) -o npcdmod.o
+ 
+ ###############################
+ #
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
new file mode 100644
index 0000000..4428cc4
--- /dev/null
+++ b/net-analyzer/pnp4nagios/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>dertobi123@gentoo.org</email>
+		<name>Tobias Scherbaum</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
new file mode 100644
index 0000000..82d0f61
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild,v 1.6 2009/03/18 22:23:26 ranger Exp $
+
+inherit confutils
+
+MY_P=pnp-${PV}
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
+DEPEND=">=dev-lang/php-4.3
+	>=net-analyzer/rrdtool-1.2
+	net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	confutils_require_built_with_all dev-lang/php gd pcre xml zlib
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--with-perfdata-dir=/var/nagios/perfdata \
+		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" fullinstall || die "emake install failed"
+}
+
+pkg_postinst() {
+	elog "To include the pnp webinterface into your Nagios setup you could use"
+	elog "an Alias in you Apache configuration as follows:"
+
+	elog "\tAlias /nagios/pnp       /usr/share/pnp/"
+	elog "\t<Directory "/usr/share/pnp">"
+	elog "\t\tAllowOverride AuthConfig"
+	elog "\t\tOrder allow,deny"
+	elog "\t\tAllow from all"
+	elog "\t</Directory>"
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.4.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.4.ebuild
new file mode 100644
index 0000000..166574b
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.4.ebuild,v 1.2 2010/07/30 15:56:07 dertobi123 Exp $
+
+EAPI="2"
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/php-4.3[json,pcre,filter,reflection,spl,simplexml,xml,zlib]
+	|| ( >=dev-lang/php-4.3[gd-external] >=dev-lang/php-4.3[gd] )
+	>=net-analyzer/rrdtool-1.2
+	net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--with-perfdata-dir=/var/nagios/perfdata \
+		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
+}
+
+src_compile() {
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-unstripped install-config || die "emake install failed"
+	doinitd "${FILESDIR}/npcd"
+	rm "${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.5.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.5.ebuild
new file mode 100644
index 0000000..be4b1d8
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.5.ebuild,v 1.2 2010/07/30 15:56:07 dertobi123 Exp $
+
+EAPI="2"
+
+inherit depend.apache
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/php-4.3[json,pcre,filter,reflection,spl,simplexml,xml,zlib]
+   || ( >=dev-lang/php-4.3[gd-external] >=dev-lang/php-4.3[gd] )
+	>=net-analyzer/rrdtool-1.2
+	net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--with-perfdata-dir=/var/nagios/perfdata \
+		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
+}
+
+src_compile() {
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config || die "emake install failed"
+	doinitd "${FILESDIR}/npcd"
+	rm "${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+}