Old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 5 insertions, 280 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 3e4a964de8ef..554f59de1462 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.206 2015/06/28 16:16:08 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.207 2015/06/29 05:56:52 jer Exp $
+
+  29 Jun 2015; Jeroen Roovers <jer@gentoo.org> -cacti-0.8.8b-r2.ebuild,
+  -files/cacti-0.8.8b_empty_comment.patch, -files/cacti-r7420.patch:
+  Old.
 
   28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> cacti-0.8.8d.ebuild:
   alpha stable wrt bug #551728
diff --git a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild b/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
deleted file mode 100644
index 0313401b96a4..000000000000
--- a/net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 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.7 2014/07/15 16:31:34 jer 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
-
-RDEPEND="
-	dev-lang/php[cli,mysql,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	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
deleted file mode 100644
index ca1d81ac64bc..000000000000
--- a/net-analyzer/cacti/files/cacti-0.8.8b_empty_comment.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-### 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 */
diff --git a/net-analyzer/cacti/files/cacti-r7420.patch b/net-analyzer/cacti/files/cacti-r7420.patch
deleted file mode 100644
index 55a244e597ec..000000000000
--- a/net-analyzer/cacti/files/cacti-r7420.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Index: cacti-0.8.8b/host.php
-===================================================================
---- cacti-0.8.8b/host.php	(revision 7419)
-+++ cacti-0.8.8b/host.php	(revision 7420)
-@@ -149,6 +149,9 @@
- 		if ($_POST["snmp_version"] == 3 && ($_POST["snmp_password"] != $_POST["snmp_password_confirm"])) {
- 			raise_message(4);
- 		}else{
-+			input_validate_input_number(get_request_var_post("id"));
-+			input_validate_input_number(get_request_var_post("host_template_id"));
-+
- 			$host_id = api_device_save($_POST["id"], $_POST["host_template_id"], $_POST["description"],
- 				trim($_POST["hostname"]), $_POST["snmp_community"], $_POST["snmp_version"],
- 				$_POST["snmp_username"], $_POST["snmp_password"],
-Index: cacti-0.8.8b/lib/api_device.php
-===================================================================
---- cacti-0.8.8b/lib/api_device.php	(revision 7419)
-+++ cacti-0.8.8b/lib/api_device.php	(revision 7420)
-@@ -107,7 +107,7 @@
- 		$_host_template_id = db_fetch_cell("select host_template_id from host where id=$id");
- 	}
- 
--	$save["id"] = $id;
-+	$save["id"]                   = form_input_validate($id, "id", "^[0-9]+$", false, 3);
- 	$save["host_template_id"]     = form_input_validate($host_template_id, "host_template_id", "^[0-9]+$", false, 3);
- 	$save["description"]          = form_input_validate($description, "description", "", false, 3);
- 	$save["hostname"]             = form_input_validate(trim($hostname), "hostname", "", false, 3);
-Index: cacti-0.8.8b/install/index.php
-===================================================================
---- cacti-0.8.8b/install/index.php	(revision 7419)
-+++ cacti-0.8.8b/install/index.php	(revision 7420)
-@@ -310,27 +310,28 @@
- }
- 
- /* pre-processing that needs to be done for each step */
--if (empty($_REQUEST["step"])) {
--	$_REQUEST["step"] = 1;
--}else{
--	if ($_REQUEST["step"] == "1") {
--		$_REQUEST["step"] = "2";
--	}elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "1")) {
--		$_REQUEST["step"] = "3";
--	}elseif (($_REQUEST["step"] == "2") && ($_REQUEST["install_type"] == "3")) {
--		$_REQUEST["step"] = "8";
--	}elseif (($_REQUEST["step"] == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) {
--		$_REQUEST["step"] = "9";
--	}elseif ($_REQUEST["step"] == "8") {
--		$_REQUEST["step"] = "3";
--	}elseif ($_REQUEST["step"] == "9") {
--		$_REQUEST["step"] = "3";
--	}elseif ($_REQUEST["step"] == "3") {
--		$_REQUEST["step"] = "4";
-+if (isset($_REQUEST["step"]) && $_REQUEST["step"] > 0) {
-+	$step = intval($_REQUEST["step"]);
-+	if ($step == "1") {
-+		$step = "2";
-+	} elseif (($step == "2") && ($_REQUEST["install_type"] == "1")) {
-+		$step = "3";
-+	} elseif (($step == "2") && ($_REQUEST["install_type"] == "3")) {
-+		$step = "8";
-+	} elseif (($step == "8") && ($old_version_index <= array_search("0.8.5a", $cacti_versions))) {
-+		$step = "9";
-+	} elseif ($step == "8") {
-+		$step = "3";
-+	} elseif ($step == "9") {
-+		$step = "3";
-+	} elseif ($step == "3") {
-+		$step = "4";
- 	}
-+} else {
-+	$step = 1;
- }
- 
--if ($_REQUEST["step"] == "4") {
-+if ($step == "4") {
- 	include_once("../lib/data_query.php");
- 	include_once("../lib/utility.php");
- 
-@@ -366,7 +367,7 @@
- 
- 	header ("Location: ../index.php");
- 	exit;
--}elseif (($_REQUEST["step"] == "8") && ($_REQUEST["install_type"] == "3")) {
-+}elseif (($step == "8") && ($_REQUEST["install_type"] == "3")) {
- 	/* if the version is not found, die */
- 	if (!is_int($old_version_index)) {
- 		print "	<p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
-@@ -505,7 +506,7 @@
- 				</tr>
- 				<tr>
- 					<td width="100%" style="font-size: 12px;">
--						<?php if ($_REQUEST["step"] == "1") { ?>
-+						<?php if ($step == "1") { ?>
- 
- 						<p>Thanks for taking the time to download and install cacti, the complete graphing
- 						solution for your network. Before you can start making cool graphs, there are a few
-@@ -530,7 +531,7 @@
- 						MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- 						GNU General Public License for more details.</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "2") { ?>
-+						<?php }elseif ($step == "2") { ?>
- 
- 						<p>Please select the type of installation</p>
- 
-@@ -551,7 +552,7 @@
- 							print "Server Operating System Type: " . $config["cacti_server_os"] . "<br>"; ?>
- 						</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "3") { ?>
-+						<?php }elseif ($step == "3") { ?>
- 
- 						<p>Make sure all of these values are correct before continuing.</p>
- 						<?php
-@@ -609,7 +610,7 @@
- 						is an upgrade. You can change any of the settings on this screen at a later
- 						time by going to "Cacti Settings" from within Cacti.</p>
- 
--						<?php }elseif ($_REQUEST["step"] == "8") { ?>
-+						<?php }elseif ($step == "8") { ?>
- 
- 						<p>Upgrade results:</p>
- 
-@@ -659,7 +660,7 @@
- 						print $upgrade_results;
- 						?>
- 
--						<?php }elseif ($_REQUEST["step"] == "9") { ?>
-+						<?php }elseif ($step == "9") { ?>
- 
- 						<p style='font-size: 16px; font-weight: bold; color: red;'>Important Upgrade Notice</p>
- 
-@@ -673,7 +674,7 @@
- 
- 						<?php }?>
- 
--						<p align="right"><input type="image" src="install_<?php if ($_REQUEST["step"] == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($_REQUEST["step"] == "3"){?>Finish<?php }else{?>Next<?php }?>"></p>
-+						<p align="right"><input type="image" src="install_<?php if ($step == "3") {?>finish<?php }else{?>next<?php }?>.gif" alt="<?php if ($step == "3"){?>Finish<?php }else{?>Next<?php }?>"></p>
- 					</td>
- 				</tr>
- 			</table>
-@@ -681,7 +682,7 @@
- 	</tr>
- </table>
- 
--<input type="hidden" name="step" value="<?php print $_REQUEST["step"];?>">
-+<input type="hidden" name="step" value="<?php print $step;?>">
- 
- </form>
-