head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.5 OPENPKG_E1_MP:1.5 OPENPKG_E1_MP_2_STABLE:1.5 OPENPKG_E1_FP:1.5 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.5 OPENPKG_2_STABLE_20060622:1.5 OPENPKG_2_STABLE:1.5.0.4 OPENPKG_2_STABLE_BP:1.5 OPENPKG_2_5_RELEASE:1.5 OPENPKG_2_5_SOLID:1.5.0.2 OPENPKG_2_5_SOLID_BP:1.5 OPENPKG_2_4_RELEASE:1.4 OPENPKG_2_4_SOLID:1.4.0.4 OPENPKG_2_4_SOLID_BP:1.4 OPENPKG_CW_FP:1.4 OPENPKG_2_3_RELEASE:1.4 OPENPKG_2_3_SOLID:1.4.0.2 OPENPKG_2_3_SOLID_BP:1.4 OPENPKG_2_2_RELEASE:1.3 OPENPKG_2_2_SOLID:1.3.0.6 OPENPKG_2_2_SOLID_BP:1.3 OPENPKG_2_1_RELEASE:1.3 OPENPKG_2_1_SOLID:1.3.0.4 OPENPKG_2_1_SOLID_BP:1.3 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE_MP:1.2 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.6 date 2008.02.07.18.23.26; author rse; state Exp; branches; next 1.5; commitid ydUBmzhgOwylNuQs; 1.5 date 2005.07.13.13.49.30; author rse; state Exp; branches; next 1.4; 1.4 date 2004.12.27.18.56.39; author rse; state Exp; branches; next 1.3; 1.3 date 2004.02.04.19.00.20; author rse; state Exp; branches; next 1.2; 1.2 date 2003.06.01.08.09.37; author rse; state Exp; branches; next 1.1; 1.1 date 2002.11.30.20.27.03; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.50.13; author rse; state Exp; branches; next ; desc @@ 1.6 log @upgrading package: nspr 4.6.7 -> 4.7 @ text @Index: mozilla/nsprpub/pr/include/md/_freebsd.h --- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2004-11-22 22:24:53 +0100 +++ mozilla/nsprpub/pr/include/md/_freebsd.h 2008-02-07 19:15:24 +0100 @@@@ -43,6 +43,7 @@@@ #if __FreeBSD__ >= 2 #include /* for __FreeBSD_version */ #endif +#include #include #define PR_LINKER_ARCH "freebsd" Index: mozilla/nsprpub/pr/include/md/_pth.h --- mozilla/nsprpub/pr/include/md/_pth.h.orig 2006-12-08 23:58:13 +0100 +++ mozilla/nsprpub/pr/include/md/_pth.h 2008-02-07 19:15:24 +0100 @@@@ -84,7 +84,7 @@@@ #define _PT_PTHREAD_MUTEXATTR_DESTROY(x) /* */ #define _PT_PTHREAD_MUTEX_INIT(m, a) (memset(&(m), 0, sizeof(m)), \ pthread_mutex_init(&(m), NULL)) -#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) +#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) #define _PT_PTHREAD_CONDATTR_INIT(x) 0 #define _PT_PTHREAD_CONDATTR_DESTROY(x) /* */ #define _PT_PTHREAD_COND_INIT(m, a) (memset(&(m), 0, sizeof(m)), \ @@@@ -96,7 +96,7 @@@@ #if defined(FREEBSD) #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) pt_pthread_mutex_is_locked(&(m)) #else -#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) +#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) #endif #if defined(DARWIN) #define _PT_PTHREAD_CONDATTR_INIT(x) 0 Index: mozilla/nsprpub/pr/src/md/unix/unix.c --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2006-04-05 22:57:15 +0200 +++ mozilla/nsprpub/pr/src/md/unix/unix.c 2008-02-07 19:20:57 +0100 @@@@ -68,7 +68,7 @@@@ * PRInt32* pointer to a _PRSockLen_t* pointer. */ #if defined(HAVE_SOCKLEN_T) \ - || (defined(__GLIBC__) && __GLIBC__ >= 2) + || (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(FREEBSD) #define _PRSockLen_t socklen_t #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ @@@@ -76,7 +76,7 @@@@ || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ || defined(NEXTSTEP) || defined(QNX) #define _PRSockLen_t int -#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ +#elif (defined(AIX) && !defined(AIX4_1)) \ || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS) #define _PRSockLen_t size_t Index: mozilla/nsprpub/pr/src/pthreads/ptio.c --- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2008-01-13 02:27:16 +0100 +++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2008-02-07 19:15:24 +0100 @@@@ -3475,6 +3475,17 @@@@ &on, sizeof(on)); } #endif +#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ + defined(__FreeBSD__) && defined(IPV6_V6ONLY) + if (domain == PR_AF_INET6) { + int opt = 0; + if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, + &opt, sizeof(opt))) { + close(osfd); + return NULL; + } + } +#endif fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); if (fd == NULL) close(osfd); } @ 1.5 log @upgrading package: nspr 4.4.1 -> 4.6 @ text @d3 1 a3 1 +++ mozilla/nsprpub/pr/include/md/_freebsd.h 2005-07-13 15:42:26 +0200 d13 2 a14 2 --- mozilla/nsprpub/pr/include/md/_pth.h.orig 2004-11-22 22:24:53 +0100 +++ mozilla/nsprpub/pr/include/md/_pth.h 2005-07-13 15:43:47 +0200 d34 3 a36 3 --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2005-03-09 23:57:05 +0100 +++ mozilla/nsprpub/pr/src/md/unix/unix.c 2005-07-13 15:42:26 +0200 @@@@ -65,7 +65,8 @@@@ d40 2 a41 3 - || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) + || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ + || defined(FREEBSD) d45 1 a45 1 @@@@ -73,7 +74,7 @@@@ d52 1 a52 1 || defined(DGUX) || defined(VMS) || defined(NTO) d55 3 a57 3 --- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2005-03-09 23:57:06 +0100 +++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-07-13 15:42:26 +0200 @@@@ -3471,6 +3471,17 @@@@ @ 1.4 log @include a few patches for FreeBSD @ text @d2 3 a4 3 --- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2003-01-16 17:16:27 +0100 +++ mozilla/nsprpub/pr/include/md/_freebsd.h 2004-12-27 19:50:46 +0100 @@@@ -40,6 +40,7 @@@@ d13 6 a18 6 --- mozilla/nsprpub/pr/include/md/_pth.h.orig 2002-12-12 00:10:39 +0100 +++ mozilla/nsprpub/pr/include/md/_pth.h 2004-12-27 19:52:48 +0100 @@@@ -90,7 +90,7 @@@@ #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) d21 10 a32 1 #else d34 2 a35 2 --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2002-12-12 00:03:31 +0100 +++ mozilla/nsprpub/pr/src/md/unix/unix.c 2004-12-27 19:50:46 +0100 d56 3 a58 30 --- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2003-07-15 00:12:19 +0200 +++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2004-12-27 19:54:28 +0100 @@@@ -189,7 +189,7 @@@@ #endif #endif -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) static PRBool _pr_ipv6_v6only_on_by_default; /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ #ifndef IPV6_V6ONLY @@@@ -1154,7 +1154,7 @@@@ _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option * is turned on by default, contrary to what RFC 3493, Section * 5.3 says. So we have to turn it off. Find out whether we @@@@ -3462,7 +3462,7 @@@@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { -#ifdef DARWIN +#if defined(DARWIN) || defined(FREEBSD) if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) { int on = 0; @@@@ -3470,6 +3470,17 @@@@ @ 1.3 log @upgrading package: nspr 4.3 -> 4.4.1 @ text @d2 2 a3 2 --- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2003-01-16 17:16:27.000000000 +0100 +++ mozilla/nsprpub/pr/include/md/_freebsd.h 2004-02-04 19:53:59.000000000 +0100 d12 12 d25 2 a26 2 --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig 2002-12-12 00:03:31.000000000 +0100 +++ mozilla/nsprpub/pr/src/md/unix/unix.c 2004-02-04 19:53:59.000000000 +0100 d47 29 a75 2 --- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig Mon Feb 2 10:41:43 2004 +++ mozilla/nsprpub/pr/src/pthreads/ptio.c Mon Feb 2 10:44:49 2004 @ 1.2 log @apply 64bit patches from FreeBSD @ text @d1 3 a3 2 --- mozilla/nsprpub/pr/include/md/_freebsd.h.orig Sat Feb 16 09:12:55 2002 +++ mozilla/nsprpub/pr/include/md/_freebsd.h Thu Aug 8 19:31:23 2002 d12 3 a14 22 --- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002 +++ mozilla/nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002 @@@@ -3414,6 +3414,17 @@@@ if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); else { +#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \ + defined(__FreeBSD__) && defined(IPV6_V6ONLY) + if (domain == PR_AF_INET6) { + int opt = 0; + if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, + &opt, sizeof(opt))) { + close(osfd); + return NULL; + } + } +#endif fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE); if (fd == NULL) close(osfd); } --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 +++ mozilla/nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 d34 21 @ 1.1 log @include FreeBSD patches @ text @d31 21 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @a30 21 --- mozilla/nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 +++ mozilla/nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 @@@@ -65,7 +65,8 @@@@ * PRInt32* pointer to a _PRSockLen_t* pointer. */ #if defined(HAVE_SOCKLEN_T) \ - || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) + || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ + || defined(FREEBSD) #define _PRSockLen_t socklen_t #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ @@@@ -73,7 +74,7 @@@@ || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ || defined(NEXTSTEP) || defined(QNX) #define _PRSockLen_t int -#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ +#elif (defined(AIX) && !defined(AIX4_1)) \ || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ || defined(DGUX) || defined(VMS) || defined(NTO) #define _PRSockLen_t size_t @