Hello community, here is the log from the commit of package mtr for openSUSE:Factory checked in at 2015-06-15 17:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtr (Old) and /work/SRC/openSUSE:Factory/.mtr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtr" Changes: -------- --- /work/SRC/openSUSE:Factory/mtr/mtr.changes 2014-09-03 20:26:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mtr.new/mtr.changes 2015-06-15 17:49:03.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 12 15:53:18 UTC 2015 - [email protected] + +- add mtr-0.85-crash-with-xml-option.patch to fix crash if '--xml' + option is used [bnc#933854] + +------------------------------------------------------------------- New: ---- mtr-0.85-crash-with-xml-option.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtr.spec ++++++ --- /var/tmp/diff_new_pack.XI5G6t/_old 2015-06-15 17:49:04.000000000 +0200 +++ /var/tmp/diff_new_pack.XI5G6t/_new 2015-06-15 17:49:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mtr # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Patch3: mtr-0.75-nonvoid.patch Patch4: mtr-0.75-sec_snprintf.patch Patch5: mtr-0.82-capabilities.patch +# PATCH-FIX-UPSTREAM bnc#933854 [email protected] -- fix mtr crash with --xml option +Patch6: mtr-0.85-crash-with-xml-option.patch BuildRequires: automake BuildRequires: gtk2-devel BuildRequires: libcap-devel @@ -66,6 +68,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 %build autoreconf -vi ++++++ mtr-0.85-crash-with-xml-option.patch ++++++ >From 4d1ff4fc1862f01a94f18576c34fb9957f53c936 Mon Sep 17 00:00:00 2001 From: "R.E. Wolff" <[email protected]> Date: Sun, 15 Mar 2015 18:38:12 +0100 Subject: [PATCH] fix for printing space field in XML. --- report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report.c b/report.c index badb765..d6752eb 100644 --- a/report.c +++ b/report.c @@ -294,7 +294,7 @@ void xml_close(void) printf(" <HUB COUNT=%d HOST=%s>\n", at+1, name); for( i=0; i<MAXFLD; i++ ) { j = fld_index[fld_active[i]]; - if (j < 0) continue; + if (j <= 0) continue; // Field nr 0, " " shouldn't be printed in this method. strcpy(name, " <%s>"); strcat(name, data_fields[j].format);
