version bump for bug 324641 , thanks to spacefreak for testing ; dropped ~ppc keyword due to missing keyword on net-analyzer/mk-livestatus dep (bug 429088)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 162 insertions, 5 deletions

diff --git a/net-analyzer/nagvis/ChangeLog b/net-analyzer/nagvis/ChangeLog
index 703a730de587..b090b09bef65 100644
--- a/net-analyzer/nagvis/ChangeLog
+++ b/net-analyzer/nagvis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagvis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.10 2012/07/01 22:09:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.11 2012/07/31 18:49:50 axs Exp $
+
+*nagvis-1.6.6 (31 Jul 2012)
+
+  31 Jul 2012; Ian Stakenvicius <axs@gentoo.org> +nagvis-1.6.6.ebuild,
+  +files/nagvis-1.6.6-base-path.patch,
+  +files/nagvis-1.6.6-global-definitions.patch:
+  version bump for bug 324641 , thanks to spacefreak for testing ; dropped ~ppc
+  keyword due to missing keyword on net-analyzer/mk-livestatus dep (bug 429088)
 
   01 Jul 2012; Matti Bickel <mabi@gentoo.org> -nagvis-1.4.4.ebuild:
   remove old version.
diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest
index 83e0efea161f..9b50f03ffabd 100644
--- a/net-analyzer/nagvis/Manifest
+++ b/net-analyzer/nagvis/Manifest
@@ -1,4 +1,18 @@
-DIST nagvis-1.4.4.tar.gz 743628 RMD160 d56b40c8d76748c902cc4d7d0c25a550a83b0593 SHA1 a411824c39fc08d78e42d14364bfec99259a0cd1 SHA256 1b0ec2364dabd0f20786b1286149855ca4d70dc557ae3492090911bcb2c1f075
-EBUILD nagvis-1.4.4-r1.ebuild 1441 RMD160 a57e1dcf3209f46f4c75719d2355e4631bb744a2 SHA1 3c3256194396877ada03071e1816e7c23f5dcae4 SHA256 b31843da7879876a7981a30c7f1472a4d0507ef88d82fea193b37a6c88914e0e
-MISC ChangeLog 1562 RMD160 cf10a9bf280297f4241ed3a4aadd037d1e79baa8 SHA1 62521b00827c569c1bdb5ee398969cbb5a0164f8 SHA256 30f80cdbd8cdd2bae5d0ff930651cc0826d210a22c8cce2e1a5c076da57af7aa
-MISC metadata.xml 323 RMD160 0ef597d4f169221dc7d5f5be6b2773156a6c4a5f SHA1 28003456884fab86d98efdb755f2a2d837d979d7 SHA256 e7fc500cdfc65373ff0de49202a6a4cc48e1bd8ae22fb8d5a8468831b44c1825
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX nagvis-1.6.6-base-path.patch 799 SHA256 6b82254353595a8aab86bb65b46da0c7d7cfe1b15f69387f039a6049616c6a09 SHA512 54476998b1bf0b8ce25691fff558e3faa0aefaa4c1ba5d9804e809ae862f79cb96ea87fb7368a1100282bbc8d1f89902f8b4bca397df1ea24a840996889de1e0 WHIRLPOOL 01be41d6194945804f7e59401c9ddd703a1f10d9bbbf8b68762bcfa9587d7b6fa93d53c7caced4a33446fd402036305bb5b245c557d62d8e4f19ae3538f87335
+AUX nagvis-1.6.6-global-definitions.patch 1177 SHA256 dbfa2b300ffdf5fb3b8f48b7b5f0f9a577cff816b6323e2489456c6a9767f1ff SHA512 26d53a48852082010c660280ffef786a8713a02ba675b4b455de48c65136816772c8012ead282bd8da879b1696bf811e4ef091765cc3014d5b2fb1445166c79d WHIRLPOOL 75584f403eccbdc84e0a403e96891285e0bd3e1b14f05299fd2190b249e5ca357b8a037c760276c87466b197530d5ae97d7cf6c3710a9552f0d1e836704241a9
+DIST nagvis-1.4.4.tar.gz 743628 SHA256 1b0ec2364dabd0f20786b1286149855ca4d70dc557ae3492090911bcb2c1f075 SHA512 9faa6f63149b4446be9d959064326efab6251003a0a5424b8d8e6969bc434d3fe2a6048a47bc3c30504ddb53e447a0e1e426e6896bb32ec5cdd74933f7829048 WHIRLPOOL 2f4a8cfb1fdb63040782c8f9928128a4593fc53a0d838678898893ebb93a28dfca2464358daa0b55c24f8c565e00d11ec0d779fd79d1da61ea98a04629c62296
+DIST nagvis-1.6.6.tar.gz 3430714 SHA256 8aefe17ea7f43839fd5db4063fbac96eeedddbdcdf3789f4a75e9ca51c2833a8 SHA512 e5858b185dd5d31fc8d414df5b3464941769249ce582b10e155e89ba7aa0c45724550c44de9d7bfb23b96caa737e519f320e45050126feb94593cca2bfc583cb WHIRLPOOL 8af9d6c86ec84cc3630d0d93cd6cc55d2687a8b55f0f3b6eb2cadf946580af3a314daae9d5055ca41fd62f27fe06e188c9c319b42bd9118a1a6976815f2e18ad
+EBUILD nagvis-1.4.4-r1.ebuild 1441 SHA256 b31843da7879876a7981a30c7f1472a4d0507ef88d82fea193b37a6c88914e0e SHA512 dce09199738b32245617c941b0adc8d4aa061a66c1da7ce9d0ce0758d609ffbee61ad7c33d178e46870ae2a907eb21ee726d29d72b8878fb962fb4b05697a99d WHIRLPOOL c37288b931b2efe4f483d7ef4f31d091966f200dfc28a1f6c21e2cc6b03b22e881b7ea5d06407e4e861b1946af5f3f0e7eb65972c908e2c4f756767bca1a0e71
+EBUILD nagvis-1.6.6.ebuild 3002 SHA256 5d9299f638f36cd6c1e2abb33267bce07b7f3911fa9d8fa7d9fdf13baf64b12d SHA512 b41d6478eb4049350dd11251b857501d66bb58a6f9c1bce5f68109f093160fcfeffa566c538d1f23ba7030e2ec8593626124e1794e92ca1c0a73b85935155884 WHIRLPOOL 1b69affe7fd63b0818d9bd3759b7cbb19b3280cbf9c1c2285ec84a1a5e95e6f944abb8525bb0385d459ce7310b99a7d136c3432534e879d7d37ef82c61930b37
+MISC ChangeLog 1909 SHA256 ab7f3b5881efa04a4f42fa91179489d749265539d2990476781df1e7d7637241 SHA512 0bdf878f309806c60196b5155c460638e58782cc61db242cbfa3840751163b3226c74e185fb3b8efa040b0e563181b0e22a1f67a1c457f0bf0758648c4852958 WHIRLPOOL 0206288b4c9728f0574b6fb868cadecfa0dbba6dbe3a7e294a400b7acd005f8a8089b26f22191807c339cb9be9a034fe78103306d2f3f306f84cb526b83f44b1
+MISC metadata.xml 323 SHA256 e7fc500cdfc65373ff0de49202a6a4cc48e1bd8ae22fb8d5a8468831b44c1825 SHA512 aa45136f2dea70c1b996eb11c249d50072ce2d0638cb26e0d4422b0c7497480587dabe341b64bbc32a3ec8c0bba982216768eaf541fb25d942f65b4afada29f8 WHIRLPOOL 20f712e47100792fd7c56bae4f95054bdba84abb8e46e36b0040dd953a2743a1c819473c28208598a1b39ed8499c29c201bbbec6d0819721ee4b2c58e2e44584
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAYKNgACgkQ2ugaI38ACPCvBgD/fP+VK4t7XpEGG3PFJPzlLfrs
+RGzmwPi5vpv1dPkmXD8BAIxGAGVohhMrPCd9hYhDJaeEjEcQSD0vzGp/XxI2JMGa
+=tpF0
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
new file mode 100644
index 000000000000..771076c4eaa7
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
@@ -0,0 +1,13 @@
+--- a/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:14:23.000000000 -0400
++++ b/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:17:10.000000000 -0400
+@@ -1215,8 +1215,8 @@
+      * @author	Roman Kyrylych <rkyrylych@op5.com>
+      */
+     private function getBasePath() {
+-        // Go 3 levels up from nagvis/share/nagvis to nagvis base path
+-        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/';
++        // Go 2 levels up from share/nagvis to nagvis base path
++        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/';
+         // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share
+         // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/';
+     }
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
new file mode 100644
index 000000000000..9786b970179f
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
@@ -0,0 +1,30 @@
+--- a/share/server/core/defines/global.php	2012-05-13 05:44:27.000000000 -0400
++++ b/share/server/core/defines/global.php	2012-05-31 11:20:39.000000000 -0400
+@@ -64,7 +64,7 @@
+ define('DEBUGLEVEL', 6);
+ 
+ // Path to the debug file
+-define('DEBUGFILE', '../../../var/nagvis-debug.log');
++define('DEBUGFILE', '../../var/nagvis-debug.log');
+ 
+ // It is possible to define a conf.d directory for splitting the main
+ // configuration in several files. Only the values defined in the CONST_MAINCFG
+@@ -78,14 +78,14 @@
+ // The last value wins.
+ //
+ // Path to the main configuration file
+-define('CONST_MAINCFG', '../../../etc/nagvis.ini.php');
+-define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf');
++define('CONST_MAINCFG', '../../etc/nagvis.ini.php');
++define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf');
+ 
+ // Path to the main configuration conf.d directory
+-define('CONST_MAINCFG_DIR', '../../../etc/conf.d');
++define('CONST_MAINCFG_DIR', '../../etc/conf.d');
+ 
+ // The directory below the NagVis root which is shared by the webserver
+-define('HTDOCS_DIR', 'share');
++define('HTDOCS_DIR', '');
+ 
+ // Needed minimal PHP version
+ define('CONST_NEEDED_PHP_VERSION', '5.0');
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
new file mode 100644
index 000000000000..afd0c85ab3f7
--- /dev/null
+++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.1 2012/07/31 18:49:50 axs Exp $
+
+EAPI=4
+
+inherit eutils confutils depend.php depend.apache
+
+DESCRIPTION="NagVis is a visualization addon for the well known network managment system Nagios."
+HOMEPAGE="http://www.nagvis.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 automap"
+
+DEPEND=""
+RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga )
+	automap? ( >=media-gfx/graphviz-2.14 )
+	apache2? ( dev-lang/php[apache2] )
+	net-analyzer/mk-livestatus
+	dev-lang/php[gd,nls,json,session,pdo,sqlite3,sockets,mysql,unicode,xml]"
+
+need_php_httpd
+want_apache2
+
+pkg_setup() {
+	confutils_require_built_with_all dev-lang/php gd nls json session pdo sqlite3 sockets mysql unicode xml
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-base-path.patch
+	epatch "${FILESDIR}"/${P}-global-definitions.patch
+	grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g ||die
+	sed -i s:@NAGVIS_WEB@:/nagvis:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:@NAGVIS_PATH@:/usr/share/nagvis/:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:/usr/nagios/var/rw/live:/var/nagios/rw/live:g "${S}"/etc/nagvis.ini.php-sample ||die
+}
+
+src_install() {
+	dodoc README INSTALL
+
+	insinto /usr/share/nagvis
+	doins -r share/{config.php,index.php,frontend,netmap,server,userfiles}
+	doins -r docs
+
+	diropts -o apache -g root
+	dodir /var/nagvis/tmpl/{cache,compile}
+	diropts
+	dosym /var/nagvis /usr/share/nagvis/var
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins etc/apache2-nagvis.conf-sample 98_${PN}.conf
+	fi
+
+	insinto /etc/nagvis
+	doins -r etc/{conf.d,automaps,geomap,.htaccess,nagvis.ini.php-sample}
+	fowners apache:root /etc/nagvis
+	fperms 0664 /etc/nagvis/nagvis.ini.php-sample
+	dosym /etc/nagvis /usr/share/nagvis/etc
+
+	diropts -o apache -g root -m0775
+	insopts -o apache -g root -m0664
+	doins -r etc/maps
+	diropts
+	insopts
+
+	# move image maps dir from usr to var and symlink it back
+	dodir /var/nagvis/userfiles/images
+	mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die
+	fowners apache:root /var/nagvis/userfiles/images/maps
+	dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps
+}
+
+pkg_postinst() {
+	elog "Before running NagVis for the first time, you will need to set up"
+	elog "/etc/nagvis/nagvis.ini.php"
+	elog "A sample is in"
+	elog "/etc/nagvis/nagvis.ini.php-sample"
+	if use apache2 ; then
+		elog
+		elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in"
+		elog "/etc/conf.d/apache2 and to restart apache2. A default configuration"
+		elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf"
+	fi
+	elog ""
+	elog "Default user/password are: nagiosadmin/nagiosadmin"
+	elog "                                 guest/guest"
+}