Patch to address a regression on preview mode on 0.8.8b - http://forums.cacti.net/viewtopic.php?f=21&t=50645

Thanks to Reuben Farrelly for the pointer on bug 482424.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

4 files changed, 155 insertions, 15 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index f111dbe35bed..ba28616d529a 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.192 2013/08/27 02:21:33 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.193 2013/09/11 15:10:24 jmbsvicetto Exp $
+
+*cacti-0.8.8b-r2 (11 Sep 2013)
+
+  11 Sep 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +cacti-0.8.8b-r2.ebuild, +files/cacti-0.8.8b_empty_comment.patch:
+  Patch to address a regression on preview mode on 0.8.8b -
+  http://forums.cacti.net/viewtopic.php?f=21&t=50645 Thanks to Reuben Farrelly
+  for the pointer on bug 482424.
 
 *cacti-0.8.8b-r1 (27 Aug 2013)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index bc957e3f0ee6..6d9ba17ba407 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cacti-0.8.8b_empty_comment.patch 2620 SHA256 9aeac70e5cb2494abe6db43efe39bb3ce37ba9e0cfce2519836ae700b0505c88 SHA512 32f4a257fab7d36bdc12cdc1a5a5146e815ab4c2f8dfd6980c0ccdbcaa47eebef346d2f9603b9c007efc5cb5a9874aa059fdd8ae62ac44392b324b0a240cb30f WHIRLPOOL 32c2b2c405d6c0458d0db4cf5f341cb1b69af7038b9df5e281c23adae2950b6f73f21fc8cb95b3f8764897357aa81d9f85e874a1edb293e003db756437d6a60c
 AUX cacti-r7420.patch 5733 SHA256 5490aaadad974812b129e0d2c34af613d96a33db7989b78eb395f08029a47749 SHA512 f1729c9eeeb9397dd297b9edfcc857894e1eceb937b58e5ee649c455089328ec6ccb648350bc312df95ebbf68a604ea11f4841d65da376f96a838f701e1979e9 WHIRLPOOL 5f114a695e3b54428753f2fde3fa5f1102802180f336933a3871fbf80432bffff4c37f8475865b5d6f30e866f84d5f15956c78e2c84e222ca2c2cfb585a8a95b
 AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 WHIRLPOOL 0739ae29e564e81b4a08a74685efe93ec5248048dd47555befb1e805a9dc3d1606adc9126b5959ccab39f7e30d2ed4d956d78b84efedd54545a1d998986477a2
 DIST cacti-0.8.7i.tar.gz 2250128 SHA256 89846762b8f4586532ff247ec7331958f5e4a8c3c599ff8aceb53815fbf9d1cb SHA512 c8cae4d5dcfedcf15623106391e17044606afcb735007bf2362cab255ddb5a2240678515e2984c80f710a04da9babbfebb57f962468e58ef655578c91070ac9f WHIRLPOOL c1a8135550ea892a0b852f8551c5e6a0857651a4f907b8b87873601ad844499ab4222dec9124d1413a79319fbc09203c4c1c82d0692d74148cdab700c57287a7
@@ -10,23 +11,24 @@ DIST snmpv3_priv_proto_none.patch 1407 SHA256 8d48d9cf89f2ba47a6dbce884ab3f3c164
 EBUILD cacti-0.8.7i.ebuild 1963 SHA256 5c962312f6102a9ab2b5bacdce09226a42fca1513ebeecbc26ba6cf0cd16aafb SHA512 e013eb4d983a7ccf570406efd89fa1afc2c7d58ca5a72f5a0029e4b33e759516a1ceb388ba18ff025c7df5da75f596143bcd0ca979efbabc211699f8590e7d79 WHIRLPOOL 234ea1f4217fd3a05786e347002c68211f19289e4d1149ea183c960fe9bf43d20fa6fae7b1d2a11307cb231452a04d3aa84b1b05473d7e8845967d2ee50bccb2
 EBUILD cacti-0.8.8a.ebuild 1994 SHA256 f68b5bf2b45d45f0b677b46a08db3768b9f791edc62e60deeab5f252643d2ab8 SHA512 3a09ae0c5880f6eb59120cab292d42d1aa582493bfaff3a477c20aea6ec6e3c5173c4dc61bc32204fda7d433678525a631d187b8d3d1aecd7840a32c2b418265 WHIRLPOOL db9f6433c0dc00ecdc8c8a615da528841cf744b391c7de5686bf8c185bab02fe7435b4b43490696b61d19acfbb9657c9d64aebc25ac9e381b1c8b5dd189255c6
 EBUILD cacti-0.8.8b-r1.ebuild 2083 SHA256 9d34dc0189885078f5e77a0c51171c2a78236f2ebccf2e33ad8ad3971607fd67 SHA512 72fc928dec876d38b88dd8d2940c803c349dbf091790a23da8c32f7fffe0ed50e756193e473f635cbc0633df61e936058a33caa0eb3074e58f3057868d5e6996 WHIRLPOOL 53f321d34957b54c98efd54e7ea827f53a7765a8913b299325ea6a0b457924e313192d3b7b6944ded2d16dff7b8e90fc6dbb99acf8069084945a9902654adb3f
+EBUILD cacti-0.8.8b-r2.ebuild 2244 SHA256 e396c66cc2fb0c1a07ffa28af984e3e60be05768763b9542b402f62e07bb9437 SHA512 630c34f45d5f61e0ff6e555d5c907e009af51ead240fbb10bb0ea392a9f8028538b91f5c28e2c92c7a6b7007ecbd11991b65229a00b169eade24b5e97a14a883 WHIRLPOOL ffe3104fcd6e10013a7bd9193f0d411c96de4a306ab97178983475691d38d555f8d2e31e576ef08e939cc818770731faa1196a77babbef4959c2b38347a41838
 EBUILD cacti-0.8.8b.ebuild 1928 SHA256 56e26d0d6f68d1d4d319f00ee382414c1be3696e624680a5e6af04e979bec1e8 SHA512 c49c47670e6c823a677630d7a39dcf362e47d350ba6e49dd840a6cf786ae27b956c9817eeedfef296f3ab37b443a502f03d046acd7f74256bd4cbd84b1dd4f76 WHIRLPOOL 28632bfd288eee7863045bc6e74bb6c2987e3c195779054a415ea95feacefb5b94fc55ce636480e3dfc8c116a39656d4355a410ed5655078d91867d9653b70b1
-MISC ChangeLog 27670 SHA256 dab8491fdb0d32ae0318e7e7d350431138c22773044fb2bcf4bbb35128634a06 SHA512 6b912a3a5b60d7944f17567d4f89d35d579bf80f7a13fa8dd6e277b471e192977210eb65b0cbd6a3578730f9ea4dcd4a73e2a7e3f63edbbdcece2fa41b2ba8c7 WHIRLPOOL 7a9883bb8e899ba2123ecdc37caea3ea42a1402c75e1af5083a91e0ca0eb2b4787d378ab1fb94c905941c8197b54fa633274a25feb5be44021099bd8d62f2e8f
+MISC ChangeLog 28010 SHA256 07ffa2dc24afd7dc4313e85c3ce39700514b8f9d82e1dcd145113d2ddb1f2009 SHA512 55b0368aed6838439a66b704c66062df64a04d61323575f0c1ac9305ab0836f4921068547c4f55b95b19b021d6dfae232b7a95f7a51bdb2ead8b85d37a90e33e WHIRLPOOL 0f3b32ac30b02a1ab08083933d88f78b81740e283695a7dca14d4a96602fa3809f85ced7393382f388837820e1889f00deac11ec0e07a6efd371e77bdf60c0bb
 MISC metadata.xml 714 SHA256 87c3b48a554466e6e0a75944751f2e73326aef52d13d16110aaf6df770aca530 SHA512 6476909d8b29f1a56d7c7e26e8bc4edef5c46aee49ab18175f8727812764d1f1ae89781d09cf8de1ea42edc3f022432e6d52d42b75109e95c07998d7250bb40d WHIRLPOOL 6ce5f9fc982b7da218ea2dba530a5971f3acab63a996828c145bcd3c9ba049183ddd249325728fe6613148438e02dc5eafee18659bd6c977c740b35d82fcb6f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSHAxrAAoJEC8ZTXQF1qEPMtUP/ibpMvSgJItkj63qibPOqHiH
-2FPsMwO0/M8+zvg9mil2TXd/AtAsCcCCTfCRsK3XdwaHzJay8Pf/c0jwcsfMwQKu
-m5SrJdXGbG9Rmb6iknQolZ98CMMtuBzfPBzAHNQMr/lhXmFOs4JjxZV8bf5sb8hE
-AqP7tJ96VtQxquFcgLGjamAlfjlV/hdWHWDONJhME+vZXZjL0PGGQbu8T6f6fMel
-iolpA0wIJZ9AcQ3AbhYRN7bH1a7Ifup4xlisCE/MVDrGrarQycpNeup2fE8kaDi1
-FVz+WccpZ6ofEHPOQnSJuazpduElxULkJ/srP5pIegXBhvfrxCDHukKh3wBa4b0Y
-mteEzNdEd0MZNZBjlqluotbB9M5JSDry9x/3bbilX+dL7GzqolPuKQsmtLsQ4c2J
-UH11uWYlS7Z5xFigZNzTp48BtlDOX1UtHZkv6lW2MH3P5BU6IIYlIhMXmpngQIUb
-h5xEaJhQ5woh82ewoAlbRZS7XUcawcahMO7hU9zWFbRa9uTM8fgcAlEmvj0d2FtG
-pFoSky+/Xslkzhmv2nACNHH6cbn0EgChgmHcYxvheNjFi/035/p0W4emM7b3CH0d
-cWp2WTdWOSMCnPirLWPVh0tg+KE07PW54GNI+qLt+E7bXtEzByEHll3GCzvhbODe
-AAVWvOChhbqY8rjM1bh0
-=oxd7
+iQIcBAEBCAAGBQJSMIcgAAoJEC8ZTXQF1qEPfsQQALy8fE8aDLAKE8d9A5lzeqb5
+8BVA8BSVDKxPcoKZf/PY7Wv+ou0jb74/WpEvR1fvUciSu+3iyC5LECgLPvgt4xiZ
+vxuH+NkmUoLI32PtTNmQqINa2eGxU+rKKn+5RWw/+FPhyjrWbCCDCy5MhxW+zhx6
+m+Q1mj7MAo48Ho0pOZo1NTRdmF8ywfrgGAbyW3p7QfNCCqfQ25OL17YC4OrJSrlX
+RQMQdf2V8Z7XF/y1YwPJ0VDj7yU+fRj39G4Uwzigre3I9G0mvCTYjASUTU7AmMwt
+VXD0+SVYzB/TNnlT4RNMLKhc/bomA16CNTqqMJkEpIW9woJ4snk5/P3LkGtGzllB
+0pOMgi1e2oVFHmzVGzqhkPOIVtbVN7dzTJM599NocRAZhEN84jbg2r/9ctIjo7iO
+qdsjQySJYqyhM4Qoh7JGVJ62yoDp7Ry9nWZ2OR3wOTRXz9JEqsEtwPrXXsctzCwm
+ZN4H+p5Ru+cSdDkgrprBPPwzdD/Dn4xtiop0nHQwbWxuBkFQgx/ScHs66LtDSjhQ
+uPY0VlB68/Hnpa8oFswHElUjB3eIddYMdPjzBH7XD0lP6J9a5C0bcekRy4F2ztOo
+smVP5/ZOzdO9hIGwwX6QtIVuIf7IYuXfSl85lGSbDYwthuv4cMi7vifc2YhhuhqP
+RPNOKIMTEsEV7ZYnHAgb
+=DhKK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild b/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
new file mode 100644
index 000000000000..51fe8ab92590
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild,v 1.1 2013/09/11 15:10:24 jmbsvicetto Exp $
+
+EAPI="4"
+
+inherit depend.php eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+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
+UPSTREAM_PATCHES=""
+if [[ -n ${UPSTREAM_PATCHES} ]]; then
+	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 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+DEPEND=""
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${UPSTREAM_PATCHES} ]]; then
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+	fi
+}
+
+src_prepare() {
+	# Patch to address http://bugs.cacti.net/view.php?id=2383
+	# Fixes bug 482424 (CVE-2013-5588, CVE-2013-5589)
+	epatch "${FILESDIR}/${PN}-r7420.patch"
+
+	# Patch to address a regression on preview mode on 0.8.8b
+	# http://forums.cacti.net/viewtopic.php?f=21&t=50645
+	epatch "${FILESDIR}/${P}_empty_comment.patch"
+
+	if [[ -n ${UPSTREAM_PATCHES} ]]; then
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+		done ;
+	fi
+
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README || die
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die
+	use doc && dohtml -r docs/html/
+	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/files/cacti-0.8.8b_empty_comment.patch b/net-analyzer/cacti/files/cacti-0.8.8b_empty_comment.patch
new file mode 100644
index 000000000000..ca1d81ac64bc
--- /dev/null
+++ b/net-analyzer/cacti/files/cacti-0.8.8b_empty_comment.patch
@@ -0,0 +1,39 @@
+### Eclipse Workspace Patch 1.0
+#P cacti088
+Index: lib/rrd.php
+===================================================================
+--- lib/rrd.php	(Revision 7407)
++++ lib/rrd.php	(Arbeitskopie)
+@@ -1343,20 +1343,20 @@
+ 		$need_rrd_nl = TRUE;
+ 
+ 		if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") {
++			# perform variable substitution first (in case this will yield an empty results or brings command injection problems)
++			$comment_arg = rrd_substitute_host_query_data($graph_variables["text_format"][$graph_item_id], $graph, $graph_item);
++			# next, compute the argument of the COMMENT statement and perform injection counter measures
++			if (trim($comment_arg) == '') { # an empty COMMENT must be treated with care
++				$comment_arg = cacti_escapeshellarg(' ' . $hardreturn[$graph_item_id]);
++			} else {
++				$comment_arg = cacti_escapeshellarg($comment_arg . $hardreturn[$graph_item_id]);
++			}
++
++			# create rrdtool specific command line
+ 			if (read_config_option("rrdtool_version") != "rrd-1.0.x") {
+-				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id])) . " ";
+-				if (trim($comment_string) == 'COMMENT:"\n"') {
+-					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
+-				} else if (trim($comment_string) != "COMMENT:\"\"") {
+-					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
+-				}
++				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . str_replace(":", "\:", $comment_arg) . " ";
+ 			}else {
+-				$comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":" . cacti_escapeshellarg($graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id]) . " ";
+-				if (trim($comment_string) == 'COMMENT:"\n"') {
+-					$txt_graph_items .= 'COMMENT:" \n"'; # rrdtool will skip a COMMENT that holds a NL only; so add a blank to make NL work
+-				} else if (trim($comment_string) != "COMMENT:\"\"") {
+-					$txt_graph_items .= rrd_substitute_host_query_data($comment_string, $graph, $graph_item);
+-				}
++				$txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":" . $comment_arg . " ";
+ 			}
+ 		}elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) {
+ 			$graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */