Version bump, security bug 181112

Package-Manager: portage-2.1.2.7

5 files changed, 173 insertions, 8 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 9246ea172bb2..e73b800c2e04 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.99 2007/06/02 19:44:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.100 2007/06/06 19:39:40 falco Exp $
+
+*cacti-0.8.6j-r5 (06 Jun 2007)
+
+  06 Jun 2007; Raphael Marichez <falco@gentoo.org>
+  +files/cacti-0.8.6j-dos-large-values.patch, +cacti-0.8.6j-r5.ebuild:
+  Version bump, security bug 181112
 
   02 Jun 2007; Lars Weiler <pylon@gentoo.org> cacti-0.8.6j-r4.ebuild:
   Stable on ppc; bug #174551.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 7b8e206dc12e..5e4ab390e6c1 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,10 @@
 -----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
+SHA256 b677a380634a4db63b0b85aaf54103efefdbb0e0dcd7d15ce61b7e08949f8d55 files/cacti-0.8.6j-dos-large-values.patch 1127
 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
@@ -23,10 +27,14 @@ EBUILD cacti-0.8.6j-r4.ebuild 2369 RMD160 17b43402bfb4b469429c35b3e7a790710481dd
 MD5 43c8d4026d5f7ef1a22437c1ec325ae3 cacti-0.8.6j-r4.ebuild 2369
 RMD160 17b43402bfb4b469429c35b3e7a790710481ddc2 cacti-0.8.6j-r4.ebuild 2369
 SHA256 f76ce99f674476d94e4f32a804ee6efa2013b010f8632294d944b33da5467e07 cacti-0.8.6j-r4.ebuild 2369
-MISC ChangeLog 14677 RMD160 30c2541c62853cdde882d644d4878bbf6112307b SHA1 4bde0d3351ffbc191dc1ea4d62c1a4238f195a10 SHA256 6558d347bfef6ed5500952245e417ca8e41d19c5c2aa82672694e579b9a72362
-MD5 23119aa6d6c8687add4c7003730ab5cf ChangeLog 14677
-RMD160 30c2541c62853cdde882d644d4878bbf6112307b ChangeLog 14677
-SHA256 6558d347bfef6ed5500952245e417ca8e41d19c5c2aa82672694e579b9a72362 ChangeLog 14677
+EBUILD cacti-0.8.6j-r5.ebuild 2424 RMD160 fb05eea14cae3934d59e0098c63e06ad1af88c74 SHA1 1b9264f28a0324f97d3cf7c480a8136d61c50ed8 SHA256 67fb7bfc9e9753dcab16150a6cc03cf713b91fd3eed0b4397085440c1319bfd9
+MD5 4bbd6d28a13659b5436c78b7fafce2da cacti-0.8.6j-r5.ebuild 2424
+RMD160 fb05eea14cae3934d59e0098c63e06ad1af88c74 cacti-0.8.6j-r5.ebuild 2424
+SHA256 67fb7bfc9e9753dcab16150a6cc03cf713b91fd3eed0b4397085440c1319bfd9 cacti-0.8.6j-r5.ebuild 2424
+MISC ChangeLog 14869 RMD160 221b7c882e06cfeca4683e795823484d60ce58e1 SHA1 b332bbca46fe0ca7b7b44c10c6100587e63bf93d SHA256 a510422e805fdaa4990fd7e4ccba535f3da6e360c2177ad144e56184159569d6
+MD5 2cbc7381acdb2efe42f476d9bd61ae5a ChangeLog 14869
+RMD160 221b7c882e06cfeca4683e795823484d60ce58e1 ChangeLog 14869
+SHA256 a510422e805fdaa4990fd7e4ccba535f3da6e360c2177ad144e56184159569d6 ChangeLog 14869
 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743
@@ -37,10 +45,17 @@ SHA256 db0b3cfd6c831c8368801968daf70e8868b73802b120af351e2ea0741ab61a2d files/di
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGYciz6IPkARlRZfQRAnb2AKCkJUHEEZWKVGQY6+u7K0PQq/86cwCgjTU0
-TnyNuYmLevE8ReqTkrrMYQA=
-=6Dsd
+iQEVAwUBRmcNgzvRww8BFPxFAQK1Mwf/bnBSHteRVlxsgVA4wiGan4lOErfTr3CT
+Oj7zEa+scLzRnIgN+gs5IHNm3MMe8LEDcwUtldQZ1S/gaY7FZ0TAeK25RQK6B5Q2
+nAoWOd/AbPDV9KWBF8S78tbkwql+XUsxYeSKxpAnWjbgj1VXtlqKAKv57D4SoMvy
+kJbD1iGub2gRnvZaKVqz7ick9GuVYf6GxVZm0rhyhbKGcqAWojCLBE9gcOISqwp3
+Yn7PClMZmb7GHHBUKvAzzaSTZR+8khu3QRpwsUMOSAHPeu1X9OxGJv8n6I1fXZQj
+L01FO0JzA/GnTeXdO+X4IEYBhRJpYjpp9THgEIChmicPzTSBeaJzqg==
+=msuh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r5.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r5.ebuild
new file mode 100644
index 000000000000..815c9d0d0357
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6j-r5.ebuild
@@ -0,0 +1,99 @@
+# 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.1 2007/06/06 19:39:40 falco 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/files/cacti-0.8.6j-dos-large-values.patch b/net-analyzer/cacti/files/cacti-0.8.6j-dos-large-values.patch
new file mode 100644
index 000000000000..7398e962151b
--- /dev/null
+++ b/net-analyzer/cacti/files/cacti-0.8.6j-dos-large-values.patch
@@ -0,0 +1,30 @@
+diff -uNr -r cacti-0.8.6j-orig/graph_image.php cacti-0.8.6j/graph_image.php
+--- cacti-0.8.6j-orig/graph_image.php	2007-01-18 01:23:10.000000000 +0100
++++ cacti-0.8.6j/graph_image.php	2007-06-06 21:00:17.278210000 +0200
+@@ -51,22 +51,22 @@
+ $graph_data_array = array();
+ 
+ /* override: graph start time (unix time) */
+-if (!empty($_GET["graph_start"])) {
++if (!empty($_GET["graph_start"]) && $_GET["graph_start"] < 1600000000) {
+ 	$graph_data_array["graph_start"] = $_GET["graph_start"];
+ }
+ 
+ /* override: graph end time (unix time) */
+-if (!empty($_GET["graph_end"])) {
++if (!empty($_GET["graph_end"]) && $_GET["graph_end"] < 1600000000) {
+ 	$graph_data_array["graph_end"] = $_GET["graph_end"];
+ }
+ 
+ /* override: graph height (in pixels) */
+-if (!empty($_GET["graph_height"])) {
++if (!empty($_GET["graph_height"]) && $_GET["graph_height"] < 3000) {
+ 	$graph_data_array["graph_height"] = $_GET["graph_height"];
+ }
+ 
+ /* override: graph width (in pixels) */
+-if (!empty($_GET["graph_width"])) {
++if (!empty($_GET["graph_width"]) && $_GET["graph_width"] < 3000) {
+ 	$graph_data_array["graph_width"] = $_GET["graph_width"];
+ }
+ 
diff --git a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5
new file mode 100644
index 000000000000..fbccf1df186f
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r5
@@ -0,0 +1,15 @@
+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