sync comments, no package change

This commit is contained in:
jasper 2011-07-13 08:09:12 +00:00
parent cfe4b19e99
commit 8bd00d2593
2 changed files with 18 additions and 13 deletions

View File

@ -1,9 +1,12 @@
$OpenBSD: patch-data_gnome-nettool_ui,v 1.1 2011/05/18 13:29:11 jasper Exp $
$OpenBSD: patch-data_gnome-nettool_ui,v 1.2 2011/07/13 08:09:12 jasper Exp $
Gtkcombo of the address for traceroute/port scan/and whois
should not extend.
From cbd30cf35c3f5bf0ce2e211b92848de85acef11a Mon Sep 17 00:00:00 2001
From: Jean Schurger <jean@schurger.org>
Date: Wed, 13 Jul 2011 03:31:10 +0000
Subject: Fix ugliness when window is bigger than expected
Upstream bz #647895.
GtkCombo in traceroute, port scan and whois looks bad if the
gnome-nettool window is bigger than expected.
--- data/gnome-nettool.ui.orig Tue Jan 11 11:32:42 2011
+++ data/gnome-nettool.ui Wed May 18 15:09:03 2011

View File

@ -1,13 +1,15 @@
$OpenBSD: patch-src_nettool_c,v 1.2 2011/05/18 15:25:34 jasper Exp $
$OpenBSD: patch-src_nettool_c,v 1.3 2011/07/13 08:09:12 jasper Exp $
On OpenBSD configured interfaces have default IPv6 address, this would
cause the code in netinfo_get_ip_version() to believe we should use the IPv6
version of various tools, like ping6 and traceroute6. While in reality many people
leave the interfaces as is (don't remove the IPv6 address) and use the interface
over IPv4. So the IPv6 tools wouldn't have a proper way out and fail, this was the
default behaviour...
Now the code defaults to checking if for AF_INET address family instead
of the other way around (which would thus always return IPv6).
From da8ec778b8ea691e1043173a0e8ea5e226a429b0 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu, 19 May 2011 18:45:05 +0200
Subject: [PATCH] portability fix for systems that configure an ipv6 address
by default, but use the ipv4 address for actual traffic.
tweak decision logic for deciding if we should use the ipv4 or ipv6 tools.
it would default to ipv6 as most interfaces have an unused ipv6 address, while
actually using the ipv4 address. this fixes ping/traceroute functionality when
using hostnames instead of ip addresses.
--- src/nettool.c.orig Thu Dec 2 10:26:14 2010
+++ src/nettool.c Wed May 18 15:43:49 2011