204410 - Pick up new ldapcsdk, nspr, and sasl components

component_versions.mk

@@ -52,7 +52,7 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.6.2
+  NSPR_RELDATE = v4.6.2-dstest
 endif
 
 # SECURITY (NSS) LIBRARY
@@ -76,10 +76,10 @@ endif
 
 # LDAP SDK
 ifndef LDAP_RELDATE
-  LDAP_RELDATE = v5.17
+  LDAP_RELDATE = v5.17-sun-merge
 endif
 ifndef LDAPCOMP_DIR
-  LDAPCOMP_DIR=ldapsdk50
+  LDAPCOMP_DIR=ldapcsdk
 endif
 
 # CRIMSONJAR 
@@ -185,7 +185,7 @@ ifndef SASL_VERSDIR
   SASL_VERSDIR=cyrus
 endif
 ifndef SASL_RELDATE
-  SASL_RELDATE=v2.1.20.1
+  SASL_RELDATE=v2.1.20.2
 endif
 
 # jakarta/axis for DSMLGW

internal_comp_deps.mk

@@ -53,7 +53,7 @@ BOMB=$(BUILD_BOMB)
 endif # BUILD_PUMPKIN
 
 ifndef NSPR_SOURCE_ROOT
-NSPR_IMPORT = $(COMPONENTS_DIR)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR)
+NSPR_IMPORT = $(COMPONENTS_DIR_DEV)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR)
 NSPR_DEP = $(NSPR_LIBPATH)/libnspr4.$(LIB_SUFFIX)
 
 ifndef NSPR_PULL_METHOD
@@ -140,8 +140,8 @@ ifndef LDAP_VERSION
   LDAP_VERSION = $(LDAP_RELDATE)
 endif
 ifndef LDAP_SBC
-#LDAP_SBC = $(COMPONENTS_DIR_DEV)
-LDAP_SBC = $(COMPONENTS_DIR)
+LDAP_SBC = $(COMPONENTS_DIR_DEV)
+#LDAP_SBC = $(COMPONENTS_DIR)
 endif
 LDAPOBJDIR = $(FULL_RTL_OBJDIR)
 # LDAP does not have PTH version, so here is the hack which treat non PTH
@@ -162,7 +162,7 @@ endif
 # Solaris and HP-UX PA-RISC only #########################################
 # if building 64 bit version, also need the 32 bit version of NSS and NSPR
 ifeq ($(PACKAGE_LIB32), 1)
-  NSPR_IMPORT_32 = $(COMPONENTS_DIR)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR_32)
+  NSPR_IMPORT_32 = $(COMPONENTS_DIR_DEV)/nspr/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR_32)
   SECURITY_IMPORT_32 = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR_32)
   LDAP_RELEASE_32 = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(FULL_RTL_OBJDIR_32)
   SECURITY_FILES_32 = $(subst $(SPACE),$(COMMA),$(SECURITY_FILES_32_TMP))

ldap/admin/src/Makefile

@@ -77,7 +77,7 @@ DYNAMIC_DEPLIBS=$(LDAP_COMMON_LIBS_DEP)
 DYNAMIC_DEPLINK=$(LDAP_ADMLIB) $(LDAP_COMMON_LIBS)
 endif
 
-EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP)
+EXTRA_LIBS_DEP += $(NSPR_DEP) $(LDAPSDK_DEP) $(SASL_DEP)
 ifeq ($(USE_ADMINSERVER), 1)
   EXTRA_LIBS_DEP += $(ADMINUTIL_DEP)
 endif
@@ -98,7 +98,7 @@ EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
 ifeq ($(USE_SETUPUTIL), 1)
   EXTRA_LIBS += $(SETUPUTIL_S_LINK)
 endif
-EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
+EXTRA_LIBS += $(ICULINK) $(SASL_LINK) $(OLD_EXTRA_LIBS)
 
 # these are the libraries to use when building the installer for the open source version
 OPENSOURCE_LIBS = $(LDAP_ADMLIB) $(LDAP_NOSSL_LINK) $(SECURITYLINK) $(NSPRLINK)

ldap/clients/dsgw/Makefile

@@ -150,18 +150,18 @@ LIBS := $(DISTLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) $(LDAPLINK) \
 	$(ADMINUTIL_LINK) $(DYN_NSHTTPD) \
 	$(LDAP_LIBLDBM) $(ICULINK) $(NSPRLINK) \
 	$(LDAP_LIBLDIF) $(ALIBS) $(DBMLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
+	$(SASL_LINK) $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
 LIBS_DEP = $(LIBLDAPU_DEP) $(LDAP_LIBLDBM_DEP) $(LDAP_LIBLDIF_DEP)
-LIBS_DEP += $(LDAPSDK_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP)
+LIBS_DEP += $(LDAPSDK_DEP) $(SASL_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP)
 NSECLIBS = $(DISTLIBFLAG) $(SSLLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) \
 	$(LDAP_NOSSL_LINK) $(ADMINUTIL_LINK) \
 	$(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \
-	$(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \
+	$(LDAP_LIBLDIF) $(SASL_LINK) $(DBMLINK) $(ALIBS) \
 	$(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)
 endif
 
 NSECLIBS_DEP=$(SECGLUEOBJS)
-NSECLIBS_DEP += $(ICU_DEP)
+NSECLIBS_DEP += $(ICU_DEP) $(SASL_DEP)
 
 #EXTRA_LIBS += -l$(LIBARES)
 

ldap/cm/newinst/Makefile

@@ -171,7 +171,7 @@ $(BINDEST)/uninstall: uninstall
 $(BINDEST)/ns-config: $(OBJS1) $(OBJS2)
 	$(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
 		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
-	       $(EXTRA_LIBS) $(CURSES)
+	       $(SASL_LINK) $(EXTRA_LIBS) $(CURSES)
 
 $(RELDIR)/shared/bin/%: sec_tools_wrapper $(RELDIR)/shared/bin
 	-@$(RM) $@

ldap/servers/slapd/tools/Makefile

@@ -105,14 +105,15 @@ DEPLIBS=
 EXTRA_LIBS_DEP = $(LDAPSDK_DEP) \
 	$(LDAP_LIBLDIF_DEP) \
 	$(LDAP_SLIBLCACHE_DEP) $(DB_LIB_DEP) $(LIBSLAPD_DEP) \
-	$(LDAP_COMMON_LIBS_DEP)
+	$(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) \
 	$(LDAP_SLIBLCACHE) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) $(LIBSLAPD) $(LDAP_LIBLITEKEY) \
 	$(ALIBS) \
 	$(SECURITYLINK) $(DBMLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK)
+	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(NSPRLINK) $(SVRCORELINK) \
+	$(SASL_LINK)
 
 ifeq ($(ARCH), Linux)
 EXTRA_LIBS += -lcrypt
@@ -180,7 +181,7 @@ all:	$(OBJDEST) $(BINDIR) $(LDAP_ADMIN_BIN_RELDIR) $(BINS) buildRsearch buildLdc
 extras:	$(OBJDEST) $(BINDIR) $(EGGENCODE)
 
 $(LDIF):	$(OBJDEST)/ldif.o $(LDAP_LIBLDIF_DEP)
-	$(LINK_EXE) $< $(LDAP_LIBLDIF)
+	$(LINK_EXE) $< $(LDAP_LIBLDIF) $(SASL_LINK)
 
 $(PWDHASH):	$(OBJS1) $(EXTRA_LIBS_DEP)
 	$(LINK_EXE) $(OBJS1) $(EXTRA_LIBS) 

ldap/servers/slapd/tools/ldclt/Makefile

@@ -61,12 +61,12 @@ else
 OBJEXT          =.o
 endif
 
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP)
+EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
 	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS)
+	$(THREADSLIB) $(LDAP_COMMON_LIBS) $(SASL_LINK)
 
 LDCLTSRC	= \
 		data.c \

ldap/servers/slapd/tools/rsearch/Makefile

@@ -63,12 +63,12 @@ else # OSF1
 PLATFORM_SPECIFIC_EXTRA_LIBRARY =
 endif # OSF1
 
-EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP)
+EXTRA_LIBS_DEP = $(LDAPSDK_DEP) $(DB_LIB_DEP) $(LDAP_COMMON_LIBS_DEP) $(SASL_DEP)
 
 EXTRA_LIBS += $(LDAPLINK) $(DB_LIB) \
 	$(PLATFORM_SPECIFIC_EXTRA_LIBRARY) \
 	$(ALIBS) $(NSPRLINK) $(SECURITYLINK) \
-	$(THREADSLIB) $(LDAP_COMMON_LIBS) 
+	$(THREADSLIB) $(LDAP_COMMON_LIBS)  $(SASL_LINK)
 
 ifeq ($(ARCH), Linux)
 EXTRA_LIBS += -lcrypt