Version bump, bug #280193. Thank Rudy Grigar and Luca Lesinigo for report and updates.

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

4 files changed, 103 insertions, 14 deletions

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index e9b2e84a6285..1d089bafa0a0 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST cacti-spine-0.8.7a.tar.gz 364746 RMD160 77e0487817e34b286e1fcc2574939b6da92e52d7 SHA1 b4ad837bf2ef777fe739712209b681491d308ead SHA256 8b6b082333fb91872be0da4c1498926fe1da7c9802662433f4ea7304eb4ae6f9
 DIST cacti-spine-0.8.7c.tar.gz 368272 RMD160 f9352f52fadd990a3495043c9977813c19f5f8da SHA1 4eb2c40fccc5cdcca517c2e1b352b66fd0ad7e5e SHA256 44fdaf572559f192d6e2dc14e649450879770cace710f17eee6d563e2e5a0ea3
 DIST cacti-spine-0.8.7e.tar.gz 782735 RMD160 fb711786631d1630e0f2dbdce5bee44b7c645976 SHA1 cfa468e37495746ac5cd8ad9aa8a7354ecb9650b SHA256 6f0b19deea0ab29a553d53f1d356ff68f19144205e4e5649596d95c6174d2150
 EBUILD cacti-spine-0.8.7a.ebuild 1681 RMD160 dfa7c421c4344b51991d0f8f15e229a1366ec016 SHA1 d9f6dc03803f9eda4ec450d86e97316bc2586b30 SHA256 75bb0746aaec334c504920934d8e6e7b38f78dc6e1e70dcd77f652d99df0e37c
-EBUILD cacti-spine-0.8.7a_p4650.ebuild 1933 RMD160 d07644a945ba2051b7c8261f7d9d0c359365a20d SHA1 57753a50593c94253709eed84dcc27ccea859e8d SHA256 7c301cb08a5bb35030edec4afebb478b091faef5b917aaba969e6aef738f2444
 EBUILD cacti-spine-0.8.7c.ebuild 1732 RMD160 129dfbc0a23b86ca652469717d73e3eb6b402d33 SHA1 c90d5c8eecf492afd7ed3899ec11fb5a7ed4d60f SHA256 43910115a48cf70d4a27d35d8e8072e6e5befe9f647ecaf77d73c6935dd84272
 EBUILD cacti-spine-0.8.7e.ebuild 1727 RMD160 dde2d6be4858d9d83d7687603a09baf3028b5d21 SHA1 15cff9618db8fb5ce54598298c67519a5896af14 SHA256 7b99701fc427dcff6268522d8bbde7a401adbe8ef29eb351d33c75abb450c284
-MISC ChangeLog 2075 RMD160 1009d835a6c6a7c55cd5fe8c4516fbe103199c73 SHA1 245f84f4cc3d2d306be408a89f73a5b7432de29c SHA256 fd9693016b04d3344e3d806a1dba67357880e266910291dce65d701aa2b98ba9
+MISC ChangeLog 2206 RMD160 b43e5270de8496445e69e36e68d2ea0cbece4fa1 SHA1 9a2860f11ac1bf772d2e72a558986341841d9cd4 SHA256 26bcd305b4107f602df00e223967401f7ee85052969cbc01779f04363e65c23b
 MISC metadata.xml 795 RMD160 6496692432dfda95180e8d7506af90ebd79b2172 SHA1 2e929eeb09763b10b746c6b0384acd4197051c85 SHA256 a1ee2fa5779e21ff428e18a563360a7d81e383345d867cfa27046614fc18e466
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFKu8CAQW+hXSf0t0IRArxZAJsF3juOGrrh819Xqvm9zQA95z1HewCeJDJh
-e54lRO3Nx/Uqk+9iMNIlUcg=
-=L5Ur
------END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index f2fbbba2a2ad..5d5fe5458bf6 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.150 2009/05/26 17:04:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.151 2009/10/06 18:04:28 pva Exp $
+
+*cacti-0.8.7e (06 Oct 2009)
+
+  06 Oct 2009; Peter Volkov <pva@gentoo.org> +cacti-0.8.7e.ebuild:
+  Version bump, bug #280193. Thank Rudy Grigar and Luca Lesinigo for report
+  and updates.
 
   26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   cacti-0.8.6j-r8.ebuild:
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index b3f908c8604d..74e60dc1b119 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -3,6 +3,9 @@ AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1
 DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe SHA1 4ed5b7ada8710c5474e7fc4aad4ad9339caf0188 SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
 DIST cacti-0.8.7b.tar.gz 2005650 RMD160 e47f15957554fe6ac00dc4becffc06a790eae6f8 SHA1 fb4dd0374577b100bbe92fba05e084da2e685fe2 SHA256 f248e858879868d7bba2d53c459a3d61f0a9c19ee4843e3983cfe7a9d7fcaef9
 DIST cacti-0.8.7d.tar.gz 2221142 RMD160 e9a3056bdfc1ea28a174b0d55c3f148c055bf2ba SHA1 772193f0b2491feedd950aeb52bd43472fd56645 SHA256 a8ae8b9e50658b4e46b9f60c1373e4cc3f4cc9d72266ce09540e14d71ee57e8e
+DIST cacti-0.8.7e.tar.gz 2232297 RMD160 b6e4bb937e69337113d014d4a802455a852e7baf SHA1 6ba93e200e0fbbddfbc5a9a98a9cf0f70842d904 SHA256 1983f16cd5cf5e30b33b43b167e324713f0711167f5dcde57f3cbfbeddbaa7ff
+DIST cli_add_graph.patch 556 RMD160 21f5ddca4bc22ed7208d468c07c2feba0873e2b2 SHA1 a3eee5b56c2c99fe8a800904572be2fbaf0f3049 SHA256 504af2148efab2699e4cdc17581e8555d1a5d40dfbd30a316e7637378a6c6f11
+DIST fix_icmp_on_windows_iis_servers.patch 2997 RMD160 176a28cff430e79433dee4b54aac736548a6cda2 SHA1 466936d06e7a7e4d882b2375ae0cac9dc6434ab1 SHA256 5dd61a9accd5a2872d8efa03bb6b7e49c735568094286a1664f2ae4491ecdeeb
 DIST graph_debug_lockup_fix.patch 927 RMD160 8bf2112cb537b330547b8b571cc573a0f3135123 SHA1 be180e9def1f51678ed9424950dd5d5c8d3bc578 SHA256 c8ea30c6bf5764663d106d28b3308377a8c2003cc2afd3d0ba0102ed5fddee1b
 DIST graph_search.patch 1026 RMD160 c19e975b1071f77413de319e26915036e4cc2d2f SHA1 e63a156dd3a045cabb00947afd613d09ceb67aff SHA256 d928388bd03df77f156e5902fdb324b35de4d47264a95c790cc0a1ba21e7372b
 DIST multiple_vulnerabilities-0.8.6j.patch 9284 RMD160 6c7fc9bf7dbba3d9c5b98b9538696826383ef8ff SHA1 7d00e4d42866967136f639c7600d06ef23fe223d SHA256 b9c31af5772758e87c4d784dcb0b96402f7bb9ec76dda2cfe41ea339e0778957
@@ -12,13 +15,16 @@ DIST ping_timeout.patch 2475 RMD160 0e6a09c285de751be5e6c89f2457baaa8ce1adf1 SHA
 DIST reset_each_patch.patch 1291 RMD160 7227f1bf0706066febdbdf0947f874236b0a5124 SHA1 3cca8797fcc7910a6639c86547a83d96e070dd86 SHA256 b42d70a33a91794fd1f253ad103999138f31d59fe75e91cef7eb27549aa53d7f
 DIST sec_sql_injection-0.8.6j.patch 749 RMD160 c8c93f6bddd7e032cede65872cdea3df0850ec05 SHA1 3c44758623435c4311777e3a080d846dbe475736 SHA256 0f05946e598ce34b9507b8eeaa431c45280c2f6e07003cf583a11735fc01d245
 DIST snmp_auth_none_notice.patch 527 RMD160 3b29b0928babf1df9019691b494c0eab50a747b3 SHA1 dcf6072ef3e1bd667c554a44facc91ea233dea4c SHA256 03d8d7a38c343b346a0ca76005e79d5b939cff4144da853cbd4b6199f3786fb9
+DIST snmp_invalid_response.patch 921 RMD160 02d1f7fc63473fefbfee9a2edc020f5ec960d103 SHA1 8308f02d69ac3fb1a2ced5ad66c6c5c2078fc75f SHA256 4259979a2d9fdc51a6ef3a88368fe97adace3a7f1c3b895dea61757de9822db8
 DIST snmp_string_issue_with_rrdtool_creation.patch 336 RMD160 935531adae3bde73171706341d81b356169b4ca2 SHA1 e0c022271d36989697b2e62877cc405109b9ac93 SHA256 b46ecb20b459239b3af074e0627a945b93ba1d066ef22b436e88748c3b7d787f
 DIST snmpwalk_fix.patch 1056 RMD160 ba1a70dc95ceba6f5716dd8d8351db4a400abcc3 SHA1 e5cb384b87224e26e31063d13bb15e0bea12383c SHA256 ecf344ff6674306c52f6bbeea621d56310444ad12f679202b0de141485429106
+DIST template_duplication.patch 9190 RMD160 ba1d35cc207484b17c30044bb9f025ed6281c37b SHA1 27f3ee2eb37bd3c9430933cf00a30e63b2b05829 SHA256 c6ab6d2396f6b6519607f7908df642a575d32a75430e2b74381a6046d57f8ad9
 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
 DIST upgrade_from_086k_fix.patch 847 RMD160 ab5da2f9ae47a6affd4ff0ec1473a5193353df61 SHA1 105309cc259f80e17e550d53384b125782b02b9f SHA256 9385e019c25d5638a39b10a3afd7ee375d8de911d713a6c79443053419af7ec4
 EBUILD cacti-0.8.6j-r8.ebuild 2534 RMD160 60964b7e3d92eec4dca13b541415b3badcf20af4 SHA1 22e1858b867d73650972728579648badecb07e47 SHA256 2f4c2368bdb194ca070adfac92af8556f76d355754997868b1930c582fb57609
 EBUILD cacti-0.8.7b-r3.ebuild 2023 RMD160 f5695cf9b70b1b3114c682cd3286f2c7d7e75a64 SHA1 d33880634de12d809c30baf5aba460e3596cbb41 SHA256 2d3b4f9fe0a8a6dcb111f2a3429a4ccdaaf7176ae3ea728e0b8e71aabd83e8d7
 EBUILD cacti-0.8.7d.ebuild 2066 RMD160 27f3327847e3ca83f0e9822e35a7f40aa618afc7 SHA1 34262606a0dd48c960d4718caf773400b1cc0f65 SHA256 0907cf1dcbecdf9c05d65f17b6a284c029a41a85128a8a7a07599d0ff8bd47ab
-MISC ChangeLog 21839 RMD160 17cdd2c20964f624d12f30b5f60e7af0c76fc708 SHA1 823721c4288be4e7f164d2d916f4485452e76456 SHA256 17a465b233bbfa2fcc2787cd5fbf61d39892381bb6605dd77554cb1520f867f6
+EBUILD cacti-0.8.7e.ebuild 2061 RMD160 2ef9050aa8e0ebde89f09073326783a4b1ead55c SHA1 7947311ebb67bd6467cc758550af1dd6c2bbaf14 SHA256 19b1e8f5d80b8459002372f1337ab0e1149eda5112dd24c6d7849dbbe5debf74
+MISC ChangeLog 22022 RMD160 5ecd86ba006660aac22420c60519ccefa26803a0 SHA1 a57f4eacc4d5f0fe817ded2e2ca4620ca9fa1498 SHA256 180f602ba3f6c983569914e8e16d26b12638675898570bbac916190f0d884975
 MISC metadata.xml 916 RMD160 04f9ef45ccd484deda4a6333cf8d57b61c1be217 SHA1 cad0945f6d5d5427cfaae181b4c860576d7887b9 SHA256 a6e338947e55cbf427aeb35322f37c5af2e900ef4def9576da82789d804c4a0c
diff --git a/net-analyzer/cacti/cacti-0.8.7e.ebuild b/net-analyzer/cacti/cacti-0.8.7e.ebuild
new file mode 100644
index 000000000000..a58efee691e9
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.7e.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7e.ebuild,v 1.1 2009/10/06 18:04:28 pva Exp $
+
+inherit eutils webapp 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="cli_add_graph
+		snmp_invalid_response
+		template_duplication
+		fix_icmp_on_windows_iis_servers"
+	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 doc"
+
+DEPEND=""
+
+need_php_cli
+need_httpd_cgi
+need_php_httpd
+
+RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 )
+	net-analyzer/rrdtool
+	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
+
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php
+
+	rm -rf lib/adodb # don't use bundled adodb
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	require_php_with_use cli mysql xml session pcre sockets
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die
+	use doc && dohtml -r docs/html/
+	rm -rf docs
+
+	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
+}