Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mtr for openSUSE:Factory checked in
at 2023-04-11 13:51:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mtr (Old)
and /work/SRC/openSUSE:Factory/.mtr.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtr"
Tue Apr 11 13:51:59 2023 rev:42 rq:1078408 version:0.95
Changes:
--------
--- /work/SRC/openSUSE:Factory/mtr/mtr.changes 2022-01-13 00:23:35.859983241
+0100
+++ /work/SRC/openSUSE:Factory/.mtr.new.19717/mtr.changes 2023-04-11
13:52:06.223689000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 11 09:52:15 UTC 2023 - Marcus Meissner <meiss...@suse.com>
+
+- mtr-fixoverflow.patch: specify correct sizes to snprintf (bsc#1208937)
+- enable json support
+
+-------------------------------------------------------------------
New:
----
mtr-fixoverflow.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mtr.spec ++++++
--- /var/tmp/diff_new_pack.6VLmkA/_old 2023-04-11 13:52:06.859692685 +0200
+++ /var/tmp/diff_new_pack.6VLmkA/_new 2023-04-11 13:52:06.863692708 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mtr
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,10 +27,12 @@
Source1: xmtr.desktop
Patch1: mtr-0.75-manmtr.patch
Patch2: mtr-0.87-manxmtr.patch
+Patch3: mtr-fixoverflow.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gtk3-devel
BuildRequires: libcap-devel
+BuildRequires: libjansson-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
@@ -69,6 +71,7 @@
%configure \
--disable-silent-rules \
--enable-ipv6 \
+ --with-json \
--with-gtk \
--disable-gtktest
%make_build
@@ -78,6 +81,7 @@
%configure \
--disable-silent-rules \
--enable-ipv6 \
+ --with-json \
--without-gtk
%make_build
++++++ mtr-fixoverflow.patch ++++++
Index: mtr-0.95/ui/report.c
===================================================================
--- mtr-0.95.orig/ui/report.c
+++ mtr-0.95/ui/report.c
@@ -140,7 +140,7 @@ void report_close(
continue;
snprintf(fmt, sizeof(fmt), "%%%ds", data_fields[j].length);
- snprintf(buf + len, sizeof(buf), fmt, data_fields[j].title);
+ snprintf(buf + len, sizeof(buf) - len, fmt, data_fields[j].title);
len += data_fields[j].length;
}
printf("%s\n", buf);
@@ -172,10 +172,10 @@ void report_close(
/* 1000.0 is a temporary hack for stats usec to ms, impacted
net_loss. */
if (strchr(data_fields[j].format, 'f')) {
- snprintf(buf + len, sizeof(buf), data_fields[j].format,
+ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format,
data_fields[j].net_xxx(at) / 1000.0);
} else {
- snprintf(buf + len, sizeof(buf), data_fields[j].format,
+ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format,
data_fields[j].net_xxx(at));
}
len += data_fields[j].length;
