Bugzilla Bug 357333: upgraded to NSPR 4.6.4.SUNBIRD_0_5_RC3MOZILLA_1_8_BRANCH

approved for 1.8 branch, a=dveditz for drivers

14 files changed, 45 insertions, 64 deletions

diff --git a/admin/repackage.sh b/admin/repackage.sh
index 77306c96..11b7123e 100755
--- a/admin/repackage.sh
+++ b/admin/repackage.sh
@@ -64,36 +64,32 @@
 # 
 # ------------------------------------------------------------------
 
-FROMTOP=/share/builds/components/nspr20/v4.6.3
-TOTOP=./v4.6.3
-NSPRDIR=nspr-4.6.3
-SOURCETAG=NSPR_4_6_3_RTM
+FROMTOP=/share/builds/components/nspr20/v4.6.4
+TOTOP=./v4.6.4
+NSPRDIR=nspr-4.6.4
+SOURCETAG=NSPR_4_6_4_RTM
 
 #
 # enumerate Unix object directories on /s/b/c
 UNIX_OBJDIRS="
-AIX4.3_64_DBG.OBJ
-AIX4.3_64_OPT.OBJ
-AIX4.3_DBG.OBJ
-AIX4.3_OPT.OBJ
-HP-UXB.11.00_64_DBG.OBJ
-HP-UXB.11.00_64_OPT.OBJ
-HP-UXB.11.00_DBG.OBJ
-HP-UXB.11.00_OPT.OBJ
-IRIX6.5_n32_PTH_DBG.OBJ
-IRIX6.5_n32_PTH_OPT.OBJ
-Linux2.2_x86_glibc_PTH_DBG.OBJ
-Linux2.2_x86_glibc_PTH_OPT.OBJ
+HP-UXB.11.11_64_DBG.OBJ
+HP-UXB.11.11_64_OPT.OBJ
+HP-UXB.11.11_DBG.OBJ
+HP-UXB.11.11_OPT.OBJ
+HP-UXB.11.23_ia64_32_DBG.OBJ
+HP-UXB.11.23_ia64_32_OPT.OBJ
+HP-UXB.11.23_ia64_64_DBG.OBJ
+HP-UXB.11.23_ia64_64_OPT.OBJ
 Linux2.4_x86_glibc_PTH_DBG.OBJ
 Linux2.4_x86_glibc_PTH_OPT.OBJ
-OSF1V5.0_DBG.OBJ
-OSF1V5.0_OPT.OBJ
-SunOS5.6_DBG.OBJ
-SunOS5.6_OPT.OBJ
-SunOS5.8_64_DBG.OBJ
-SunOS5.8_64_OPT.OBJ
-SunOS5.8_DBG.OBJ
-SunOS5.8_OPT.OBJ
+Linux2.6_x86_64_glibc_PTH_DBG.OBJ
+Linux2.6_x86_64_glibc_PTH_OPT.OBJ
+Linux2.6_x86_glibc_PTH_DBG.OBJ
+Linux2.6_x86_glibc_PTH_OPT.OBJ
+SunOS5.9_64_DBG.OBJ
+SunOS5.9_64_OPT.OBJ
+SunOS5.9_DBG.OBJ
+SunOS5.9_OPT.OBJ
 "
 #
 # enumerate Windows object directories on /s/b/c
@@ -101,9 +97,9 @@ WIN_OBJDIRS="
 WIN954.0_DBG.OBJ
 WIN954.0_DBG.OBJD
 WIN954.0_OPT.OBJ
-WINNT4.0_DBG.OBJ
-WINNT4.0_DBG.OBJD
-WINNT4.0_OPT.OBJ
+WINNT5.0_DBG.OBJ
+WINNT5.0_DBG.OBJD
+WINNT5.0_OPT.OBJ
 "
 
 #
diff --git a/configure b/configure
index 06b95bf2..68660c33 100755
--- a/configure
+++ b/configure
@@ -687,7 +687,7 @@ test "$host_alias" != "$target_alias" &&
 
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=3
+MOD_PATCH_VERSION=4
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/configure.in b/configure.in
index d111446f..f6d99214 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,7 @@ dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
 MOD_MINOR_VERSION=6
-MOD_PATCH_VERSION=3
+MOD_PATCH_VERSION=4
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=
 USE_PTHREADS=
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index 2916ab70..5a2e0722 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -63,11 +63,6 @@ HEADERS = \
 HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
 
 ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
 RES=$(OBJDIR)/plds.res
 RESNAME=plds.rc
 endif # WINNT
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index fcdbae60..a0f4295f 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -73,11 +73,6 @@ LIBRARY_VERSION	= $(MOD_MAJOR_VERSION)
 RELEASE_LIBS = $(TARGETS)
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
 RES=$(OBJDIR)/plc.res
 RESNAME=plc.rc
 endif # WINNT
diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in
index de834cc5..5d5a1146 100644
--- a/lib/msgc/src/Makefile.in
+++ b/lib/msgc/src/Makefile.in
@@ -69,11 +69,6 @@ EXTRA_LIBS += $(OS_LIBS)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
 #RES=$(OBJDIR)/ds.res
 #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
 #OS_LIBS = user32.lib
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index 679c03d9..a29af95d 100644
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -88,7 +88,6 @@ CXXSRCS = \
 OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
 
 ifeq ($(OS_ARCH), WINNT)
-        DLLBASE=-BASE:0x30000000
         RES=$(OBJDIR)/prstrms.res
         RESNAME=prstrms.rc
         OS_LIBS = user32.lib
diff --git a/pr/include/md/_hpux.h b/pr/include/md/_hpux.h
index 64729607..55156f49 100644
--- a/pr/include/md/_hpux.h
+++ b/pr/include/md/_hpux.h
@@ -48,7 +48,12 @@
 #define _PR_SI_ARCHITECTURE "ia64"
 #define PR_DLL_SUFFIX        ".so"
 #else
-#define _PR_SI_ARCHITECTURE "hppa"
+/*
+ * _PR_SI_ARCHITECTURE must be "hppa1.1" for backward compatibility.
+ * It was changed to "hppa" in NSPR 4.6.2, but was changed back in
+ * NSPR 4.6.4.
+ */
+#define _PR_SI_ARCHITECTURE "hppa1.1"
 #define PR_DLL_SUFFIX        ".sl"
 #endif
 
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index 9f7bc3d3..d040169e 100644
--- a/pr/include/prinit.h
+++ b/pr/include/prinit.h
@@ -63,10 +63,10 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.6.3"
+#define PR_VERSION  "4.6.4"
 #define PR_VMAJOR   4
 #define PR_VMINOR   6
-#define PR_VPATCH   3
+#define PR_VPATCH   4
 #define PR_BETA     PR_FALSE
 
 /*
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index d3605901..2d785bdc 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -316,11 +316,6 @@ OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX)
 endif
 
 ifeq ($(OS_ARCH), WINNT)
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif # GCC
 RES=$(OBJDIR)/nspr.res
 RESNAME=nspr.rc
 endif # WINNT
diff --git a/pr/src/linking/prlink.c b/pr/src/linking/prlink.c
index 7fb06b78..5f83f257 100644
--- a/pr/src/linking/prlink.c
+++ b/pr/src/linking/prlink.c
@@ -1267,7 +1267,8 @@ PR_UnloadLibrary(PRLibrary *lib)
 #elif defined(USE_HPSHL)
     result = shl_unload(lib->dlh);
 #elif defined(USE_MACH_DYLD)
-    result = NSUnLinkModule(lib->dlh, NSUNLINKMODULE_OPTION_NONE) ? 0 : -1;
+    if (lib->dlh)
+        result = NSUnLinkModule(lib->dlh, NSUNLINKMODULE_OPTION_NONE) ? 0 : -1;
 #else
 #error Configuration error
 #endif
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
index 63b21070..515d9601 100644
--- a/pr/src/misc/prnetdb.c
+++ b/pr/src/misc/prnetdb.c
@@ -108,6 +108,11 @@ PRLock *_pr_dnsLock = NULL;
 #define _PR_HAVE_GETPROTO_R_INT
 #endif
 
+#if __FreeBSD_version >= 602000
+#define _PR_HAVE_GETPROTO_R
+#define _PR_HAVE_5_ARG_GETPROTO_R
+#endif
+
 #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
 #define _PR_HAVE_GETPROTO_R
 #define _PR_HAVE_5_ARG_GETPROTO_R
diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in
index 906f5310..a9cbac43 100644
--- a/pr/tests/dll/Makefile.in
+++ b/pr/tests/dll/Makefile.in
@@ -68,11 +68,6 @@ ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
 # do nothing
 else
-ifdef NS_USE_GCC
-DLLBASE=-Wl,--image-base -Wl,0x30000000
-else
-DLLBASE=-BASE:0x30000000
-endif
 RES=$(OBJDIR)/my.res
 RESNAME=../../../pr/src/nspr.rc
 endif
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index cbd41256..82cf8b44 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -52,15 +52,15 @@
 #include <stdlib.h>
 
 /*
- * This release (4.6.3) is backward compatible with the
- * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6, 4.6.1,
- * and 4.6.2 releases.  It, of course, is compatible with
+ * This release (4.6.4) is backward compatible with the
+ * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6, 4.6.1, 4.6.2,
+ * and 4.6.3 releases.  It, of course, is compatible with
  * itself.
  */
 static char *compatible_version[] = {
     "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3",
     "4.2", "4.2.1", "4.2.2", "4.3", "4.4", "4.4.1",
-    "4.5", "4.5.1", "4.6", "4.6.1", "4.6.2", PR_VERSION
+    "4.5", "4.5.1", "4.6", "4.6.1", "4.6.2", "4.6.3", PR_VERSION
 };
 
 /*
@@ -75,7 +75,7 @@ static char *incompatible_version[] = {
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.6.4",
+    "4.6.5",
     "4.7", "4.7.1",
     "10.0", "11.1", "12.14.20"
 };