diff options
author | jperkin <jperkin@pkgsrc.org> | 2016-04-18 12:14:29 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2016-04-18 12:14:29 +0000 |
commit | 83d6446469c37b909c229fa8b1a2d94916419a27 (patch) | |
tree | 95a84cd0669786d63cea15ee356c3e299478b8b6 /net | |
parent | 10cc529d9e52081cd12847e6f6805afb2a1d0d75 (diff) | |
download | pkgsrc-83d6446469c37b909c229fa8b1a2d94916419a27.tar.gz |
Pull in some patches from OpenIndiana to fix the build on SunOS.
Diffstat (limited to 'net')
-rw-r--r-- | net/gnome-nettool/distinfo | 5 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_netstat.c | 52 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_netstat.h | 19 | ||||
-rw-r--r-- | net/gnome-nettool/patches/patch-src_utils.h | 18 |
4 files changed, 93 insertions, 1 deletions
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index c48963c064a..277e590c7de 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 00:35:02 agc Exp $ +$NetBSD: distinfo,v 1.8 2016/04/18 12:14:29 jperkin Exp $ SHA1 (gnome-nettool-2.26.2.tar.bz2) = dcb026f358a5797793391e5a90ae74c8401a8fec RMD160 (gnome-nettool-2.26.2.tar.bz2) = 20b2145d8d616fbbac0c6081a0d508439a9b31f7 SHA512 (gnome-nettool-2.26.2.tar.bz2) = ec3165a4c4365feaff84d937474528135dc10fce5272214c3aa6508bfc53df04fb79ac30308983ff65533f52057167baaf02042c5595c39245bac5c73f57c9d1 Size (gnome-nettool-2.26.2.tar.bz2) = 631631 bytes +SHA1 (patch-src_netstat.c) = c71285c56b565e40ed28681d62e24470eede49f0 +SHA1 (patch-src_netstat.h) = e087a0ad253031889b6e29f9ab692bf532414657 +SHA1 (patch-src_utils.h) = 29ec268988ada403627fe4f1f3c89572b0c3f22e diff --git a/net/gnome-nettool/patches/patch-src_netstat.c b/net/gnome-nettool/patches/patch-src_netstat.c new file mode 100644 index 00000000000..d3d673f7624 --- /dev/null +++ b/net/gnome-nettool/patches/patch-src_netstat.c @@ -0,0 +1,52 @@ +$NetBSD: patch-src_netstat.c,v 1.1 2016/04/18 12:14:29 jperkin Exp $ + +Fix SunOS build, from OpenIndiana. + +--- src/netstat.c.orig 2009-05-20 00:56:41.000000000 +0000 ++++ src/netstat.c +@@ -112,9 +112,15 @@ netstat_get_active_option (Netinfo * net + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { + /* Works for Solaris and Linux */ + if (netinfo_is_ipv6_enable ()) { ++#ifdef __sun ++ option = g_strdup ("-rn -f inet -f inet6"); ++ } else { ++ option = g_strdup ("-rn -f inet"); ++#else + option = g_strdup ("-rn -A inet -A inet6"); + } else { + option = g_strdup ("-rn -A inet"); ++#endif + } + + if (netinfo->stbar_text) +@@ -125,7 +131,7 @@ netstat_get_active_option (Netinfo * net + /* Only works for Solaris */ + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + option = g_strdup ("-a -f inet -ln"); +-#else ++#elif defined(__linux) + if (netinfo_is_ipv6_enable ()) { + option = g_strdup ("-A inet -A inet6 -ln"); + } else { +@@ -541,7 +547,11 @@ netstat_route_tree_insert (GtkTreeView * + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, data.destination, + 1, data.gateway, ++#ifdef __sun ++ 2, NULL, ++#else + 2, data.netmask, ++#endif + 3, data.iface, -1); + + gtk_tree_view_set_model (widget, model); +@@ -562,7 +572,7 @@ strip_route_line (gchar * line, netstat_ + gchar **items; + #endif + +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__sun) + count = sscanf (line, NETSTAT_ROUTE_FORMAT, + data->destination, + data->gateway, flags, diff --git a/net/gnome-nettool/patches/patch-src_netstat.h b/net/gnome-nettool/patches/patch-src_netstat.h new file mode 100644 index 00000000000..e8e2ae7a996 --- /dev/null +++ b/net/gnome-nettool/patches/patch-src_netstat.h @@ -0,0 +1,19 @@ +$NetBSD: patch-src_netstat.h,v 1.1 2016/04/18 12:14:29 jperkin Exp $ + +Fix SunOS build, from OpenIndiana. + +--- src/netstat.h.orig 2009-05-20 00:56:41.000000000 +0000 ++++ src/netstat.h +@@ -36,6 +36,12 @@ + # define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s" + # define NETSTAT_MULTICAST_FORMAT "%s %d %s" + ++#elif defined(__sun) ++# define NETSTAT_PROTOCOL_FORMAT "%s %d %d %s %s %s" ++# define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s" ++# define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s" ++# define NETSTAT_MULTICAST_FORMAT "%s %s %d" ++ + #endif + + typedef enum { diff --git a/net/gnome-nettool/patches/patch-src_utils.h b/net/gnome-nettool/patches/patch-src_utils.h new file mode 100644 index 00000000000..77007000b8d --- /dev/null +++ b/net/gnome-nettool/patches/patch-src_utils.h @@ -0,0 +1,18 @@ +$NetBSD: patch-src_utils.h,v 1.1 2016/04/18 12:14:29 jperkin Exp $ + +Fix SunOS build, from OpenIndiana. + +--- src/utils.h.orig 2009-04-18 14:59:27.000000000 +0000 ++++ src/utils.h +@@ -29,6 +29,11 @@ + # include <config.h> + #endif + ++#ifdef __sun ++#define gethostbyname2(name, domain) getipnodebyname((name), (domain), 0, &g_n_err_macro) ++int g_n_err_macro; ++#endif ++ + #if (GLIB_MINOR_VERSION < 2) + + # define _g_vsprintf vsprintf |