Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to shut up repoman.

Package-Manager: portage-2.1.3.16

5 files changed, 128 insertions, 22 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 2b9b7bd461d2..c21783003851 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,13 @@
 # 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.112 2007/10/29 15:03:46 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.113 2007/11/03 18:53:22 pva Exp $
+
+*cacti-0.8.7-r1 (03 Nov 2007)
+
+  03 Nov 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild,
+  +cacti-0.8.7-r1.ebuild:
+  Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to
+  shut up repoman.
 
 *cacti-0.8.7 (29 Oct 2007)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index cea20e12608e..b880237fa748 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
@@ -11,23 +8,29 @@ RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191
 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e files/postinstall-en.txt 2191
 DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe SHA1 4ed5b7ada8710c5474e7fc4aad4ad9339caf0188 SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
 DIST cacti-0.8.7.tar.gz 2405448 RMD160 2d7b111fea85c59483621aa5c30056332976b05d SHA1 ea81fcaa8219263a7110e3de6407877fbb900653 SHA256 6a30ef4588f27fd885389710003ead98a229c01d6b355dc958fc61be49eb3545
+DIST graph_create_xml_warning.patch 554 RMD160 9081954ba486c0c8fb29ed7780253296238294b3 SHA1 fd54d9a50a2cee02608b34bf3d4c19f2057525f9 SHA256 5b62bb209627ced3e336f12c80a28d2b01a55daa75a01f87c977bb289032f11c
 DIST graph_debug_lockup_fix.patch 927 RMD160 8bf2112cb537b330547b8b571cc573a0f3135123 SHA1 be180e9def1f51678ed9424950dd5d5c8d3bc578 SHA256 c8ea30c6bf5764663d106d28b3308377a8c2003cc2afd3d0ba0102ed5fddee1b
 DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 SHA1 41be27e18e136d79c5e3b2f99438a192fffdc383 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170
+DIST sec_sql_injection-0.8.7.patch 742 RMD160 b1bcdc9d76265b208fc697e127ca729b4ec13f57 SHA1 7c3d05130a07dbd73317116eca0de50869c54d5f SHA256 b7c46249e643aca6c7e56311edd55a2c80d0705075001bc5c370abe692cd1549
 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.6j-r6.ebuild 2496 RMD160 de768dec72467aec7626e4750d82a7152c915daa SHA1 649bbc4e8daf5811619133b46d3f748599a4955e SHA256 1d70e740a5d7acd34664ebc4274be2578fce9d184db2df71b315bffa08a1fbc3
-MD5 59be6fce4c79bd997fae4334ed78ece2 cacti-0.8.6j-r6.ebuild 2496
-RMD160 de768dec72467aec7626e4750d82a7152c915daa cacti-0.8.6j-r6.ebuild 2496
-SHA256 1d70e740a5d7acd34664ebc4274be2578fce9d184db2df71b315bffa08a1fbc3 cacti-0.8.6j-r6.ebuild 2496
+EBUILD cacti-0.8.6j-r6.ebuild 2476 RMD160 1f6e20d51f0dd441db94664a582934f39dfc2cc3 SHA1 d946d80845c790c2a91b95a345c0548bb3df3948 SHA256 d9638010b0564de816b744ebf954211caeca0b8551cefddbcae05edc7532d473
+MD5 b50a58706fa13129ca7f2cf69d60201b cacti-0.8.6j-r6.ebuild 2476
+RMD160 1f6e20d51f0dd441db94664a582934f39dfc2cc3 cacti-0.8.6j-r6.ebuild 2476
+SHA256 d9638010b0564de816b744ebf954211caeca0b8551cefddbcae05edc7532d473 cacti-0.8.6j-r6.ebuild 2476
+EBUILD cacti-0.8.7-r1.ebuild 2293 RMD160 0b11bae2ad07c9c16b4ac89a54feb9eeeb9fd4f2 SHA1 7f22daccf7debb668c29ccfe0e68bad07c44b2f9 SHA256 4138db416574adb7038cf5c811584a5530bc4942ba9bbbd3f850745b2fd723a7
+MD5 0057e64dea6eb8b590f935620c411bad cacti-0.8.7-r1.ebuild 2293
+RMD160 0b11bae2ad07c9c16b4ac89a54feb9eeeb9fd4f2 cacti-0.8.7-r1.ebuild 2293
+SHA256 4138db416574adb7038cf5c811584a5530bc4942ba9bbbd3f850745b2fd723a7 cacti-0.8.7-r1.ebuild 2293
 EBUILD cacti-0.8.7.ebuild 2383 RMD160 c5da3288921765ae1d8da37c67815499623e986b SHA1 b9847e63b616703cca83d30aa65a5ae368de07f8 SHA256 546fdf585b14d41585a4fe656f64154069b7d98e27d390569088bd69a1ebed68
 MD5 276820bb9037653b6284257e89dd4cd6 cacti-0.8.7.ebuild 2383
 RMD160 c5da3288921765ae1d8da37c67815499623e986b cacti-0.8.7.ebuild 2383
 SHA256 546fdf585b14d41585a4fe656f64154069b7d98e27d390569088bd69a1ebed68 cacti-0.8.7.ebuild 2383
-MISC ChangeLog 16436 RMD160 ffcc90dd025e6c3507f1e548a4e638598698736a SHA1 0521fded15cf3782a7a9079dd3a8204c0547a1be SHA256 84835a5ee21c860254fd79bbda2c2e7a60dcaacdd8babd3c4638c587d5169784
-MD5 b4f57d8a73db3d7c1c93b04e622843cd ChangeLog 16436
-RMD160 ffcc90dd025e6c3507f1e548a4e638598698736a ChangeLog 16436
-SHA256 84835a5ee21c860254fd79bbda2c2e7a60dcaacdd8babd3c4638c587d5169784 ChangeLog 16436
+MISC ChangeLog 16645 RMD160 79a0233216079078cafd2739d89e1853ea86c439 SHA1 154e690090a1bb25eafc23fd99daabd74d8b5c83 SHA256 6e3dcf23ccd463a0bd79396a8985e062d4e62b7e8d45afb23e4eb35d6436a58f
+MD5 83ba14e1d12ece3419d7f9cd38cec645 ChangeLog 16645
+RMD160 79a0233216079078cafd2739d89e1853ea86c439 ChangeLog 16645
+SHA256 6e3dcf23ccd463a0bd79396a8985e062d4e62b7e8d45afb23e4eb35d6436a58f ChangeLog 16645
 MISC metadata.xml 646 RMD160 aba1a1b33b779ca833d51b3f4e26f64b531b4ab5 SHA1 2eaabae404ac516b6f6bc3cb1802d1d08d57e51a SHA256 0269abacb0ac96dc71aa2075c573736414bb3d67ec169a1d0bd2f52e3afc2056
 MD5 ab96e75cd872ea3d8cdcf32cdc69d771 metadata.xml 646
 RMD160 aba1a1b33b779ca833d51b3f4e26f64b531b4ab5 metadata.xml 646
@@ -38,10 +41,6 @@ SHA256 8f3c7636f92503dddcc9a7c078c983aabe6d78f677ea9e36aa38892adf396055 files/di
 MD5 1575ddfd094a60231f66f33ad5226fc6 files/digest-cacti-0.8.7 238
 RMD160 e2b88284d396bc79e2bdf11c406722dded5b32a4 files/digest-cacti-0.8.7 238
 SHA256 10f42a1629b9f9fbfb27a7b7eb1c30de5bddb2d9536894ffd0f62e101257456b files/digest-cacti-0.8.7 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHJfZbz974XjDVpbkRAjTTAJ9iY8ZQV41QPmP3hqfGPkTllIAk6gCfaiHm
-2V8AEC6nYLYRdO0FqfnsyAc=
-=0Pss
------END PGP SIGNATURE-----
+MD5 8d353fe079b55dddaa1bd42974fc2bc5 files/digest-cacti-0.8.7-r1 759
+RMD160 9652865867205b49c8503b0efb05cb5b149e7fca files/digest-cacti-0.8.7-r1 759
+SHA256 5ad5b78f0be79b930a6a9f8eb96910267c32a6e5da31e28fc9e8cd8a28f89d3c files/digest-cacti-0.8.7-r1 759
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild
index a41ea256d27d..d3f78fd867b6 100644
--- a/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6j-r6.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/cacti/cacti-0.8.6j-r6.ebuild,v 1.11 2007/07/19 13:27:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.12 2007/11/03 18:53:22 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -79,9 +79,7 @@ src_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
diff --git a/net-analyzer/cacti/cacti-0.8.7-r1.ebuild b/net-analyzer/cacti/cacti-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..4e1daf12b3ae
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.7-r1.ebuild,v 1.1 2007/11/03 18:53:22 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="graph_create_xml_warning
+					  sec_sql_injection-0.8.7"
+	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
+
+	use bundled-adodb || sed -i -e \
+	's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+	"${S}"/include/global.php
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [ $PHP_VERSION = 5 ] ; then
+		phpUseFlags="cli mysql xml session pcre"
+	elif [ $PHP_VERSION = 4 ] ; then
+		phpUseFlags="cli mysql xml session pcre expat"
+	fi
+	use bundled-adodb || phpUseFlags="${phpUseFlags} sockets"
+	require_php_with_use ${phpUseFlags}
+}
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	webapp_src_preinst
+
+	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.7-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.7-r1
new file mode 100644
index 000000000000..e09bf91c98d5
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.7-r1
@@ -0,0 +1,9 @@
+MD5 d28e8f9fd4b657c2ad79c4bcf1e3694d cacti-0.8.7.tar.gz 2405448
+RMD160 2d7b111fea85c59483621aa5c30056332976b05d cacti-0.8.7.tar.gz 2405448
+SHA256 6a30ef4588f27fd885389710003ead98a229c01d6b355dc958fc61be49eb3545 cacti-0.8.7.tar.gz 2405448
+MD5 ecb0a12c6f3265e1739d07a46894331d graph_create_xml_warning.patch 554
+RMD160 9081954ba486c0c8fb29ed7780253296238294b3 graph_create_xml_warning.patch 554
+SHA256 5b62bb209627ced3e336f12c80a28d2b01a55daa75a01f87c977bb289032f11c graph_create_xml_warning.patch 554
+MD5 6aeea0a9f7e7ff807104d843cec60b6b sec_sql_injection-0.8.7.patch 742
+RMD160 b1bcdc9d76265b208fc697e127ca729b4ec13f57 sec_sql_injection-0.8.7.patch 742
+SHA256 b7c46249e643aca6c7e56311edd55a2c80d0705075001bc5c370abe692cd1549 sec_sql_injection-0.8.7.patch 742