use internal nspr&nss since i'm not going to update em at least

until after release
2009-06-21 15:04:16 +00:00 · 2009-06-21 15:04:16 +00:00 · b654f91899
commit b654f91899
parent 755a5cdf35
16 changed files with 3749 additions and 3 deletions
--- a/www/firefox35/patches/patch-nsprpub_config_rules_mk
+++ b/www/firefox35/patches/patch-nsprpub_config_rules_mk
@ -0,0 +1,12 @@
+$OpenBSD: patch-nsprpub_config_rules_mk,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/config/rules.mk.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/config/rules.mk	Sun Jun 21 17:51:31 2009
+@@ -219,7 +219,7 @@ ifdef RELEASE_HEADERS
+ 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
+ endif
+ ifdef RELEASE_LIBS
+-	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+	$(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ endif
+ 	+$(LOOP_OVER_DIRS)
+ 
--- a/www/firefox35/patches/patch-nsprpub_configure_in
+++ b/www/firefox35/patches/patch-nsprpub_configure_in
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_configure_in,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/configure.in.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/configure.in	Sun Jun 21 17:52:40 2009
+@@ -1809,9 +1809,11 @@ mips-sony-newsos*)
+     AC_DEFINE(OPENBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
+     AC_DEFINE(HAVE_SOCKLEN_T)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
+     CFLAGS="$CFLAGS -ansi -Wall"
+     CXXFLAGS="$CXXFLAGS -ansi -Wall"
+-    DLL_SUFFIX=so.1.0
+    DLL_SUFFIX="so.${SO_VERSION}"
+     DSO_CFLAGS=-fPIC
+     MDCPUCFG_H=_openbsd.cfg
+     PR_MD_CSRCS=openbsd.c
--- a/www/firefox35/patches/patch-nsprpub_lib_tests_Makefile_in
+++ b/www/firefox35/patches/patch-nsprpub_lib_tests_Makefile_in
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_lib_tests_Makefile_in,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/lib/tests/Makefile.in.orig	Sun Jun 21 17:49:59 2009
+++ nsprpub/lib/tests/Makefile.in	Sun Jun 21 17:52:57 2009
+@@ -117,6 +117,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH)))
+     endif
+ endif
+ 
+ifeq ($(OS_ARCH), OpenBSD)
+        ifeq ($(USE_PTHREADS),1)
+            EXTRA_LIBS = -lpthread
+        endif
+endif
+
+ ifeq ($(OS_ARCH), OSF1)
+ LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
+ endif
--- a/www/firefox35/patches/patch-nsprpub_pr_include_md__openbsd_cfg
+++ b/www/firefox35/patches/patch-nsprpub_pr_include_md__openbsd_cfg
@ -0,0 +1,12 @@
+$OpenBSD: patch-nsprpub_pr_include_md__openbsd_cfg,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/include/md/_openbsd.cfg.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/include/md/_openbsd.cfg	Sun Jun 21 17:53:09 2009
+@@ -193,7 +193,7 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+-#elif defined(__sparc__)
+#elif defined(__sparc__) || defined(__hppa__)
+ 
+ #undef IS_LITTLE_ENDIAN
+ #define  IS_BIG_ENDIAN 1
--- a/www/firefox35/patches/patch-nsprpub_pr_include_md__openbsd_h
+++ b/www/firefox35/patches/patch-nsprpub_pr_include_md__openbsd_h
@ -0,0 +1,24 @@
+$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/include/md/_openbsd.h.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/include/md/_openbsd.h	Sun Jun 21 17:53:25 2009
+@@ -56,6 +56,8 @@
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__hppa__)
+#define _PR_SI_ARCHITECTURE "hppa"
+ #endif
+ 
+ #define PR_DLL_SUFFIX		".so"
+@@ -65,7 +67,11 @@
+ #define _MD_DEFAULT_STACK_SIZE	65536L
+ #define _MD_MMAP_FLAGS          MAP_PRIVATE
+ 
+#if defined(__hppa__)
+#define HAVE_STACK_GROWING_UP
+#else
+ #undef  HAVE_STACK_GROWING_UP
+#endif
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
--- a/www/firefox35/patches/patch-nsprpub_pr_src_misc_prdtoa_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_src_misc_prdtoa_c
--- a/www/firefox35/patches/patch-nsprpub_pr_src_misc_prinit_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_src_misc_prinit_c
@ -0,0 +1,33 @@
+$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/src/misc/prinit.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/misc/prinit.c	Sun Jun 21 17:53:51 2009
+@@ -414,8 +414,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+         _PR_CleanupDtoa();
+         _PR_CleanupCallOnce();
+ 		_PR_ShutdownLinker();
+-        _PR_CleanupNet();
+-        _PR_CleanupIO();
+         /* Release the primordial thread's private data, etc. */
+         _PR_CleanupThread(me);
+ 
+@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+ 	    _PR_LogCleanup();
+ 
+         /*
+         * accesses the current thread
+         */
+        _PR_CleanupNet();
+        _PR_CleanupIO();
+
+        /*
+          * This part should look like the end of _PR_NativeRunThread
+          * and _PR_UserRunThread.
+          */
+@@ -437,6 +441,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+             PR_DELETE(me->stack);
+             PR_DELETE(me);
+         }
+        _PR_MD_SET_CURRENT_THREAD(NULL);
+ 
+         /*
+          * XXX: We are freeing the heap memory here so that Purify won't
--- a/www/firefox35/patches/patch-nsprpub_pr_src_misc_prnetdb_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_src_misc_prnetdb_c
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/src/misc/prnetdb.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/misc/prnetdb.c	Sun Jun 21 17:54:00 2009
+@@ -2039,7 +2039,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const 
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
+	LOCK_DNS();
+
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
+
+	UNLOCK_DNS();
+
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 
--- a/www/firefox35/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
@ -0,0 +1,11 @@
+$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/src/pthreads/ptthread.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/pthreads/ptthread.c	Sun Jun 21 17:54:11 2009
+@@ -51,6 +51,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
+ 
+ #ifdef SYMBIAN
+ /* In Open C sched_get_priority_min/max do not work properly, so we undefine
--- a/www/firefox35/patches/patch-nsprpub_pr_tests_nameshm1_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_tests_nameshm1_c
@ -0,0 +1,13 @@
+$OpenBSD: patch-nsprpub_pr_tests_nameshm1_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/tests/nameshm1.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/nameshm1.c	Sun Jun 21 17:54:19 2009
+@@ -598,7 +598,9 @@ int main(int argc, char **argv)
+         ReadOnlyTest();
+         if ( failed_already != 0 )
+             goto Finished;
+#if !defined(__OpenBSD__)
+         ClientServerTest();
+#endif
+     }
+ 
+ Finished:
--- a/www/firefox35/patches/patch-nsprpub_pr_tests_prpollml_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_tests_prpollml_c
@ -0,0 +1,19 @@
+$OpenBSD: patch-nsprpub_pr_tests_prpollml_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/tests/prpollml.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/prpollml.c	Sun Jun 21 17:54:29 2009
+@@ -47,14 +47,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#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];
+ 
--- a/www/firefox35/patches/patch-nsprpub_pr_tests_runtests_sh
+++ b/www/firefox35/patches/patch-nsprpub_pr_tests_runtests_sh
@ -0,0 +1,43 @@
+$OpenBSD: patch-nsprpub_pr_tests_runtests_sh,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/tests/runtests.sh.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/runtests.sh	Sun Jun 21 17:54:39 2009
+@@ -90,11 +90,10 @@ fi
+ # Tests not run (but should)
+ #
+ 
+-#forktest (failed on IRIX)
+#nameshm1 - runs with ClientServerTest deactivated (idles forever) under OpenBSD
+ #nbconn - fails on some platforms 
+-#poll_er - fails on some platforms? limited use?
+ #prpoll -  the bad-FD test needs to be moved to a different test
+-#sleep	-  specific to OS/2
+#sema,semaerr and semaping - idles forever under OpenBSD (semaphore/thread)
+ 
+ LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
+ 
+@@ -124,6 +123,7 @@ exit
+ fdcach
+ fileio
+ foreign
+forktest
+ formattm
+ fsync
+ gethost
+@@ -168,6 +168,7 @@ perf
+ pipeping
+ pipeping2
+ pipeself
+poll_er
+ poll_nm
+ poll_to
+ pollable
+@@ -184,9 +185,6 @@ selct_er
+ selct_nm
+ selct_to
+ selintr
+-sema
+-semaerr
+-semaping
+ sendzlf
+ server_test
+ servr_kk
--- a/www/firefox35/patches/patch-nsprpub_pr_tests_socket_c
+++ b/www/firefox35/patches/patch-nsprpub_pr_tests_socket_c
@ -0,0 +1,59 @@
+$OpenBSD: patch-nsprpub_pr_tests_socket_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- nsprpub/pr/tests/socket.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/socket.c	Sun Jun 21 17:54:48 2009
+@@ -2234,6 +2234,7 @@ int main(int argc, char **argv)
+     /*
+      * client-server test, Ipv6-Ipv4
+      */
+    #if !defined(__OpenBSD__)
+ 	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)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * client-server test, Ipv4-Ipv6
+      */
+    #if !defined(__OpenBSD__)
+ 	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)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * client-server test, Ipv6-Ipv6
+      */
+@@ -2281,6 +2285,7 @@ int main(int argc, char **argv)
+     /*
+      * run client-server test with UDP, IPv6/IPv4
+      */
+    #if !defined(__OpenBSD__)
+ 	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)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * run client-server test with UDP,IPv4-IPv6
+      */
+    #if !defined(__OpenBSD__)
+ 	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)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * run client-server test with UDP,IPv6-IPv6
+      */
--- a/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk
+++ b/www/firefox35/patches/patch-security_coreconf_OpenBSD_mk
@ -1,6 +1,6 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.1.1.1 2009/06/21 01:31:26 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig	Thu Nov 22 06:39:56 2007
-+++ security/coreconf/OpenBSD.mk	Sun Apr 13 18:35:49 2008
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2009/06/21 15:04:16 martynas Exp $
+--- security/coreconf/OpenBSD.mk.orig	Wed Jun 17 07:22:08 2009
+++ security/coreconf/OpenBSD.mk	Sun Jun 21 17:57:58 2009
@@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
 DSO_LDOPTS		+= -pthread
 endif
@ -10,3 +10,12 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.1.1.1 2009/06/21 01:31:26 marty
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
 
+@@ -68,7 +68,7 @@ DSO_CFLAGS		= -fPIC -DPIC
+ DSO_LDOPTS		= -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ DSO_LDFLAGS		=
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+ 
+ USE_SYSTEM_ZLIB		= 1
+ ZLIB_LIBS		= -lz
--- a/www/firefox35/patches/patch-security_coreconf_UNIX_mk
+++ b/www/firefox35/patches/patch-security_coreconf_UNIX_mk
@ -0,0 +1,12 @@
+$OpenBSD: patch-security_coreconf_UNIX_mk,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- security/coreconf/UNIX.mk.orig	Wed Jun 17 07:22:08 2009
+++ security/coreconf/UNIX.mk	Sun Jun 21 17:58:10 2009
+@@ -42,7 +42,7 @@ AR          = ar cr $@
+ LDOPTS     += -L$(SOURCE_LIB_DIR)
+ 
+ ifdef BUILD_OPT
+-	OPTIMIZER  += -O
+	OPTIMIZER  +=
+ 	DEFINES    += -UDEBUG -DNDEBUG
+ else
+ 	OPTIMIZER  += -g
--- a/www/firefox35/patches/patch-security_nss_lib_freebl_unix_rand_c
+++ b/www/firefox35/patches/patch-security_nss_lib_freebl_unix_rand_c
@ -0,0 +1,29 @@
+$OpenBSD: patch-security_nss_lib_freebl_unix_rand_c,v 1.1 2009/06/21 15:04:16 martynas Exp $
+--- security/nss/lib/freebl/unix_rand.c.orig	Wed Jun 17 07:22:10 2009
+++ security/nss/lib/freebl/unix_rand.c	Sun Jun 21 17:58:22 2009
+@@ -890,7 +890,6 @@ safe_pclose(FILE *fp)
+ /* Fork netstat to collect its output by default. Do not unset this unless
+  * another source of entropy is available
+  */
+-#define DO_NETSTAT 1
+ 
+ void RNG_SystemInfoForRNG(void)
+ {
+@@ -957,7 +956,7 @@ void RNG_SystemInfoForRNG(void)
+     GiveSystemInfo();
+ 
+     /* grab some data from system's PRNG before any other files. */
+-    bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
+    bytes = RNG_FileUpdate(RAND_DEV, SYSTEM_RNG_SEED_COUNT);
+ 
+     /* If the user points us to a random file, pass it through the rng */
+     randfile = getenv("NSRANDFILE");
+@@ -1259,7 +1258,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
+     size_t fileBytes = 0;
+     unsigned char *buffer = dest;
+ 
+-    file = fopen("/dev/urandom", "r");
+    file = fopen(RAND_DEV, "r");
+     if (file == NULL) {
+ 	return rng_systemFromNoise(dest, maxLen);
+     }