Fixing nightly build

Changes:
1) NSPR_RELDATE: v4.6.1 --> v4.6
2) ICU_LIB_VERSION: 34 --> 24
This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4.
3) lib/base/systhr.cpp: Applied NSPR sysfd table patch
4) DS version: 7.1 --> 7.2

4 files changed, 33 insertions, 8 deletions

diff --git a/component_versions.mk b/component_versions.mk
index ea8b79c7..fe676cdd 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -52,7 +52,7 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.6.1
+  NSPR_RELDATE = v4.6
 endif
 
 # SECURITY (NSS) LIBRARY
@@ -205,7 +205,7 @@ endif
 
 # DOC
 ifndef DSDOC_RELDATE
-  DSDOC_RELDATE = 20051028
+  DSDOC_RELDATE = 20050311
 endif
 
 # WIX
diff --git a/components.mk b/components.mk
index 464110cf..31b39b2e 100644
--- a/components.mk
+++ b/components.mk
@@ -439,7 +439,7 @@ endif
 
 ### ICU package ##########################################
 
-ICU_LIB_VERSION = 34
+ICU_LIB_VERSION = 24
 ifdef ICU_SOURCE_ROOT
   ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
   ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -589,7 +589,7 @@ ifdef ADMINSERVER_SOURCE_ROOT
 # else set in internal_buildpaths.mk
 endif
 # these are the subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base setup.inf
+ADMINSERVER_SUBCOMPS=admin base
 
 ifdef LDAPCONSOLE_SOURCE_ROOT
   LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
index 7b437da0..7889255a 100644
--- a/internal_comp_deps.mk
+++ b/internal_comp_deps.mk
@@ -273,6 +273,7 @@ endif # SASL_SOURCE_ROOT
 
 ifndef ICU_SOURCE_ROOT
 ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
+#ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
 ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h
 ifndef ICU_PULL_METHOD
 ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -330,8 +331,8 @@ endif # DB_SOURCE_ROOT
 ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)
 ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
 ifeq ($(BUILD_MODE), int)
-  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+#  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+  ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 else
 #  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
   ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
@@ -501,7 +502,7 @@ ifeq ($(BUILD_JAVA_CODE),1)
 ifndef GET_ANT_FROM_PATH
 #  (we use ant for building some Java code)
 ANTJAR = ant.jar
-JAXPJAR = jaxp.jar
+#JAXPJAR = jaxp.jar # ???
 ANT_FILES = $(ANTJAR) $(JAXPJAR)
 ANT_RELEASE = $(COMPONENTS_DIR)
 ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION)
diff --git a/lib/base/systhr.cpp b/lib/base/systhr.cpp
index 8bbfc55f..1f611fb3 100644
--- a/lib/base/systhr.cpp
+++ b/lib/base/systhr.cpp
@@ -47,11 +47,19 @@
 #ifdef USE_NSPR
 #include "nspr.h"
 #include "private/prpriv.h"
+#ifdef LINUX
+#    include <sys/time.h>
+#    include <sys/resource.h>
+#else
+/* This declaration should be removed when NSPR newer than v4.6 is picked up,
+   which should have the fix for bug 326110
+ */
 extern "C" {
 int32 PR_GetSysfdTableMax(void);
 int32 PR_SetSysfdTableSize(int table_size);
 }
 #endif
+#endif
 #include "systems.h"
 
 #ifdef THREAD_WIN32
@@ -161,9 +169,25 @@ NSAPI_PUBLIC void systhread_init(char *name)
 {
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256);
 #ifdef XP_UNIX
-    /* XXXrobm allocate all the fd's we can... */
+#ifdef LINUX
+    /*
+     * NSPR 4.6 does not export PR_SetSysfdTableSize
+     * and PR_GetSysfdTableMax by mistake (NSPR Bugzilla
+     * bug 326110) on platforms that use GCC with symbol
+     * visibility, so we have to call the system calls
+     * directly.
+     */
+    {
+        struct rlimit rlim;
+        if (getrlimit(RLIMIT_NOFILE, &rlim) < 0)
+            return;
+        rlim.rlim_cur = rlim.rlim_max;
+        (void) setrlimit(RLIMIT_NOFILE, &rlim);
+    }
+#else 
     PR_SetSysfdTableSize(PR_GetSysfdTableMax());
 #endif
+#endif
 }