Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime,

and more on Solaris and HP-UX.
Use setup.inf from admin server, and make sure the admin component is in there.

4 files changed, 51 insertions, 27 deletions

diff --git a/component_versions.mk b/component_versions.mk
index 289ca66d..ea8b79c7 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -52,12 +52,12 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.4.1
+  NSPR_RELDATE = v4.6.1
 endif
 
 # SECURITY (NSS) LIBRARY
 ifndef SECURITY_RELDATE
-  SECURITY_RELDATE = NSS_3_9_3_RTM
+  SECURITY_RELDATE = NSS_3_11_RTM
 endif
 
 # LIBDB
@@ -97,7 +97,7 @@ endif
 
 # ANT 
 ifndef ANT_VERSION
-  ANT_VERSION = 1.4.1
+  ANT_VERSION = 1.6.2
 endif
 ifndef ANT_COMP
   ANT_COMP = ant
@@ -140,7 +140,7 @@ endif
 
 # server core
 ifndef SVRCORE_RELDATE
-  SVRCORE_RELDATE = SVRCORE_4_0_RTM
+  SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
 endif
 
 # admin utility library
diff --git a/components.mk b/components.mk
index a559ef57..02fdbcfc 100644
--- a/components.mk
+++ b/components.mk
@@ -210,23 +210,30 @@ endif
 SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
 # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
 SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
+# as of NSS 3.11, no longer need to link with softokn3
+SECURITY_LIBNAMES = ssl3 nss3
 # these libs have a corresponding .chk file
-SECURITY_NEED_CHK = softokn3
+# freebl is new for NSS 3.11
+SECURITY_NEED_CHK = softokn3 freebl3
 
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3
 
-# these are only needed on 32 bit Solaris and HP-UX
 ifneq ($(USE_64), 1)
 ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
 # these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-endif
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+endif # SOLARIS
 ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3
+# these libs have a corresponding .chk file
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+endif # HPUX
+else  # USE_64
+ifeq ($(ARCH), SOLARIS)
+SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3
 # these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
+SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
 endif
 endif # USE_64
 
@@ -238,7 +245,7 @@ SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_P
 LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
 LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
 ifeq ($(USE_SETUPUTIL), 1)
-  PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
+  PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) # for the setup programs
 endif
 ifeq ($(USE_DSGW), 1)
   LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw
@@ -423,7 +430,7 @@ endif
 
 ### ICU package ##########################################
 
-ICU_LIB_VERSION = 24
+ICU_LIB_VERSION = 34
 ifdef ICU_SOURCE_ROOT
   ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
   ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -518,10 +525,10 @@ endif
 # during the build process
 ifdef ADMINUTIL_SOURCE_ROOT
   ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
-  ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include
+  ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
 else
   ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
-  ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include
+  ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
 endif
 
 PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
@@ -529,11 +536,11 @@ LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
 LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
 
 ifeq ($(ARCH),WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil.$(LIB_SUFFIX)
+ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s.$(LIB_SUFFIX)
+LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX)
 else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
+ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil
 endif
 ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
 	-I$(ADMINUTIL_INCPATH)/libadmsslutil
@@ -572,8 +579,8 @@ ifdef ADMINSERVER_SOURCE_ROOT
   ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
 # else set in internal_buildpaths.mk
 endif
-# these are the only two subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base
+# these are the subcomponents we use from the adminserver package
+ADMINSERVER_SUBCOMPS=admin base setup.inf
 
 ifdef LDAPCONSOLE_SOURCE_ROOT
   LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 75c15439..be1b04cc 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -595,7 +595,6 @@ packageDirectory: $(INSTDIR)/slapd \
 # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
 ifeq ($(USE_SETUPUTIL),1)
 	cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
-	$(PERL) -w $(FIX_SETUP_INF) $(SETUPUTIL_BINPATH)/setup.inf $(INSTDIR)/setup.inf
 endif
 
 # copy in our product .inf files
@@ -691,6 +690,13 @@ endif
 		done ; \
 	fi
 
+# make sure setup.inf has everything we need
+ifeq ($(USE_SETUPUTIL),1)
+	cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp
+	$(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
+	rm -f $(INSTDIR)/setup.inf.tmp
+endif
+
 # we must remove the nsbase.zip file - we package those files now
 	rm -f $(INSTDIR)/base/nsbase.zip
 # we also need to remove the Archive directive from the [base] section of the
@@ -714,7 +720,7 @@ ifndef NO_INSTALLER_TAR_FILES
 # build the combined packages tar file; use h flag to follow symlinks
 ifdef BUILD_SHIP
 ifndef BUILD_PATCH
-	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
+	cd $(INSTDIR); $(TAR) cvfh - setup slapd \
 	dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
 endif
 ifeq ($(DEBUG), optimize)
@@ -723,7 +729,7 @@ endif
 else
 	echo base/unzipped > $(TMPLIST)
 	echo admin/unzipped >> $(TMPLIST)
-	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd  \
+	cd $(INSTDIR); $(TAR) cvfh - setup slapd  \
 	dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
 	rm -f $(TMPLIST)
 endif # BUILD_SHIP
@@ -913,7 +919,7 @@ _admserv_files: $(INSTDIR) $(ADMSERV_DEP)
 # move the tarball back after the copy
 	mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)
 # make sure our packages are in the setup.inf file
-	$(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf
+	$(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
 
 
 #----------------------------  slapd rules --------------------------------------------------
diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index ca9b990b..003cba5f 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.pl
@@ -51,6 +51,8 @@ $ServerDirKey = "DefaultInstallDirectory";
 
 $input = shift;
 $output = shift;
+$use_adminserver = shift;
+
 die "cannot open input file $input" unless open( FILE, $input );
 die "cannot open output file $output" unless open( OUT, ">$output" );
 $inGeneralSection = 0;
@@ -65,6 +67,10 @@ while ( <FILE> ) {
 			$_ .= ", slapd";
 			$addedSlapd = 1;
 		}
+        if (! /admin/ && $use_adminserver) {
+			$_ .= ", admin";
+			$addedAdmin = 1;
+        }
 		if (! /perldap/) {
 			$_ .= ", perldap";
 			$addedPerLDAP = 1;
@@ -95,6 +101,11 @@ if ($addedSlapd) {
 	print OUT "ComponentInfoFile = slapd/slapd.inf\n";
 }
 
+if ($addedAdmin) {
+	print OUT "\n[admin]\n";
+	print OUT "ComponentInfoFile = admin/admin.inf\n";
+}
+
 if ($addedPerLDAP) {
 	print OUT "\n[perldap]\n";
 	print OUT "ComponentInfoFile = perldap/perldap.inf\n";