commit gnome-nettool for openSUSE:11.4

Hello community, here is the log from the commit of package gnome-nettool for openSUSE:11.4 checked in at Thu Mar 17 14:27:07 CET 2011. -------- --- old-versions/11.4/all/gnome-nettool/gnome-nettool.changes 2011-02-13 17:22:48.000000000 +0100 +++ 11.4/gnome-nettool/gnome-nettool.changes 2011-03-15 19:25:36.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 15 18:24:23 UTC 2011 - malcolmlewis@opensuse.org + +- Fix bug bnc#679874 malcolmlewis@opensuse.org -- Handle output + with icmp_req + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gnome-nettool Destination is old-versions/11.4/UPDATES/all/gnome-nettool calling whatdependson for 11.4-i586 New: ---- 0001-ping-Handle-output-with-icmp_req.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-nettool.spec ++++++ --- /var/tmp/diff_new_pack.YbNPmU/_old 2011-03-17 14:26:50.000000000 +0100 +++ /var/tmp/diff_new_pack.YbNPmU/_new 2011-03-17 14:26:50.000000000 +0100 @@ -19,12 +19,14 @@ Name: gnome-nettool Version: 2.32.0 -Release: 3 +Release: 9.<RELEASE2> License: GPLv2+ Summary: GNOME Interface for Various Networking Tools Url: http://www.gnome.org Group: System/GUI/GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE 0001-ping-Handle-output-with-icmp_req.patch bnc#679874 and bg0#634749 malcolmlewis@opensuse.org -- Handle output with icmp_req +Patch0: 0001-ping-Handle-output-with-icmp_req.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool @@ -44,6 +46,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure\ ++++++ 0001-ping-Handle-output-with-icmp_req.patch ++++++

From 9af2e18755725dc47ae8eb2867e3f038c298bc09 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sat, 13 Nov 2010 13:53:12 +0100 Subject: [PATCH] [ping] Handle output with icmp_req

iputils-ping displays icmp_req= instead of icmp_seq=. Handle the two outputs correctly. --- src/ping.c | 7 ++++--- src/ping.h | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ping.c b/src/ping.c index 2c973c3..74f3c19 100644 --- a/src/ping.c +++ b/src/ping.c @@ -405,7 +405,7 @@ ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len, if (len > 0) { /* there are data to show */ count = strip_line (line, &data, netinfo); - if ((count == 5) || (count == 6)) { + if ((count == 5) || (count == 7)) { /* Creation of GtkTreeView */ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW @@ -519,6 +519,7 @@ static gint strip_line (gchar * line, ping_data * data, Netinfo * netinfo) { gint count; + gchar dummy_buf[3]; if (netinfo_get_ip_version (netinfo) == IPV4) line = g_strdelimit (line, ":", ' '); @@ -530,9 +531,9 @@ strip_line (gchar * line, ping_data * data, Netinfo * netinfo) &(data)->bytes, data->ip, &(data)->icmp_seq, data->srtt, data->unit); #endif -#ifdef PING_PARAMS_6 +#ifdef PING_PARAMS_7 count = sscanf (line, PING_FORMAT, - &(data)->bytes, data->ip, &(data)->icmp_seq, + &(data)->bytes, data->ip, dummy_buf, &(data)->icmp_seq, &(data)->ttl, data->srtt, data->unit); #endif if (count != 5 && count != 6) { diff --git a/src/ping.h b/src/ping.h index 0d2e068..53dd5de 100644 --- a/src/ping.h +++ b/src/ping.h @@ -28,14 +28,14 @@ /* <path to program> ping -b [-c <count>] -n <host> */ # define PING_PROGRAM_FORMAT "%s ping -b%s-n %s" # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s" -# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s" -# define PING_PARAMS_6 +# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s" +# define PING_PARAMS_7 #elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* <path to program> ping [-c <count>] -n <host> */ # define PING_PROGRAM_FORMAT "%s ping%s-n %s" # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s" -# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s" -# define PING_PARAMS_6 +# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s" +# define PING_PARAMS_7 #elif defined(__sun__) /* <path to program> ping -s -n <host> [<count>] */ # define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s" -- 1.7.2.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org