Sorry for all the diffs. This is my first time updating the port. Had to bump the SHARED_LIB to 1.0 as some of the functionality has changed. (Thanks sthen!)
Tom Index: Makefile =================================================================== RCS file: /cvs/ports/net/libnice/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 12 Jul 2010 22:07:39 -0000 1.5 +++ Makefile 14 Sep 2010 10:56:21 -0000 @@ -4,9 +4,8 @@ SHARED_ONLY = Yes COMMENT = GLib ICE implementation -DISTNAME = libnice-0.0.9 -REVISION = 2 -SHARED_LIBS += nice 0.0 # .5.0 +DISTNAME = libnice-0.0.13 +SHARED_LIBS += nice 1.0 CATEGORIES = net HOMEPAGE = http://nice.freedesktop.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/net/libnice/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ distinfo 14 Sep 2010 10:56:21 -0000 @@ -1,5 +1,5 @@ -MD5 (libnice-0.0.9.tar.gz) = GawlZe50h8HzJIe5SBELGQ== -RMD160 (libnice-0.0.9.tar.gz) = S49+f3Lf+lry1LolGhj4qwItTUg= -SHA1 (libnice-0.0.9.tar.gz) = ghy+65codIVXJNipz7qqMIb2KIE= -SHA256 (libnice-0.0.9.tar.gz) = +oZSxCK/i0bu2zSe1P3FVF3OEE+b1sJhpo6tban/KKE= -SIZE (libnice-0.0.9.tar.gz) = 627674 +MD5 (libnice-0.0.13.tar.gz) = 5bn3maV8uTnqJljsNSU6uQ== +RMD160 (libnice-0.0.13.tar.gz) = CiDQPE7Q+xZ3FJstlZWmER6VihU= +SHA1 (libnice-0.0.13.tar.gz) = cDsD+7INppPAV9P+UHSxgqF8c2Q= +SHA256 (libnice-0.0.13.tar.gz) = 2N0mDEhqRwpgUqUyOSCHighORKGd8JsVcouFyePW7fA= +SIZE (libnice-0.0.13.tar.gz) = 635783 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile_in --- patches/patch-Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- Makefile.in.orig Wed Aug 19 11:42:27 2009 -+++ Makefile.in Wed Aug 19 11:55:06 2009 -@@ -208,7 +208,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- Makefile.in.orig Mon Sep 13 10:59:09 2010 ++++ Makefile.in Mon Sep 13 10:59:22 2010 +@@ -244,7 +244,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -218,8 +217,7 @@ ERROR_CFLAGS = \ +@@ -254,8 +253,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-agent_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-agent_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-agent_Makefile_in --- patches/patch-agent_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-agent_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-agent_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- agent/Makefile.in.orig Wed Aug 19 11:39:52 2009 -+++ agent/Makefile.in Wed Aug 19 12:19:29 2009 -@@ -214,7 +214,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- agent/Makefile.in.orig Mon Sep 13 11:01:37 2010 ++++ agent/Makefile.in Mon Sep 13 11:01:46 2010 +@@ -237,7 +237,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -224,8 +223,7 @@ ERROR_CFLAGS = \ +@@ -247,8 +246,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ @@ -19,14 +19,3 @@ $OpenBSD: patch-agent_Makefile_in,v 1.1. # -Wold-style-definition -Winline -Wunreachable-code CLEANFILES = *.gcno *.gcda $(BUILT_SOURCES) -@@ -580,8 +578,8 @@ agent-signals-marshal.h: agent-signals-marshal.list - - agent-signals-marshal.c: agent-signals-marshal.list Makefile.am - glib-genmarshal --body --prefix=agent_marshal $< > $@ -- sed -i "1i#include \"agent-signals-marshal.h\"" $@ -- sed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@ -+ gsed -i "1i#include \"agent-signals-marshal.h\"" $@ -+ gsed -i -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Index: patches/patch-agent_interfaces_c =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-agent_interfaces_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-agent_interfaces_c --- patches/patch-agent_interfaces_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-agent_interfaces_c 14 Sep 2010 10:56:21 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-agent_interfaces_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- agent/interfaces.c.orig Wed Aug 19 12:20:47 2009 -+++ agent/interfaces.c Wed Aug 19 12:21:26 2009 -@@ -47,6 +47,7 @@ +--- agent/interfaces.c.orig Tue Jul 20 22:54:40 2010 ++++ agent/interfaces.c Mon Sep 13 11:24:57 2010 +@@ -49,6 +49,7 @@ #include <net/if.h> #include <net/if_arp.h> #include <arpa/inet.h> @@ -9,3 +9,12 @@ $OpenBSD: patch-agent_interfaces_c,v 1.1 #ifdef HAVE_GETIFADDRS +@@ -198,7 +199,7 @@ nice_interfaces_get_local_ips (gboolean include_loopba + struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr; + + /* Skip link-local addresses, they require a scope */ +- if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr)) ++ if (IN6_IS_ADDR_LINKLOCAL ((struct in6_addr *)sa6->sin6_addr.s6_addr)) + continue; + + if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string, Index: patches/patch-common_mk =================================================================== RCS file: patches/patch-common_mk diff -N patches/patch-common_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-common_mk 14 Sep 2010 10:56:21 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- common.mk.orig Mon Sep 13 10:59:40 2010 ++++ common.mk Mon Sep 13 10:59:53 2010 +@@ -2,7 +2,6 @@ + ERROR_CFLAGS = \ + $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ +- -Wextra \ + -Wundef \ + -Wnested-externs \ + -Wwrite-strings \ +@@ -12,8 +11,7 @@ ERROR_CFLAGS = \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wredundant-decls \ +- -Wno-unused-parameter \ +- -Wno-missing-field-initializers ++ -Wno-unused-parameter + # -Wold-style-definition -Winline -Wunreachable-code + + CLEANFILES = *.gcno *.gcda Index: patches/patch-nice_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-nice_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-nice_Makefile_in --- patches/patch-nice_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-nice_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-nice_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- nice/Makefile.in.orig Wed Aug 19 11:42:48 2009 -+++ nice/Makefile.in Wed Aug 19 11:55:06 2009 -@@ -216,7 +216,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- nice/Makefile.in.orig Mon Sep 13 11:03:13 2010 ++++ nice/Makefile.in Mon Sep 13 11:03:28 2010 +@@ -238,7 +238,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -226,8 +225,7 @@ ERROR_CFLAGS = \ +@@ -248,8 +247,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-random_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-random_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-random_Makefile_in --- patches/patch-random_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-random_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-random_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- random/Makefile.in.orig Wed Aug 19 12:40:55 2009 -+++ random/Makefile.in Wed Aug 19 12:41:04 2009 -@@ -204,7 +204,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- random/Makefile.in.orig Mon Sep 13 11:02:05 2010 ++++ random/Makefile.in Mon Sep 13 11:02:14 2010 +@@ -215,7 +215,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -214,8 +213,7 @@ ERROR_CFLAGS = \ +@@ -225,8 +224,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-socket_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-socket_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-socket_Makefile_in --- patches/patch-socket_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-socket_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-socket_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- socket/Makefile.in.orig Wed Aug 19 11:43:10 2009 -+++ socket/Makefile.in Wed Aug 19 11:55:06 2009 -@@ -210,7 +210,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- socket/Makefile.in.orig Mon Sep 13 11:03:44 2010 ++++ socket/Makefile.in Mon Sep 13 11:03:55 2010 +@@ -209,7 +209,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -220,8 +219,7 @@ ERROR_CFLAGS = \ +@@ -219,8 +218,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-stun_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_Makefile_in --- patches/patch-stun_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-stun_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/Makefile.in.orig Wed Aug 19 11:41:06 2009 -+++ stun/Makefile.in Wed Aug 19 11:55:06 2009 -@@ -227,7 +227,6 @@ top_srcdir = @top_srcdir@ - SUBDIRS = . tools tests +$OpenBSD$ +--- stun/Makefile.in.orig Mon Sep 13 11:01:05 2010 ++++ stun/Makefile.in Mon Sep 13 11:01:16 2010 +@@ -277,7 +277,6 @@ SUBDIRS = . tools tests ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -237,8 +236,7 @@ ERROR_CFLAGS = \ +@@ -287,8 +286,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-stun_stun5389_c =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_stun5389_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_stun5389_c --- patches/patch-stun_stun5389_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_stun5389_c 14 Sep 2010 10:56:21 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-stun_stun5389_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/stun5389.c.orig Wed Aug 19 11:45:57 2009 -+++ stun/stun5389.c Wed Aug 19 11:48:15 2009 -@@ -41,9 +41,6 @@ +$OpenBSD$ +--- stun/stun5389.c.orig Mon Sep 13 11:07:22 2010 ++++ stun/stun5389.c Mon Sep 13 11:08:09 2010 +@@ -40,9 +40,6 @@ #ifdef _WIN32 #include <winsock2.h> Index: patches/patch-stun_stunmessage_c =================================================================== RCS file: patches/patch-stun_stunmessage_c diff -N patches/patch-stun_stunmessage_c --- patches/patch-stun_stunmessage_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-stun_stunmessage_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/stunmessage.c.orig Wed Aug 19 11:44:02 2009 -+++ stun/stunmessage.c Wed Aug 19 11:44:20 2009 -@@ -46,6 +46,7 @@ - #else - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #endif - - Index: patches/patch-stun_tests_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_tests_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_tests_Makefile_in --- patches/patch-stun_tests_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_tests_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-stun_tests_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tests/Makefile.in.orig Wed Aug 19 11:41:43 2009 -+++ stun/tests/Makefile.in Wed Aug 19 11:55:06 2009 -@@ -217,7 +217,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- stun/tests/Makefile.in.orig Mon Sep 13 11:02:28 2010 ++++ stun/tests/Makefile.in Mon Sep 13 11:02:38 2010 +@@ -228,7 +228,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -227,8 +226,7 @@ ERROR_CFLAGS = \ +@@ -238,8 +237,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-stun_tests_test-bind_c =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_tests_test-bind_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-stun_tests_test-bind_c --- patches/patch-stun_tests_test-bind_c 9 Sep 2009 22:13:08 -0000 1.2 +++ patches/patch-stun_tests_test-bind_c 14 Sep 2010 10:56:21 -0000 @@ -1,110 +1,25 @@ -$OpenBSD: patch-stun_tests_test-bind_c,v 1.2 2009/09/09 22:13:08 jasper Exp $ ---- stun/tests/test-bind.c.orig Tue Mar 31 20:58:55 2009 -+++ stun/tests/test-bind.c Wed Sep 9 16:19:43 2009 -@@ -49,10 +49,6 @@ - #ifdef _WIN32 +$OpenBSD$ +--- stun/tests/test-bind.c.orig Mon Sep 13 11:34:38 2010 ++++ stun/tests/test-bind.c Mon Sep 13 11:35:18 2010 +@@ -50,9 +50,6 @@ #include <winsock2.h> #include <ws2tcpip.h> -- + -#define MSG_DONTWAIT 0 -#define MSG_NOSIGNAL 0 - #define alarm(...) #define close closesocket #else -@@ -62,6 +58,11 @@ +@@ -60,6 +57,11 @@ + #include <sys/socket.h> + #include <arpa/inet.h> #include <netdb.h> - #endif - ++#endif ++ +#if defined(_WIN32) || defined(__OpenBSD__) +#define MSG_DONTWAIT 0 +#define MSG_NOSIGNAL 0 -+#endif -+ - #undef NDEBUG /* ensure assertions are built-in */ - #include <assert.h> - -@@ -216,13 +217,10 @@ static void bad_responses (void) - val = getsockname (fd, (struct sockaddr *)&addr, &addrlen); - assert (val == 0); - -- val = connect (servfd, (struct sockaddr *)&addr, addrlen); -- assert (val == 0); -- - /* Send request instead of response */ - val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); - assert (val == 0); -- len = recv (servfd, buf, 1000, MSG_DONTWAIT); -+ len = recvfrom (servfd, buf, 1000, MSG_DONTWAIT, NULL, 0); - assert (len >= 20); - - assert (stun_agent_validate (&agent, &msg, buf, len, NULL, NULL) -@@ -283,30 +281,29 @@ static void responses (void) - fd = socket (addr.ss_family, SOCK_DGRAM, 0); - assert (fd != -1); - -- val = connect (fd, (struct sockaddr *)&addr, addrlen); -- assert (val == 0); -- - /* Send to/receive from our client instance only */ - val = getsockname (fd, (struct sockaddr *)&addr, &addrlen); - assert (val == 0); - -- val = connect (servfd, (struct sockaddr *)&addr, addrlen); -- assert (val == 0); -- - /* Send error response */ - req_len = stun_usage_bind_create (&agent, &req_msg, req, sizeof(req)); - assert (req_len > 0); - -- val = send (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL); -+ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); -+ assert (val == 0); -+ -+ val = sendto (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL, -+ (struct sockaddr *)&addr, addrlen); - assert (val >= 0); - -- val = recv (servfd, buf, 1000, MSG_DONTWAIT); -+ val = recvfrom (servfd, buf, 1000, MSG_DONTWAIT, NULL, 0); - assert (val >= 0); - - assert (stun_agent_validate (&agent, &msg, buf, val, NULL, NULL) - == STUN_VALIDATION_SUCCESS); - -- stun_agent_init_error (&agent, &msg, buf, sizeof (buf), &msg, STUN_ERROR_SERVER_ERROR); -+ stun_agent_init_error (&agent, &msg, buf, sizeof (buf), -+ &msg, STUN_ERROR_SERVER_ERROR); - len = stun_agent_finish_message (&agent, &msg, NULL, 0); - assert (len > 0); - -@@ -321,7 +318,11 @@ static void responses (void) - req_len = stun_usage_bind_create (&agent, &req_msg, req, sizeof(req)); - assert (req_len > 0); - -- val = send (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL); -+ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); -+ assert (val == 0); -+ -+ val = sendto (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL, -+ (struct sockaddr *)&addr, addrlen); - assert (val >= 0); - - val = recv (servfd, buf, 1000, MSG_DONTWAIT); -@@ -348,10 +349,14 @@ static void responses (void) - req_len = stun_usage_bind_create (&agent, &req_msg, req, sizeof(req)); - assert (req_len > 0); - -- val = send (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL); -+ val = getsockname (servfd, (struct sockaddr *)&addr, &addrlen); -+ assert (val == 0); -+ -+ val = sendto (fd, req, req_len, MSG_DONTWAIT | MSG_NOSIGNAL, -+ (struct sockaddr *)&addr, addrlen); - assert (val >= 0); - -- val = recv (servfd, buf, 1000, MSG_DONTWAIT); -+ val = recvfrom (servfd, buf, 1000, MSG_DONTWAIT, NULL, 0); - assert (val >= 0); + #endif - assert (stun_agent_validate (&agent, &msg, buf, val, NULL, NULL) + #undef NDEBUG /* ensure assertions are built-in */ Index: patches/patch-stun_tests_test-format_c =================================================================== RCS file: patches/patch-stun_tests_test-format_c diff -N patches/patch-stun_tests_test-format_c --- patches/patch-stun_tests_test-format_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-stun_tests_test-format_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tests/test-format.c.orig Thu Aug 20 17:15:52 2009 -+++ stun/tests/test-format.c Thu Aug 20 17:15:55 2009 -@@ -52,6 +52,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <arpa/inet.h> -+#include <netinet/in.h> - #endif - - Index: patches/patch-stun_tests_test-parse_c =================================================================== RCS file: patches/patch-stun_tests_test-parse_c diff -N patches/patch-stun_tests_test-parse_c --- patches/patch-stun_tests_test-parse_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-stun_tests_test-parse_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tests/test-parse.c.orig Thu Aug 20 17:15:41 2009 -+++ stun/tests/test-parse.c Thu Aug 20 17:15:45 2009 -@@ -49,6 +49,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <arpa/inet.h> -+#include <netinet/in.h> - #endif - - Index: patches/patch-stun_tools_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_tools_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_tools_Makefile_in --- patches/patch-stun_tools_Makefile_in 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_tools_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-stun_tools_Makefile_in,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tools/Makefile.in.orig Wed Aug 19 11:42:02 2009 -+++ stun/tools/Makefile.in Wed Aug 19 11:55:06 2009 -@@ -207,7 +207,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- stun/tools/Makefile.in.orig Mon Sep 13 11:02:46 2010 ++++ stun/tools/Makefile.in Mon Sep 13 11:02:56 2010 +@@ -215,7 +215,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -217,8 +216,7 @@ ERROR_CFLAGS = \ +@@ -225,8 +224,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: patches/patch-stun_tools_stunbdc_c =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_tools_stunbdc_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_tools_stunbdc_c --- patches/patch-stun_tools_stunbdc_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_tools_stunbdc_c 14 Sep 2010 10:56:21 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-stun_tools_stunbdc_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tools/stunbdc.c.orig Wed Aug 19 11:49:36 2009 -+++ stun/tools/stunbdc.c Wed Aug 19 11:50:26 2009 -@@ -38,7 +38,6 @@ +$OpenBSD$ +--- stun/tools/stunbdc.c.orig Mon Sep 13 11:09:41 2010 ++++ stun/tools/stunbdc.c Mon Sep 13 11:11:19 2010 +@@ -41,7 +41,6 @@ #endif #ifndef _WIN32 @@ -9,7 +9,7 @@ $OpenBSD: patch-stun_tools_stunbdc_c,v 1 #include <netdb.h> #include <sys/types.h> -@@ -51,6 +50,7 @@ +@@ -54,6 +53,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> Index: patches/patch-stun_tools_stund_c =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-stun_tools_stund_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-stun_tools_stund_c --- patches/patch-stun_tools_stund_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ patches/patch-stun_tools_stund_c 14 Sep 2010 10:56:21 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-stun_tools_stund_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/tools/stund.c.orig Wed Aug 19 11:51:53 2009 -+++ stun/tools/stund.c Wed Aug 19 11:54:56 2009 -@@ -55,6 +55,7 @@ +$OpenBSD$ +--- stun/tools/stund.c.orig Mon Sep 13 11:12:38 2010 ++++ stun/tools/stund.c Mon Sep 13 11:14:18 2010 +@@ -58,6 +58,7 @@ #include <unistd.h> #include <errno.h> #include <limits.h> Index: patches/patch-stun_usages_bind_c =================================================================== RCS file: patches/patch-stun_usages_bind_c diff -N patches/patch-stun_usages_bind_c --- patches/patch-stun_usages_bind_c 9 Sep 2009 22:13:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-stun_usages_bind_c,v 1.1 2009/09/09 22:13:08 jasper Exp $ ---- stun/usages/bind.c.orig Wed Sep 9 16:20:06 2009 -+++ stun/usages/bind.c Wed Sep 9 16:23:43 2009 -@@ -263,16 +263,20 @@ stun_trans_create (StunTransport *tr, int type, int pr - if (fd == -1) - return STUN_USAGE_TRANS_RETURN_ERROR; - -- if (connect (fd, srv, srvlen) && -+ if (type != SOCK_DGRAM) { -+ if (connect (fd, srv, srvlen) && - #ifdef _WIN32 -- (WSAGetLastError () != WSAEINPROGRESS)) { -+ (WSAGetLastError () != WSAEINPROGRESS)) { - #else -- (errno != EINPROGRESS)) { -+ (errno != EINPROGRESS)) { - #endif -- goto error; -+ goto error; -+ } -+ val = stun_trans_init (tr, fd, NULL, 0); -+ } else { -+ val = stun_trans_init (tr, fd, srv, srvlen); - } - -- val = stun_trans_init (tr, fd, NULL, 0); - if (val) - goto error; - Index: patches/patch-stun_utils_c =================================================================== RCS file: patches/patch-stun_utils_c diff -N patches/patch-stun_utils_c --- patches/patch-stun_utils_c 20 Aug 2009 17:09:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-stun_utils_c,v 1.1.1.1 2009/08/20 17:09:00 jasper Exp $ ---- stun/utils.c.orig Wed Aug 19 11:48:44 2009 -+++ stun/utils.c Wed Aug 19 11:49:09 2009 -@@ -44,6 +44,8 @@ - - #include "utils.h" - -+#include <netinet/in.h> -+ - size_t stun_padding (size_t l) - { - return (4 - (l & 3)) & 3; Index: patches/patch-tests_Makefile_in =================================================================== RCS file: /cvs/ports/net/libnice/patches/patch-tests_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-tests_Makefile_in --- patches/patch-tests_Makefile_in 9 Sep 2009 22:13:08 -0000 1.1 +++ patches/patch-tests_Makefile_in 14 Sep 2010 10:56:21 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-tests_Makefile_in,v 1.1 2009/09/09 22:13:08 jasper Exp $ ---- tests/Makefile.in.orig Wed Sep 9 16:27:19 2009 -+++ tests/Makefile.in Wed Sep 9 16:27:40 2009 -@@ -240,7 +240,6 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +$OpenBSD$ +--- tests/Makefile.in.orig Mon Sep 13 11:04:05 2010 ++++ tests/Makefile.in Mon Sep 13 11:04:15 2010 +@@ -256,7 +256,6 @@ top_srcdir = @top_srcdir@ ERROR_CFLAGS = \ $(LIBNICE_CFLAGS) \ + -fno-strict-aliasing \ - -Wextra \ -Wundef \ -Wnested-externs \ -Wwrite-strings \ -@@ -250,8 +249,7 @@ ERROR_CFLAGS = \ +@@ -266,8 +265,7 @@ ERROR_CFLAGS = \ -Wmissing-prototypes \ -Wstrict-prototypes \ -Wredundant-decls \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/libnice/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 20 Aug 2009 18:48:02 -0000 1.2 +++ pkg/PLIST 14 Sep 2010 10:56:21 -0000 @@ -1,4 +1,4 @@ -...@comment $OpenBSD: PLIST,v 1.2 2009/08/20 18:48:02 ajacoutot Exp $ +...@comment $OpenBSD$ @bin bin/stunbdc @bin bin/stund include/nice/ @@ -6,16 +6,9 @@ include/nice/address.h include/nice/agent.h include/nice/candidate.h include/nice/debug.h -include/nice/http.h include/nice/interfaces.h include/nice/nice.h -include/nice/pseudossl.h -include/nice/socket.h -include/nice/socks5.h -include/nice/tcp-bsd.h -include/nice/tcp-turn.h -include/nice/turn.h -include/nice/udp-bsd.h +include/nice/pseudotcp.h include/stun/ include/stun/constants.h include/stun/debug.h @@ -27,8 +20,7 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -...@comment lib/gstreamer-0.10/libgstnice.a -...@comment lib/gstreamer-0.10/libgstnice.la +lib/gstreamer-0.10/libgstnice.la lib/gstreamer-0.10/libgstnice.so lib/libnice.la @lib lib/libnice.so.${LIBnice_VERSION} @@ -39,6 +31,7 @@ share/gtk-doc/html/libnice/ch01.html share/gtk-doc/html/libnice/ch02.html share/gtk-doc/html/libnice/ch03.html share/gtk-doc/html/libnice/ch04.html +share/gtk-doc/html/libnice/ch05.html share/gtk-doc/html/libnice/home.png share/gtk-doc/html/libnice/index.html share/gtk-doc/html/libnice/index.sgml @@ -49,6 +42,7 @@ share/gtk-doc/html/libnice/libnice-ICE.h share/gtk-doc/html/libnice/libnice-Network-interfaces-discovery.html share/gtk-doc/html/libnice/libnice-NiceAddress.html share/gtk-doc/html/libnice/libnice-NiceCandidate.html +share/gtk-doc/html/libnice/libnice-Pseudo-TCP-Socket.html share/gtk-doc/html/libnice/libnice-StunAgent.html share/gtk-doc/html/libnice/libnice-StunMessage.html share/gtk-doc/html/libnice/libnice-TURN.html @@ -57,6 +51,7 @@ share/gtk-doc/html/libnice/libnice.devhe share/gtk-doc/html/libnice/libnice.devhelp2 share/gtk-doc/html/libnice/pt01.html share/gtk-doc/html/libnice/pt02.html +share/gtk-doc/html/libnice/pt03.html share/gtk-doc/html/libnice/right.png share/gtk-doc/html/libnice/style.css share/gtk-doc/html/libnice/up.png
