[pkgsrc/trunk]: pkgsrc/net/libupnp Fix for setsockopt() in Threadpool.c to al...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca642248b0bc
branches:  trunk
changeset: 542401:ca642248b0bc
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu May 15 13:42:29 2008 +0000

description:
Fix for setsockopt() in Threadpool.c to allow more than one process
to join the multicast-group on BSDs, not only FreeBSD and MacOS X.

Noticed by Greg Kerr via private mail.

Bump PKGREVISION.

diffstat:

 net/libupnp/Makefile         |   3 ++-
 net/libupnp/distinfo         |   3 ++-
 net/libupnp/patches/patch-ab |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 3a95c6357e11 -r ca642248b0bc net/libupnp/Makefile
--- a/net/libupnp/Makefile      Thu May 15 13:17:38 2008 +0000
+++ b/net/libupnp/Makefile      Thu May 15 13:42:29 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/04/26 01:52:53 obache Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/15 13:42:29 obache Exp $
 #
 
 DISTNAME=              libupnp-1.6.6
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 3a95c6357e11 -r ca642248b0bc net/libupnp/distinfo
--- a/net/libupnp/distinfo      Thu May 15 13:17:38 2008 +0000
+++ b/net/libupnp/distinfo      Thu May 15 13:42:29 2008 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2008/05/13 11:20:02 obache Exp $
+$NetBSD: distinfo,v 1.14 2008/05/15 13:42:29 obache Exp $
 
 SHA1 (libupnp-1.6.6.tar.bz2) = 24c2c349cb52ed3d62121fbdae205c8d9dc0f5fa
 RMD160 (libupnp-1.6.6.tar.bz2) = 25ff0390793cfa48cca32a335b4d633283b1fe64
 Size (libupnp-1.6.6.tar.bz2) = 1146854 bytes
 SHA1 (patch-aa) = 66473171bdabd6396766a328f448f5ce21835093
+SHA1 (patch-ab) = cfdedfc192854389d77ee79d875b618a204770f9
 SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
 SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
 SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
diff -r 3a95c6357e11 -r ca642248b0bc net/libupnp/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libupnp/patches/patch-ab      Thu May 15 13:42:29 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.4 2008/05/15 13:42:29 obache Exp $
+
+--- upnp/src/ssdp/ssdp_server.c.orig   2008-03-20 23:08:25.000000000 +0000
++++ upnp/src/ssdp/ssdp_server.c
+@@ -47,6 +47,8 @@
+       #include <winsock2.h>
+       #include <ws2tcpip.h>
+       #include "unixutil.h"
++#else
++      #include <sys/param.h>
+ #endif
+ 
+ #define MAX_TIME_TOREAD  45
+@@ -915,7 +917,7 @@ get_ssdp_sockets( MiniServerSockArray * 
+         return UPNP_E_SOCKET_ERROR;
+     }
+     
+-#if defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
++#if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
+     ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
+         (char *)&onOff, sizeof (onOff) );
+     if ( ret == -1 ) {