head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.4 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.2 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q1:1.4.0.36 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.34 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.32 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.30 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.28 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.26 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.24 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.22 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.20 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.18 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.16 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.14 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.12 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.10 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.8 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.6 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.4 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.2 pkgsrc-2008Q1:1.3.0.8 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.6 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.4 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.1.1.1.0.8 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.6 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.4 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.2 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2012.04.13.23.38.34; author obache; state dead; branches; next 1.4; 1.4 date 2008.05.15.13.42.29; author obache; state Exp; branches; next 1.3; 1.3 date 2007.06.19.01.40.14; author rh; state dead; branches; next 1.2; 1.2 date 2007.06.07.08.08.16; author rh; state Exp; branches; next 1.1; 1.1 date 2006.06.03.23.29.24; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.06.03.23.29.24; author rh; state Exp; branches; next ; desc @@ 1.5 log @Update libupnp to 1.6.17. * IPv6 support (introduce some API/ABI incompatibility). * many bug fixes, @ text @$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 #include #include "unixutil.h" +#else + #include #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 ) { @ 1.4 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update libupnp to 1.6.0 (currently a leaf package). Changes are mainly bugfixes, including a couple of serious bugs that prevented the library from working on NetBSD and Darwin (for anything other than trivial tests). Add a buildlink3.mk while at it. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2007/06/07 08:08:16 rh Exp $ d3 9 a11 31 --- upnp/src/genlib/net/sock.c.orig 2006-10-05 16:19:25.000000000 +1000 +++ upnp/src/genlib/net/sock.c @@@@ -231,6 +231,15 @@@@ sock_read_write( IN SOCKINFO * info, } } +#ifdef SO_NOSIGPIPE + { + int old; + int set = 1; + socklen_t olen = sizeof(old); + getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen); + setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set)); +#endif + if( bRead ) { // read data numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL); @@@@ -243,6 +252,9 @@@@ sock_read_write( IN SOCKINFO * info, send( sockfd, buffer + bytes_sent, byte_left, MSG_DONTROUTE|MSG_NOSIGNAL); if( num_written == -1 ) { +#ifdef SO_NOSIGPIPE + setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen); +#endif return num_written; } @@@@ -253,6 +265,11 @@@@ sock_read_write( IN SOCKINFO * info, numBytes = bytes_sent; } d13 2 a14 6 +#ifdef SO_NOSIGPIPE + setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen); + } +#endif + if( numBytes < 0 ) { d17 6 @ 1.2 log @Update libupnp to 1.4.6. Changes include tons of bugfixes and portability fixes. This version now also comes with full API reference documentation. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- upnp/src/genlib/net/sock.c.orig 2006-02-23 07:38:03.000000000 +1000 d5 1 a5 12 @@@@ -49,6 +49,10 @@@@ #include #include "unixutil.h" +#ifndef MSG_NOSIGNAL +#define MSG_NOSIGNAL 0 +#endif + /************************************************************************ * Function : sock_init * @@@@ -223,6 +227,15 @@@@ sock_read_write( IN SOCKINFO * info, d20 2 a21 2 numBytes = recv( sockfd, buffer, bufsize, MSG_NOSIGNAL ); @@@@ -235,6 +248,9 @@@@ sock_read_write( IN SOCKINFO * info, d23 1 a23 1 MSG_DONTROUTE | MSG_NOSIGNAL ); d31 1 a31 1 @@@@ -245,6 +261,11 @@@@ sock_read_write( IN SOCKINFO * info, @ 1.1.1.1 log @Initial import of libupnp-1.3.1, a universal plug and play (UPnP) SDK. @ text @@