Mon Aug 9 09:53:30 2010 UTC ()
split libnice into two pkgs, to get dependencies sorted and stop
abuse of the options framework
being here, update to 0.0.13
changes:
- Add support for IPv6
- Fix crc32 function conflict with libz.so
- Various bug fixing and code cleaning
- Validate the remote candidate address before adding it


(drochner)
diff -r1.847 -r1.848 pkgsrc/net/Makefile
diff -r0 -r1.1 pkgsrc/net/gst-plugins0.10-libnice/DESCR
diff -r0 -r1.1 pkgsrc/net/gst-plugins0.10-libnice/Makefile
diff -r0 -r1.1 pkgsrc/net/gst-plugins0.10-libnice/PLIST
diff -r1.5 -r1.6 pkgsrc/net/libnice/Makefile
diff -r1.2 -r1.3 pkgsrc/net/libnice/PLIST
diff -r1.4 -r1.5 pkgsrc/net/libnice/distinfo
diff -r1.1.1.1 -r0 pkgsrc/net/libnice/options.mk
diff -r1.2 -r1.3 pkgsrc/net/libnice/patches/patch-ac
diff -r0 -r1.1 pkgsrc/net/libnice/patches/patch-ad
cvs diff -r1.847 -r1.848 pkgsrc/net/Makefile (expand / switch to unified diff)

--- pkgsrc/net/Makefile 2010/08/04 21:33:16 1.847
+++ pkgsrc/net/Makefile 2010/08/09 09:53:30 1.848
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.847 2010/08/04 21:33:16 seb Exp $ 1# $NetBSD: Makefile,v 1.848 2010/08/09 09:53:30 drochner Exp $
2# 2#
3 3
4COMMENT= Networking tools 4COMMENT= Networking tools
5 5
6SUBDIR+= 3proxy 6SUBDIR+= 3proxy
7SUBDIR+= 6tunnel 7SUBDIR+= 6tunnel
8SUBDIR+= DarwinStreamingServer 8SUBDIR+= DarwinStreamingServer
9SUBDIR+= GeoIP 9SUBDIR+= GeoIP
10SUBDIR+= Geomyidae 10SUBDIR+= Geomyidae
11SUBDIR+= IglooFTP 11SUBDIR+= IglooFTP
12SUBDIR+= LaBrea 12SUBDIR+= LaBrea
13SUBDIR+= ORBit 13SUBDIR+= ORBit
14SUBDIR+= ORBit2 14SUBDIR+= ORBit2
@@ -138,26 +138,27 @@ SUBDIR+= gkrellm-snmp @@ -138,26 +138,27 @@ SUBDIR+= gkrellm-snmp
138SUBDIR+= gkrellm-wireless 138SUBDIR+= gkrellm-wireless
139SUBDIR+= gnapfetch 139SUBDIR+= gnapfetch
140SUBDIR+= gnet 140SUBDIR+= gnet
141SUBDIR+= gnet1 141SUBDIR+= gnet1
142SUBDIR+= gnetcat 142SUBDIR+= gnetcat
143SUBDIR+= gnome-netstatus 143SUBDIR+= gnome-netstatus
144SUBDIR+= gnome-nettool 144SUBDIR+= gnome-nettool
145SUBDIR+= gnome-vfs-smb 145SUBDIR+= gnome-vfs-smb
146SUBDIR+= gnugk 146SUBDIR+= gnugk
147SUBDIR+= gofish 147SUBDIR+= gofish
148SUBDIR+= gopher 148SUBDIR+= gopher
149SUBDIR+= gsnmp 149SUBDIR+= gsnmp
150SUBDIR+= gssdp 150SUBDIR+= gssdp
 151SUBDIR+= gst-plugins0.10-libnice
151SUBDIR+= gst-plugins0.10-mms 152SUBDIR+= gst-plugins0.10-mms
152SUBDIR+= gst-plugins0.10-soup 153SUBDIR+= gst-plugins0.10-soup
153SUBDIR+= gt-itm 154SUBDIR+= gt-itm
154SUBDIR+= gtk-gnutella 155SUBDIR+= gtk-gnutella
155SUBDIR+= gtk-vnc 156SUBDIR+= gtk-vnc
156SUBDIR+= gtk_wicontrol 157SUBDIR+= gtk_wicontrol
157SUBDIR+= gupnp 158SUBDIR+= gupnp
158SUBDIR+= gupnp-av 159SUBDIR+= gupnp-av
159SUBDIR+= gupnp-igd 160SUBDIR+= gupnp-igd
160SUBDIR+= gupnp-tools 161SUBDIR+= gupnp-tools
161SUBDIR+= hesiod 162SUBDIR+= hesiod
162SUBDIR+= hf6to4 163SUBDIR+= hf6to4
163SUBDIR+= hlfl 164SUBDIR+= hlfl
File Added: pkgsrc/net/gst-plugins0.10-libnice/Attic/DESCR
GLib ICE library

 - only implements ICE Lite
 - no support for RTCP
 - no support for IPv6
File Added: pkgsrc/net/gst-plugins0.10-libnice/Attic/Makefile
# $NetBSD: Makefile,v 1.1 2010/08/09 09:53:30 drochner Exp $
#

DISTNAME=	libnice-0.0.13
PKGNAME=	gst-plugins0.10-libnice-0.0.13
CATEGORIES=	net devel
MASTER_SITES=	http://nice.freedesktop.org/releases/
CONFLICTS+=	libnice<0.0.13

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://nice.freedesktop.org/wiki/
COMMENT=	IETF's draft Interactice Connectivity Establishment standard implementation
LICENSE=	gnu-lgpl-v2.1 OR mpl-1.1

PATCHDIR=	${.CURDIR}/../../net/libnice/patches
DISTINFO_FILE=	${.CURDIR}/../../net/libnice/distinfo

PKG_DESTDIR_SUPPORT=	user-destdir

GNU_CONFIGURE=	yes
USE_LIBTOOL=	yes
USE_TOOLS+=	pkg-config
CONFIGURE_ARGS+= --with-gstreamer

BUILD_DIRS=	gst
INSTALL_DIRS=	gst

.include "../../devel/glib2/buildlink3.mk"
.include "../../net/gupnp-igd/buildlink3.mk"
.include "../../net/libnice/buildlink3.mk"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/net/gst-plugins0.10-libnice/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2010/08/09 09:53:30 drochner Exp $
lib/gstreamer-0.10/libgstnice.la
cvs diff -r1.5 -r1.6 pkgsrc/net/libnice/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libnice/Makefile 2010/06/13 22:45:11 1.5
+++ pkgsrc/net/libnice/Makefile 2010/08/09 09:53:30 1.6
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2010/08/09 09:53:30 drochner Exp $
2# 2#
3 3
4DISTNAME= libnice-0.0.11 4DISTNAME= libnice-0.0.13
5PKGREVISION= 1 
6CATEGORIES= net devel 5CATEGORIES= net devel
7MASTER_SITES= http://nice.freedesktop.org/releases/ 6MASTER_SITES= http://nice.freedesktop.org/releases/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://nice.freedesktop.org/wiki/ 9HOMEPAGE= http://nice.freedesktop.org/wiki/
11COMMENT= IETF's draft Interactice Connectivity Establishment standard implementation 10COMMENT= IETF's draft Interactice Connectivity Establishment standard implementation
12LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 11LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16.include "options.mk" 
17 
18GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 16USE_LIBTOOL= yes
20USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
 18CONFIGURE_ARGS+= --without-gstreamer
21 19
22PKGCONFIG_OVERRIDE+= nice/nice.pc.in 20PKGCONFIG_OVERRIDE+= nice/nice.pc.in
23 21
24.include "../../devel/glib2/buildlink3.mk" 22.include "../../devel/glib2/buildlink3.mk"
25.include "../../net/gupnp-igd/buildlink3.mk" 23.include "../../net/gupnp-igd/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/net/libnice/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libnice/PLIST 2010/05/02 11:45:35 1.2
+++ pkgsrc/net/libnice/PLIST 2010/08/09 09:53:30 1.3
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1@comment $NetBSD: PLIST,v 1.2 2010/05/02 11:45:35 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2010/08/09 09:53:30 drochner Exp $
2bin/stunbdc 2bin/stunbdc
3bin/stund 3bin/stund
4include/nice/address.h 4include/nice/address.h
5include/nice/agent.h 5include/nice/agent.h
6include/nice/candidate.h 6include/nice/candidate.h
7include/nice/debug.h 7include/nice/debug.h
8include/nice/interfaces.h 8include/nice/interfaces.h
9include/nice/nice.h 9include/nice/nice.h
10include/nice/pseudotcp.h 10include/nice/pseudotcp.h
11include/stun/constants.h 11include/stun/constants.h
12include/stun/debug.h 12include/stun/debug.h
13include/stun/stunagent.h 13include/stun/stunagent.h
14include/stun/stunmessage.h 14include/stun/stunmessage.h
15include/stun/usages/bind.h 15include/stun/usages/bind.h
16include/stun/usages/ice.h 16include/stun/usages/ice.h
17include/stun/usages/timer.h 17include/stun/usages/timer.h
18include/stun/usages/turn.h 18include/stun/usages/turn.h
19include/stun/win32_common.h 19include/stun/win32_common.h
20${PLIST.gstreamer}lib/gstreamer-0.10/libgstnice.la 
21lib/libnice.la 20lib/libnice.la
22lib/pkgconfig/nice.pc 21lib/pkgconfig/nice.pc
23share/gtk-doc/html/libnice/NiceAgent.html 22share/gtk-doc/html/libnice/NiceAgent.html
24share/gtk-doc/html/libnice/ch01.html 23share/gtk-doc/html/libnice/ch01.html
25share/gtk-doc/html/libnice/ch02.html 24share/gtk-doc/html/libnice/ch02.html
26share/gtk-doc/html/libnice/ch03.html 25share/gtk-doc/html/libnice/ch03.html
27share/gtk-doc/html/libnice/ch04.html 26share/gtk-doc/html/libnice/ch04.html
28share/gtk-doc/html/libnice/ch05.html 27share/gtk-doc/html/libnice/ch05.html
29share/gtk-doc/html/libnice/home.png 28share/gtk-doc/html/libnice/home.png
30share/gtk-doc/html/libnice/index.html 29share/gtk-doc/html/libnice/index.html
31share/gtk-doc/html/libnice/index.sgml 30share/gtk-doc/html/libnice/index.sgml
32share/gtk-doc/html/libnice/left.png 31share/gtk-doc/html/libnice/left.png
33share/gtk-doc/html/libnice/libnice-Bind.html 32share/gtk-doc/html/libnice/libnice-Bind.html
cvs diff -r1.4 -r1.5 pkgsrc/net/libnice/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libnice/distinfo 2010/05/02 11:45:35 1.4
+++ pkgsrc/net/libnice/distinfo 2010/08/09 09:53:30 1.5
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.4 2010/05/02 11:45:35 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2010/08/09 09:53:30 drochner Exp $
2 2
3SHA1 (libnice-0.0.11.tar.gz) = 357ce736c106b0b11fd37c13675640a884f42413 3SHA1 (libnice-0.0.13.tar.gz) = 703b03fbb20da693c057d3fe5074b182a17c7364
4RMD160 (libnice-0.0.11.tar.gz) = 02c6949c7cb09fc92db89a3c0f221acfe3f9a6c5 4RMD160 (libnice-0.0.13.tar.gz) = 0a20d03c4ed0fb1677149b2d9595a6111e958a15
5Size (libnice-0.0.11.tar.gz) = 636299 bytes 5Size (libnice-0.0.13.tar.gz) = 635783 bytes
6SHA1 (patch-ac) = 1dd3664f86b331067eddecf82bedfc56bd62ff1b 6SHA1 (patch-ac) = 908988e65c637db9bf6ca35f912a841055369e07
 7SHA1 (patch-ad) = bb8161468e0875b6ca69d699c4119821a26d4532
File Deleted: pkgsrc/net/libnice/Attic/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/net/libnice/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/libnice/patches/Attic/patch-ac 2010/05/02 11:45:35 1.2
+++ pkgsrc/net/libnice/patches/Attic/patch-ac 2010/08/09 09:53:30 1.3
@@ -1,12 +1,21 @@ @@ -1,12 +1,21 @@
1$NetBSD: patch-ac,v 1.2 2010/05/02 11:45:35 wiz Exp $ 1$NetBSD: patch-ac,v 1.3 2010/08/09 09:53:30 drochner Exp $
2 2
3--- agent/interfaces.c.orig 2010-03-18 20:57:10.000000000 +0000 3--- agent/interfaces.c.orig 2010-07-20 21:54:40.000000000 +0000
4+++ agent/interfaces.c 4+++ agent/interfaces.c
5@@ -49,6 +49,7 @@ 5@@ -49,6 +49,7 @@
6 #include <net/if.h> 6 #include <net/if.h>
7 #include <net/if_arp.h> 7 #include <net/if_arp.h>
8 #include <arpa/inet.h> 8 #include <arpa/inet.h>
9+#include <netinet/in.h> 9+#include <netinet/in.h>
10  10
11 #ifdef HAVE_GETIFADDRS 11 #ifdef HAVE_GETIFADDRS
12  12
 13@@ -198,7 +199,7 @@ nice_interfaces_get_local_ips (gboolean
 14 struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr;
 15
 16 /* Skip link-local addresses, they require a scope */
 17- if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr))
 18+ if (IN6_IS_ADDR_LINKLOCAL (&sa6->sin6_addr))
 19 continue;
 20
 21 if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string,
File Added: pkgsrc/net/libnice/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2010/08/09 09:53:30 drochner Exp $

--- gst/Makefile.in.orig	2010-07-20 21:57:29.000000000 +0000
+++ gst/Makefile.in
@@ -76,8 +76,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(gstplugindir)"
 LTLIBRARIES = $(gstplugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/nice/libnice.la
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libgstnice_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_libgstnice_la_OBJECTS = gstnicesrc.lo gstnicesink.lo gstnice.lo
 libgstnice_la_OBJECTS = $(am_libgstnice_la_OBJECTS)
@@ -242,7 +241,7 @@ AM_CFLAGS = $(LIBNICE_CFLAGS) \
 
 COMMON_LDADD = \
 	$(GST_LIBS) \
-	$(top_builddir)/nice/libnice.la
+	$(prefix)/lib/libnice.la
 
 
 # libgstnice