Update to 0.81

- mtr-now-waits-for-last-response.patch is no longer needed
- fixed wide report output (#703549)

Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2011-11-01 12:19:03 +01:00
parent 987cc8bd9f
commit 35b128e4d5
5 changed files with 22 additions and 42 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
mtr-0.79.tar.gz mtr-0.79.tar.gz
/mtr-0.80.tar.gz /mtr-0.80.tar.gz
/mtr-0.81.tar.gz

View File

@ -1,37 +0,0 @@
From c196de71466b475192fb4c1910fbcaf91ba36ae7 Mon Sep 17 00:00:00 2001
From: Jan Gorig <jgorig@redhat.com>
Date: Tue, 26 Oct 2010 10:02:45 +0200
Subject: [PATCH 3/3] mtr now waits for last response
---
select.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/select.c b/select.c
index a53017f..d8e460f 100644
--- a/select.c
+++ b/select.c
@@ -50,6 +50,7 @@ void select_loop(void) {
int dnsfd, netfd;
int NumPing = 0;
int paused = 0;
+ int quit = 0;
struct timeval lasttime, thistime, selecttime;
int dt;
int rv;
@@ -97,9 +98,10 @@ void select_loop(void) {
(thistime.tv_sec == lasttime.tv_sec + intervaltime.tv_sec &&
thistime.tv_usec >= lasttime.tv_usec + intervaltime.tv_usec)) {
lasttime = thistime;
+ if(quit == 1) return;
if(NumPing >= MaxPing && (!Interactive || ForceMaxPing))
- return;
- if (net_send_batch())
+ quit = 1;
+ else if (net_send_batch())
NumPing++;
}
--
1.7.3.1

View File

@ -1,7 +1,7 @@
Summary: A network diagnostic tool Summary: A network diagnostic tool
Name: mtr Name: mtr
Version: 0.80 Version: 0.81
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
Group: Applications/Internet Group: Applications/Internet
License: GPLv2+ License: GPLv2+
@ -13,7 +13,7 @@ Source3: net-x%{name}.desktop
Patch1: mtr-crash-in-xml-mode.patch Patch1: mtr-crash-in-xml-mode.patch
Patch2: mtr-xml-format-fixes.patch Patch2: mtr-xml-format-fixes.patch
Patch3: mtr-now-waits-for-last-response.patch Patch3: mtr081-rh703549.patch
BuildRequires: ncurses-devel gtk2-devel desktop-file-utils BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
@ -40,7 +40,7 @@ diagnostic tool.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1 -b .rh703549
%build %build
%configure --enable-gtk2 %configure --enable-gtk2
@ -91,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/mtr_icon.xpm %{_datadir}/pixmaps/mtr_icon.xpm
%changelog %changelog
* Tue Nov 01 2011 Adam Tkac <atkac redhat com> - 2:0.81-1
- update to 0.81
- mtr-now-waits-for-last-response.patch is no longer needed
- fixed wide report output (#703549)
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.80-3 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.80-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

11
mtr081-rh703549.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up mtr-0.81/mtr.c.rh703549 mtr-0.81/mtr.c
--- mtr-0.81/mtr.c.rh703549 2011-11-01 12:17:02.045258713 +0100
+++ mtr-0.81/mtr.c 2011-11-01 12:17:21.229257381 +0100
@@ -172,6 +172,7 @@ void parse_arg (int argc, char **argv)
break;
case 'w':
reportwide = 1;
+ DisplayMode = DisplayReport;
break;
case 't':
DisplayMode = DisplayCurses;

View File

@ -1 +1 @@
fa68528eaec1757f52bacf9fea8c68a9 mtr-0.80.tar.gz b7a7914f1fc1b5a21ab10bdca44356e1 mtr-0.81.tar.gz