[gnome-network] r22391 - in /desktop/unstable/gnome-nettool/debian: changelog patches/02_kfreebsd.patch

[joss users alioth debian org]

Author: joss
Date: Fri Nov 20 10:15:11 2009
New Revision: 22391

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22391
Log:
02_kfreebsd.patch: port to kFreeBSD by adding the correct macro 
checks.

Added:
    desktop/unstable/gnome-nettool/debian/patches/02_kfreebsd.patch
Modified:
    desktop/unstable/gnome-nettool/debian/changelog

Modified: desktop/unstable/gnome-nettool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/changelog?rev=22391&op=diff
==============================================================================
--- desktop/unstable/gnome-nettool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-nettool/debian/changelog [utf-8] Fri Nov 20 10:15:11 2009
@@ -1,3 +1,10 @@
+gnome-nettool (2.28.0-2) unstable; urgency=low
+
+  * 02_kfreebsd.patch: port to kFreeBSD by adding the correct macro 
+    checks.
+
+ -- Josselin Mouette <joss debian org>  Fri, 20 Nov 2009 11:15:02 +0100
+
 gnome-nettool (2.28.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-nettool/debian/patches/02_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-nettool/debian/patches/02_kfreebsd.patch?rev=22391&op=file
==============================================================================
--- desktop/unstable/gnome-nettool/debian/patches/02_kfreebsd.patch (added)
+++ desktop/unstable/gnome-nettool/debian/patches/02_kfreebsd.patch [utf-8] Fri Nov 20 10:15:11 2009
@@ -1,0 +1,99 @@
+diff -pruN src.orig/netstat.c src/netstat.c
+--- src.orig/netstat.c	2009-11-20 11:09:50.275203020 +0100
++++ src/netstat.c	2009-11-20 11:11:03.483697108 +0100
+@@ -123,7 +123,7 @@ netstat_get_active_option (Netinfo * net
+ 	}
+ 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
+ 		/* Only works for Solaris */
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	    	option = g_strdup ("-a -f inet -ln");
+ #else
+ 		if (netinfo_is_ipv6_enable ()) {
+@@ -292,7 +292,7 @@ netstat_protocol_tree_insert (GtkTreeVie
+ 	g_return_if_fail (line != NULL);
+ 
+ 	count = strip_protocol_line (line, &data);
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	if (count == 5 || count == 6 || count == 9 || count == 10) {
+ #else
+ 	if (count == 5 || count == 6) {
+@@ -360,7 +360,7 @@ static gint
+ strip_protocol_line (gchar * line, netstat_protocol_data *data)
+ {
+ 	gint count = 0;
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	gint a1, a2, a3, a4;
+ 	gchar s9[30];
+ #else
+@@ -371,7 +371,7 @@ strip_protocol_line (gchar * line, netst
+ 
+ 	/*line = g_strdelimit (line, ":", ' ');*/
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	line = g_strdelimit (line, ":", ' ');
+ 	
+ 	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
+@@ -485,7 +485,7 @@ netstat_route_tree_insert (GtkTreeView *
+ 	g_return_if_fail (line != NULL);
+ 
+ 	count = strip_route_line (line, &data);
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	if (count == 6) {
+ #else
+ 	if ((count == 8) || (count == 7)) {
+@@ -562,7 +562,7 @@ strip_route_line (gchar * line, netstat_
+ 	gchar **items;
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
+ 			data->destination,
+ 			data->gateway, flags,
+@@ -605,7 +605,7 @@ netstat_create_route_model (GtkTreeView 
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	column =
+ 	    gtk_tree_view_column_new_with_attributes
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	    (_("Destination/Prefix"), renderer, "text", 0, NULL);
+ #else
+ 	    (_("Destination"), renderer, "text", 0, NULL);
+@@ -619,7 +619,7 @@ netstat_create_route_model (GtkTreeView 
+ 	gtk_tree_view_column_set_alignment (column, 0.5);
+ 	gtk_tree_view_append_column (widget, column);
+ 
+-#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__) || defined(__DragonFly__)
++#if ! (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)) || defined(__NetBSD__) || defined(__DragonFly__)
+ 	renderer = gtk_cell_renderer_text_new ();
+ 	column =
+ 	    gtk_tree_view_column_new_with_attributes
+diff -pruN src.orig/netstat.h src/netstat.h
+--- src.orig/netstat.h	2009-11-20 11:09:50.275203020 +0100
++++ src/netstat.h	2009-11-20 11:11:15.311697454 +0100
+@@ -30,7 +30,7 @@
+ #   define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
+ #   define NETSTAT_MULTICAST_FORMAT "%s %d %s"
+ 
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
+ #   define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
+ #   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
+diff -pruN src.orig/ping.h src/ping.h
+--- src.orig/ping.h	2009-11-20 11:09:50.275203020 +0100
++++ src/ping.h	2009-11-20 11:11:35.111696550 +0100
+@@ -30,7 +30,7 @@
+ #   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
+-#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#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"