* fixes for libupnp>=1.6.7

* more patches (and comments)
* Bump PKGREVISION from libupnp shlib bump.

5 files changed, 72 insertions, 5 deletions

diff --git a/multimedia/gmediaserver/Makefile b/multimedia/gmediaserver/Makefile
index 09c29a8bafd..191cde639f0 100644
--- a/multimedia/gmediaserver/Makefile
+++ b/multimedia/gmediaserver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2011/04/22 13:44:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2012/04/13 23:52:11 obache Exp $
 
 DISTNAME=		gmediaserver-0.13.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		multimedia net
 MASTER_SITES=		http://download.savannah.gnu.org/releases/gmediaserver/
 
diff --git a/multimedia/gmediaserver/distinfo b/multimedia/gmediaserver/distinfo
index cd8bb053bd4..b9e8848b92f 100644
--- a/multimedia/gmediaserver/distinfo
+++ b/multimedia/gmediaserver/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2010/08/31 19:18:14 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/04/13 23:52:11 obache Exp $
 
 SHA1 (gmediaserver-0.13.0.tar.gz) = 5b868bc3c3d3bf0c2c550a4fc618c586a2640799
 RMD160 (gmediaserver-0.13.0.tar.gz) = 57fb849172d28e8adcff2234c787d552c16bde9a
 Size (gmediaserver-0.13.0.tar.gz) = 668281 bytes
 SHA1 (patch-aa) = 8913274c78c646a3dd3e26a0b33d309697302eb9
-SHA1 (patch-ab) = 27122e8f08eb63ee4c3571bc91f2cbf5d057538c
+SHA1 (patch-ab) = 09b60dc2cfed813d823f3b6bfeffd5bdc4d14037
+SHA1 (patch-src_contentdir.c) = 8269681895e5c9aa72f53d5251a6049c690dd11f
+SHA1 (patch-src_upnp.c) = 013fa7a7072c7d7731cad6c12dfa408838daf5c1
diff --git a/multimedia/gmediaserver/patches/patch-ab b/multimedia/gmediaserver/patches/patch-ab
index 53166ebf5e0..85a76e64f06 100644
--- a/multimedia/gmediaserver/patches/patch-ab
+++ b/multimedia/gmediaserver/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2010/08/31 19:18:14 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/13 23:52:11 obache Exp $
+
+* for newer version of libmagic.
 
 --- src/metadata.c.orig	2007-10-20 09:41:32.000000000 +0000
 +++ src/metadata.c
diff --git a/multimedia/gmediaserver/patches/patch-src_contentdir.c b/multimedia/gmediaserver/patches/patch-src_contentdir.c
new file mode 100644
index 00000000000..c4bf6b0b1c0
--- /dev/null
+++ b/multimedia/gmediaserver/patches/patch-src_contentdir.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_contentdir.c,v 1.1 2012/04/13 23:52:11 obache Exp $
+
+* assert.h for assert(3)
+
+--- src/contentdir.c.orig	2007-10-20 07:59:38.000000000 +0000
++++ src/contentdir.c
+@@ -22,6 +22,7 @@
+ #include <stdint.h>		/* Gnulib/C99 */
+ #include <inttypes.h>		/* ? */
+ #include <sys/stat.h>		/* POSIX */
++#include <assert.h>
+ #include "gettext.h"		/* Gnulib/gettext */
+ #define _(s) gettext(s)
+ #define N_(s) gettext_noop(s)
diff --git a/multimedia/gmediaserver/patches/patch-src_upnp.c b/multimedia/gmediaserver/patches/patch-src_upnp.c
new file mode 100644
index 00000000000..059debf7f1e
--- /dev/null
+++ b/multimedia/gmediaserver/patches/patch-src_upnp.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_upnp.c,v 1.1 2012/04/13 23:52:11 obache Exp $
+
+* API change for libupnp>=1.6.7
+
+--- src/upnp.c.orig	2007-10-28 08:20:43.000000000 +0000
++++ src/upnp.c
+@@ -25,6 +25,7 @@
+ #include <assert.h>		/* C89 */
+ #include <netinet/in.h>		/* ?; inet_ntoa */
+ #include <arpa/inet.h>		/* ?; inet_ntoa */
++#include <netdb.h>
+ #include <inttypes.h>		/* POSIX */
+ #include "gettext.h"            /* Gnulib/gettext */
+ #define _(s) gettext(s)
+@@ -61,6 +62,16 @@ static Service services[] = {
+   { 0, }
+ };
+ 
++static void
++say_ip_addr(int level, const char* header, struct sockaddr_storage* addr)
++{
++  char hbuf[NI_MAXHOST];
++  int err;
++  err = getnameinfo((struct sockaddr*)addr, addr->ss_len, hbuf, NI_MAXHOST,
++		    NULL, 0, NI_NUMERICHOST);
++  say(level, header, err == 0 ? hbuf : "(unknown)");
++}
++
+ static const char *
+ upnp_errmsg(int res)
+ {
+@@ -265,7 +276,7 @@ handle_get_var_request(struct Upnp_State
+     say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+     say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+     say(3, _("Event variable name: %s\n"), quotearg(request->StateVarName));
+-    say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++    say_ip_addr(3, _("Event source: %s\n"), &request->CtrlPtIPAddr);
+ 
+     if (strcmp(request->DevUDN, device_udn) != 0) {
+         say(1, _("Discarding event - event device UDN (%s) not recognized\n"), quotearg(request->DevUDN));
+@@ -306,7 +317,7 @@ handle_action_request(struct Upnp_Action
+     say(3, _("Event device UDN: %s\n"), quotearg(request->DevUDN));
+     say(3, _("Event service ID: %s\n"), quotearg(request->ServiceID));
+     say(3, _("Event action name: %s\n"), quotearg(request->ActionName));
+-    say(3, _("Event source: %s\n"), inet_ntoa(request->CtrlPtIPAddr));
++    say_ip_addr(3, _("Event source: %s\n"), &request->CtrlPtIPAddr);
+     say_document(4, _("Event action request:\n"), request->ActionRequest);
+ 
+     if (strcmp(request->DevUDN, device_udn) != 0) {