Added pcre and session php checks. Fixed bug #184057. Removed vulnerable to bug #181112 versions.

Package-Manager: portage-2.1.3_rc6

9 files changed, 17 insertions, 370 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index ffb74fea7e18..bb5268d0ea92 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.109 2007/06/09 16:12:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.110 2007/07/03 10:33:26 pva Exp $
+
+  03 Jul 2007; <pva@gentoo.org> -cacti-0.8.6i-r1.ebuild,
+  -cacti-0.8.6j-r4.ebuild, -cacti-0.8.6j-r5.ebuild, cacti-0.8.6j-r6.ebuild:
+  Added pcre and session php checks. Fixed bug #184057. Removed vulnerable to
+  bug #181112 versions.
 
   09 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r6.ebuild:
   Stable on ppc64; bug #181112
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 50fe343a4792..c1dcb5e800c7 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -6,50 +6,24 @@ AUX postinstall-en.txt 2191 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 SHA1
 MD5 472d9c7edf09b6bb78d0eeca60001ad1 files/postinstall-en.txt 2191
 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191
 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e files/postinstall-en.txt 2191
-DIST cacti-0.8.6i.tar.gz 1122700 RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f SHA1 bd8032fe7e1e792c38ed8f8774a692fbc17e295c SHA256 3998dae625314309c58cea0fc1e48fb08cf4c2973013413f2726cdc5cf1ac6ac
 DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe SHA1 4ed5b7ada8710c5474e7fc4aad4ad9339caf0188 SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
-DIST dec06-vulnerability-poller-0.8.6i.patch 5994 RMD160 cf60d715e6ae9285c6a0bd562fcd65290dcd1bdb SHA1 3f0eef9611837b7e30c785e11171e744545bce94 SHA256 4bb02a9022be25a1340e328f3c911a5386a8fb0c23a95285fcc8d8912dacc605
-DIST dec06-vulnerability-scripts-0.8.6i.patch 4358 RMD160 8daaaf3d7d743206551502c3945c81fc689999c1 SHA1 e175a14fbb9915cce2ea40943337bfac47e9d640 SHA256 89d48d5758ef0517f8d34a95dee02662af80efc8f988b87cfbc68c6e169c9f36
 DIST graph_debug_lockup_fix.patch 927 RMD160 8bf2112cb537b330547b8b571cc573a0f3135123 SHA1 be180e9def1f51678ed9424950dd5d5c8d3bc578 SHA256 c8ea30c6bf5764663d106d28b3308377a8c2003cc2afd3d0ba0102ed5fddee1b
-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 2073 RMD160 94944b6c8c2f97a346499ee5109442e16c32b65f SHA1 7e346fc7e46d53de6b3e272aeb0cb7ad75ee6d8c SHA256 383f4471acb67c373138d697ccbac5a50fa77a4891b2cc12ef3ef1621d2f7c5b
-MD5 46e38c422c1693abbc61fd9b8e17fd5d cacti-0.8.6i-r1.ebuild 2073
-RMD160 94944b6c8c2f97a346499ee5109442e16c32b65f cacti-0.8.6i-r1.ebuild 2073
-SHA256 383f4471acb67c373138d697ccbac5a50fa77a4891b2cc12ef3ef1621d2f7c5b cacti-0.8.6i-r1.ebuild 2073
-EBUILD cacti-0.8.6j-r4.ebuild 2372 RMD160 d906f85b2541003a8c71aeffcfd68f53fe9b77c7 SHA1 11f024f75c3704b45e85f3d49b51178e6ae2eac2 SHA256 9ff537dc3a522bcbc35bc7a0ea5538dc5484c8d7fe4d65e039cba5bbc62f15d8
-MD5 01f28adc26e9e7192bace86ec33828c3 cacti-0.8.6j-r4.ebuild 2372
-RMD160 d906f85b2541003a8c71aeffcfd68f53fe9b77c7 cacti-0.8.6j-r4.ebuild 2372
-SHA256 9ff537dc3a522bcbc35bc7a0ea5538dc5484c8d7fe4d65e039cba5bbc62f15d8 cacti-0.8.6j-r4.ebuild 2372
-EBUILD cacti-0.8.6j-r5.ebuild 2425 RMD160 9808b5f8832047593f9025a01dc0d12890fc9d1d SHA1 d5825f2be5395ada0214297b42ec77f26c6f28f5 SHA256 c62f77979663a3c39f19f32ea949cf50596bbbeceaa7ca723ad90b73c3187d74
-MD5 c3acdd716bce63ad3f7c5231de6cbe24 cacti-0.8.6j-r5.ebuild 2425
-RMD160 9808b5f8832047593f9025a01dc0d12890fc9d1d cacti-0.8.6j-r5.ebuild 2425
-SHA256 c62f77979663a3c39f19f32ea949cf50596bbbeceaa7ca723ad90b73c3187d74 cacti-0.8.6j-r5.ebuild 2425
-EBUILD cacti-0.8.6j-r6.ebuild 2473 RMD160 7163f13f1717e36c212d6397c6f0b97bc90c1154 SHA1 5968aed6fb667448cfcfb94448cbd36f6c3cec08 SHA256 b8f131c690f14f6dbe3d4c5309b53d43d9da8d1e314795bd02cf6e47ba6ed8b0
-MD5 a3237a9104d82eda36d3e1df8ab27ec3 cacti-0.8.6j-r6.ebuild 2473
-RMD160 7163f13f1717e36c212d6397c6f0b97bc90c1154 cacti-0.8.6j-r6.ebuild 2473
-SHA256 b8f131c690f14f6dbe3d4c5309b53d43d9da8d1e314795bd02cf6e47ba6ed8b0 cacti-0.8.6j-r6.ebuild 2473
-MISC ChangeLog 15901 RMD160 ceb3d763420eeac72d7686a6b548a645aa2c2580 SHA1 e32ae16f7c3d26cb9318a8d7c53e2acb844c59cd SHA256 13363b2d51a2511472ca7daea1deea0579773e377e0f7d1ebf90e26230f8a5f7
-MD5 731a0688e538c028e52dd0badd7490cc ChangeLog 15901
-RMD160 ceb3d763420eeac72d7686a6b548a645aa2c2580 ChangeLog 15901
-SHA256 13363b2d51a2511472ca7daea1deea0579773e377e0f7d1ebf90e26230f8a5f7 ChangeLog 15901
+EBUILD cacti-0.8.6j-r6.ebuild 2493 RMD160 e5f15fde7ee253e583dde614c25ce6c4b1fb8be1 SHA1 6dbc6b5580ebbf0fc2a0fcbf303fcf980c67b32d SHA256 2a8181f287c87cae857661e9d7a6265ab0794208db8772628952b983beb01658
+MD5 bdc78a08256fed42e5bf2d5743cfeb92 cacti-0.8.6j-r6.ebuild 2493
+RMD160 e5f15fde7ee253e583dde614c25ce6c4b1fb8be1 cacti-0.8.6j-r6.ebuild 2493
+SHA256 2a8181f287c87cae857661e9d7a6265ab0794208db8772628952b983beb01658 cacti-0.8.6j-r6.ebuild 2493
+MISC ChangeLog 16133 RMD160 e7807f44b4038ee21dc9b14e91b47b462a708456 SHA1 eacfcd25eca1b253be7963ad1b9bdce8d6cc98bd SHA256 b0a71d002a99f9e56611a7fb7cccfcd6b41dad3dce13ec5fb07eca131d0f6c7c
+MD5 fe1c290f4a563a1c0b8f9d041330578e ChangeLog 16133
+RMD160 e7807f44b4038ee21dc9b14e91b47b462a708456 ChangeLog 16133
+SHA256 b0a71d002a99f9e56611a7fb7cccfcd6b41dad3dce13ec5fb07eca131d0f6c7c ChangeLog 16133
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 metadata.xml 743
-MD5 2b7a8cbe3c24b2359cb5d26537b808e0 files/digest-cacti-0.8.6i-r1 1394
-RMD160 9d15af37d721c2d83f56a6403ad9abc5c4bc34e5 files/digest-cacti-0.8.6i-r1 1394
-SHA256 db0b3cfd6c831c8368801968daf70e8868b73802b120af351e2ea0741ab61a2d files/digest-cacti-0.8.6i-r1 1394
-MD5 38df7d586d1c23ff201127c8427c8d4d files/digest-cacti-0.8.6j-r4 1322
-RMD160 01e8f11d9e673427686bcbf175c047009e65cf99 files/digest-cacti-0.8.6j-r4 1322
-SHA256 2475591f5e75d503f0bc0f33096d47e17d6ee9076213afe841177d5dd7289360 files/digest-cacti-0.8.6j-r4 1322
-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
 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.6i-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild
deleted file mode 100644
index 2a94b44f03ac..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.6i-r1.ebuild,v 1.9 2007/06/26 02:20:27 mr_bones_ Exp $
-
-inherit eutils webapp depend.apache depend.php
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-# (patched versions)
-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="poller_output_remainder
-	dec06-vulnerability-poller-0.8.6i
-	dec06-vulnerability-scripts-0.8.6i
-	import_template_argument_space_removal"
-	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"
-
-DEPEND=""
-
-want_apache
-need_php_cli
-need_php_httpd
-
-RDEPEND="!apache2? ( www-servers/lighttpd )
-	snmp? ( net-analyzer/net-snmp )
-	net-analyzer/rrdtool
-	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
-}
-
-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
-}
-
-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
-
-	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/cacti-0.8.6j-r4.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
deleted file mode 100644
index aae5a99c46e3..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-r4.ebuild,v 1.9 2007/06/26 02:20:27 mr_bones_ 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"
-	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":"/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/cacti-0.8.6j-r5.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r5.ebuild
deleted file mode 100644
index c42f58028af9..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6j-r5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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-r5.ebuild,v 1.4 2007/06/26 02:20:27 mr_bones_ 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"
-	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/cacti-0.8.6j-r6.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild
index 805256cfda56..72d9123ff004 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.8 2007/06/26 02:20:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r6.ebuild,v 1.9 2007/07/03 10:33:26 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -64,9 +64,9 @@ pkg_setup() {
 	webapp_pkg_setup
 	has_php
 	if [ $PHP_VERSION = 5 ] ; then
-		phpUseFlags="cli mysql xml"
+		phpUseFlags="cli mysql xml session pcre"
 	elif [ $PHP_VERSION = 4 ] ; then
-		phpUseFlags="cli mysql xml expat"
+		phpUseFlags="cli mysql xml session pcre expat"
 	fi
 	use bundled-adodb || phpUseFlags="${phpUseFlags} sockets"
 	require_php_with_use ${phpUseFlags}
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6i-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.6i-r1
deleted file mode 100644
index 5518d1fcba6f..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6i-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz 1122700
-RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f cacti-0.8.6i.tar.gz 1122700
-SHA256 3998dae625314309c58cea0fc1e48fb08cf4c2973013413f2726cdc5cf1ac6ac cacti-0.8.6i.tar.gz 1122700
-MD5 17b2997b6708a8bcf99c702b6cec047d dec06-vulnerability-poller-0.8.6i.patch 5994
-RMD160 cf60d715e6ae9285c6a0bd562fcd65290dcd1bdb dec06-vulnerability-poller-0.8.6i.patch 5994
-SHA256 4bb02a9022be25a1340e328f3c911a5386a8fb0c23a95285fcc8d8912dacc605 dec06-vulnerability-poller-0.8.6i.patch 5994
-MD5 5ce8da430a63ea8e675d0eef46e8b60a dec06-vulnerability-scripts-0.8.6i.patch 4358
-RMD160 8daaaf3d7d743206551502c3945c81fc689999c1 dec06-vulnerability-scripts-0.8.6i.patch 4358
-SHA256 89d48d5758ef0517f8d34a95dee02662af80efc8f988b87cfbc68c6e169c9f36 dec06-vulnerability-scripts-0.8.6i.patch 4358
-MD5 c56da30a12487610393aa2eaa7fe8c6a import_template_argument_space_removal.patch 634
-RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 import_template_argument_space_removal.patch 634
-SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460 import_template_argument_space_removal.patch 634
-MD5 3b7ad717cbf8874fd96ea9f45d97cfbc poller_output_remainder.patch 1891
-RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e poller_output_remainder.patch 1891
-SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201 poller_output_remainder.patch 1891
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r4 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r4
deleted file mode 100644
index fbccf1df186f..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-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 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
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5
deleted file mode 100644
index fbccf1df186f..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-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 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