[186642] Directory Server Makefile updates for Internal build

. removed the dependency on DBM
. Updated components' RELDATEs.
. Console jar file name adjustment: <brand>-<comp>-<dotversion>.jar
. Fix for HP-UX IPF
. Use non-branded SetupUtil; add resource file to change branding
. Updated the code to call createSIE so that the right brand is passed to SetupUtil.

21 files changed, 171 insertions, 177 deletions

diff --git a/Makefile b/Makefile
index 73bd79d4..a8db18ff 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ help:
 ###### End of implementation notes.
 
 ifeq ($(INTERNAL_BUILD), 1)
-  COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
+  COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
 	$(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
 	$(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP)
 endif
@@ -202,7 +202,7 @@ brandDirectory: $(RELTOOLSPATH)/brandver.pl
 	$(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
 	@echo ==== Finished Branding LDAP Server ==========
 
-debrandDirectory: $(RELTOOLSPATH)/brandver.pl
+versionDirectory: $(RELTOOLSPATH)/brandver.pl
 	@echo ==== Debranding LDAP Server ==========
 	$(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
 	@echo ==== Finished Debranding LDAP Server ==========
diff --git a/buildpaths.mk b/buildpaths.mk
index 928b6b52..7b24e51c 100644
--- a/buildpaths.mk
+++ b/buildpaths.mk
@@ -104,7 +104,7 @@ SVRCORE_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
 LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
 #LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.15
 
-SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
+SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
 #SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl
 
 ICU_SOURCE_ROOT = $(BUILD_ROOT)/../icu
diff --git a/component_versions.mk b/component_versions.mk
index fe676cdd..42ff4ba7 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -69,11 +69,6 @@ ifndef DB_VERSION
   DB_VERSION:=20040813
 endif
 
-# DBM Library
-ifndef DBM_RELDATE
-  DBM_RELDATE = DBM_1_61_RTM
-endif
-
 # SMARTHEAP
 ifndef SH_VERSION
   SH_VERSION:=v6.01
@@ -81,7 +76,7 @@ endif
 
 # LDAP SDK
 ifndef LDAP_RELDATE
-  LDAP_RELDATE = v5.16
+  LDAP_RELDATE = v5.17
 endif
 ifndef LDAPCOMP_DIR
   LDAPCOMP_DIR=ldapsdk50
@@ -114,7 +109,7 @@ endif
 # admin server
 
 ifndef ADM_RELDATE
-  ADM_RELDATE = 20051028
+  ADM_RELDATE = 20060328
 endif
 ifndef ADM_VERSDIR
   ADM_VERSDIR = adminserver/1.0
@@ -127,7 +122,7 @@ endif
 
 # setuputil
 ifndef SETUPUTIL_RELDATE
-  SETUPUTIL_RELDATE = 20051027
+  SETUPUTIL_RELDATE = 20060327
 endif
 ifndef SETUPUTIL_VER
   SETUPUTIL_VER = 10
@@ -149,7 +144,7 @@ ifndef ADMINUTIL_VER
   ADMINUTIL_DOT_VER=1.0
 endif
 ifndef ADMINUTIL_RELDATE
-  ADMINUTIL_RELDATE=20051026
+  ADMINUTIL_RELDATE=20060323
 endif
 
 ifndef ADMINUTIL_VERSDIR
@@ -157,14 +152,17 @@ ifndef ADMINUTIL_VERSDIR
 endif
 
 # LDAP Console
+ifndef LDAPCONSOLE_GENREL
+  LDAPCONSOLE_GENREL=1.0
+endif
 ifndef LDAPCONSOLE_REL
-  LDAPCONSOLE_REL=10
+  LDAPCONSOLE_REL=1.0.2
 endif
 ifndef LDAPCONSOLE_COMP
   LDAPCONSOLE_COMP = directoryconsole
 endif
 ifndef LDAPCONSOLE_RELDATE
-  LDAPCONSOLE_RELDATE=1.0/20051028
+  LDAPCONSOLE_RELDATE=$(LDAPCONSOLE_GENREL)/20060323
 endif
 
 ifndef PERLDAP_VERSION
@@ -176,11 +174,11 @@ ifndef JSS_COMP
 endif
 
 ifndef JSS_VERSION
-  JSS_VERSION=JSS_3_5_1_RTM
+  JSS_VERSION=JSS_3_7_RTM
 endif
 
 ifndef JSS_JAR_VERSION
-  JSS_JAR_VERSION=351
+  JSS_JAR_VERSION=3
 endif
 
 ifndef SASL_VERSDIR
@@ -197,10 +195,10 @@ endif
 
 # ICU
 ifndef ICU_VERSDIR
-  ICU_VERSDIR=libicu_2_4
+  ICU_VERSDIR=libicu_3_4
 endif
 ifndef ICU_RELDATE
-  ICU_RELDATE=20040820
+  ICU_RELDATE=
 endif
 
 # DOC
diff --git a/components.mk b/components.mk
index 31b39b2e..bcdd1850 100644
--- a/components.mk
+++ b/components.mk
@@ -124,6 +124,7 @@ PACKAGE_SRC_DESTFILE =
 COMMA := ,
 NULLSTRING :=
 SPACE := $(NULLSTRING) # the space is between the ) and the #
+DS_BRAND := fedora
 
 ifeq ($(ARCH), WINNT)
 EXE_SUFFIX = .exe
@@ -180,31 +181,6 @@ else
   NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
 endif
 
-### DBM #############################
-
-ifdef DBM_SOURCE_ROOT
-  DBM_LIBPATH = $(DBM_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
-  DBM_INCDIR = $(DBM_SOURCE_ROOT)/dist/public/dbm
-else
-  DBM_LIBPATH = $(DBM_BUILD_DIR)/lib
-  DBM_INCDIR = $(DBM_BUILD_DIR)/include
-endif
-DBM_INCLUDE = -I$(DBM_INCDIR)
-DBM_LIBNAMES = dbm
-
-ifeq ($(ARCH), WINNT)
-  DBMOBJNAME = $(addsuffix .lib, $(DBM_LIBNAMES))
-  LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMOBJNAME))
-  DBMLINK = /LIBPATH:$(DBM_LIBPATH) $(DBMOBJNAME)
-else
-  DBM_SOLIBS = $(addsuffix .$(DLL_SUFFIX),  $(addprefix $(LIB_PREFIX), $(DBM_LIBNAMES)))
-  DBMROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(DBM_LIBNAMES)))
-  LIBDBM = $(addprefix $(DBM_LIBPATH)/, $(DBMROBJNAME))
-  DBMLINK = -L$(DBM_LIBPATH) $(addprefix -l, $(DBM_LIBNAMES))
-endif
-
-### DBM END #############################
-
 ### SECURITY #############################
 ifdef SECURITY_SOURCE_ROOT
   SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
@@ -312,7 +288,7 @@ ifdef LDAPSDK_SOURCE_ROOT
 else
   LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
   LDAPSDK_INCDIR = $(LDAP_ROOT)/include
-  LDAPSDK_BINPATH = $(LDAP_ROOT)/tools
+  LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
 endif
 LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
 
@@ -380,7 +356,7 @@ ifeq ($(ARCH), Linux)
 else
   ifdef SASL_SOURCE_ROOT
     SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
-    SASL_INCDIR = $(SASL_SOURCE_ROOT)/include
+    SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
   else
     SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
     SASL_INCDIR = $(SASL_BUILD_DIR)/include
@@ -405,7 +381,7 @@ else
   ifeq ($(ARCH), HPUX)
       GSSAPI_LIBS=-lgss
       ifeq ($(USE_64),1)
-        GSSAPI_LIBS=-L/usr/lib/pa20_64 -lgss
+        GSSAPI_LIBS=-lgss
       endif
   endif
 
@@ -439,7 +415,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
@@ -588,16 +564,19 @@ ifdef ADMINSERVER_SOURCE_ROOT
   ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
 # else set in internal_buildpaths.mk
 endif
+ADMINSERVER_PKG:=admserv.tar.gz
 # these are the subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base
+ADMINSERVER_SUBCOMPS:=admin base
 
 ifdef LDAPCONSOLE_SOURCE_ROOT
-  LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
+  LDAPCONSOLE_DIR = $(ABS_ROOT)/../built/package
 else
   LDAPCONSOLE_DIR = $(CLASS_DEST)
 endif
-LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
-LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
+LDAPCONSOLEJAR = $(DS_BRAND)-ds-$(LDAPCONSOLE_REL).jar
+LDAPCONSOLEJAR_EN = $(DS_BRAND)-ds-$(LDAPCONSOLE_REL)_en.jar
+LDAPCONSOLEGENJAR = $(DS_BRAND)-ds-$(LDAPCONSOLE_GENREL).jar
+LDAPCONSOLEGENJAR_EN = $(DS_BRAND)-ds-$(LDAPCONSOLE_GENREL)_en.jar
 
 #### online help docs ######
 ifndef ONLINEHELP_SOURCE_ROOT
diff --git a/config/HP-UX.mk b/config/HP-UX.mk
index 11ae3ed3..050d035f 100644
--- a/config/HP-UX.mk
+++ b/config/HP-UX.mk
@@ -97,10 +97,18 @@ DSO_LDFLAGS		=
 DSO_CFLAGS		= +z
 
 ifdef SERVER_BUILD
-ifeq ($(OS_RELEASE),B.11.23)
-SERVER_CFLAGS           = +DD32 -Wl,-E,-N
+  ifeq ($(OS_RELEASE),B.11.23)
+    ifdef USE_64
+      SERVER_CFLAGS           = +DD64 -Wl,-E,-N
+    else
+      SERVER_CFLAGS           = +DD32 -Wl,-E,-N
+    endif
 else
-SERVER_CFLAGS		= +DA1.0 -Wl,-E,-N
+    ifdef USE_64
+      SERVER_CFLAGS		= +DA2.0W +DS2.0 -Wl,-E,-N
+    else
+      SERVER_CFLAGS		= +DA1.0 -Wl,-E,-N
+    endif
 endif
 STATIC_JAVA		= yes
 endif
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
index ff2eb9fb..face9aae 100644
--- a/internal_comp_deps.mk
+++ b/internal_comp_deps.mk
@@ -71,32 +71,6 @@ endif
 	fi
 endif # NSPR_SOURCE_ROOT
 
-ifndef DBM_SOURCE_ROOT
-DBM_IMPORT = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)/$(NSOBJDIR_NAME)
-ifeq ($(ARCH), WINNT)
-  DBM_DEP = $(DBM_LIBPATH)/dbm.$(LIB_SUFFIX)
-else
-  DBM_DEP = $(DBM_LIBPATH)/libdbm.$(LIB_SUFFIX)
-endif
-
-ifndef DBM_PULL_METHOD
-DBM_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(DBM_DEP): $(NSCP_DISTDIR_FULL_RTL)
-ifdef COMPONENT_DEPS
-	$(FTP_PULL) -method $(DBM_PULL_METHOD) \
-		-objdir $(DBM_BUILD_DIR) -componentdir $(DBM_IMPORT)/.. \
-		-files xpheader.jar -unzip $(DBM_INCDIR)
-	$(FTP_PULL) -method $(DBM_PULL_METHOD) \
-		-objdir $(DBM_BUILD_DIR) -componentdir $(DBM_IMPORT) \
-		-files mdbinary.jar -unzip $(DBM_BUILD_DIR)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component DBM file $@" ; \
-	fi
-endif # DBM_SOURCE_ROOT
-
 ifndef SECURITY_SOURCE_ROOT
 SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR)
 ifeq ($(ARCH), WINNT)
@@ -193,7 +167,7 @@ ifdef COMPONENT_DEPS
 	mkdir -p $(LDAP_LIBPATH)
 	$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
 		-objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \
-		-files include,$(LDAPSDK_PULL_LIBS),tools
+		-files include,$(LDAPSDK_PULL_LIBS),bin
 endif
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component LDAPSDK file $@" ; \
@@ -202,7 +176,6 @@ endif # LDAPSDK_SOURCE_ROOT
 
 ifndef SASL_SOURCE_ROOT
 ifneq ($(ARCH), Linux)
-#SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
 SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
 SASL_DEP = $(SASL_INCLUDE)/sasl.h
 ifndef SASL_PULL_METHOD
@@ -222,8 +195,8 @@ endif # not Linux
 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_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)
@@ -284,7 +257,7 @@ 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=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
   ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 endif
 ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
@@ -292,7 +265,7 @@ ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
 #
 # Libadminutil
 #
-ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX).$(ADMINUTIL_DOT_VER)
 
 ifndef ADMINUTIL_PULL_METHOD
 ADMINUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -512,7 +485,7 @@ LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
 else
 LDAPCONSOLE_RELEASE=$(FED_COMPONENTS_DIR)
 endif
-LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/jars
+LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)/$(LDAPCONSOLE_RELDATE)/$(NSOBJDIR_NAME)
 LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
 LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
 
@@ -565,16 +538,15 @@ endif
 
 ADMIN_REL = $(ADM_VERSDIR)
 ADMIN_REL_DATE = $(ADM_VERSION)
-#ADMIN_FILE = adminserver.tar.gz
-ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
-ADMIN_FILE_TAR = adminserver.tar
+ADMIN_FILE := $(ADMINSERVER_PKG)
+#ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
 ifeq ($(BUILD_MODE), int)
 IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
 else
 IMPORTADMINSRV_BASE=$(FED_COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
 endif
 IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME)
-ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
+ADMSERV_DEP = $(ADMSERV_DIR)/$(ADMINSERVER_PKG)
 
 ADM_VERSION = $(ADM_RELDATE)
 
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
index b736e61b..8f877797 100644
--- a/ldap/admin/lib/Makefile
+++ b/ldap/admin/lib/Makefile
@@ -65,6 +65,8 @@ OBJS = $(addprefix $(OBJDEST)/, $(subst .c,.o,$(SRCS)))
 
 INCLUDES += -I$(LDAP_SRC)/admin/include
 
+SECURITYLINK += -lsoftokn3
+
 EXTRA_LIBS += $(LDAP_COMMON_LIBS) $(SECURITYLINK) $(NSPRLINK)
 
 LIBS= $(LDAP_ADMDLLDIR)/libds_admin$(DLL_PRESUF).$(DLL_SUFFIX)
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index 17d3ea11..d7c49358 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -132,9 +132,15 @@ EXTRA_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
 OPENSOURCE_LIBS += -lsocket -lnsl -lgen -lm -lposix4 -lthread
 else
 ifeq ($(ARCH),HPUX)
-ifeq ($(USE_64), 1)
-EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
-endif
+  ifeq ($(NSOS_RELEASE),B.11.23)
+    ifeq ($(USE_64), 1)
+      EXTRALDFLAGS += +DD64
+    endif
+  else
+    ifeq ($(USE_64), 1)
+      EXTRALDFLAGS += +DA2.0W +DS2.0 +Z
+    endif
+  endif
 else
 ifeq ($(ARCH),OSF1)
 #CC += -E
diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index ed69bb3e..80b5b24d 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.cpp
@@ -133,7 +133,7 @@ extern "C" {
 // name of script file to generate relative to slapd instance directory
 #define SCRIPT_FILE_NAME "start-console"
 
-#define DS_JAR_FILE_NAME "ds10.jar"
+#define DS_JAR_FILE_NAME "fedora-ds-1.0.jar"
 #define DS_CONSOLE_CLASS_NAME "com.netscape.admin.dirserv.DSAdmin"
 
 #ifdef XP_WIN32
@@ -711,6 +711,7 @@ static LdapError
 create_sie_and_isie(LdapEntry *sieEntry, LdapEntry *appEntry, NSString& sieDN)
 {
 	LdapError ldapError; // return value
+	const char *adminBrand = "Fedora";
 
 	// Prepare sieEntry
 	sieEntry->clear();
@@ -758,7 +759,7 @@ create_sie_and_isie(LdapEntry *sieEntry, LdapEntry *appEntry, NSString& sieDN)
 
 	LdapErrorCode code = createSIE(sieEntry, appEntry, fqdn,
 								   installInfo->get(SLAPD_KEY_SERVER_ROOT),
-								   ssDN);
+								   ssDN, adminBrand);
 	delete [] fqdn;
 
 	if (code != OKAY)
diff --git a/ldap/clients/dsgw/Makefile b/ldap/clients/dsgw/Makefile
index 659632b7..8eaf69f9 100644
--- a/ldap/clients/dsgw/Makefile
+++ b/ldap/clients/dsgw/Makefile
@@ -71,9 +71,15 @@ ifeq ($(ARCH), HPUX)
 # Use C++ compiler when linking on HP to pick up
 # exception-handling flag (+eh). We need this because
 # we link with other objs compiled with +eh
-ifeq ($(USE_64), 1)
-ALDFLAGS += +DA2.0W +DS2.0 +Z -lpthread
-endif
+  ifeq ($(NSOS_RELEASE),B.11.23)
+    ifeq ($(USE_64), 1)
+      ALDFLAGS += +DD64 -lpthread
+    endif
+  else
+    ifeq ($(USE_64), 1)
+      ALDFLAGS += +DA2.0W +DS2.0 +Z -lpthread
+    endif
+  endif
 
 DSGW_LINK=$(CXX)
 else
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile
index 1e3f933c..25590cfe 100644
--- a/ldap/clients/dsmlgw/Makefile
+++ b/ldap/clients/dsmlgw/Makefile
@@ -46,8 +46,16 @@ include $(BUILD_ROOT)/nsconfig.mk
 include $(BUILD_ROOT)/ldap/javarules.mk
 
 all: $(ANT_DEP) $(LDAPJDK_DEP)
-	@if [ ! -f $(DSMLGWJARS_BUILD_DIR)/axis.jar ]; then \
-		cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
+	@if [ ! -d $(DSMLGWJARS_BUILD_DIR) ] ; then \
+		mkdir $(DSMLGWJARS_BUILD_DIR) ; \
+	fi
+	@if [ ! -f $(DSMLGWJARS_BUILD_DIR)/axis.jar ]; then  \
+	  if [ -f $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar ]; then  \
+		cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(DSMLGWJARS_BUILD_DIR) ; \
+	  fi ; \
+	  if [ -f $(CLASS_DEST)/$(AXIS_REL_DIR)/axis.jar ]; then  \
+		cp $(CLASS_DEST)/$(AXIS_REL_DIR)/axis.jar $(DSMLGWJARS_BUILD_DIR) ; \
+	  fi ; \
 	fi
 	$(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR) -Dldapdist.dir=$(LDAPJDK_DIR)
 
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index a8606498..2d62d714 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -68,7 +68,7 @@ ifneq ($(ARCH), WINNT)
 TAR=tar
 endif
 
-MMDD = $(shell date +%m.%d)
+MMDD := $(shell date +%m.%d)
 
 TMPLIST := $(shell echo /tmp/build.$$$$)
 
@@ -191,7 +191,7 @@ endif
 # make a local copy of, we just import directly into the tar file or create a
 # symlink to
 ADMIN_IMPORTS=$(ADMINSERVER_SUBCOMPS)
-ADMIN_SERVER_TARGZ=adminserver.tar.gz
+ADMIN_SERVER_TARGZ=$(ADMINSERVER_PKG)
 ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ)
 
 # these are files we need to put in the command line/console only package
@@ -510,6 +510,10 @@ endif
 ifeq ($(USE_CONSOLE), 1)
 	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(INSTALL) -m 644 $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
+  ifneq ($(ARCH), WINNT)
+	-(cd $(RELDIR)/$(DS_JAR_DEST_PATH); ln -s $(LDAPCONSOLEJAR_EN) $(LDAPCONSOLEGENJAR_EN))
+	-(cd $(RELDIR)/$(DS_JAR_DEST_PATH); ln -s $(LDAPCONSOLEJAR) $(LDAPCONSOLEGENJAR))
+  endif
 endif
 ifeq ($(USE_JAVATOOLS), 1)
 	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
@@ -614,8 +618,14 @@ packageDirectory: $(INSTDIR)/slapd \
 	$(ADMSERV_DEP)
 
 # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
-ifeq ($(USE_SETUPUTIL),1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
+ifeq ($(DS_BRAND), redhat)
+	cd $(INSTDIR); \
+	$(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \
+	cat setup.inf | sed -e "s/^#Resource/Resource/" > setup.inf.tmp; \
+	mv setup.inf.tmp setup.inf
+endif
 endif
 
 # copy in our product .inf files
@@ -750,8 +760,8 @@ endif
 else
 	echo base/unzipped > $(TMPLIST)
 	echo admin/unzipped >> $(TMPLIST)
-	cd $(INSTDIR); $(TAR) cvfh - setup slapd  \
-	dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	cd $(INSTDIR); $(TAR) cvfh - -X $(TMPLIST) setup slapd  \
+	dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
 	rm -f $(TMPLIST)
 endif # BUILD_SHIP
 #cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
diff --git a/ldap/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index bb0ae428..ba419292 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -206,7 +206,7 @@ SlapdPreInstall::init()
 
    if (installMode() != Silent)
    {
-	 Dialog::initDisplay("Directory");
+	 Dialog::initDisplay("Directory", "Fedora Project");
    }
 
    if ((installMode() == Silent && _infoFile == (char *) NULL) || 
diff --git a/ldap/ldif/roledit.ldif b/ldap/ldif/roledit.ldif
index 85ce05db..aba3c4dc 100644
--- a/ldap/ldif/roledit.ldif
+++ b/ldap/ldif/roledit.ldif
@@ -64,9 +64,9 @@ objectclass: top
 objectclass: extensibleObject
 objectclass: nsResourceRef
 objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@ds10.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@ds10.jar
-nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@ds10.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@fedora-ds-1.0.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@fedora-ds-1.0.jar
+nsclassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@fedora-ds-1.0.jar
 nsmerge: {nsclassname}MULTI_MERGE
 
 dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=1.0, ou=Admin, ou=Global Preferences
@@ -75,8 +75,8 @@ objectclass: top
 objectclass: extensibleObject
 objectclass: nsResourceRef
 objectclass: nsAdminResourceEditorExtension
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@ds10.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@ds10.jar
-nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@ds10.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@fedora-ds-1.0.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@fedora-ds-1.0.jar
+nsclassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@fedora-ds-1.0.jar
 nsmerge: {nsclassname}MULTI_MERGE
 
diff --git a/ldap/ldif/tasks.ldif b/ldap/ldif/tasks.ldif
index 683d56c5..2384296f 100644
--- a/ldap/ldif/tasks.ldif
+++ b/ldap/ldif/tasks.ldif
@@ -62,60 +62,60 @@ dn: cn=start, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Start@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Start@fedora-ds-1.0.jar
 nsexecref: start
 
 dn: cn=stop, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Stop@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Stop@fedora-ds-1.0.jar
 nsexecref: shutdown
 
 dn: cn=restart, cn=Operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restart@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Restart@fedora-ds-1.0.jar
 nsexecref: restart
 
 dn: cn=Backup, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Backup@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Backup@fedora-ds-1.0.jar
 nsexecref: ds_db2bak
 
 dn: cn=Restore, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Restore@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Restore@fedora-ds-1.0.jar
 nsexecref: ds_bak2db
 
 dn: cn=KeyCert, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.KeyCert@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.KeyCert@fedora-ds-1.0.jar
 
 dn: cn=Authenticate, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.Authenticate@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.Authenticate@fedora-ds-1.0.jar
 
 dn: cn=CompleteImport, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteImport@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteImport@fedora-ds-1.0.jar
 
 dn: cn=CompleteExport, cn=operation, cn=Tasks
 objectclass: top
 objectclass: nstask
 objectclass: nsAdminObject
-nsClassname: com.netscape.admin.dirserv.task.CompleteExport@ds10.jar
+nsClassname: com.netscape.admin.dirserv.task.CompleteExport@fedora-ds-1.0.jar
 
 dn: cn=Export, cn=operation, cn=Tasks
 objectclass: top
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
index b9dbf41a..53e24e01 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -598,16 +598,10 @@ CB_DLL = chainingdb-plugin$(DLL_PRESUFFIX)
 #
 # Admin server dynamic library location.
 #
-ifeq ($(ARCH), HPUX)
-ifeq ($(OS_TEST), ia64)
-ADMSONAME=ns-admin.so
-else
-ADMSONAME=ns-admin.sl
+ifeq ($(BUILD_MODULE), HTTP_ADMIN)
+ADMININCLUDEDIR = $(BUILD_ROOT)/include
 endif
-else 
-ifeq ($(ARCH), SOLARIS)
-ADMSONAME=ns-admin.$(DLL_SUFFIX)
-else
+
 ifeq ($(ARCH), AIX)
 ADMSONAME=ns-admin$(DLL_PRESUFFIX).$(DLL_SUFFIX)
 else
@@ -615,15 +609,9 @@ ifeq ($(ARCH), WINNT)
 ADMSONAME=ns-admin.$(LIB_SUFFIX)
 endif # WINNT
 endif # AIX
-endif # SOLARIS
-endif # HPUX
-
-ifeq ($(BUILD_MODULE), HTTP_ADMIN)
-ADMININCLUDEDIR = $(BUILD_ROOT)/include
-endif
 
 ifndef ADMSONAME
-ADMSONAME=ns-admin.so
+ADMSONAME=ns-admin.$(DLL_SUFFIX)
 endif
 
 ifndef ADMSOLIB
@@ -1566,8 +1554,7 @@ ACFLAGS		= $(EXTRACFLAGS) $(UNPROTOCFLAGS)
 # ALDFLAGS are always placed near the beginning of all linker (cc -o) commands
 ifneq ($(ARCH), WINNT)
 # Passed to every link (ld).  Include -g here if you did in EXTRACFLAGS.
-EXTRALDFLAGS=-$(LIBPATH)$(LDAP_LIBDIR)
-#EXTRALDFLAGS=-$(LIBPATH)$(LDAP_LIBDIR) -$(LIBPATH)$(LDAP_LIBPATH)
+  EXTRALDFLAGS=-$(LIBPATH)$(LDAP_LIBDIR)
 endif
 
 ifeq ($(ARCH), IRIX)
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index 2e19f6b4..ceb4ac29 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -194,25 +194,25 @@ endif
 # In order for debugging to work properly with shared libraries on HP/UX,
 # we need to link with end.o.
 ifeq ($(ARCH), HPUX)
-# need to add arch flags :maybe
-LDFLAGS+=$(ARCH_CFLAGS)
-# HPUX linker voodoo
-ifeq ($(DEBUG), full)
-ifeq ($(USE_64), 1)
-EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-ifneq ($(OS_TEST), ia64)
-EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o
-endif
-else
-EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-ifneq ($(OS_TEST), ia64)
-EXTRA_LIBS += /opt/langtools/lib/end.o
-endif
-endif #USE_64
-endif #DEBUG
-# Always put libpthread at the beginning of the library list, otherwise NSPR gets upset (very)
-EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
-EXTRA_LIBS = -lpthread $(EXTRA_LIBS_TEMP) 
+  # need to add arch flags :maybe
+  LDFLAGS+=$(ARCH_CFLAGS)
+  # HPUX linker voodoo
+  ifeq ($(DEBUG), full)
+    ifeq ($(USE_64), 1)
+      EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
+      ifneq ($(OS_TEST), ia64)
+        EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o
+      endif
+    else
+      EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
+      ifneq ($(OS_TEST), ia64)
+        EXTRA_LIBS += /opt/langtools/lib/end.o
+      endif
+    endif #USE_64
+  endif #DEBUG
+  # Always put libpthread at the beginning of the library list, otherwise NSPR gets upset (very)
+  EXTRA_LIBS_TEMP:=$(EXTRA_LIBS)
+  EXTRA_LIBS =-lpthread $(EXTRA_LIBS_TEMP) 
 endif #HPUX
 
 #Put SmartHeap at the beginning of the linker library list
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index 19b33c91..b34f8f95 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -66,12 +66,16 @@ ARCH := $(shell $(BUILD_ROOT)/nsarch)
 endif
 
 ifeq ($(USE_64), 1)
-ifeq ($(ARCH), HPUX)
-LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
-endif
-ifeq ($(ARCH), SOLARIS)
-LDFLAGS += -xarch=v9
-endif
+ ifeq ($(ARCH), HPUX)
+  ifeq ($(NSOS_RELEASE), B.11.23)
+    LDFLAGS += -lpthread +DD64 +Z
+  else
+    LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
+  endif
+ endif
+ ifeq ($(ARCH), SOLARIS)
+  LDFLAGS += -xarch=v9
+ endif
 endif
 
 SNMP_OBJS = main.o ldap-agent.o agtmmap.o
diff --git a/ldap/systools/Makefile b/ldap/systools/Makefile
index 7e08fdc0..91cb857e 100644
--- a/ldap/systools/Makefile
+++ b/ldap/systools/Makefile
@@ -66,12 +66,16 @@ endif # OSF1
 
 
 ifeq ($(USE_64), 1)
-ifeq ($(ARCH), HPUX)
-LDFLAGS += +DA2.0W +DS2.0 +Z
-endif
-ifeq ($(ARCH), SOLARIS)
-LDFLAGS += -xarch=v9
-endif
+ ifeq ($(ARCH), HPUX)
+  ifeq ($(NSOS_RELEASE),B.11.23)
+   LDFLAGS += +DD64
+  else
+   LDFLAGS += +DA2.0W +DS2.0 +Z
+  endif
+ endif
+ ifeq ($(ARCH), SOLARIS)
+  LDFLAGS += -xarch=v9
+ endif
 endif
 
 LDFLAGS	+= $(EXLDFLAGS)
diff --git a/lib/libsi18n/Makefile b/lib/libsi18n/Makefile
index 408ad20b..184ea578 100644
--- a/lib/libsi18n/Makefile
+++ b/lib/libsi18n/Makefile
@@ -74,12 +74,16 @@ else
 endif
 
 ifeq ($(USE_64), 1)
-ifeq ($(ARCH), HPUX)
-  MYLDFLAG = +DA2.0W
-endif
-ifeq ($(ARCH), SOLARIS)
+ ifeq ($(ARCH), HPUX)
+  ifeq ($(NSOS_RELEASE),B.11.23)
+   MYLDFLAG += +DD64
+  else
+   MYLDFLAG = +DA2.0W
+  endif
+ endif
+ ifeq ($(ARCH), SOLARIS)
   MYLDFLAG = -xarch=v9 
-endif
+ endif
 endif
 
 ifeq ($(BUILD_MODULE), DIRECTORY)
diff --git a/nscore.mk b/nscore.mk
index 77176109..f05e35f3 100644
--- a/nscore.mk
+++ b/nscore.mk
@@ -74,7 +74,12 @@ endif
 
 # HP-UX
 ifeq ($(ARCH), HPUX)
-  CFLAGS += -DCPU_hppa -DOS_hpux
+  HPUX_ARCH := $(shell uname -m)
+  ifeq ($(HPUX_ARCH), ia64)
+    CFLAGS += -DCPU_ia64 -DOS_hpux
+  else
+    CFLAGS += -DCPU_hppa -DOS_hpux
+  endif
   CFLAGS += -D_NO_THREADS_
 endif
 # AIX