Patch from upstream (Graph Debug Apache Lockup Issue).

(Portage version: 2.1.2.2)

5 files changed, 13 insertions, 106 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 31ace23b437d..d3d7af34399e 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2007/03/10 14:14:14 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.91 2007/03/27 06:22:07 pva Exp $
+
+*cacti-0.8.6j-r4 (27 Mar 2007)
+
+  27 Mar 2007; <pva@gentoo.org> -cacti-0.8.6j-r2.ebuild,
+  -cacti-0.8.6j-r3.ebuild, +cacti-0.8.6j-r4.ebuild:
+  Patch from upstream (Graph Debug Apache Lockup Issue).
 
   10 Mar 2007; Matti Bickel <mabi@gentoo.org> cacti-0.8.6i-r1.ebuild:
   ppc stable (bug #155147)
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r2.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r2.ebuild
deleted file mode 100644
index 200abc2cbcec..000000000000
--- a/net-analyzer/cacti/cacti-0.8.6j-r2.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.6j-r2.ebuild,v 1.1 2007/02/26 06:53:27 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"
-	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
-
-# alpha doesn't have lighttpd keyworded yet
-# sparc doesn't have a stable keyword for lighttpd yet
-RDEPEND="!alpha? ( !sparc? ( !apache? ( !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-r3.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
index 80f1843443a2..0bc8ed479e7f 100644
--- a/net-analyzer/cacti/cacti-0.8.6j-r3.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6j-r4.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-r3.ebuild,v 1.1 2007/02/27 15:14:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r4.ebuild,v 1.1 2007/03/27 06:22:07 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -16,7 +16,8 @@ SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 if [ $HAS_PATCHES == 1 ] ; then
 	UPSTREAM_PATCHES="ping_php_version4_snmpgetnext
 					  tree_console_missing_hosts
-					  thumbnail_graphs_not_working"
+					  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
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3
deleted file mode 100644
index 7bc03c5a5855..000000000000
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r3
+++ /dev/null
@@ -1,12 +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 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-r2 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r4
index 7bc03c5a5855..fbccf1df186f 100644
--- a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r2
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r4
@@ -1,6 +1,9 @@
 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