diff options
| author | tron <tron> | 2008-11-23 22:57:05 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-11-23 22:57:05 +0000 |
| commit | 636ae54511640aa7d37147c2c4eec7303249a584 (patch) | |
| tree | 3a6ae997c00815ae1b52c6617bb24a793e5e63a5 | |
| parent | 053c968d5d5add30e72ca961307ed9c4eb7592fb (diff) | |
| download | pkgsrc-636ae54511640aa7d37147c2c4eec7303249a584.tar.gz | |
Make interface scanning in mDNS code work under NetBSD 4.99.32(?) and
newer. The daemon works again under 5.0_BETA on my system now.
Bump package revision because of this bug fix.
| -rw-r--r-- | audio/mt-daapd/Makefile | 3 | ||||
| -rw-r--r-- | audio/mt-daapd/distinfo | 4 | ||||
| -rw-r--r-- | audio/mt-daapd/patches/patch-ad | 31 |
3 files changed, 31 insertions, 7 deletions
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile index fb096da1991..e6a770bf1ff 100644 --- a/audio/mt-daapd/Makefile +++ b/audio/mt-daapd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2008/05/14 21:12:12 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2008/11/23 22:57:05 tron Exp $ DISTNAME= mt-daapd-0.2.4.2 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mt-daapd/} diff --git a/audio/mt-daapd/distinfo b/audio/mt-daapd/distinfo index c6ff5e8a43d..1b121946b05 100644 --- a/audio/mt-daapd/distinfo +++ b/audio/mt-daapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2008/05/14 21:12:12 adrianp Exp $ +$NetBSD: distinfo,v 1.5 2008/11/23 22:57:05 tron Exp $ SHA1 (mt-daapd-0.2.4.2.tar.gz) = 5f1c04100b1d18a9cf6f03f879b5c3e9a7bd172f RMD160 (mt-daapd-0.2.4.2.tar.gz) = 918b76ffe3af7b0413be1cbbafdd11274f5d3e9d @@ -6,4 +6,4 @@ Size (mt-daapd-0.2.4.2.tar.gz) = 436513 bytes SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad SHA1 (patch-ab) = be78b7f5089d3283e0cb9ee3c64a4a53360899d7 SHA1 (patch-ac) = 363a0a2ec43b7fcc8fbff75ce13885cf9969e0a4 -SHA1 (patch-ad) = c556f5b3aa69779c30957e3e873563be2cb8ef32 +SHA1 (patch-ad) = ec48904eaf6cb77448f04cfe5022411b8bda9ae1 diff --git a/audio/mt-daapd/patches/patch-ad b/audio/mt-daapd/patches/patch-ad index b21c03d1020..9f97319e480 100644 --- a/audio/mt-daapd/patches/patch-ad +++ b/audio/mt-daapd/patches/patch-ad @@ -1,13 +1,36 @@ -$NetBSD: patch-ad,v 1.1 2007/02/05 22:23:06 tron Exp $ +$NetBSD: patch-ad,v 1.2 2008/11/23 22:57:05 tron Exp $ ---- src/mDNSUNP.c.orig 2005-09-11 20:13:48.000000000 +0100 -+++ src/mDNSUNP.c 2007-02-05 22:16:56.000000000 +0000 -@@ -168,7 +168,7 @@ +--- src/mDNSUNP.c.orig 2008-04-19 20:17:23.000000000 +0100 ++++ src/mDNSUNP.c 2008-11-23 22:54:21.000000000 +0000 +@@ -88,6 +88,10 @@ + #include <unistd.h> + #include <stdio.h> + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + /* Solaris defined SIOCGIFCONF etc in <sys/sockio.h> but + other platforms don't even have that include file. So, + if we haven't yet got a definition, let's try to find +@@ -168,13 +172,19 @@ * have the apple mDNS included, I guess it's a * small price to pay. */ -#ifdef FREEBSD ++#if defined (__NetBSD_Version__) && __NetBSD_Version__ >= 499003200 /* NetBSD 4.99.32 */ ++ ptr += (sizeof(ifr->ifr_name) + len) > ++ sizeof(struct ifreq) ? ++ (sizeof(ifr->ifr_name) + len) : sizeof(struct ifreq); ++#else +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ptr += sizeof(ifr->ifr_name) + len; /* for next one in buffer */ // ptr += sizeof(*ifr); #else + + ptr += sizeof(struct ifreq); /* for next one in buffer */ + #endif ++#endif + + // fprintf(stderr, "intf %d name=%s AF=%d\n", index, ifr->ifr_name, ifr->ifr_addr.sa_family); + |