New patch from upstream: snmpwalk_fix.

Package-Manager: portage-2.1.2.9

4 files changed, 136 insertions, 15 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 40cb05230e49..07595cc8eba7 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.101 2007/06/06 20:48:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.102 2007/06/07 10:24:31 pva Exp $
+
+*cacti-0.8.6j-r6 (07 Jun 2007)
+
+  07 Jun 2007; <pva@gentoo.org> +cacti-0.8.6j-r6.ebuild:
+  New patch from upstream: snmpwalk_fix.
 
   06 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   cacti-0.8.6j-r5.ebuild:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 6cf1bb126e29..0a92f1ca1217 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cacti-0.8.6j-dos-large-values.patch 1127 RMD160 102be3fdad2334c50a5d8ce4a4655c0220842d82 SHA1 79fab202a7473c66b10909a982c2f9fcf70c9b50 SHA256 b677a380634a4db63b0b85aaf54103efefdbb0e0dcd7d15ce61b7e08949f8d55
 MD5 c8479eb1b2bddd85075afd6c37ffc7ee files/cacti-0.8.6j-dos-large-values.patch 1127
 RMD160 102be3fdad2334c50a5d8ce4a4655c0220842d82 files/cacti-0.8.6j-dos-large-values.patch 1127
@@ -17,6 +14,7 @@ DIST graph_debug_lockup_fix.patch 927 RMD160 8bf2112cb537b330547b8b571cc573a0f31
 DIST import_template_argument_space_removal.patch 634 RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 SHA1 d9c27c69957c1755cda9095e938aacbe93fe127a SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460
 DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 SHA1 41be27e18e136d79c5e3b2f99438a192fffdc383 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170
 DIST poller_output_remainder.patch 1891 RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e SHA1 5e2d8b008c96f2761c12e1d94e225546a0e98e7b SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201
+DIST snmpwalk_fix.patch 1056 RMD160 ba1a70dc95ceba6f5716dd8d8351db4a400abcc3 SHA1 e5cb384b87224e26e31063d13bb15e0bea12383c SHA256 ecf344ff6674306c52f6bbeea621d56310444ad12f679202b0de141485429106
 DIST thumbnail_graphs_not_working.patch 1515 RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 SHA1 3684fe33e37105c719c59bd3ba7e1aaf2795c9a8 SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd
 DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e SHA1 bccc1293567c9160971537a3cbbf69ab0ca9cf81 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
 EBUILD cacti-0.8.6i-r1.ebuild 2068 RMD160 a49dceece2cf1f8e772456c5459a38b2b3960fe9 SHA1 e00f784388ed5d9a20cd28503f6feccc74f369bf SHA256 d76745fbcbe7fe4ebd20bd6a5ef9a22b7439e7dbf9690191a84fa86d15d0b918
@@ -31,10 +29,14 @@ EBUILD cacti-0.8.6j-r5.ebuild 2426 RMD160 c9778c0ac3980fc1fb596f90f3350e27db9c1c
 MD5 ee47febed306b317d036984cf1799ea7 cacti-0.8.6j-r5.ebuild 2426
 RMD160 c9778c0ac3980fc1fb596f90f3350e27db9c1c8e cacti-0.8.6j-r5.ebuild 2426
 SHA256 3d1ba08b0ae2e2d3a7ddea5708559f981632d783206ad583ab993f1f37b87f7f cacti-0.8.6j-r5.ebuild 2426
-MISC ChangeLog 14992 RMD160 7383fc86be6f05e1c04545e8e54a7d7a0ebc984e SHA1 16d8545927e81a120e82b678c9f554aa8976cb2f SHA256 6a001be74523f53332bcb27810679ed87552a8b6b1c50ff37e9cbd5c0b523efe
-MD5 80bba5a3b17fae670546fe5a9ff58a70 ChangeLog 14992
-RMD160 7383fc86be6f05e1c04545e8e54a7d7a0ebc984e ChangeLog 14992
-SHA256 6a001be74523f53332bcb27810679ed87552a8b6b1c50ff37e9cbd5c0b523efe ChangeLog 14992
+EBUILD cacti-0.8.6j-r6.ebuild 2442 RMD160 85c1292ccb1aaef741bf5776f5e23304f57e7125 SHA1 aed1ab9bb2e53a16943f0ce07bc4359162431b7a SHA256 6f427daf787f74a5534a88b90cf6e9b0bfde55196d36b8dc327930c6039f77e1
+MD5 0af6e71def1d70ef19815b3826610110 cacti-0.8.6j-r6.ebuild 2442
+RMD160 85c1292ccb1aaef741bf5776f5e23304f57e7125 cacti-0.8.6j-r6.ebuild 2442
+SHA256 6f427daf787f74a5534a88b90cf6e9b0bfde55196d36b8dc327930c6039f77e1 cacti-0.8.6j-r6.ebuild 2442
+MISC ChangeLog 15118 RMD160 ee3539607f1453b3463d3d79936c6beccca5a9fb SHA1 d254ae849f9c2764b5b94c16d5a7512c994c9636 SHA256 22744ee93ddbde954faf333b32cf0e085d2afeb93ba33aabceafc0e3a2d5edfe
+MD5 69d827aac9c3060d73e30997709e4074 ChangeLog 15118
+RMD160 ee3539607f1453b3463d3d79936c6beccca5a9fb ChangeLog 15118
+SHA256 22744ee93ddbde954faf333b32cf0e085d2afeb93ba33aabceafc0e3a2d5edfe ChangeLog 15118
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -48,10 +50,6 @@ SHA256 2475591f5e75d503f0bc0f33096d47e17d6ee9076213afe841177d5dd7289360 files/di
 MD5 38df7d586d1c23ff201127c8427c8d4d files/digest-cacti-0.8.6j-r5 1322
 RMD160 01e8f11d9e673427686bcbf175c047009e65cf99 files/digest-cacti-0.8.6j-r5 1322
 SHA256 2475591f5e75d503f0bc0f33096d47e17d6ee9076213afe841177d5dd7289360 files/digest-cacti-0.8.6j-r5 1322
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGZx2KKRy60XGEcJIRAqwbAJ9K8Xad3YiM9hgRZBP6cJWNhqSMdwCgnHKx
-BLGRd6WqyTHZhCIJ3ZNTzBY=
-=Nekj
------END PGP SIGNATURE-----
+MD5 4db4c0016068269dcc609ca79a8b55f0 files/digest-cacti-0.8.6j-r6 1551
+RMD160 70c8763ff02a78634f4c313cce16e883d2018089 files/digest-cacti-0.8.6j-r6 1551
+SHA256 8f3c7636f92503dddcc9a7c078c983aabe6d78f677ea9e36aa38892adf396055 files/digest-cacti-0.8.6j-r6 1551
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild
new file mode 100644
index 000000000000..2834d10e68a0
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.1 2007/06/07 10:24:31 pva Exp $
+
+inherit eutils webapp depend.apache depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+HAS_PATCHES=1
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+# patches 
+if [ $HAS_PATCHES == 1 ] ; then
+	UPSTREAM_PATCHES="ping_php_version4_snmpgetnext
+					  tree_console_missing_hosts
+					  thumbnail_graphs_not_working
+					  graph_debug_lockup_fix
+					  snmpwalk_fix"
+	for i in $UPSTREAM_PATCHES ; do
+		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+	done
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp bundled-adodb"
+
+DEPEND=""
+
+want_apache
+need_php_cli
+need_php_httpd
+
+RDEPEND="!apache2? ( www-servers/lighttpd )
+	snmp? ( net-analyzer/net-snmp )
+	net-analyzer/rrdtool
+	!bundled-adodb? ( dev-php/adodb )
+	virtual/mysql
+	virtual/cron"
+
+src_unpack() {
+	if [ $HAS_PATCHES == 1 ] ; then
+		unpack ${MY_P}.tar.gz
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+		# patches
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+		done ;
+	else
+		unpack ${MY_P}.tar.gz
+	fi
+
+	epatch "${FILESDIR}/${P}"-dos-large-values.patch
+
+	use bundled-adodb || sed -i -e \
+	's:$config\["library_path"\] . "/adodb/adodb.inc.php":"/usr/share/php/adodb/adodb.inc.php":' \
+	"${S}"/include/config.php || die "Adodb sed failed."
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [ $PHP_VERSION = 5 ] ; then
+		require_php_with_use cli mysql xml
+	elif [ $PHP_VERSION = 4 ] ; then
+		require_php_with_use cli mysql xml expat
+	fi
+	use bundled-adodb || require_php_with_use sockets
+}
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc LICENSE
+	rm LICENSE README
+
+	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
+	rm -rf docs
+	use bundled-adodb || rm -rf lib/adodb
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r6 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r6
new file mode 100644
index 000000000000..85accc0f09c1
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r6
@@ -0,0 +1,18 @@
+MD5 29436be46b289d13dfce48e7618129e2 cacti-0.8.6j.tar.gz 1126337
+RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe cacti-0.8.6j.tar.gz 1126337
+SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46 cacti-0.8.6j.tar.gz 1126337
+MD5 85a95eaef5fac31d5ca87cb915493cdd graph_debug_lockup_fix.patch 927
+RMD160 8bf2112cb537b330547b8b571cc573a0f3135123 graph_debug_lockup_fix.patch 927
+SHA256 c8ea30c6bf5764663d106d28b3308377a8c2003cc2afd3d0ba0102ed5fddee1b graph_debug_lockup_fix.patch 927
+MD5 bedf583646e59dd628d4aced7e83fdf3 ping_php_version4_snmpgetnext.patch 1262
+RMD160 94882973199b8e59c40ad43a132548862654f312 ping_php_version4_snmpgetnext.patch 1262
+SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170 ping_php_version4_snmpgetnext.patch 1262
+MD5 9ccde09fe134a6f8c9c83d0e573e1759 snmpwalk_fix.patch 1056
+RMD160 ba1a70dc95ceba6f5716dd8d8351db4a400abcc3 snmpwalk_fix.patch 1056
+SHA256 ecf344ff6674306c52f6bbeea621d56310444ad12f679202b0de141485429106 snmpwalk_fix.patch 1056
+MD5 1a3c9580a1f94d991502c8650d18b617 thumbnail_graphs_not_working.patch 1515
+RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 thumbnail_graphs_not_working.patch 1515
+SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd thumbnail_graphs_not_working.patch 1515
+MD5 109afedcd49dc173da8c27fb23c322fe tree_console_missing_hosts.patch 771
+RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e tree_console_missing_hosts.patch 771
+SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180 tree_console_missing_hosts.patch 771