From a67cc0b5558752e58bc5f3548091ff8c25ab3831 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@fedoraproject.org>
Date: Fri, 14 Jul 2017 22:26:28 +0200
Subject: [PATCH] Update to 1.1.13

---
 .gitignore          |  1 +
 cacti-fix-xss.patch | 35 -----------------------------------
 cacti.spec          |  9 +++++----
 sources             |  2 +-
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 cacti-fix-xss.patch

diff --git a/.gitignore b/.gitignore
index 28ba556..9cf85ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /cacti-1.1.10.tar.gz
 /cacti-1.1.11.tar.gz
 /cacti-1.1.12.tar.gz
+/cacti-1.1.13.tar.gz
diff --git a/cacti-fix-xss.patch b/cacti-fix-xss.patch
deleted file mode 100644
index a81efa1..0000000
--- a/cacti-fix-xss.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3381cba6a9e36b01ed0ab0acfd41b00487966cb5 Mon Sep 17 00:00:00 2001
-From: cigamit <jimmy@sqmail.org>
-Date: Wed, 5 Jul 2017 06:45:03 -0500
-Subject: [PATCH] Resolving Issue #838
-
-Cross-site Scripting (XSS) issue with link.php
----
- docs/CHANGELOG        | 3 +++
- lib/html_validate.php | 6 +++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/lib/html_validate.php b/lib/html_validate.php
-index 3d5e97fad..d5cb6168f 100644
---- a/lib/html_validate.php
-+++ b/lib/html_validate.php
-@@ -48,16 +48,16 @@ function die_html_input_error($variable = '', $value = '', $message = '') {
- 	global $config;
- 
- 	?>
--	<table style="width:100%;text-align:center;">
-+	<table style='width:100%;text-align:center;'>
- 		<tr>
- 			<td>
--				Validation error<?php print ($variable != '' ? ' for variable ' . $variable . ', with value of "' . $value . '"' . ($message != '' ? ', and error:' . $message : '') : '');?>.  See backtrace below for more details.
-+				<?php print __('Validation error for variable %s with a value of %s.  See backtrace below for more details.', $variable, htmlspecialchars($value));?>
- 			</td>
- 		</tr>
- 	</table>
- 	<?php
- 
--	cacti_debug_backtrace('Validation Error' . ($variable != '' ? ", Variable:$variable":"") . ($value != '' ? ", Value:$value":""), true);
-+	cacti_debug_backtrace('Validation Error' . ($variable != '' ? ", Variable:$variable":'') . ($value != '' ? ", Value:$value":''), true);
- 
- 	bottom_footer();
- 	exit;
diff --git a/cacti.spec b/cacti.spec
index d9ed29d..4e43e84 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
-Version: 1.1.12
-Release: 2%{?dist}
+Version: 1.1.13
+Release: 1%{?dist}
 Summary: An rrd based graphing tool
 License: GPLv2+
 URL: http://www.cacti.net/
@@ -9,7 +9,6 @@ Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.fedora
 Source4: %{name}.cron
-Patch0: cacti-fix-xss.patch
 
 # Requires PHP 5.3+
 Requires: php(language) >= 5.3
@@ -70,7 +69,6 @@ driven.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # cacti's build is a noop
@@ -168,6 +166,9 @@ restorecon -Rv '/var/log/cacti' &> /dev/null || :
 %attr(-,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Fri Jul 14 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.1.13-1
+- Update to 1.1.13
+
 * Thu Jul 06 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.1.12-2
 - Fix Cross-site Scripting (XSS) issue with link.php
 
diff --git a/sources b/sources
index 0efc37c..413c7e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cacti-1.1.12.tar.gz) = 852695a5f8efc11c67e9b2ebcdb42a84e445a7d936eaf829028c3b658c1ee51b341dd3632c1d4e4aa166cd95268dbc84afe71bb7a82d96106420edbe93a3164c
+SHA512 (cacti-1.1.13.tar.gz) = 3f18ee1c940392c235e6e4648297e015e3bee2ae028e14348c1679af580d102c1ba8ea0ca08935c9f7608c691329125093fad0af8feb8b7cfbe066b975589a3a