From 449827516efdbade99c3b8820d7d57d3b9f14855 Mon Sep 17 00:00:00 2001 From: martynas Date: Tue, 4 Aug 2009 13:56:09 +0000 Subject: [PATCH] update to nspr-4.8. security. please note, this will be needed in stable for further mozilla-firefox security updates. bulk build done by sthen@. thanks! --- devel/nspr/Makefile | 8 +- devel/nspr/distinfo | 10 +- .../patch-mozilla_nsprpub_config_rules_mk | 8 +- .../patch-mozilla_nsprpub_configure_in | 10 +- ...atch-mozilla_nsprpub_lib_tests_Makefile_in | 8 +- ...patch-mozilla_nsprpub_pr_src_misc_prdtoa_c | 106 ++++++++---------- ...patch-mozilla_nsprpub_pr_src_misc_prinit_c | 12 +- ...atch-mozilla_nsprpub_pr_src_misc_prnetdb_c | 8 +- ...mozilla_nsprpub_pr_src_pthreads_ptthread_c | 10 +- .../patch-mozilla_nsprpub_pr_tests_nameshm1_c | 8 +- .../patch-mozilla_nsprpub_pr_tests_prpollml_c | 15 ++- ...patch-mozilla_nsprpub_pr_tests_runtests_sh | 10 +- .../patch-mozilla_nsprpub_pr_tests_socket_c | 18 +-- devel/nspr/pkg/PLIST-main | 4 +- 14 files changed, 116 insertions(+), 119 deletions(-) diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 0f107046de5..c24096fb6cc 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2009/03/23 00:50:52 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.30 2009/08/04 13:56:09 martynas 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 powerpc sparc sparc64 hppa @@ -6,14 +6,14 @@ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 hppa COMMENT-main= Netscape Portable Runtime COMMENT-docs= HTML Documentation for NSPR -VER= 4.7.3 +VER= 4.8 DISTNAME= nspr-${VER} -PKGNAME-main= ${DISTNAME}p0 +PKGNAME-main= ${DISTNAME} PKGNAME-docs= nspr-docs-${VER} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ nspr-reference${EXTRACT_SUFX}:0 -SO_VERSION= 20.0 +SO_VERSION= 21.0 .for _lib in nspr4 plc4 plds4 SHARED_LIBS+= ${_lib} ${SO_VERSION} .endfor diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo index d177c21486f..6bdd923a4d4 100644 --- a/devel/nspr/distinfo +++ b/devel/nspr/distinfo @@ -1,10 +1,10 @@ -MD5 (nspr-4.7.3.tar.gz) = NJbWZW8+At3cfinxsSK3RA== +MD5 (nspr-4.8.tar.gz) = 4JFqcrzGxCdVHqJiGD/bJg== MD5 (nspr-reference.tar.gz) = jZRQOnk+OzIiUnYci0jz4A== -RMD160 (nspr-4.7.3.tar.gz) = UyQXyMTQSjLWz8CeqPInnV7mnnI= +RMD160 (nspr-4.8.tar.gz) = 9jRo3jYTeTqLVk6WfzqWOquXfJk= RMD160 (nspr-reference.tar.gz) = 4eQ4pZI64spNagflIfhYo+D3wcY= -SHA1 (nspr-4.7.3.tar.gz) = NRw0yPJtEaRBvDEwZVzZFE5ySJk= +SHA1 (nspr-4.8.tar.gz) = rDDsGL8NBwqWY9GowtJYAE8/Qq0= SHA1 (nspr-reference.tar.gz) = mihC1ynB3kmPoYRmevtjk5qdcec= -SHA256 (nspr-4.7.3.tar.gz) = sdJBnvGAfDiUT8dG//FP2oUGWJ5UYtwxGUqdG0lLn0k= +SHA256 (nspr-4.8.tar.gz) = ot6EqiGnu6vZPE8XISPVjGQywjWIB7smCsM4stxh2/4= SHA256 (nspr-reference.tar.gz) = zhhZrKNh2VTVMaJ+qR7AzZwW8lssI0mT1E5+d1gHiwo= -SIZE (nspr-4.7.3.tar.gz) = 1254585 +SIZE (nspr-4.8.tar.gz) = 1170419 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 977f221f50c..8e82f36c28f 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.3 2008/12/15 21:26:04 martynas Exp $ ---- mozilla/nsprpub/config/rules.mk.orig Fri May 2 11:18:04 2008 -+++ mozilla/nsprpub/config/rules.mk Fri Dec 12 05:57:31 2008 -@@ -228,7 +228,7 @@ ifdef RELEASE_HEADERS +$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 $(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 37b62ed50c9..87288e381cc 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.8 2008/12/15 21:26:04 martynas Exp $ ---- mozilla/nsprpub/configure.in.orig Tue Nov 4 20:07:15 2008 -+++ mozilla/nsprpub/configure.in Fri Dec 12 05:57:31 2008 -@@ -1805,9 +1805,11 @@ mips-sony-newsos*) +$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*) 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.8 2008/12/15 21:26:04 martynas DSO_CFLAGS=-fPIC MDCPUCFG_H=_openbsd.cfg PR_MD_CSRCS=openbsd.c -@@ -2799,6 +2801,7 @@ config/autoconf.mk +@@ -2871,6 +2873,7 @@ config/autoconf.mk config/nsprincl.mk config/nsprincl.sh config/nspr-config diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in b/devel/nspr/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in index 9b68c36df5c..2fb1f5699bc 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in +++ b/devel/nspr/patches/patch-mozilla_nsprpub_lib_tests_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_lib_tests_Makefile_in,v 1.3 2008/12/15 21:26:04 martynas Exp $ ---- mozilla/nsprpub/lib/tests/Makefile.in.orig Sun May 4 01:28:43 2008 -+++ mozilla/nsprpub/lib/tests/Makefile.in Fri Dec 12 05:57:31 2008 -@@ -127,6 +127,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH))) +$OpenBSD: patch-mozilla_nsprpub_lib_tests_Makefile_in,v 1.4 2009/08/04 13:56:09 martynas Exp $ +--- mozilla/nsprpub/lib/tests/Makefile.in.orig Sun Feb 22 20:56:04 2009 ++++ mozilla/nsprpub/lib/tests/Makefile.in Sat Jun 20 23:38:30 2009 +@@ -117,6 +117,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH))) endif endif 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 5ee04eb65ee..e6d94051255 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,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig Sat Nov 17 18:00:42 2007 -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c Sat Nov 17 18:14:54 2007 -@@ -37,42 +37,14 @@ +$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 @@ #include "primpl.h" @@ -44,7 +44,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m /**************************************************************** * * The author of this software is David M. Gay. -@@ -92,3303 +64,82 @@ void _PR_CleanupDtoa(void) +@@ -102,3300 +74,82 @@ void _PR_CleanupDtoa(void) * ***************************************************************/ @@ -173,11 +173,6 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - * floating-point numbers and flushes underflows to zero rather - * than implementing gradual underflow, then you must also #define - * Sudden_Underflow. -- * #define YES_ALIAS to permit aliasing certain double values with -- * arrays of ULongs. This leads to slightly better code with -- * some compilers and was always used prior to 19990916, but it -- * is not strictly legal and can cause trouble with aggressively -- * optimizing compilers (e.g., gcc 2.95.1 under -O2). - * #define USE_LOCALE to use the current locale's decimal_point value. - * #define SET_INEXACT if IEEE arithmetic is being used and extra - * computation should be done to set the inexact flag when the @@ -331,11 +326,10 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - -typedef union { double d; ULong L[2]; } U; - --#ifdef YES_ALIAS --#define dval(x) x +-#define dval(x) (x).d -#ifdef IEEE_8087 --#define word0(x) ((ULong *)&x)[1] --#define word1(x) ((ULong *)&x)[0] +-#define word0(x) (x).L[1] +-#define word1(x) (x).L[0] +typedef union { + double d; + ULong ul[2]; @@ -345,21 +339,11 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m +#define word0(x) ((x).ul[1]) +#define word1(x) ((x).ul[0]) #else --#define word0(x) ((ULong *)&x)[0] --#define word1(x) ((ULong *)&x)[1] +-#define word0(x) (x).L[0] +-#define word1(x) (x).L[1] +#define word0(x) ((x).ul[0]) +#define word1(x) ((x).ul[1]) #endif --#else --#ifdef IEEE_8087 --#define word0(x) ((U*)&x)->L[1] --#define word1(x) ((U*)&x)->L[0] --#else --#define word0(x) ((U*)&x)->L[0] --#define word1(x) ((U*)&x)->L[1] --#endif --#define dval(x) ((U*)&x)->d --#endif -/* The following definition of Storeinc is appropriate for MIPS processors. - * An alternative that might be better on some machines is @@ -486,13 +470,13 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m -#define Tiny1 0 -#define Quick_max 15 -#define Int_max 15 --#endif /* IBM, VAX */ + #endif /* IBM, VAX */ -#endif /* IEEE_Arith */ - -#ifndef IEEE_Arith -#define ROUND_BIASED #endif -- + -#ifdef RND_PRODQUOT -#define rounded_product(a,b) a = rnd_prod(a, b) -#define rounded_quotient(a,b) a = rnd_quot(a, b) @@ -500,17 +484,17 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m -extern double rnd_prod(), rnd_quot(); -#else -extern double rnd_prod(double, double), rnd_quot(double, double); - #endif +-#endif -#else -#define rounded_product(a,b) a *= b -#define rounded_quotient(a,b) a /= b -#endif - --#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1)) --#define Big1 0xffffffff +char *__dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve); +void __freedtoa(char *s); +-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1)) +-#define Big1 0xffffffff +- -#ifndef Pack_32 -#define Pack_32 +#ifdef __cplusplus @@ -1174,14 +1158,15 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - static double -ulp -#ifdef KR_headers -- (x) double x; +- (dx) double dx; -#else -- (double x) +- (double dx) -#endif -{ - register Long L; -- double a; +- U x, a; - +- dval(x) = dx; - L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1; -#ifndef Avoid_Underflow -#ifndef Sudden_Underflow @@ -1223,7 +1208,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m -{ - ULong *xa, *xa0, w, y, z; - int k; -- double d; +- U d; -#ifdef VAX - ULong d0, d1; -#else @@ -1286,11 +1271,12 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - static Bigint * -d2b -#ifdef KR_headers -- (d, e, bits) double d; int *e, *bits; +- (dd, e, bits) double dd; int *e, *bits; -#else -- (double d, int *e, int *bits) +- (double dd, int *e, int *bits) -#endif -{ +- U d; - Bigint *b; - int de, k; - ULong *x, y, z; @@ -1299,6 +1285,10 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m -#endif -#ifdef VAX - ULong d0, d1; +-#endif +- +- dval(d) = dd; +-#ifdef VAX - d0 = word0(d) >> 16 | word0(d) << 16; - d1 = word1(d) >> 16 | word1(d) << 16; -#else @@ -1429,7 +1419,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - (Bigint *a, Bigint *b) -#endif -{ -- double da, db; +- U da, db; - int k, ka, kb; - - dval(da) = b2d(a, &ka); @@ -1603,7 +1593,8 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, - e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; - CONST char *s, *s0, *s1; -- double aadj, aadj1, adj, rv, rv0; +- double aadj, aadj1, adj; +- U aadj2, rv, rv0; - Long L; - ULong y, z; - Bigint *bb, *bb1, *bd, *bd0, *bs, *delta; @@ -2366,7 +2357,9 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - aadj = z; - aadj1 = dsign ? aadj : -aadj; - } -- word0(aadj1) += (2*P+1)*Exp_msk1 - y; +- dval(aadj2) = aadj1; +- word0(aadj2) += (2*P+1)*Exp_msk1 - y; +- aadj1 = dval(aadj2); - } - adj = aadj1 * ulp(dval(rv)); - dval(rv) += adj; @@ -2701,10 +2694,10 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - static char * -dtoa -#ifdef KR_headers -- (d, mode, ndigits, decpt, sign, rve) -- double d; int mode, ndigits, *decpt, *sign; char **rve; +- (dd, mode, ndigits, decpt, sign, rve) +- double dd; int mode, ndigits, *decpt, *sign; char **rve; -#else -- (double d, int mode, int ndigits, int *decpt, int *sign, char **rve) +- (double dd, int mode, int ndigits, int *decpt, int *sign, char **rve) -#endif -{ - /* Arguments ndigits, decpt, sign are similar to those @@ -2750,7 +2743,8 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - ULong x; -#endif - Bigint *b, *b1, *delta, *mlo, *mhi, *S; -- double d2, ds, eps; +- U d, d2, eps; +- double ds; - char *s, *s0; -#ifdef Honor_FLT_ROUNDS - int rounding; @@ -2766,6 +2760,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - } -#endif - +- dval(d) = dd; - if (word0(d) & Sign_bit) { - /* set sign for everything, including 0's and NaNs */ - *sign = 1; @@ -3346,7 +3341,9 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m - ++*s++; - } - else { +-#ifdef Honor_FLT_ROUNDS - trimzeros: +-#endif - while(*--s == '0'); - s++; - } @@ -3384,7 +3381,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m PR_IMPLEMENT(PRStatus) PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, -@@ -3404,7 +155,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, +@@ -3411,7 +165,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return rv; } @@ -3393,7 +3390,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m if (!result) { PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); return rv; -@@ -3419,7 +170,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, +@@ -3426,7 +180,7 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, } rv = PR_SUCCESS; } @@ -3402,24 +3399,19 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prdtoa_c,v 1.4 2008/07/25 00:42:34 m return rv; } -@@ -3435,13 +186,15 @@ PR_dtoa(PRFloat64 d, PRIntn mode, PRIntn ndigits, - ** '+' or '-' after the 'e' in scientific notation - */ - PR_IMPLEMENT(void) --PR_cnvtf(char *buf,int bufsz, int prcsn,double fval) -+PR_cnvtf(char *buf,int bufsz, int prcsn,double _fval) - { - PRIntn decpt, sign, numdigits; +@@ -3448,9 +202,9 @@ PR_cnvtf(char *buf, int bufsz, int prcsn, double dfval char *num, *nump; char *bufp = buf; char *endnum; +- U fval; + _double fval; -+ value(fval) = _fval; +- dval(fval) = dfval; ++ value(fval) = dfval; /* If anything fails, we store an empty string in 'buf' */ num = (char*)PR_MALLOC(bufsz); if (num == NULL) { -@@ -3449,7 +202,7 @@ PR_cnvtf(char *buf,int bufsz, int prcsn,double fval) +@@ -3458,7 +212,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 a1e01d537ea..164b7df1174 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.4 2008/07/25 00:42:34 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prinit.c.orig Sat Apr 26 03:39:35 2008 -+++ mozilla/nsprpub/pr/src/misc/prinit.c Fri Jun 13 21:58:54 2008 -@@ -417,8 +417,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +$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() _PR_CleanupDtoa(); _PR_CleanupCallOnce(); _PR_ShutdownLinker(); @@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.4 2008/07/25 00:42:34 m /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); -@@ -429,6 +427,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() _PR_LogCleanup(); /* @@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_src_misc_prinit_c,v 1.4 2008/07/25 00:42:34 m * This part should look like the end of _PR_NativeRunThread * and _PR_UserRunThread. */ -@@ -440,6 +444,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -437,6 +441,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 694fd8faefc..cead78ffa7c 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.6 2008/12/15 21:26:04 martynas Exp $ ---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Fri May 2 11:18:14 2008 -+++ mozilla/nsprpub/pr/src/misc/prnetdb.c Fri Dec 12 05:57:31 2008 -@@ -2023,7 +2023,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const +$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 */ hints.ai_socktype = SOCK_STREAM; diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c index 65f7391865d..bb10591daa4 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2006/11/06 14:35:45 ajacoutot Exp $ ---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig Sat Jul 2 00:26:37 2005 -+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c Sat Nov 4 13:15:29 2006 +$OpenBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptthread_c,v 1.2 2009/08/04 13:56:09 martynas Exp $ +--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig Fri May 8 04:01:11 2009 ++++ mozilla/nsprpub/pr/src/pthreads/ptthread.c Sat Jun 20 23:38:30 2009 @@ -51,6 +51,7 @@ #include #include #include +#undef _POSIX_THREAD_PRIORITY_SCHEDULING - /* - * Record whether or not we have the privilege to set the scheduling + #ifdef SYMBIAN + /* In Open C sched_get_priority_min/max do not work properly, so we undefine diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c index 09977660c6a..1969ab362fb 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_tests_nameshm1_c,v 1.1 2006/11/15 09:05:36 ajacoutot Exp $ ---- mozilla/nsprpub/pr/tests/nameshm1.c.orig Sun Apr 25 17:01:02 2004 -+++ mozilla/nsprpub/pr/tests/nameshm1.c Mon Nov 13 12:45:53 2006 -@@ -589,7 +589,9 @@ PRIntn main(PRIntn argc, char *argv[]) +$OpenBSD: patch-mozilla_nsprpub_pr_tests_nameshm1_c,v 1.2 2009/08/04 13:56:09 martynas Exp $ +--- mozilla/nsprpub/pr/tests/nameshm1.c.orig Wed Mar 18 11:49:45 2009 ++++ mozilla/nsprpub/pr/tests/nameshm1.c Sat Jun 20 23:38:30 2009 +@@ -598,7 +598,9 @@ int main(int argc, char **argv) ReadOnlyTest(); if ( failed_already != 0 ) goto Finished; diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c index 852e77ebde3..4e4920e139e 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c @@ -1,12 +1,19 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_tests_prpollml_c,v 1.1 2006/11/15 09:05:36 ajacoutot Exp $ ---- mozilla/nsprpub/pr/tests/prpollml.c.orig Sun Apr 25 17:01:02 2004 -+++ mozilla/nsprpub/pr/tests/prpollml.c Sun Nov 12 13:18:20 2006 -@@ -47,7 +47,7 @@ +$OpenBSD: patch-mozilla_nsprpub_pr_tests_prpollml_c,v 1.2 2009/08/04 13:56:09 martynas Exp $ +--- mozilla/nsprpub/pr/tests/prpollml.c.orig Wed Mar 18 11:49:45 2009 ++++ mozilla/nsprpub/pr/tests/prpollml.c Sun Jun 21 16:37:17 2009 +@@ -47,14 +47,10 @@ #include #include +-#ifdef SYMBIAN +-#define POLL_DESC_COUNT 128 +-#else -#define POLL_DESC_COUNT 256 /* This should be greater than the +#define POLL_DESC_COUNT 120 /* This should be greater than the * STACK_POLL_DESC_COUNT macro in * ptio.c to cause syspoll_list to * be created. */ +-#endif + + static PRPollDesc pd[POLL_DESC_COUNT]; + diff --git a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh index acf528d0080..d5a736de2d5 100644 --- a/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh +++ b/devel/nspr/patches/patch-mozilla_nsprpub_pr_tests_runtests_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.1 2008/07/25 00:42:34 martynas Exp $ ---- mozilla/nsprpub/pr/tests/runtests.sh.orig Sun Jan 27 02:45:13 2008 -+++ mozilla/nsprpub/pr/tests/runtests.sh Sat Apr 5 22:26:43 2008 +$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.2 2009/08/04 13:56:09 martynas Exp $ +--- mozilla/nsprpub/pr/tests/runtests.sh.orig Sun May 10 00:30:55 2009 ++++ mozilla/nsprpub/pr/tests/runtests.sh Sat Jun 20 23:38:30 2009 @@ -90,11 +90,10 @@ fi # Tests not run (but should) # @@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.1 2008/07/25 00:42:34 m formattm fsync gethost -@@ -166,6 +166,7 @@ perf +@@ -168,6 +168,7 @@ perf pipeping pipeping2 pipeself @@ -31,7 +31,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_sh,v 1.1 2008/07/25 00:42:34 m poll_nm poll_to pollable -@@ -181,9 +182,6 @@ selct_er +@@ -184,9 +185,6 @@ selct_er selct_nm selct_to selintr 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 0d83d584fba..a1e8b93cb66 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.1 2006/11/09 19:00:39 ajacoutot Exp $ ---- mozilla/nsprpub/pr/tests/socket.c.orig Sun Apr 25 17:01:02 2004 -+++ mozilla/nsprpub/pr/tests/socket.c Thu Nov 9 14:29:45 2006 -@@ -2245,6 +2245,7 @@ main(int argc, char **argv) +$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) /* * client-server test, Ipv6-Ipv4 */ @@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_nsprpub_pr_tests_socket_c,v 1.1 2006/11/09 19:00:39 ajac client_domain = PR_AF_INET6; printf("TCP Client/Server Test - IPv6/Ipv4\n"); if (TCP_Socket_Client_Server_Test() < 0) { -@@ -2252,9 +2253,11 @@ main(int argc, char **argv) +@@ -2241,9 +2242,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.1 2006/11/09 19:00:39 ajac client_domain = PR_AF_INET; server_domain = PR_AF_INET6; printf("TCP Client/Server Test - IPv4/Ipv6\n"); -@@ -2263,6 +2266,7 @@ main(int argc, char **argv) +@@ -2252,6 +2255,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.1 2006/11/09 19:00:39 ajac /* * client-server test, Ipv6-Ipv6 */ -@@ -2289,6 +2293,7 @@ main(int argc, char **argv) +@@ -2281,6 +2285,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.1 2006/11/09 19:00:39 ajac printf("UDP Client/Server Test - IPv6/Ipv4\n"); client_domain = PR_AF_INET6; server_domain = PR_AF_INET; -@@ -2297,9 +2302,11 @@ main(int argc, char **argv) +@@ -2289,9 +2294,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.1 2006/11/09 19:00:39 ajac printf("UDP Client/Server Test - IPv4/Ipv6\n"); client_domain = PR_AF_INET; server_domain = PR_AF_INET6; -@@ -2308,6 +2315,7 @@ main(int argc, char **argv) +@@ -2300,6 +2307,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 b74f7388e74..855b07719a2 100644 --- a/devel/nspr/pkg/PLIST-main +++ b/devel/nspr/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2008/12/15 21:26:04 martynas Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2009/08/04 13:56:09 martynas Exp $ @pkgpath devel/nspr bin/nspr-config include/nspr/ @@ -21,7 +21,6 @@ include/nspr/md/_netbsd.cfg include/nspr/md/_nextstep.cfg include/nspr/md/_nto.cfg include/nspr/md/_openbsd.cfg -include/nspr/md/_openvms.cfg include/nspr/md/_os2.cfg include/nspr/md/_osf1.cfg include/nspr/md/_qnx.cfg @@ -34,7 +33,6 @@ include/nspr/md/_sunos4.cfg include/nspr/md/_symbian.cfg include/nspr/md/_unixware.cfg include/nspr/md/_unixware7.cfg -include/nspr/md/_win16.cfg include/nspr/md/_win95.cfg include/nspr/md/_winnt.cfg include/nspr/nspr.h