Patch from upstream (Graph Debug Apache Lockup Issue).

Package-Manager: portage-2.1.2.2

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 31ace23b437d65f575e6e62377b11dec1a00fef8..d3d7af34399e1a1605ebd5d88d1dca38c1653e81 100644 (file)
--- 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/Manifest b/net-analyzer/cacti/Manifest
index b0721b49005724adabd603f9575457878fc9cfbd..0c55db04a9fddaa56bad1ba997465b4911e060e5 100644 (file)
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 2191 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 SHA1 0c9fc10166b40ad42d38811dbb744f4accfe1bb8 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e
 MD5 472d9c7edf09b6bb78d0eeca60001ad1 files/postinstall-en.txt 2191
 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191
@@ -9,6 +6,7 @@ DIST cacti-0.8.6i.tar.gz 1122700 RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f
 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
@@ -18,18 +16,14 @@ EBUILD cacti-0.8.6i-r1.ebuild 2205 RMD160 b2274904a036938517359ddb733c5e795e9852
 MD5 fcfaa77dec55ec55baeb93834d917504 cacti-0.8.6i-r1.ebuild 2205
 RMD160 b2274904a036938517359ddb733c5e795e985224 cacti-0.8.6i-r1.ebuild 2205
 SHA256 fa600d704c99cf724e39706a6df4200f9cd6babdb3cd69e3019f7f3fcde0713b cacti-0.8.6i-r1.ebuild 2205
-EBUILD cacti-0.8.6j-r2.ebuild 2153 RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead627 SHA1 c4bd5285ba3f58c66cdb5b8d7f3b6d83769ea88c SHA256 624eb035123d8a79a0c0a401394776cb27fdefdd40cdae5a5915db4a657cbc62
-MD5 9613b94a237904b1c62e04298d932af2 cacti-0.8.6j-r2.ebuild 2153
-RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead627 cacti-0.8.6j-r2.ebuild 2153
-SHA256 624eb035123d8a79a0c0a401394776cb27fdefdd40cdae5a5915db4a657cbc62 cacti-0.8.6j-r2.ebuild 2153
-EBUILD cacti-0.8.6j-r3.ebuild 2477 RMD160 9879338f282d165bc000e46a592aedbe6107dc7e SHA1 7727c4038642d78168791b39f1c8d8c009a19e2c SHA256 1a1b3ee50f5159e0989e4d1b064c752ecbbce18d6e41b12e8b9bfe26d23bd623
-MD5 ec6e0cacce11291403bdc2e8ab2ff366 cacti-0.8.6j-r3.ebuild 2477
-RMD160 9879338f282d165bc000e46a592aedbe6107dc7e cacti-0.8.6j-r3.ebuild 2477
-SHA256 1a1b3ee50f5159e0989e4d1b064c752ecbbce18d6e41b12e8b9bfe26d23bd623 cacti-0.8.6j-r3.ebuild 2477
-MISC ChangeLog 13438 RMD160 93944655269d198bdb3eb2036c42b2c790a4be85 SHA1 a899d204fe0def8851d8aed2e1dbababd2a0078f SHA256 b98089b50eda10edd82cd2bb8887ae4581309dc9ef437d691d55d4397b954c7c
-MD5 493f3644382d36e8bfaf61164f842f25 ChangeLog 13438
-RMD160 93944655269d198bdb3eb2036c42b2c790a4be85 ChangeLog 13438
-SHA256 b98089b50eda10edd82cd2bb8887ae4581309dc9ef437d691d55d4397b954c7c ChangeLog 13438
+EBUILD cacti-0.8.6j-r4.ebuild 2507 RMD160 987524c8e8547aa1301e80c35458a49224ab4825 SHA1 ea4687009d2f8066fe060c4232ef4fb5d11d4d74 SHA256 788ecc40f13f9575ecb25a4aef083faf8c7b5aca7d1298a97e9a8b5fb4d2f9f2
+MD5 fd3f77f5b452726621b4cb8c0fb79ef0 cacti-0.8.6j-r4.ebuild 2507
+RMD160 987524c8e8547aa1301e80c35458a49224ab4825 cacti-0.8.6j-r4.ebuild 2507
+SHA256 788ecc40f13f9575ecb25a4aef083faf8c7b5aca7d1298a97e9a8b5fb4d2f9f2 cacti-0.8.6j-r4.ebuild 2507
+MISC ChangeLog 13636 RMD160 6c87a57dfbdbe339658082898b68618f8294688e SHA1 63f22d36ae476a7f39f898223bd66450125fff8a SHA256 2aba47fc712e8409dd0774a23538d1353f47045346bbbf4546c2bd6607ea25c2
+MD5 8ec52a2c3cce89435df7a2e045790fd1 ChangeLog 13636
+RMD160 6c87a57dfbdbe339658082898b68618f8294688e ChangeLog 13636
+SHA256 2aba47fc712e8409dd0774a23538d1353f47045346bbbf4546c2bd6607ea25c2 ChangeLog 13636
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -37,16 +31,6 @@ SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 metadata
 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 b3423859331f217ba597ee4516502268 files/digest-cacti-0.8.6j-r2 1066
-RMD160 a2ea6b39f15b24dde13c23ccf5fbcf8be12ea5df files/digest-cacti-0.8.6j-r2 1066
-SHA256 d3689347a3bbe22515239e9b39630c407ec40c241a58ffd8fe43d24016d18e23 files/digest-cacti-0.8.6j-r2 1066
-MD5 b3423859331f217ba597ee4516502268 files/digest-cacti-0.8.6j-r3 1066
-RMD160 a2ea6b39f15b24dde13c23ccf5fbcf8be12ea5df files/digest-cacti-0.8.6j-r3 1066
-SHA256 d3689347a3bbe22515239e9b39630c407ec40c241a58ffd8fe43d24016d18e23 files/digest-cacti-0.8.6j-r3 1066
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF8rz6fNMcoUhJ7GwRAimlAKCWZS0yvTDhtI9eC1VoBsPqcuUHWgCgjl4M
-T04OY8G/FmAy7ozkxBoStAI=
-=+/Do
------END PGP SIGNATURE-----
+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

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 (file)
index 200abc2..0000000
--- 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
similarity index 95%
rename from net-analyzer/cacti/cacti-0.8.6j-r3.ebuild
rename to net-analyzer/cacti/cacti-0.8.6j-r4.ebuild
index 80f1843443a2994ddea4cce8daf2fd9c41cdea76..0bc8ed479e7fc08733d8acdbec7a17edee32af14 100644 (file)
--- 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 (file)
index 7bc03c5..0000000
--- 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
similarity index 80%
rename from net-analyzer/cacti/files/digest-cacti-0.8.6j-r2
rename to net-analyzer/cacti/files/digest-cacti-0.8.6j-r4
index 7bc03c5a5855a45b7636bc80d1df7254d6905c88..fbccf1df186fc9894f074e7df95a0a3eb00b11cd 100644 (file)
--- 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