Bug(s) fixed: 167453

Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin
Server open source candidate (using Apache, modules, etc), and the new
adminutil and setuputil components.  The code has been changed to
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil)
and new versions of these components (7.1) and new /s/b/c disk layout
where applicable.  We don't really get very much from the admin server
anymore, just the admin and base packages.  All of the other setup stuff
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

Makefile

@@ -79,7 +79,7 @@ help:
 	@echo "   USE_ORGCHART=1    - build/bundle the Org Chart webapp"
 	@echo "   USE_DSGW=1        - build/bundle the Phonebook/DS Gateway webapp"
 	@echo "   USE_JAVATOOLS=1   - build/bundle the Java command line tools"
-	@echo "   USE_SETUPSDK=1    - build/bundle programs that use Setup SDK"
+	@echo "   USE_SETUPUTIL=1    - build/bundle programs that use Setuputil"
 
 ###### Implementation notes:
 #
@@ -131,7 +131,7 @@ help:
 
 ifeq ($(INTERNAL_BUILD), 1)
   COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
-	$(ICU_DEP) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
+	$(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
 	$(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP)
 endif
 
@@ -316,7 +316,7 @@ Longduration:
 
 setupDirectory:
 	cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory;
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cd ldap/cm; $(MAKE) $(MFLAGS) packageDirectory;
 endif
 

component_versions.mk

@@ -122,10 +122,10 @@ endif
 # admin server
 
 ifndef ADM_RELDATE
-  ADM_RELDATE = 20050512
+  ADM_RELDATE = 20050901
 endif
 ifndef ADM_VERSDIR
-  ADM_VERSDIR = adminserver/70$(BUILD_MODE)
+  ADM_VERSDIR = adminserver/7.1
 endif
 
 # Net-SNMP
@@ -133,16 +133,17 @@ ifndef NETSNMP_VER
   NETSNMP_VER = v5.2.1
 endif
 
-# setup sdk
-ifndef SETUP_SDK_RELDATE
-  SETUP_SDK_RELDATE = 20050426
+# setuputil
+ifndef SETUPUTIL_RELDATE
+  SETUPUTIL_RELDATE = 20050831
 endif
-ifndef SETUPSDK_VER
-  SETUPSDK_VER = 70
+ifndef SETUPUTIL_VER
+  SETUPUTIL_VER = 71
+  SETUPUTIL_DOT_VER = 7.1
 endif
 
-ifndef SETUPSDK_VERSDIR
-  SETUPSDK_VERSDIR=setupsdk$(SETUPSDK_VER)$(BUILD_MODE)
+ifndef SETUPUTIL_VERSDIR
+  SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER)
 endif
 
 # infozip utilities
@@ -157,14 +158,15 @@ endif
 
 # admin utility library
 ifndef ADMINUTIL_VER
-  ADMINUTIL_VER=70
+  ADMINUTIL_VER=71
+  ADMINUTIL_DOT_VER=7.1
 endif
 ifndef ADMINUTIL_RELDATE
-  ADMINUTIL_RELDATE=20050330
+  ADMINUTIL_RELDATE=20050721
 endif
 
 ifndef ADMINUTIL_VERSDIR
-  ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)$(BUILD_MODE)
+  ADMINUTIL_VERSDIR=adminutil/$(ADMINUTIL_DOT_VER)
 endif
 
 # LDAP Console

components.mk

@@ -152,7 +152,7 @@ NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(
 
 LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG)
 LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
   PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG)
 endif
 ifeq ($(USE_DSGW), 1)
@@ -237,7 +237,7 @@ SECURITY_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(SECURITY_LIBPATH
 SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK)))
 LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
 LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
   PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
 endif
 ifeq ($(USE_DSGW), 1)
@@ -318,7 +318,7 @@ ifeq ($(ARCH), WINNT)
 
   LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
   LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  ifeq ($(USE_SETUPSDK), 1)
+  ifeq ($(USE_SETUPUTIL), 1)
     PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
   endif
   ifeq ($(USE_DSGW), 1)
@@ -339,7 +339,7 @@ else # not WINNT
 
   LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
   LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  ifeq ($(USE_SETUPSDK), 1)
+  ifeq ($(USE_SETUPUTIL), 1)
     PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
   endif
   ifeq ($(USE_DSGW), 1)

internal_comp_deps.mk

@@ -322,10 +322,14 @@ endif # DB_SOURCE_ROOT
 
 # ADMINUTIL library #######################################
 ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE)
-ADMINUTIL_BASE=adminsdk/$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION}
-ADMSDKOBJDIR = $(FULL_RTL_OBJDIR)
-ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
-#ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+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)
+else
+  ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+#  ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
+endif
 # this is the base directory under which the component's files will be found
 # during the build process
 ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
@@ -339,7 +343,7 @@ LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
 #
 # Libadminutil
 #
-ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
+ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(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)
@@ -376,7 +380,7 @@ NETSNMP_DEP = $(NETSNMP_INCDIR)/net-snmp/net-snmp-includes.h
 ifndef NETSNMP_PULL_METHOD
 NETSNMP_PULL_METHOD = $(COMPONENT_PULL_METHOD)
 endif
-                                                                                                                          
+
 $(NETSNMP_DEP): $(NSCP_DISTDIR_FULL_RTL)
 ifneq ($(ARCH), WINNT)
 ifdef COMPONENT_DEPS
@@ -392,41 +396,45 @@ endif # NETSNMP_SOURCE_ROOT
 
 ###########################################################
 
-### SETUPSDK #############################
+### SETUPUTIL #############################
 # this is where the build looks for setupsdk components
-SETUP_SDK_BUILD_DIR = $(NSCP_DISTDIR)/setupsdk
-SETUPSDK_VERSION = $(SETUP_SDK_RELDATE)
-SETUPSDK_RELEASE = $(COMPONENTS_DIR)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME)
-#SETUPSDK_RELEASE = $(COMPONENTS_DIR_DEV)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME)
-SETUPSDK_LIBPATH = $(SETUP_SDK_BUILD_DIR)/lib
-SETUPSDK_INCDIR = $(SETUP_SDK_BUILD_DIR)/include
-SETUPSDK_BINPATH = $(SETUP_SDK_BUILD_DIR)/bin
-SETUPSDK_INCLUDE = -I$(SETUPSDK_INCDIR)
+SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR)/setuputil
+SETUPUTIL_VERSION = $(SETUPUTIL_RELDATE)
+ifeq ($(BUILD_MODE), int)
+  SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+#  SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+else
+  SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
+endif
+SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
+SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
+SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
+SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
 
 ifeq ($(ARCH), WINNT)
-SETUP_SDK_FILES = setupsdk.tar.gz -unzip $(NSCP_DISTDIR)/setupsdk
-SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/nssetup32.$(LIB_SUFFIX)
-SETUPSDKLINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32.$(LIB_SUFFIX)
-SETUPSDK_S_LINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
+SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil
+SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX)
+SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
+SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
 else
-SETUP_SDK_FILES = bin,lib,include
-SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/libinstall.$(LIB_SUFFIX)
-SETUPSDKLINK = -L$(SETUPSDK_LIBPATH) -linstall
-SETUPSDK_S_LINK = $(SETUPSDKLINK)
+SETUPUTIL_FILES = bin,lib,include
+SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
+SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
+SETUPUTIL_S_LINK = $(SETUPUTILLINK)
 endif
 
-ifndef SETUPSDK_PULL_METHOD
-SETUPSDK_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+ifndef SETUPUTIL_PULL_METHOD
+SETUPUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
 endif
 
-$(SETUPSDK_DEP): $(NSCP_DISTDIR)
+$(SETUPUTIL_DEP): $(NSCP_DISTDIR)
 ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(SETUPSDK_PULL_METHOD) \
-		-objdir $(SETUP_SDK_BUILD_DIR) -componentdir $(SETUPSDK_RELEASE) \
-		-files $(SETUP_SDK_FILES)
+	$(FTP_PULL) -method $(SETUPUTIL_PULL_METHOD) \
+		-objdir $(SETUPUTIL_BUILD_DIR) -componentdir $(SETUPUTIL_RELEASE) \
+		-files $(SETUPUTIL_FILES)
 endif
 	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component SETUPSDK file $@" ; \
+	then echo "Error: could not get component SETUPUTIL file $@" ; \
 	fi
 # apache-axis java classes #######################################
 AXIS = axis-$(AXIS_VERSION).zip
@@ -702,28 +710,13 @@ endif
 
 ADMIN_REL = $(ADM_VERSDIR)
 ADMIN_REL_DATE = $(ADM_VERSION)
-ADMIN_FILE = admserv.tar.gz
-ADMIN_FILE_TAR = admserv.tar
-ADMSDKOBJDIR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-IMPORTADMINSRV_BASE=$(COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
-#IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
+#ADMIN_FILE = adminserver.tar.gz
+ADMIN_FILE = admin,base
+ADMIN_FILE_TAR = adminserver.tar
+IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
 IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/admserv
-ADMSERV_DEP = $(ADMSERV_DIR)/setup$(EXE_SUFFIX)
-
-ifdef FORTEZZA
-  ADM_VERSION = $(ADM_RELDATE)F
-else
-  ifeq ($(SECURITY), domestic)
-    ADM_VERSION = $(ADM_RELDATE)D
-  else
-    ifneq ($(ARCH), IRIX)
-        ADM_VERSION = $(ADM_RELDATE)E
-    else
-        ADM_VERSION = $(ADM_RELDATE)D
-    endif
-  endif
-endif
+ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
+ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
 
 ADM_VERSION = $(ADM_RELDATE)
 ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
@@ -741,7 +734,7 @@ $(ADMSERV_DEP): $(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)
 ifdef ADMSERV_DEPS
 	$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
 		-objdir $(ADMSERV_DIR) -componentdir $(IMPORTADMINSRV) \
-		-files $(ADMIN_FILE) -unzip $(ADMSERV_DIR)
+		-files $(ADMIN_FILE)
 endif
 	@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component ADMINSERV file $@" ; \
@@ -755,7 +748,7 @@ DSDOC_DIR = $(ABS_ROOT)/../dist/dsdoc
 DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE)
 #DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
 DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE)
-                                                                                                                          
+
 DSDOC_CLIENTS = slapd_clients.zip
 DSDOC_COPYRIGHT = slapd_copyright.zip
 DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS)

ldap/Makefile

@@ -61,7 +61,7 @@ ldapprogs:
 ifneq ($(ARCH), WINNT) 
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cd cm/newinst; $(MAKE) $(MFLAGS) all
 ifeq ($(USE_64),1)
 	# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
@@ -70,11 +70,11 @@ ifeq ($(USE_64),1)
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR)
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR)
 endif # USE_64
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
 else # not WINNT
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cd cm/newinstnt; $(MAKE) $(MFLAGS) all
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
 endif # WINNT
 	cd admin; $(MAKE) $(MFLAGS) all
 ifeq ($(ARCH), WINNT) 

ldap/admin/src/DSAdmin.mk

@@ -62,7 +62,7 @@ ifneq ($(ARCH), WINNT)
 EXTRALDFLAGS += $(SSLLIBFLAG)
 endif
 
-EXTRA_LIBS += $(LIBPERL_A) $(SETUPSDK_S_LINK) $(LDAP_ADMLIB) \
+EXTRA_LIBS += $(LIBPERL_A) $(SETUPUTIL_S_LINK) $(LDAP_ADMLIB) \
         $(LDAPLINK) $(DEPLINK) $(ADMINUTIL_LINK) \
         $(NSPRLINK) $(NLSLINK) \
         $(NLSLINK_CONV_STATIC)
@@ -102,7 +102,7 @@ DSADMIN_BASENAME = DSAdmin$(DLL_PRESUFFIX).$(DLL_SUFFIX)
 OBJS= $(addprefix $(OBJDEST)/, $(DSADMIN_OBJS)) 
 DSADMIN_SO = $(addprefix $(BINDIR)/, $(DSADMIN_BASENAME))
 
-EXTRA_LIBS_DEP = $(SETUPSDK_DEP)
+EXTRA_LIBS_DEP = $(SETUPUTIL_DEP)
 
 # for Solaris, our most common unix build platform, we check for undefined
 # symbols at link time so we don't catch them at run time.  To do this, we

ldap/admin/src/Makefile

@@ -95,8 +95,8 @@ ifeq ($(USE_ADMINSERVER), 1)
   EXTRA_LIBS += $(ADMINUTIL_LINK)
 endif
 EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK)
-ifeq ($(USE_SETUPSDK), 1)
-  EXTRA_LIBS += $(SETUPSDK_S_LINK)
+ifeq ($(USE_SETUPUTIL), 1)
+  EXTRA_LIBS += $(SETUPUTIL_S_LINK)
 endif
 EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS)
 
@@ -220,7 +220,7 @@ endif
 
 ifeq ($(ARCH), WINNT)
 OBJECTS += namegen.o latest_file.o
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
   OBJECTS += ds_remove_uninst.o
 endif
 endif
@@ -308,7 +308,7 @@ $(BINDIR)/ds_create.exe:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
 	$(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/instindex.o \
 		$(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \
 		$(OBJDEST)/configure_instance.o $(OBJDEST)/script-gen.o \
-		$(SETUPSDK_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
+		$(SETUPUTIL_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \
 		$(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB)
 # linking this file causes a .exp and a .lib file to be generated which don't seem
 # to be required while running, so I get rid of them
@@ -317,10 +317,10 @@ $(BINDIR)/ds_create.exe:	$(OBJDEST)/instindex.o $(OBJDEST)/cfg_sspt.o \
 $(BINDIR)/ds_remove:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
 	$(LINK_EXE_NOLIBSOBJS)  $(SHARED) $(EXTRALDFLAGS) \
 		$(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/init_ds_env.o \
-		$(SETUPSDK_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
+		$(SETUPUTIL_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS)
 
 $(BINDIR)/ds_remove.exe:  $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP)
-	$(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPSDK_S_LINK) $(NT_NOLIBS)
+	$(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPUTIL_S_LINK) $(NT_NOLIBS)
 # linking this file causes a .exp and a .lib file to be generated which don't seem
 # to be required while running, so I get rid of them
 	$(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@)
@@ -330,9 +330,9 @@ $(OBJDEST)/%.o: %.c
 
 $(OBJDEST)/%.o: %.cpp
 ifeq ($(ARCH), WINNT)
-	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+	$(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
 else
-	$(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@
+	$(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@
 endif
 
 ifneq ($(ARCH), WINNT)

ldap/admin/src/create_instance.c

@@ -1161,7 +1161,7 @@ char *create_server(server_config_s *cf, char *param_name)
                "        sleep 1;\n"
                "    else\n"
                "        PID=`cat $PIDFILE`\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
                 "        echo Server has been started. ns-slapd process started: $PID\n"*/
                "        exit 0;\n"
                "    fi\n"
@@ -1218,7 +1218,7 @@ char *create_server(server_config_s *cf, char *param_name)
                "        sleep 1;\n"
                "    else\n"
                "        PID=`cat $PIDFILE`\n"
-                /* rbyrne: setupsdk takes any message here as an error:
+                /* rbyrne: setuputil takes any message here as an error:
                "        echo Server has been started. ns-slapd process started: $PID\n"*/
                "        exit 0;\n"
                "    fi\n"
@@ -1297,7 +1297,7 @@ char *create_server(server_config_s *cf, char *param_name)
             "    fi\n"
             "    else\n"
             "        PID=`cat $PIDFILE`\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
             "        echo Server has been started. ns-slapd process started: $PID\n"*/
             "        exit 0;\n"
             "    fi\n"
@@ -1345,7 +1345,7 @@ char *create_server(server_config_s *cf, char *param_name)
            "        if test -f $PIDFILE ; then\n"
            "            rm -f $PIDFILE\n"
            "        fi\n"
-            /* rbyrne: setupsdk takes any message here as an error:
+            /* rbyrne: setuputil takes any message here as an error:
                "        echo Server has been stopped. ns-slapd process stopped: $PID\n"*/
            "        exit 0\n"
            "    fi\n"

ldap/admin/src/ds_newinst.c

@@ -37,7 +37,7 @@
 /*
  * ds_newinst.c - creates a new instance of directory server, scripts,
  * configuration, etc.  Does not create any Admin Server stuff or
- * deal with any setupsdk stuff, but may be optionally used to create
+ * deal with any setuputil stuff, but may be optionally used to create
  * and configure the config suffix (o=NetscapeRoot)
  */
 

ldap/admin/src/ds_remove_uninst.cpp

@@ -37,7 +37,7 @@
  * END COPYRIGHT BLOCK **/
 // ds_remove_uninst.cpp
 //
-// ds_remove routines that use c++ calls in adminsdk
+// ds_remove routines that use c++ calls in adminutil
 //
 #include <iostream.h>
 #include <fstream.h>

ldap/cm/Makefile

@@ -194,12 +194,12 @@ SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR)
 #ADM_VERSDIR = admserv40
 #ADM_RELDATE = untested/19980119
 #IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME)
+IMPORTADMINSRVNOTARBASE = $(COMPONENTS_DIR_DEV)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME)
 # these are files and directories in the import adminsrv directory which we don't
 # make a local copy of, we just import directly into the tar file or create a
 # symlink to
-ADMIN_IMPORTS=setup base admin svrcore silent.inf LICENSE.txt README.txt
-ADMIN_SERVER_TARGZ=admserv.tar.gz
+ADMIN_IMPORTS=base admin
+ADMIN_SERVER_TARGZ=adminserver.tar.gz
 ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
 
 # Release directory for ldapsdk
@@ -610,9 +610,11 @@ packageDirectory: $(INSTDIR)/slapd \
 	$(INSTDIR)/tools/infozip.zip \
 	$(ADMSERV_DEP)
 
-# copy over the setup sdk stuff
-# hack - remove once admin server bundles setupsdk 6.02
-#	cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR)
+# 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
 	$(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd
@@ -675,23 +677,17 @@ endif
 
 # if the untar directory is there, hooray; otherwise, we will have to unpack the
 # binaries ourselves . . .
-	@curdir=`pwd`; cd $(INSTDIR) ; \
-	if [ ! -d $(IMPORTADMINSRVNOTAR) ] ; \
+	curdir=`pwd`; cd $(INSTDIR) ; \
+	if [ ! -d $(IMPORTADMINSRVNOTARBASE)/admin ] ; \
 		then for file in $(ADMIN_IMPORTS_TARGZ) ; \
 			do rm -rf $$file ; \
 			$(GUNZIP) -c $(ADMSERV_DIR)/$$file | $(TAR) xvf - ; \
 		done ; \
-		cd $$curdir ; \
-		$(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf \
-			$(INSTDIR)/setup.inf.tmp ; \
-		mv $(INSTDIR)/setup.inf.tmp \
-			$(INSTDIR)/setup.inf ; \
 	else \
 		for file in $(ADMIN_IMPORTS) ; \
 			do rm -rf $$file ; \
-			ln -s $(IMPORTADMINSRVNOTAR)/$$file $$file ; \
+			cp -r $(IMPORTADMINSRVNOTARBASE)/$$file $$file ; \
 		done ; \
-		$(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \
 	fi
 
 # we must remove the nsbase.zip file - we package those files now
@@ -700,11 +696,6 @@ endif
 # base.inf file
 	$(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf
 
-# We must remove the JRE per Red Hat.  The user will download the jre
-ifneq ($(ARCH), Linux)
-	rm -f $(INSTDIR)/base/nsjre.zip 
-endif
-
 # Move setup binary to dssetup
 	mv $(INSTDIR)/setup $(INSTDIR)/dssetup
 # Move the new setup wrappers into place
@@ -734,11 +725,6 @@ endif
 # Install dsktune at root of Installation
 	cp $(RELDIR)/bin/slapd/server/dsktune $(INSTDIR)
 
-# copy the sample silent.inf from setup
-	if [ ! -f $(INSTDIR)/silent.inf ] ; \
-	then cp $(SETUPSDK_BINPATH)/silent.inf $(INSTDIR) ; \
-	fi
-
 ifndef NO_INSTALLER_TAR_FILES
 # build the slapd package tar file
 	cd $(INSTDIR); $(TAR) cvf - slapd \

ldap/cm/newinst/Makefile

@@ -57,8 +57,8 @@ include $(BUILD_ROOT)/nsconfig.mk
 include $(LDAP_SRC)/nsldap.mk
 
 test:
-	echo $(SETUPSDK_VERSION)
-	echo $(SETUPSDK_RELEASE)
+	echo $(SETUPUTIL_VERSION)
+	echo $(SETUPUTIL_RELEASE)
 
 # MODULE_CFLAGS = -DUSE_ADMSERV
 
@@ -98,12 +98,12 @@ endif
 INFO= $(OBJDIR)/$(DIR)
 
 # Source for staged installation utilities
-INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
+INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src
 
 # ADM_VERSDIR = admserv40
 # ADM_RELDATE = 19980112
 
-all: $(OBJDEST) $(BINDEST) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP)  $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
+all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP)  $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall
 # removed ns-keygen from build - it was only used for Dir Lite
 # $(BINDEST)/ns-keygen 
 ifeq ($(ARCH), BSDI)
@@ -172,7 +172,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) $(SETUPSDKLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
+		-o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \
 	       $(EXTRA_LIBS) $(CURSES)
 
 ifeq ($(ARCH), WINNT)
@@ -191,5 +191,5 @@ $(OBJDEST)/%.o: %.cc
 
 ns-config-gt: $(OBJS1GT)
 	$(PURIFY) $(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \
-		-o ns-config-gt $(OBJS1GT) $(SETUPSDKLINK) $(LIBLDAP) \
+		-o ns-config-gt $(OBJS1GT) $(SETUPUTILLINK) $(LIBLDAP) \
 		$(EXTRA_LIBS) $(CURSES)

ldap/cm/newinst/ux-config.cc

@@ -206,11 +206,6 @@ SlapdPreInstall::init()
 
    if (installMode() != Silent)
    {
-/* richm 20011005 - we can't do this until we get setupsdk46 - if ever
-      if (iDSISolaris)
-         Dialog::initDisplay("Directory", (const char *) NULL, "Configuration");
-      else
-*/
 	 Dialog::initDisplay("Directory");
    }
 

ldap/cm/newinstnt/Makefile

@@ -54,7 +54,7 @@ include $(LDAP_SRC)/nsldap.mk
 
 OUTDIR=$(OBJDIR)/setup
 
-CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPSDK_INCLUDE) $(LDAPSDK_INCLUDE) \
+CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPUTIL_INCLUDE) $(LDAPSDK_INCLUDE) \
  /I "$(LDAP_SRC)/admin/include" /I "$(LDAP_SRC)/admin/lib" \
  /I "$(LDAP_SRC)/admin/src" /D \
  "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(OUTDIR)/dsinst.pch" /YX \
@@ -71,7 +71,7 @@ LIBS= \
 	kernel32.lib user32.lib gdi32.lib comdlg32.lib\
 	comctl32.lib advapi32.lib shell32.lib uuid.lib\
 	wsock32.lib\
-	$(SETUPSDKLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
+	$(SETUPUTILLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK)
 
 DSOBJS= \
 	$(OUTDIR)/dsinst_dsalib_dn.obj \
@@ -92,7 +92,7 @@ RC=rc.exe
 RM=erase /F /Q
 FIXINF= ../newinst/fixINF.pl
 
-all: $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf
+all: $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf
 
 clean:
 	-rm -rf "$(OUTDIR)"

ldap/cm/newinstnt/dsinst.c

@@ -7455,7 +7455,7 @@ NSPERLINST_PostInstall(VOID)
     return FALSE;
   }
 
-  // hack to work around potential bug in setupsdk . . .
+  // hack to work around potential bug in setuputil . . .
   SetCurrentDirectory("../slapd");
   my_snprintf(infFile, sizeof(infFile), "slapd.inf");
   GetProductInfoStringWithTok(NSPERL_POST_INSTALL_PROG, "=", nsPerlPostInstall,

nsconfig.mk

@@ -66,7 +66,7 @@ ifdef INTERNAL_BUILD
 	USE_ORGCHART:=1
 	USE_DSGW:=1
 	USE_JAVATOOLS:=1
-	USE_SETUPSDK:=1
+	USE_SETUPUTIL:=1
 endif
 
 include $(BUILD_ROOT)/nsdefs.mk
@@ -373,14 +373,15 @@ ifndef COMPONENTS_DIR_DEV
 COMPONENTS_DIR_DEV = /share/builds/sbsintegration
 endif
 
+# internal repository for all pre-built RTM components, including Red Hat branded ones
 ifndef COMPONENTS_DIR
 COMPONENTS_DIR = /share/builds/components
 endif
 
-# For now, we need to pick up a private build of the LDAP SDK
-#ifndef LDAP_SBC
-#LDAP_SBC = /share/builds/sbsintegration/ds/ds70-bozeman
-#endif
+# internal repository for pre-built RTM Fedora branded components
+ifndef FED_COMPONENTS_DIR
+FED_COMPONENTS_DIR = /fedora/components
+endif
 
 ###########################################################
 
@@ -1303,7 +1304,7 @@ NSCP_DISTDIR_FULL_RTL = $(NSCP_DISTDIR)
 NSCP_ABS_DISTDIR_FULL_RTL = $(ABS_ROOT_PARENT)/dist/$(FULL_RTL_OBJDIR)
 
 # these components may have additional RTL debugging support built in on NT
-# adminsdk (adminutil), dbm, ldapsdk, NLS, NSPR, NSS (security)
+# adminutil, dbm, ldapsdk, NLS, NSPR, NSS (security)
 # we cannot simply redefine NSOBJDIR_NAME and NSCP_DISTDIR because other
 # components do not have this RTL support stuff and the .OBJD directory
 # does not exist