Hello community,

here is the log from the commit of package mtr.3861 for openSUSE:13.1:Update 
checked in at 2015-07-02 09:35:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1:Update/mtr.3861 (Old)
 and      /work/SRC/openSUSE:13.1:Update/.mtr.3861.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mtr.3861"

Changes:
--------
New Changes file:

--- /dev/null   2015-06-25 09:04:34.320025005 +0200
+++ /work/SRC/openSUSE:13.1:Update/.mtr.3861.new/mtr.changes    2015-07-02 
09:35:37.000000000 +0200
@@ -0,0 +1,279 @@
+-------------------------------------------------------------------
+Wed Jun 17 14:18:59 UTC 2015 - [email protected]
+
+- add mtr-0.82-crash-with-xml-option.patch to fix crash if '--xml' 
+  option is used [bnc#933854]
+
+-------------------------------------------------------------------
+Fri May 25 13:39:36 UTC 2012 - [email protected]
+
+- run_permissions macro is obsolete: use set_permissions
+  (bnc#764102) 
+
+-------------------------------------------------------------------
+Tue Jan 24 00:55:32 UTC 2012 - [email protected]
+
+- build mtr binary with PIE and full RELRO 
+
+-------------------------------------------------------------------
+Wed Dec 21 10:31:41 UTC 2011 - [email protected]
+
+- remove call to suse_update_config (very old work around)
+
+-------------------------------------------------------------------
+Thu Dec 15 10:36:54 UTC 2011 - [email protected]
+
+- update to mtr-0.82
+  * Enable decoding of ICMP extensions for MPLS for curses and 
+    report interfaces. Use the -e flag or press 'e' to enable it.
+- fix spec license to GPL-2 (bnc#735559)
+
+-------------------------------------------------------------------
+Fri Dec  2 15:51:13 UTC 2011 - [email protected]
+
+- add automake as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Mon Oct 10 11:25:00 UTC 2011 - [email protected]
+
+- update to mtr-0.81
+  - Fix for https://bugs.launchpad.net/mtr/+bug/776211
+
+-------------------------------------------------------------------
+Mon Nov  8 13:24:05 UTC 2010 - [email protected]
+
+- remove support for pre-9.1
+
+-------------------------------------------------------------------
+Tue Jul 20 20:18:17 UTC 2010 - [email protected]
+
+- update to mtr-0.80 
+  - display load sharing hosts in --raw output 
+  - added about button in gui 
+
+-------------------------------------------------------------------
+Sat Jan  2 17:04:58 CET 2010 - [email protected]
+
+- Remove gtk1-compat-devel BuildRequires: it has been ported to
+  GTK+ 2.x a while ago.
+
+-------------------------------------------------------------------
+Fri Nov 27 09:22:31 UTC 2009 - [email protected]
+
+- Update patches to apply with fuzz=0 
+
+-------------------------------------------------------------------
+Tue Jan  6 16:30:13 CET 2009 - [email protected]
+
+- update to v0.75
+  * feelgood patch to move sprintf to snprintf
+  * cut-paste patches: you can now copy an intermediate host to the
+    clipboard
+- v0.74 
+  * Martin Pels' patch to allow UDP probes
+  * changed some docs to advertise the new mailing list
+  * added documentation for the Mac OS X compilation problem
+  * added -Wno-pointer-sign to the compiler options
+  * Nico Lichtmaier's cleanup-gtk patch. (now mtr uses a more modern
+    dialect of gtk)
+- rewritten mtr-*-sec_snprintf.patch for v0.75
+
+-------------------------------------------------------------------
+Tue May 27 17:46:24 CEST 2008 - [email protected]
+
+- fixed more possible overflows because of using sprintf in dns.c
+  (*-sec_snprintf.patch) [bnc#392458]
+
+-------------------------------------------------------------------
+Mon Apr 14 17:27:24 CEST 2008 - [email protected]
+
+- update to version 0.73
+ * Fix signed/unsigned bug in IPV6 part improved random packet 
+   size behaviour.
+ * includes also fix for sprintf overflow [bnc#372610]
+
+-------------------------------------------------------------------
+Mon Apr  2 14:50:01 CEST 2007 - [email protected]
+
+- add ncurses-devel BuildRequires
+
+-------------------------------------------------------------------
+Fri Mar 30 12:14:25 CEST 2007 - [email protected]
+
+- fixed return value for non-void function (nonvoid.patch)
+
+-------------------------------------------------------------------
+Fri Jan 12 11:35:23 CET 2007 - [email protected]
+
+- changed prefix /opt/gnome to /usr for aclocal
+
+-------------------------------------------------------------------
+Mon Oct  2 17:10:09 CEST 2006 - [email protected]
+
+- update to version 0.72
+  * some code improvements 
+  * option change: If PACKETSIZE is set to a negative number, every 
+  iteration will use a different, random packet size up to that 
+  number.
+
+-------------------------------------------------------------------
+Thu Jul 27 14:27:30 CEST 2006 - [email protected]
+
+- building with X.org 7.x: detects version of X.org instead of 
+  suse_version 
+- uses icecream 
+
+-------------------------------------------------------------------
+Mon Jul 24 16:02:25 CEST 2006 - [email protected]
+
+- udjusted specfile to build also with new X.org 7.x 
+
+-------------------------------------------------------------------
+Wed Jun 14 20:17:00 CEST 2006 - [email protected]
+
+- Upgrade to version 0.71 which obsoletes res_mkquery.diff
+  - some nice improvements.
+- building with gtk1-compat-devel
+
+-------------------------------------------------------------------
+Wed Jan 25 21:38:27 CET 2006 - [email protected]
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Sat Jan 14 01:38:19 CET 2006 - [email protected]
+
+- Don't strip binaries.
+
+-------------------------------------------------------------------
+Sun Oct  2 15:04:41 CEST 2005 - [email protected]
+
+- fixed GenericName in .desktop file
+
+-------------------------------------------------------------------
+Thu Jan 20 10:06:52 CET 2005 - [email protected]
+
+- updated to version 0.69
+- removed obsoleted patch automake.patch
+
+-------------------------------------------------------------------
+Wed Dec 15 22:10:54 CET 2004 - [email protected]
+
+- fix desktop file
+
+-------------------------------------------------------------------
+Wed Nov 10 12:48:25 CET 2004 - [email protected]
+
+- permission handling fixes for /usr/sbin/mtr
+
+-------------------------------------------------------------------
+Thu Aug 26 14:02:13 CEST 2004 - [email protected]
+
+- updated to version 0.65
+
+-------------------------------------------------------------------
+Thu Aug 19 15:33:41 CEST 2004 - [email protected]
+
+- updated to version 0.64
+
+-------------------------------------------------------------------
+Mon Aug 16 20:18:37 CEST 2004 - [email protected]
+
+- updated to version 0.63
+- removed obsoleted patch buffer_overflow
+- used gtk2
+
+-------------------------------------------------------------------
+Thu Jan 22 17:48:12 CET 2004 - [email protected]
+
+- fixed Makefile.am 
+
+-------------------------------------------------------------------
+Sat Jan 10 17:12:11 CET 2004 - [email protected]
+
+- build as user
+
+-------------------------------------------------------------------
+Fri Aug 29 09:56:29 CEST 2003 - [email protected]
++++ 82 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.1:Update/.mtr.3861.new/mtr.changes

New:
----
  mtr-0.75-manmtr.patch
  mtr-0.75-manxmtr.patch
  mtr-0.75-nonvoid.patch
  mtr-0.75-sec_snprintf.patch
  mtr-0.82-crash-with-xml-option.patch
  mtr-0.82.tar.bz2
  mtr.changes
  mtr.gif
  mtr.spec
  xmtr.desktop

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mtr.spec ++++++
#
# spec file for package mtr
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           mtr
BuildRequires:  automake
BuildRequires:  gtk2-devel
BuildRequires:  ncurses-devel
BuildRequires:  update-desktop-files
BuildRequires:  xorg-x11-devel
Summary:        Ping and Traceroute Network Diagnostic Tool
License:        GPL-2.0
Group:          Productivity/Networking/Diagnostic
Version:        0.82
Release:        0
Url:            http://www.BitWizard.nl/mtr
Source:         %{name}-%{version}.tar.bz2
Source1:        xmtr.desktop
Patch1:         mtr-0.75-manmtr.patch
Patch2:         mtr-0.75-manxmtr.patch
Patch3:         mtr-0.75-nonvoid.patch
Patch4:         mtr-0.75-sec_snprintf.patch
# PATCH-FIX-UPSTREAM bnc#933854 [email protected] -- fix mtr crash with --xml 
option
Patch5:         mtr-0.82-crash-with-xml-option.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Icon:           mtr.gif
PreReq:         permissions

%description
Mtr is a network diagnostic tool that combines Ping and Traceroute into
one program. This package contains the mtr version with an ncurses
interface, in other words, the text mode version is usable in a shell
(telnet or SSH session, for example).

Find the graphical version in the mtr-gtk package.

%package gtk
Summary:        Ping and Traceroute Network Diagnostic Tool
Group:          Productivity/Networking/Diagnostic

%description gtk
Mtr is a network diagnostic tool which combines Ping and Traceroute
into one program. This package contains mtr with a GTK interface.
You'll find the text mode version in the mtr package.

%define _xorg7libs %_lib
%define _xorg7libs32 lib
%define _xorg7bin bin
%define _xorg7mandir %_mandir
%define _xorg7pixmaps include
%define _xorg7libshare share
%define _xorg7xkb /usr/share/X11/xkb
%define _xorg7termcap /usr/lib/X11/etc
%define _xorg7include /usr/include/xorg
%define _xorg7fonts /usr/share/fonts
%define _xorg7prefix /usr

%prep
%setup -q 
cp mtr.8 xmtr.8
%patch1
%patch2
%patch3
%patch4
%patch5 -p1

%build
#
# GTK version
CFLAGS="$RPM_OPT_FLAGS" ./configure \
        --enable-gtk2 \
        --prefix=%{_xorg7prefix}
make && mv mtr xmtr  
make distclean
#
# console version
export CFLAGS="$RPM_OPT_FLAGS -fpie -fPIE" 
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
./configure \
        --prefix=/usr \
        --mandir=%{_mandir} \
        --without-gtk
make %{?jobs:-j%jobs}

%install
mkdir -p $RPM_BUILD_ROOT/usr/sbin
mkdir -p $RPM_BUILD_ROOT/usr/%{_xorg7bin}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
make DESTDIR=$RPM_BUILD_ROOT install
install -m 4755 xmtr $RPM_BUILD_ROOT/usr/%{_xorg7bin}
install -m 644 xmtr.8 $RPM_BUILD_ROOT/%{_mandir}/man8
install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/
install -m 644 img/mtr_icon.xpm 
$RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/xmtr_icon.xpm
install -d -m 755 $RPM_BUILD_ROOT/usr/share/pixmaps/
install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/xmtr_icon.xpm
%suse_update_desktop_file -i xmtr Network Monitor

%clean
rm -rf  %{buildroot}

%files
%defattr(-,root,root)
%doc AUTHORS COPYING FORMATS NEWS README SECURITY TODO
%doc %{_mandir}/man8/mtr.8*
%verify(not mode) %attr(755,root,dialout) /usr/sbin/mtr

%files gtk
%defattr(-,root,root)
%doc AUTHORS COPYING FORMATS NEWS README SECURITY TODO
%doc %{_mandir}/man8/xmtr.8*
%attr(755,root,root) /usr/%{_xorg7bin}/xmtr
/usr/%{_xorg7pixmaps}/X11/pixmaps
/usr/share/applications/*
/usr/share/pixmaps/*

%post
%if 0%{?suse_version} <= 1130
%run_permissions
%else
%set_permissions /usr/sbin/mtr
%endif
%verifyscript
%verify_permissions -e /usr/sbin/mtr

%changelog
++++++ mtr-0.75-manmtr.patch ++++++
Index: mtr.8
===================================================================
--- mtr.8.orig
+++ mtr.8
@@ -54,6 +54,14 @@ mtr \- a network diagnostic tool
 
 .SH DESCRIPTION
 
+This version was compiled 
+.BR without 
+.BR GTK .
+Therefore corresponding options doesn't work. You can use 
+.B xmtr 
+for work with GTK interface.
+
+.PP
 .B mtr 
 combines the functionality of the 
 .B traceroute
++++++ mtr-0.75-manxmtr.patch ++++++
Index: xmtr.8
===================================================================
--- xmtr.8.orig
+++ xmtr.8
@@ -2,11 +2,11 @@
 
 
 .SH NAME
-mtr \- a network diagnostic tool
+xmtr \- a network diagnostic tool
 
 
 .SH SYNOPSIS
-.B mtr 
+.B xmtr 
 [\c
 .B \-hvrctglspeniu46\c
 ]
@@ -57,7 +57,7 @@ mtr \- a network diagnostic tool
 
 .SH DESCRIPTION
 
-.B mtr 
+.B xmtr 
 combines the functionality of the 
 .B traceroute
 and 
@@ -66,9 +66,9 @@ programs in a single network diagnostic
 
 .PP
 As 
-.B mtr 
+.B xmtr 
 starts, it investigates the network connection between the host 
-.B mtr
+.B xmtr
 runs on and 
 .BR HOSTNAME . 
 by sending packets with purposly low TTLs. It continues to send
@@ -95,7 +95,7 @@ Print the summary of command line argume
 .TP
 .B \-\-version
 .br
-Print the installed version of mtr.  
+Print the installed version of xmtr.  
 
 .TP
 .B \-r
@@ -103,11 +103,11 @@ Print the installed version of mtr.
 .B \-\-report
 .br
 This option puts 
-.B mtr
+.B xmtr
 into 
 .B report
 mode.  When in this mode,
-.B mtr
+.B xmtr
 will run for the number of cycles specified by the 
 .B \-c
 option, and then print statistics and exit.  
@@ -115,9 +115,9 @@ option, and then print statistics and ex
 \c
 This mode is useful for generating statistics about network quality.  
 Note that each running instance of 
-.B mtr
+.B xmtr
 generates a significant amount of network traffic.  Using 
-.B mtr
+.B xmtr
 to measure the quality of your network may result in decreased
 network performance.  
 
@@ -160,7 +160,7 @@ packetsize upto that number.
 .B \-\-curses
 .br
 Use this option to force 
-.B mtr 
+.B xmtr 
 to use the curses based terminal
 interface (if available).
 
@@ -180,7 +180,7 @@ that are encoded in the response packets
 .B \-\-no-dns
 .br
 Use this option to force 
-.B mtr 
+.B xmtr 
 to display numeric IP numbers and not try to resolve the
 host names. 
 
@@ -200,10 +200,10 @@ Example:
 .B \-\-gtk
 .br
 Use this option to force
-.B mtr 
+.B xmtr 
 to use the GTK+ based X11 window interface (if available).  
 GTK+ must have been available on the system when 
-.B mtr 
+.B xmtr 
 was built for this to work.  See the GTK+ web page at 
 .B http://www.gimp.org/gtk/
 for more information about GTK+.
@@ -214,7 +214,7 @@ for more information about GTK+.
 .B \-\-split
 .br
 Use this option to set
-.B mtr 
+.B xmtr 
 to spit out a format that is suitable for a split-user interface.
 
 .TP
@@ -223,7 +223,7 @@ to spit out a format that is suitable fo
 .B \-\-raw
 .br
 Use this option to tell 
-.B mtr 
+.B xmtr 
 to use the raw output format. This format is better suited for
 archival of the measurement results. It could be parsed to 
 be presented into any of the other display methods. 
@@ -266,7 +266,7 @@ Use IPv6 only.
 Some modern routers give a lower priority to ICMP ECHO packets than 
 to other network traffic.  Consequently, the reliability of these
 routers reported by 
-.B mtr
+.B xmtr
 will be significantly lower than the actual reliability of 
 these routers.  
 
++++++ mtr-0.75-nonvoid.patch ++++++
Index: display.c
===================================================================
--- display.c.orig
+++ display.c
@@ -37,7 +37,7 @@ extern int DisplayMode;
 #define mtr_curses_open()
 #define mtr_curses_close()
 #define mtr_curses_redraw()
-#define mtr_curses_keyaction()
+#define mtr_curses_keyaction() 0
 #define mtr_curses_clear()
 #else
 #include "mtr-curses.h"
++++++ mtr-0.75-sec_snprintf.patch ++++++
Index: dns.c
===================================================================
--- dns.c.orig
+++ dns.c
@@ -900,7 +900,7 @@ void resendrequest(struct resolve *rp,in
   } else if (type == T_PTR) {
     switch ( af ) {
     case AF_INET:
-    sprintf(tempstring,"%u.%u.%u.%u.in-addr.arpa",
+    snprintf(tempstring, sizeof(tempstring),"%u.%u.%u.%u.in-addr.arpa",
            ((byte *)&rp->ip)[3],
            ((byte *)&rp->ip)[2],
            ((byte *)&rp->ip)[1],
++++++ mtr-0.82-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);
++++++ xmtr.desktop ++++++
[Desktop Entry]
Type=Application
Exec=xmtr
Icon=xmtr_icon
Name=Xmtr
GenericName=Network Diagnostic Tool

Reply via email to