rev bump to fix security bug #129284

Package-Manager: portage-2.0.54

4 files changed, 97 insertions, 2 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 0ae9030e74df..f8600a12c5c9 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.65 2006/04/03 02:47:37 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.66 2006/04/11 01:08:53 ramereth Exp $
+
+*cacti-0.8.6h_p20060108-r2 (11 Apr 2006)
+
+  11 Apr 2006; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6h_p20060108-r2.ebuild:
+  * Rev bump to fix security bug #129284
 
 *cacti-0.8.6h_p20060108-r1 (03 Apr 2006)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index ef35e336c457..198a0cc6998f 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,13 +1,15 @@
-MD5 491389bb2aa47087c75f8d0a28641aaf ChangeLog 9661
+MD5 fa222e176730bfa397abcee2a3b1ba55 ChangeLog 9835
 MD5 8e19108be4619e53fa7e51c02e1dd872 cacti-0.8.6g.ebuild 1710
 MD5 e8e9790acabe6a42fda45cc8e72a93a3 cacti-0.8.6g_p20051023.ebuild 1859
 MD5 9bbfa8d2e7512b33b3e88b61593c639d cacti-0.8.6h.ebuild 1783
 MD5 0b74725f681806788213db083fc604e3 cacti-0.8.6h_p20060108-r1.ebuild 1991
+MD5 40dd922cdadaf76d46771acf6fc1bf8e cacti-0.8.6h_p20060108-r2.ebuild 2079
 MD5 df24e22f75580fb07149910f3426bb09 cacti-0.8.6h_p20060108.ebuild 1937
 MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
 MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
 MD5 ede2752b4bd41c56fbb8dd6085875f58 files/digest-cacti-0.8.6h 65
 MD5 0882b2c5bfd2ede2d9fd67eedbf625eb files/digest-cacti-0.8.6h_p20060108 383
 MD5 0882b2c5bfd2ede2d9fd67eedbf625eb files/digest-cacti-0.8.6h_p20060108-r1 383
+MD5 0882b2c5bfd2ede2d9fd67eedbf625eb files/digest-cacti-0.8.6h_p20060108-r2 383
 MD5 c016a8f3ca49916d8c3e61543ed5838b files/postinstall-en.txt 2191
 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
diff --git a/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild b/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild
new file mode 100644
index 000000000000..17703b86febc
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6h_p20060108-r2.ebuild,v 1.1 2006/04/11 01:08:53 ramereth Exp $
+
+inherit eutils webapp depend.apache
+
+# (patched versions)
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+# patches 
+UPSTREAM_PATCHES="fix_search_session_clear_issue
+fix_sql_syntax_related_to_default_rra_id mysql_5x_strict
+nth_percentile_empty_return_set_issue"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+for i in $UPSTREAM_PATCHES ; do
+	SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+done
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp"
+
+DEPEND=""
+
+want_apache
+
+# alpha doesn't have lighttpd keyworded yet
+RDEPEND="!alpha? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) )
+	snmp? ( net-analyzer/net-snmp )
+	net-analyzer/rrdtool
+	dev-db/mysql
+	virtual/cron
+	virtual/php
+	virtual/httpd-php"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz ; mv ${MY_P} ${P}
+	# patches
+	for i in ${UPSTREAM_PATCHES} ; do
+		EPATCH_OPTS="-p1 -d ${S} -N" epatch ${DISTDIR}/${i}.patch
+	done ;
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	built_with_use virtual/php mysql || \
+		die "php cli sapi must be compiled with USE=mysql"
+	built_with_use virtual/httpd-php mysql || \
+		die "php apache/cgi sapi must be compiled with USE=mysql"
+}
+
+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
+
+	# Fix Security bug #129284 (remove on next release)
+	rm lib/adodb/adodb-pager.inc.php
+
+	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/digest-cacti-0.8.6h_p20060108-r2 b/net-analyzer/cacti/files/digest-cacti-0.8.6h_p20060108-r2
new file mode 100644
index 000000000000..23e1daf799f8
--- /dev/null
+++ b/net-analyzer/cacti/files/digest-cacti-0.8.6h_p20060108-r2
@@ -0,0 +1,5 @@
+MD5 5f6100b525b5b29e81f43cc7c55f4000 cacti-0.8.6h.tar.gz 1096877
+MD5 20dd3bd4688e95490d649768e9191f3a fix_search_session_clear_issue.patch 1154
+MD5 4ab874541b292e07eacbbce6dc505717 fix_sql_syntax_related_to_default_rra_id.patch 1058
+MD5 055b4e270e0586ff630b45886850bbbf mysql_5x_strict.patch 2593
+MD5 b64160dd736d404eb1b2537e9c80199d nth_percentile_empty_return_set_issue.patch 4792