Sun Jan 27 06:11:24 2008 UTC ()
Update libupnp to 1.6.4.

Changes:
*******************************************************************************
Version 1.6.4
*******************************************************************************

2008-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Workaround for a problem with the new automake AM_CONDITIONAL macro
	from autotools-1.10. Thanks to Ingo Hofmann for helping with debugging
	this one.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Added quoting to macros AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR and
	AC_CONFIG_SRCDIR in configure.ac. Also changed the name of the
	auxiliary directory in AC_CONFIG_AUX_DIR to build-aux.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Fix for setsockopt() in Threadpool.c to allow more than one process
	to join the multicast-group on OSX. Thanks to Ingo Hofmann.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Using defined(__OSX__) || defined(__APPLE__) instead of just
	defined(__OSX__) in the code. Thanks to Ingo Hofmann and Chris
	Pickel.

2008-01-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Fix for isFileInVirtualDir. Thanks to Peter Hartley for the patch.

2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Putting back a "defined(__OSX__)" that has been removed in the
	previous *BSD patch. Thanks to Chris Pickel for pointing it out.

2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* SF Patches Tracker [ 1865812 ] typo in docs comment
	Submitted By: Hartmut Holzgraefe - hholzgra
	typo in docs comment ACCAPTED instead of ACCEPTED in
	@name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
	Also, the documentation file name was mispelled and was corrected in
	the Makefile.am.


(obache)
diff -r1.9 -r1.10 pkgsrc/net/libupnp/Makefile
diff -r1.9 -r1.10 pkgsrc/net/libupnp/distinfo
diff -r1.5 -r1.6 pkgsrc/net/libupnp/PLIST
diff -r1.6 -r1.7 pkgsrc/net/libupnp/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/net/libupnp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libupnp/Makefile 2008/01/03 12:32:34 1.9
+++ pkgsrc/net/libupnp/Makefile 2008/01/27 06:11:24 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2008/01/03 12:32:34 obache Exp $ 1# $NetBSD: Makefile,v 1.10 2008/01/27 06:11:24 obache Exp $
2# 2#
3 3
4DISTNAME= libupnp-1.6.3 4DISTNAME= libupnp-1.6.4
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pupnp/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pupnp/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://pupnp.sourceforge.net/ 10HOMEPAGE= http://pupnp.sourceforge.net/
11COMMENT= Portable Universal Plug and Play (UPnP) SDK 11COMMENT= Portable Universal Plug and Play (UPnP) SDK
12 12
13USE_LANGUAGES= c 13USE_LANGUAGES= c
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
cvs diff -r1.9 -r1.10 pkgsrc/net/libupnp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libupnp/distinfo 2008/01/03 12:32:34 1.9
+++ pkgsrc/net/libupnp/distinfo 2008/01/27 06:11:24 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.9 2008/01/03 12:32:34 obache Exp $ 1$NetBSD: distinfo,v 1.10 2008/01/27 06:11:24 obache Exp $
2 2
3SHA1 (libupnp-1.6.3.tar.bz2) = 60c45f2a1090b186cdb4a968f76b85b5cef9b28b 3SHA1 (libupnp-1.6.4.tar.bz2) = 8dc48a6c5a29e211db07565ec4570a73845108c4
4RMD160 (libupnp-1.6.3.tar.bz2) = 12a36ad263e4e66fb9c4d9d5ca9ea41dcb55d650 4RMD160 (libupnp-1.6.4.tar.bz2) = 901ce5a3f733b7f2c9f5147a73c49fc615857aa8
5Size (libupnp-1.6.3.tar.bz2) = 1136813 bytes 5Size (libupnp-1.6.4.tar.bz2) = 1137057 bytes
6SHA1 (patch-aa) = 5999583dfe62e1293f08547008f531c2d3caae8b 6SHA1 (patch-aa) = 96abe92b59b9aab6f3a761823d76638d62f02d32
7SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970 7SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
8SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1 8SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
9SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba 9SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
10SHA1 (patch-ah) = f46422955005a8b1b187163e97ee84a45b713847 10SHA1 (patch-ah) = f46422955005a8b1b187163e97ee84a45b713847
cvs diff -r1.5 -r1.6 pkgsrc/net/libupnp/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libupnp/PLIST 2008/01/03 12:32:34 1.5
+++ pkgsrc/net/libupnp/PLIST 2008/01/27 06:11:24 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2008/01/03 12:32:34 obache Exp $ 1@comment $NetBSD: PLIST,v 1.6 2008/01/27 06:11:24 obache Exp $
2include/upnp/FreeList.h 2include/upnp/FreeList.h
3include/upnp/LinkedList.h 3include/upnp/LinkedList.h
4include/upnp/ThreadPool.h 4include/upnp/ThreadPool.h
5include/upnp/TimerThread.h 5include/upnp/TimerThread.h
6include/upnp/ithread.h 6include/upnp/ithread.h
7include/upnp/ixml.h 7include/upnp/ixml.h
8include/upnp/upnp.h 8include/upnp/upnp.h
9include/upnp/upnpconfig.h 9include/upnp/upnpconfig.h
10include/upnp/upnpdebug.h 10include/upnp/upnpdebug.h
11include/upnp/upnptools.h 11include/upnp/upnptools.h
12lib/libixml.la 12lib/libixml.la
13lib/libthreadutil.la 13lib/libthreadutil.la
14lib/libupnp.la 14lib/libupnp.la
@@ -49,27 +49,27 @@ share/doc/${PKGBASE}-${PKGVERSION}/html/ @@ -49,27 +49,27 @@ share/doc/${PKGBASE}-${PKGVERSION}/html/
49share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_BAD_HTTPMSG-119.html 49share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_BAD_HTTPMSG-119.html
50share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_ALREADY_REGISTERED-120.html 50share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_ALREADY_REGISTERED-120.html
51share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NETWORK_ERROR-200.html 51share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NETWORK_ERROR-200.html
52share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_WRITE-201.html 52share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_WRITE-201.html
53share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_READ-202.html 53share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_READ-202.html
54share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_BIND-203.html 54share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_BIND-203.html
55share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_CONNECT-204.html 55share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_CONNECT-204.html
56share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_OUTOF_SOCKET-205.html 56share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_OUTOF_SOCKET-205.html
57share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_LISTEN-206.html 57share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_LISTEN-206.html
58share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_TIMEDOUT-207.html 58share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_TIMEDOUT-207.html
59share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_ERROR-208.html 59share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_ERROR-208.html
60share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_CANCELED-210.html 60share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_CANCELED-210.html
61share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html 61share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
62share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html 62share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
63share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html 63share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html
64share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_ARGUMENT-501.html 64share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_ARGUMENT-501.html
65share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_NOT_FOUND-502.html 65share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_NOT_FOUND-502.html
66share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_READ_ERROR-503.html 66share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_READ_ERROR-503.html
67share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_EXT_NOT_XML-504.html 67share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_EXT_NOT_XML-504.html
68share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOT_FOUND-507.html 68share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOT_FOUND-507.html
69share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INTERNAL_ERROR-911.html 69share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INTERNAL_ERROR-911.html
70share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/ConstantsStructuresandTypes.html 70share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/ConstantsStructuresandTypes.html
71share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpClient_Handle.html 71share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpClient_Handle.html
72share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpDevice_Handle.html 72share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpDevice_Handle.html
73share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPnP_EventType.html 73share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPnP_EventType.html
74share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_REQUEST.html 74share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_REQUEST.html
75share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_COMPLETE.html 75share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_COMPLETE.html
cvs diff -r1.6 -r1.7 pkgsrc/net/libupnp/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/libupnp/patches/patch-aa 2008/01/03 12:32:34 1.6
+++ pkgsrc/net/libupnp/patches/patch-aa 2008/01/27 06:11:24 1.7
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-aa,v 1.6 2008/01/03 12:32:34 obache Exp $ 1$NetBSD: patch-aa,v 1.7 2008/01/27 06:11:24 obache Exp $
2 2
3--- threadutil/src/ThreadPool.c.orig 2007-12-25 17:32:22.000000000 +0000 3--- threadutil/src/ThreadPool.c.orig 2008-01-22 10:16:37.000000000 +0000
4+++ threadutil/src/ThreadPool.c 4+++ threadutil/src/ThreadPool.c
5@@ -234,7 +234,7 @@ static int SetPolicyType( PolicyType in  5@@ -234,7 +234,7 @@ static int SetPolicyType( PolicyType in
6 return 0; 6 return 0;
7 #elif defined(WIN32) 7 #elif defined(WIN32)
8 return sched_setscheduler( 0, in ); 8 return sched_setscheduler( 0, in );
9-#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 9-#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
10+#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L 10+#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
11 struct sched_param current; 11 struct sched_param current;
12  12
13 sched_getparam( 0, &current ); 13 sched_getparam( 0, &current );
14@@ -261,7 +261,7 @@ static int SetPolicyType( PolicyType in  14@@ -261,7 +261,7 @@ static int SetPolicyType( PolicyType in
15 *****************************************************************************/ 15 *****************************************************************************/
16 static int SetPriority( ThreadPriority priority ) 16 static int SetPriority( ThreadPriority priority )
17 { 17 {
18-#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 18-#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
19+#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L 19+#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
20 int currentPolicy; 20 int currentPolicy;
21 int minPriority = 0; 21 int minPriority = 0;
22 int maxPriority = 0; 22 int maxPriority = 0;
23@@ -389,7 +389,7 @@ static void SetSeed() 23@@ -389,7 +389,7 @@ static void SetSeed()
24 gettimeofday(&t, NULL); 24 gettimeofday(&t, NULL);
25 #if defined(WIN32) 25 #if defined(WIN32)
26 srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p ); 26 srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
27-#elif defined(__FreeBSD__) 27-#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
28+#elif defined(__FreeBSD__) || defined(__NetBSD__) 28+#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__)
29 srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() ); 29 srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
30 #elif defined(__linux__) 30 #elif defined(__linux__)
31 srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() ); 31 srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );