diff options
Diffstat (limited to 'net/gnome-nettool/files')
| -rw-r--r-- | net/gnome-nettool/files/patch-src_lookup.c | 10 | ||||
| -rw-r--r-- | net/gnome-nettool/files/patch-src_netstat.c | 21 | ||||
| -rw-r--r-- | net/gnome-nettool/files/patch-src_nettool.c | 32 |
3 files changed, 24 insertions, 39 deletions
diff --git a/net/gnome-nettool/files/patch-src_lookup.c b/net/gnome-nettool/files/patch-src_lookup.c deleted file mode 100644 index 9744c13973da..000000000000 --- a/net/gnome-nettool/files/patch-src_lookup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lookup.c.orig Sun Jul 3 17:47:02 2005 -+++ src/lookup.c Sun Jul 3 17:47:20 2005 -@@ -21,6 +21,7 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - #include <glib/gprintf.h> -+#include <sys/types.h> - - #include "lookup.h" - #include "utils.h" diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c index 1eec8492793a..660514d28322 100644 --- a/net/gnome-nettool/files/patch-src_netstat.c +++ b/net/gnome-nettool/files/patch-src_netstat.c @@ -1,20 +1,11 @@ ---- src/netstat.c.orig Tue Jul 6 13:55:25 2004 -+++ src/netstat.c Fri Aug 20 15:55:40 2004 -@@ -108,12 +108,17 @@ +--- src/netstat.c.orig 2012-01-03 10:38:09.000000000 +0100 ++++ src/netstat.c 2015-08-28 16:21:17.101757000 +0200 +@@ -114,7 +114,7 @@ netstat_get_active_option (Netinfo * net g_return_val_if_fail (netinfo != NULL, NULL); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { -+#ifdef __FreeBSD__ -+ /* XXX We only support ipv4 now */ -+ option = g_strdup ("-rn -f inet"); -+#else - /* Works for Solaris and Linux */ +-#if defined (__OpenBSD__) ++#if defined (__OpenBSD__) || defined (__FreeBSD__) if (netinfo_is_ipv6_enable ()) { - option = g_strdup ("-rn -A inet -A inet6"); + option = g_strdup ("-rn"); } else { - option = g_strdup ("-rn -A inet"); - } -+#endif - - if (netinfo->stbar_text) - g_free (netinfo->stbar_text); diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c index 40e45446775a..05fa09223019 100644 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ b/net/gnome-nettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig 2009-06-18 13:51:14.000000000 -0400 -+++ src/nettool.c 2009-07-19 16:05:59.000000000 -0400 -@@ -24,6 +24,7 @@ +--- src/nettool.c.orig 2012-01-03 10:38:09.000000000 +0100 ++++ src/nettool.c 2015-08-28 16:28:52.904785000 +0200 +@@ -28,7 +28,6 @@ #include <string.h> #include <sys/types.h> #include <sys/socket.h> -+#include <netinet/in.h> +-#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -410,6 +409,10 @@ netinfo_io_text_buffer_dialog (GIOChanne len, NULL); } @@ -19,16 +19,19 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -421,6 +424,11 @@ netinfo_io_text_buffer_dialog (GIOChanne } g_string_append_c (netinfo->command_output, buf[0]); } ++ + g_free (text); ++ + return TRUE; ++ } else if (status == G_IO_STATUS_EOF) { } else if (status == G_IO_STATUS_ERROR) { -@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChanne +@@ -438,15 +446,16 @@ netinfo_io_text_buffer_dialog (GIOChanne } else { g_warning ("Error: %s\n", err->message); @@ -36,14 +39,15 @@ g_free (err); } -+ g_free (text); -+ return TRUE; -+ - } - - g_free (text); +- } - -- return TRUE; + g_free (text); + + return TRUE; ++ ++ } ++ ++ g_free (text); } /* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so |