summaryrefslogtreecommitdiff
path: root/multimedia/ushare/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/ushare/patches/patch-af')
-rw-r--r--multimedia/ushare/patches/patch-af87
1 files changed, 87 insertions, 0 deletions
diff --git a/multimedia/ushare/patches/patch-af b/multimedia/ushare/patches/patch-af
new file mode 100644
index 00000000000..39a8dbe6586
--- /dev/null
+++ b/multimedia/ushare/patches/patch-af
@@ -0,0 +1,87 @@
+$NetBSD: patch-af,v 1.1.1.1 2010/05/23 08:18:04 obache Exp $
+
+* Treat NetBSD same as FreeBSD.
+* Move sys/param.h and config.h header files before using conditions.
+
+--- src/ushare.c.orig 2007-12-09 13:03:36.000000000 +0000
++++ src/ushare.c
+@@ -28,7 +28,11 @@
+ #include <errno.h>
+ #include <getopt.h>
+
+-#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__))
++#if (defined(__unix__) || defined(unix)) && !defined(USG) || defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__))
+ #include <sys/socket.h>
+ #include <sys/sysctl.h>
+ #include <net/if_dl.h>
+@@ -49,18 +53,15 @@
+ #include <ifaddrs.h>
+ #endif
+
+-#if (defined(__unix__) || defined(unix)) && !defined(USG)
+-#include <sys/param.h>
+-#endif
+-
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+
++#include "config.h"
++
+ #if (defined(HAVE_SETLOCALE) && defined(CONFIG_NLS))
+ # include <locale.h>
+ #endif
+
+-#include "config.h"
+ #include "ushare.h"
+ #include "services.h"
+ #include "http.h"
+@@ -505,7 +506,7 @@ create_udn (char *interface)
+ char *buf;
+ unsigned char *ptr;
+
+-#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__))
++#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__))
+ int mib[6];
+ size_t len;
+ struct if_msghdr *ifm;
+@@ -517,7 +518,7 @@ create_udn (char *interface)
+ if (!interface)
+ return NULL;
+
+-#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__))
++#if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__))
+ mib[0] = CTL_NET;
+ mib[1] = AF_ROUTE;
+ mib[2] = 0;
+@@ -568,7 +569,7 @@ create_udn (char *interface)
+ buf = (char *) malloc (64 * sizeof (char));
+ memset (buf, 0, 64);
+ ptr = (unsigned char *) ifr.ifr_hwaddr.sa_data;
+-#endif /* (defined(BSD) || defined(__FreeBSD__)) */
++#endif /* (defined(BSD) || defined(__FreeBSD__) || defined(__NetBSD__)) */
+
+ snprintf (buf, 64, "%s-%02x%02x%02x%02x%02x%02x", DEFAULT_UUID,
+ (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
+@@ -734,7 +735,7 @@ setup_i18n(void)
+ #ifdef HAVE_SETLOCALE
+ setlocale (LC_ALL, "");
+ #endif
+-#if (!defined(BSD) && !defined(__FreeBSD__))
++#if (!defined(BSD) && !defined(__FreeBSD__) && !defined(__NetBSD__))
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ #endif
+ textdomain (PACKAGE);
+@@ -845,6 +846,9 @@ main (int argc, char **argv)
+
+ signal (SIGINT, UPnPBreak);
+ signal (SIGHUP, reload_config);
++#ifndef MSG_NOSIGNAL
++ signal (SIGPIPE, SIG_IGN);
++#endif
+
+ if (ut->use_telnet)
+ {