From a1e2c78dcda9048bf3f4f6a592d1b90b6b53c0e0 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 30 Aug 2010 20:12:55 +0000 Subject: [PATCH] Update to nspr 4.8.6, required by (at least) a future firefox 4 update.. Tested in a bunch of amd64 bulk builds. ok naddy@ phessler@ --- devel/nspr/Makefile | 6 +- devel/nspr/distinfo | 10 +-- .../patch-mozilla_nsprpub_config_rules_mk | 8 +- .../patch-mozilla_nsprpub_configure_in | 10 +-- ...tch-mozilla_nsprpub_pr_src_md_unix_uxrng_c | 8 +- ...patch-mozilla_nsprpub_pr_src_misc_prdtoa_c | 74 +++++++++++++------ ...patch-mozilla_nsprpub_pr_src_misc_prinit_c | 12 +-- ...atch-mozilla_nsprpub_pr_src_misc_prnetdb_c | 8 +- .../patch-mozilla_nsprpub_pr_tests_socket_c | 18 ++--- devel/nspr/pkg/PLIST-main | 3 +- 10 files changed, 91 insertions(+), 66 deletions(-) diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 1f4dd45cffb..57e7eb66856 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/03/30 11:47:33 jasper Exp $ +# $OpenBSD: Makefile,v 1.32 2010/08/30 20:12:55 landry Exp $ # $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa @@ -6,14 +6,14 @@ ONLY_FOR_ARCHS= alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa COMMENT-main= Netscape Portable Runtime COMMENT-docs= HTML Documentation for NSPR -VER= 4.8 +VER= 4.8.6 DISTNAME= nspr-${VER} PKGNAME-main= ${DISTNAME} PKGNAME-docs= nspr-docs-${VER} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ nspr-reference${EXTRACT_SUFX}:0 -SO_VERSION= 21.0 +SO_VERSION= 21.1 .for _lib in nspr4 plc4 plds4 SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index 6bdd923a4d4..b2d50f90de0 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,10 +1,10 @@ -MD5 (nspr-4.8.tar.gz) = 4JFqcrzGxCdVHqJiGD/bJg== +MD5 (nspr-4.8.6.tar.gz) = WSwnVyjCnRk/26gAkWWZCw== MD5 (nspr-reference.tar.gz) = jZRQOnk+OzIiUnYci0jz4A== -RMD160 (nspr-4.8.tar.gz) = 9jRo3jYTeTqLVk6WfzqWOquXfJk= +RMD160 (nspr-4.8.6.tar.gz) = Md5u7s1MwjFc+4TQLLlzDNPAlyk= RMD160 (nspr-reference.tar.gz) = 4eQ4pZI64spNagflIfhYo+D3wcY= -SHA1 (nspr-4.8.tar.gz) = rDDsGL8NBwqWY9GowtJYAE8/Qq0= +SHA1 (nspr-4.8.6.tar.gz) = VMo8vhTMiipZy0jUlhA0zjXI8iM= SHA1 (nspr-reference.tar.gz) = mihC1ynB3kmPoYRmevtjk5qdcec= -SHA256 (nspr-4.8.tar.gz) = ot6EqiGnu6vZPE8XISPVjGQywjWIB7smCsM4stxh2/4= +SHA256 (nspr-4.8.6.tar.gz) = 2QQLsBU2+mOIHEI8T6gx6kWWlrMtIJf2FIQvgk4an20= SHA256 (nspr-reference.tar.gz) = zhhZrKNh2VTVMaJ+qR7AzZwW8lssI0mT1E5+d1gHiwo= -SIZE (nspr-4.8.tar.gz) = 1170419 +SIZE (nspr-4.8.6.tar.gz) = 1202257 SIZE (nspr-reference.tar.gz) = 195121 diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_config_rules_mk b/devel/nspr/patches/patch-mozilla_nsprpub_config_rules_mk index 8e82f36c28f..376110a3149 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_config_rules_mk +++ b/devel/nspr/patches/patch-mozilla_nsprpub_config_rules_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.4 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/config/rules.mk.orig Sat May 2 02:08:01 2009 -+++ mozilla/nsprpub/config/rules.mk Sat Jun 20 23:38:30 2009 -@@ -219,7 +219,7 @@ ifdef RELEASE_HEADERS +$OpenBSD: patch-mozilla_nsprpub_config_rules_mk,v 1.5 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/config/rules.mk.orig Tue Mar 30 20:03:10 2010 ++++ mozilla/nsprpub/config/rules.mk Sun Aug 1 13:16:27 2010 +@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir) endif ifdef RELEASE_LIBS diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_configure_in b/devel/nspr/patches/patch-mozilla_nsprpub_configure_in index 87288e381cc..312328e3d8a 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_configure_in +++ b/devel/nspr/patches/patch-mozilla_nsprpub_configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.9 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/configure.in.orig Sat May 2 02:08:00 2009 -+++ mozilla/nsprpub/configure.in Sat Jun 20 23:38:30 2009 -@@ -1809,9 +1809,11 @@ mips-sony-newsos*) +$OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.10 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/configure.in.orig Fri Jul 9 04:30:36 2010 ++++ mozilla/nsprpub/configure.in Sun Aug 1 13:16:27 2010 +@@ -1987,9 +1987,11 @@ mips-sony-newsos*) AC_DEFINE(OPENBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) @@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_nsprpub_configure_in,v 1.9 2009/08/04 13:56:09 martynas DSO_CFLAGS=-fPIC MDCPUCFG_H=_openbsd.cfg PR_MD_CSRCS=openbsd.c -@@ -2871,6 +2873,7 @@ config/autoconf.mk +@@ -3087,6 +3089,7 @@ config/autoconf.mk config/nsprincl.mk config/nsprincl.sh config/nspr-config diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c index c3f37234c02..215f2ea8cde 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c,v 1.2 2010/03/30 11:47:33 jasper Exp $ ---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig Sat May 2 01:08:05 2009 -+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c Mon Feb 8 16:00:07 2010 -@@ -132,7 +132,11 @@ static PRCallOnceType coOpenDevURandom; +$OpenBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng_c,v 1.3 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig Fri Apr 30 02:04:10 2010 ++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c Sun Aug 1 13:16:28 2010 +@@ -136,7 +136,11 @@ static PRCallOnceType coOpenDevURandom; static PRStatus OpenDevURandom( void ) { diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c index e6d94051255..0c1e81c561f 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prdtoa_c @@ -1,9 +1,9 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Fri Mar 20 05:41:21 2009 -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c Sun Jun 21 00:03:35 2009 -@@ -47,42 +47,14 @@ - +$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.6 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Sun Mar 28 20:26:57 2010 ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c Wed Aug 4 21:23:17 2010 +@@ -48,42 +48,14 @@ #include "primpl.h" + #include "prbit.h" -#define MULTIPLE_THREADS -#define ACQUIRE_DTOA_LOCK(n) PR_Lock(dtoa_lock[n]) @@ -44,7 +44,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m /**************************************************************** * * The author of this software is David M. Gay. -@@ -102,3300 +74,82 @@ void _PR_CleanupDtoa(void) +@@ -103,3326 +75,82 @@ void _PR_CleanupDtoa(void) * ***************************************************************/ @@ -131,7 +131,12 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n) - * if memory is available and otherwise does something you deem - * appropriate. If MALLOC is undefined, malloc will be invoked -- * directly -- and assumed always to succeed. +- * directly -- and assumed always to succeed. Similarly, if you +- * want something other than the system's free() to be called to +- * recycle memory acquired from MALLOC, #define FREE to be the +- * name of the alternate routine. (FREE or free is only called in +- * pathological cases, e.g., in a dtoa call after a dtoa return in +- * mode 3 with thousands of digits requested.) - * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making - * memory allocations from a private pool of memory when possible. - * When used, the private pool is PRIVATE_MEM bytes long: 2304 bytes, @@ -531,7 +536,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m -#define FREE_DTOA_LOCK(n) /*nothing*/ -#endif - --#define Kmax 15 +-#define Kmax 7 - - struct -Bigint { @@ -561,9 +566,10 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m -#endif - - ACQUIRE_DTOA_LOCK(0); -- if (rv = freelist[k]) { +- /* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */ +- /* but this case seems very unlikely. */ +- if (k <= Kmax && (rv = freelist[k])) - freelist[k] = rv->next; -- } - else { - x = 1 << k; -#ifdef Omit_Private_Memory @@ -571,7 +577,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m -#else - len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) - /sizeof(double); -- if (pmem_next - private_mem + len <= PRIVATE_mem) { +- if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) { - rv = (Bigint*)pmem_next; - pmem_next += len; - } @@ -595,10 +601,18 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m -#endif -{ - if (v) { -- ACQUIRE_DTOA_LOCK(0); -- v->next = freelist[v->k]; -- freelist[v->k] = v; -- FREE_DTOA_LOCK(0); +- if (v->k > Kmax) +-#ifdef FREE +- FREE((void*)v); +-#else +- free((void*)v); +-#endif +- else { +- ACQUIRE_DTOA_LOCK(0); +- v->next = freelist[v->k]; +- freelist[v->k] = v; +- FREE_DTOA_LOCK(0); +- } - } - } - @@ -708,6 +722,9 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - (register ULong x) -#endif -{ +-#ifdef PR_HAVE_BUILTIN_BITSCAN32 +- return( (!x) ? 32 : pr_bitscan_clz32(x) ); +-#else - register int k = 0; - - if (!(x & 0xffff0000)) { @@ -732,6 +749,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - return 32; - } - return k; +-#endif /* PR_HAVE_BUILTIN_BITSCAN32 */ - } - - static int @@ -742,6 +760,15 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - (ULong *y) -#endif -{ +-#ifdef PR_HAVE_BUILTIN_BITSCAN32 +- int k; +- ULong x = *y; +- +- if (x>1) +- *y = ( x >> (k = pr_bitscan_ctz32(x)) ); +- else +- k = ((x ^ 1) << 5); +-#else - register int k; - register ULong x = *y; - @@ -779,6 +806,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - return 32; - } - *y = x; +-#endif /* PR_HAVE_BUILTIN_BITSCAN32 */ - return k; - } - @@ -1328,10 +1356,6 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - b->wds = (x[1] = z) ? 2 : 1; - } - else { --#ifdef DEBUG -- if (!z) -- Bug("Zero passed to d2b"); --#endif - k = lo0bits(&z); - x[0] = z; -#ifndef Sudden_Underflow @@ -1698,6 +1722,8 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - } - } - dig_done: +- if (nd > 64 * 1024) +- goto ret0; - e = 0; - if (c == 'e' || c == 'E') { - if (!nd && !nz && !nz0) { @@ -2641,7 +2667,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m - * when MULTIPLE_THREADS is not defined. - */ - -- void +- static void -#ifdef KR_headers -freedtoa(s) char *s; -#else @@ -3381,7 +3407,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m PR_IMPLEMENT(PRStatus) PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, -@@ -3411,7 +165,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, +@@ -3438,7 +166,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return rv; } @@ -3390,7 +3416,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m if (!result) { PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); return rv; -@@ -3426,7 +180,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, +@@ -3453,7 +181,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, } rv = PR_SUCCESS; } @@ -3399,7 +3425,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m return rv; } -@@ -3448,9 +202,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval +@@ -3475,9 +203,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval char *num, *nump; char *bufp = buf; char *endnum; @@ -3411,7 +3437,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.5 2009/08/04 13:56:09 m /* If anything fails, we store an empty string in 'buf' */ num = (char*)PR_MALLOC(bufsz); if (num == NULL) { -@@ -3458,7 +212,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval +@@ -3485,7 +213,7 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval return; } /* XXX Why use mode 1? */ diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c index 164b7df1174..e19017531f4 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prinit_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.5 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prinit.c.orig Fri May 8 04:01:11 2009 -+++ mozilla/nsprpub/pr/src/misc/prinit.c Sat Jun 20 23:38:30 2009 -@@ -414,8 +414,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.6 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/pr/src/misc/prinit.c.orig Sun Jul 11 19:14:38 2010 ++++ mozilla/nsprpub/pr/src/misc/prinit.c Sun Aug 1 13:16:28 2010 +@@ -416,8 +416,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() _PR_CleanupDtoa(); _PR_CleanupCallOnce(); _PR_ShutdownLinker(); @@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.5 2009/08/04 13:56:09 m /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); -@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -428,6 +426,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() _PR_LogCleanup(); /* @@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.5 2009/08/04 13:56:09 m * This part should look like the end of _PR_NativeRunThread * and _PR_UserRunThread. */ -@@ -437,6 +441,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -439,6 +443,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() PR_DELETE(me->stack); PR_DELETE(me); } diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c index cead78ffa7c..9bbb758cbc0 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.7 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Sat May 2 02:08:05 2009 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c Sat Jun 20 23:38:30 2009 -@@ -2039,7 +2039,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const +$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prnetdb_c,v 1.8 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Tue Mar 30 21:01:53 2010 ++++ mozilla/nsprpub/pr/src/misc/prnetdb.c Sun Aug 1 13:16:28 2010 +@@ -2051,7 +2051,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const */ hints.ai_socktype = SOCK_STREAM; diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_socket_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_socket_c index a1e8b93cb66..4d7e95365d1 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_socket_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_socket_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 martynas Exp $ ---- mozilla/nsprpub/pr/tests/socket.c.orig Wed May 6 08:40:39 2009 -+++ mozilla/nsprpub/pr/tests/socket.c Sat Jun 20 23:38:30 2009 -@@ -2234,6 +2234,7 @@ int main(int argc, char **argv) +$OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.3 2010/08/30 20:12:55 landry Exp $ +--- mozilla/nsprpub/pr/tests/socket.c.orig Sat Feb 13 01:32:47 2010 ++++ mozilla/nsprpub/pr/tests/socket.c Sun Aug 1 13:16:28 2010 +@@ -2238,6 +2238,7 @@ int main(int argc, char **argv) /* * client-server test, Ipv6-Ipv4 */ @@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 mart client_domain = PR_AF_INET6; printf("TCP Client/Server Test - IPv6/Ipv4\n"); if (TCP_Socket_Client_Server_Test() < 0) { -@@ -2241,9 +2242,11 @@ int main(int argc, char **argv) +@@ -2245,9 +2246,11 @@ int main(int argc, char **argv) goto done; } else printf("TCP_Socket_Client_Server_Test Passed\n"); @@ -21,7 +21,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 mart client_domain = PR_AF_INET; server_domain = PR_AF_INET6; printf("TCP Client/Server Test - IPv4/Ipv6\n"); -@@ -2252,6 +2255,7 @@ int main(int argc, char **argv) +@@ -2256,6 +2259,7 @@ int main(int argc, char **argv) goto done; } else printf("TCP_Socket_Client_Server_Test Passed\n"); @@ -29,7 +29,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 mart /* * client-server test, Ipv6-Ipv6 */ -@@ -2281,6 +2285,7 @@ int main(int argc, char **argv) +@@ -2285,6 +2289,7 @@ int main(int argc, char **argv) /* * run client-server test with UDP, IPv6/IPv4 */ @@ -37,7 +37,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 mart printf("UDP Client/Server Test - IPv6/Ipv4\n"); client_domain = PR_AF_INET6; server_domain = PR_AF_INET; -@@ -2289,9 +2294,11 @@ int main(int argc, char **argv) +@@ -2293,9 +2298,11 @@ int main(int argc, char **argv) goto done; } else printf("UDP_Socket_Client_Server_Test Passed\n"); @@ -49,7 +49,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.2 2009/08/04 13:56:09 mart printf("UDP Client/Server Test - IPv4/Ipv6\n"); client_domain = PR_AF_INET; server_domain = PR_AF_INET6; -@@ -2300,6 +2307,7 @@ int main(int argc, char **argv) +@@ -2304,6 +2311,7 @@ int main(int argc, char **argv) goto done; } else printf("UDP_Socket_Client_Server_Test Passed\n"); diff --git a/devel/nspr/pkg/PLIST-main b/devel/nspr/pkg/PLIST-main index 855b07719a2..9a51ea55993 100644 --- a/devel/nspr/pkg/PLIST-main +++ b/devel/nspr/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2009/08/04 13:56:09 martynas Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2010/08/30 20:12:55 landry Exp $ @pkgpath devel/nspr bin/nspr-config include/nspr/ @@ -47,7 +47,6 @@ include/nspr/plbase64.h include/nspr/plerror.h include/nspr/plgetopt.h include/nspr/plhash.h -include/nspr/plresolv.h include/nspr/plstr.h include/nspr/pratom.h include/nspr/prbit.h