[sysstat/f16] - resolves: #859102 fixed invalid xml output of sadf -x command

[pschiffe]

commit 6fa48248c67847709379b94c806d2c333de3da3f
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Wed Nov 14 13:54:27 2012 +0100

    - resolves: #859102
      fixed invalid xml output of sadf -x command

 .gitignore               |    2 +-
 sysstat-10.0.2-xml.patch |   12 ++++++++++++
 sysstat.spec             |    9 ++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b909dac..e8d0a7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/sysstat-10.0.1.tar.bz2
+/sysstat-10.0.2.tar.bz2
diff --git a/sysstat-10.0.2-xml.patch b/sysstat-10.0.2-xml.patch
new file mode 100644
index 0000000..d47843b
--- /dev/null
+++ b/sysstat-10.0.2-xml.patch
@@ -0,0 +1,12 @@
+diff -upr sysstat-10.0.2.orig/sadf_misc.c sysstat-10.0.2/sadf_misc.c
+--- sysstat-10.0.2.orig/sadf_misc.c	2011-08-13 14:54:00.000000000 +0200
++++ sysstat-10.0.2/sadf_misc.c	2012-11-14 13:41:00.120734840 +0100
+@@ -288,7 +288,7 @@ __printf_funct_t print_xml_timestamp(int
+ 				     char *cur_time, int utc, unsigned long long itv)
+ {
+ 	if (action & F_BEGIN) {
+-		xprintf(*tab, "<timestamp date=\"%s\" time=\"%s\" utc=\"%d\" interval=\"%llu\"/>",
++		xprintf(*tab, "<timestamp date=\"%s\" time=\"%s\" utc=\"%d\" interval=\"%llu\">",
+ 			cur_date, cur_time, utc ? 1 : 0, itv);
+ 	}
+ 	if (action & F_END) {
diff --git a/sysstat.spec b/sysstat.spec
index fff3ff7..97e7e5c 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 10.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -10,6 +10,8 @@ Source1: sysstat.service
 # fixes #643380
 Patch11: sysstat-10.0.0-cpu.patch
 Patch12: sysstat-10.0.0-makefile.patch
+# fixes #859102
+Patch13: sysstat-10.0.2-xml.patch
 Requires: sh-utils textutils grep fileutils /etc/cron.d
 BuildRequires: lm_sensors-devel
 BuildRequires: perl %{_includedir}/linux/if.h gettext
@@ -29,6 +31,7 @@ activity.
 %setup -q
 %patch11 -p1 -b .cpu
 %patch12 -p1 -b .ls
+%patch13 -p1 -b .xml-val
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -94,6 +97,10 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Wed Nov 14 2012 Peter Schiffer <pschiffe at redhat.com> - 10.0.2-3
+- resolves: #859102
+  fixed invalid xml output of sadf -x command
+
 * Tue Sep 13 2011 Tom Callaway <spot at fedoraproject.org> - 10.0.2-2
 - fix libdir pathing in systemd service file