diff --git a/x11/gnome3/x11/gnome/nettool/Makefile b/x11/gnome3/x11/gnome/nettool/Makefile index 3402a703dab..6ed1a10b03b 100644 --- a/x11/gnome3/x11/gnome/nettool/Makefile +++ b/x11/gnome3/x11/gnome/nettool/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2011/06/15 17:01:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2011/06/16 09:42:46 ajacoutot Exp $ COMMENT= GNOME interface for various networking tools GNOME_PROJECT= gnome-nettool GNOME_VERSION= 3.0.0 -REVISION= 3 +REVISION= 4 CATEGORIES= net diff --git a/x11/gnome3/x11/gnome/nettool/patches/patch-src_netstat_c b/x11/gnome3/x11/gnome/nettool/patches/patch-src_netstat_c index b2a8025138b..95ac8197fc6 100644 --- a/x11/gnome3/x11/gnome/nettool/patches/patch-src_netstat_c +++ b/x11/gnome3/x11/gnome/nettool/patches/patch-src_netstat_c @@ -1,19 +1,24 @@ -$OpenBSD: patch-src_netstat_c,v 1.3 2011/06/15 08:48:52 ajacoutot Exp $ +$OpenBSD: patch-src_netstat_c,v 1.4 2011/06/16 09:42:46 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=652705 From 50b013254dfe239af364599f8ebfed14853e9390 Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Wed, 15 Jun 2011 08:42:19 +0000 Subject: Add initial support (routing) for OpenBSD. ---- src/netstat.c.orig Tue Mar 30 06:11:19 2010 -+++ src/netstat.c Wed Apr 21 11:35:42 2010 -@@ -110,12 +110,17 @@ netstat_get_active_option (Netinfo * netinfo) +--- src/netstat.c.orig Thu Dec 2 10:26:14 2010 ++++ src/netstat.c Thu Jun 16 11:25:57 2011 +@@ -110,12 +110,20 @@ netstat_get_active_option (Netinfo * netinfo) g_return_val_if_fail (netinfo != NULL, NULL); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { -+#if defined (__FreeBSD__) || defined (__OpenBSD__) -+ /* XXX We only support ipv4 now */ -+ option = g_strdup ("-rn -f inet"); ++#if defined (__OpenBSD__) ++ if (netinfo_is_ipv6_enable ()) { ++ option = g_strdup ("-rn"); ++ } else { ++ option = g_strdup ("-rn -f inet"); ++ } +#else /* Works for Solaris and Linux */ if (netinfo_is_ipv6_enable ()) { @@ -25,7 +30,7 @@ Subject: Add initial support (routing) for OpenBSD. if (netinfo->stbar_text) g_free (netinfo->stbar_text); -@@ -485,8 +490,10 @@ netstat_route_tree_insert (GtkTreeView *widget, gchar +@@ -485,8 +493,10 @@ netstat_route_tree_insert (GtkTreeView *widget, gchar g_return_if_fail (line != NULL); count = strip_route_line (line, &data); @@ -37,7 +42,7 @@ Subject: Add initial support (routing) for OpenBSD. #else if ((count == 8) || (count == 7)) { #endif -@@ -557,16 +564,25 @@ strip_route_line (gchar * line, netstat_route_data *da +@@ -557,16 +567,25 @@ strip_route_line (gchar * line, netstat_route_data *da gint count = 0; gchar flags[30]; gint ref, use;