[Fedora-directory-commits] adminutil component_versions.mk, 1.2, 1.3 components.mk, 1.2, 1.3 internal_comp_deps.mk, 1.2, 1.3

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16214

Modified Files:
	component_versions.mk components.mk internal_comp_deps.mk 
Log Message:
[179394] HP-UX PA-RISC support
 NSPR_RELDATE = v4.6
 SECURITY_RELDATE = NSS_3_11_RTM
 ICU_VERSDIR=libicu_3_4 (from /share/builds/sbsintegration/libicu/libicu_3_4)



Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/component_versions.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- component_versions.mk	28 Jan 2006 02:29:52 -0000	1.2
+++ component_versions.mk	22 Feb 2006 21:45:17 -0000	1.3
@@ -34,12 +34,12 @@
 # naming scheme.
 # NSPR
 ifndef NSPR_RELDATE
-  NSPR_RELDATE = v4.4.1
+  NSPR_RELDATE = v4.6
 endif
 
 # SECURITY (NSS) LIBRARY
 ifndef SECURITY_RELDATE
-  SECURITY_RELDATE = NSS_3_9_3_RTM
+  SECURITY_RELDATE = NSS_3_11_RTM
 endif
 
 # LDAP SDK
@@ -63,6 +63,6 @@
   ICU_VERSDIR=libicu_3_4
 endif
 ifndef ICU_RELDATE
-  ICU_RELDATE=20040820
+  ICU_RELDATE=
 endif
 


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/components.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- components.mk	28 Jan 2006 02:29:52 -0000	1.2
+++ components.mk	22 Feb 2006 21:45:17 -0000	1.3
@@ -73,15 +73,6 @@
 NSPR_INCLUDE = -I$(NSPR_INCDIR)
 NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES)))
 
-LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG)
-LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools
-ifeq ($(USE_SETUPSDK), 1)
-  PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG)
-endif
-ifeq ($(USE_DSGW), 1)
-  LIBS_TO_PKG_CLIENTS += $(NSPR_LIBS_TO_PKG) # for dsgw
-endif
-
 ifeq ($(ARCH), WINNT)
   NSPRDLL_NAME = $(addprefix lib, $(NSPR_LIBNAMES))
   NSPROBJNAME = $(addsuffix .lib, $(NSPRDLL_NAME))
@@ -109,38 +100,6 @@
 # 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
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK = softokn3
-
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
-
-# 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
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-endif
-ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-endif
-endif # USE_64
-
-SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES))
-SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS))
-
-SECURITY_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_LIBNAMES.pkg)))
-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)
-  PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
-endif
-ifeq ($(USE_DSGW), 1)
-  LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw
-endif
 
 ifeq ($(ARCH), WINNT)
   SECURITYOBJNAME = $(addsuffix .$(LIB_SUFFIX), $(SECURITY_LIBNAMES))
@@ -152,12 +111,6 @@
   SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES))
 endif
 
-# we need to package the root cert file in the alias directory
-PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) alias
-
-# need to package the sec tools in shared/bin
-BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH)
-
 ### SECURITY END #############################
 
 ####################################################
@@ -175,13 +128,8 @@
 endif
 LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
 
-# package the command line programs
-LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX))
-BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS)
 # package the include files - needed for the plugin API
 LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h)
-PACKAGE_SRC_DEST += $(subst
$(SPACE),$(SPACE)plugins/slapd/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES))
-PACKAGE_SRC_DEST += plugins/slapd/slapi/include
 
 ifeq ($(ARCH), WINNT)
   LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
@@ -191,14 +139,6 @@
   LDAP_NOSSL_LINK = /LIBPATH:$(LDAPSDK_LIBPATH) nsldap32v$(LDAP_SUF).$(LIB_SUFFIX)
   LIBLDAPDLL_NAMES = $(addsuffix .dll, $(addprefix $(LDAP_LIBPATH)/, $(LDAPDLL_NAME)))
 
-  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)
-    PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  endif
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME)))
-  endif
 else # not WINNT
   LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
   ifndef LDAP_NO_LIBLCACHE
@@ -212,14 +152,6 @@
   LDAPLINK = -L$(LDAPSDK_LIBPATH) $(addprefix -l,$(LDAP_SOLIB_NAMES))
   LDAP_NOSSL_LINK = -L$(LDAPSDK_LIBPATH) -lldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
 
-  LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  ifeq ($(USE_SETUPSDK), 1)
-    PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  endif
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS))
-  endif
 endif
 
 LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
@@ -248,19 +180,9 @@
   ICU_LIBNAMES = icuin$(ICU_LIB_SUF) icuuc$(ICU_LIB_SUF) icudata
   ICU_DLLNAMES = icuin$(ICU_LIB_VERSION)$(ICU_LIB_SUF)
icuuc$(ICU_LIB_VERSION)$(ICU_LIB_SUF) icudt$(ICU_LIB_VERSION)l
   ICULINK = /LIBPATH:$(ICU_LIBPATH) $(addsuffix .$(LIB_SUFFIX),$(ICU_LIBNAMES))
-  LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix
$(ICU_BINPATH)/,$(ICU_DLLNAMES)))
-  endif
 else
   ICU_LIBNAMES = icui18n icuuc icudata
   ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES))
-  LIBS_TO_PKG += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix
$(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  LIBS_TO_PKG_SHARED += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix
.$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  ifeq ($(USE_DSGW), 1)
-    LIBS_TO_PKG_CLIENTS += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix
.$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES)))))
-  endif
 #LIBS_TO_PKG = $(addsuffix $(addprefix lib,$(ICU_LIBNAMES))
 endif
 
@@ -271,9 +193,6 @@
     ICU_GENRB = sh ./genrb_wrapper.sh  $(ICU_BUILD_DIR)
 endif
 
-
-BINS_TO_PKG_SHARED += $(ICU_BINPATH)/uconv$(EXE_SUFFIX)
-
 ###########################################################
 
 ifeq ($(INTERNAL_BUILD), 1)


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal_comp_deps.mk	15 Feb 2006 22:50:15 -0000	1.2
+++ internal_comp_deps.mk	22 Feb 2006 21:45:17 -0000	1.3
@@ -55,47 +55,11 @@
 else
   SECURITY_DEP = $(SECURITY_LIBPATH)/libssl3.$(DLL_SUFFIX)
 endif
-# if building 64 bit version, also need the 32 bit version of nssckbi.so
-# rename it as nssckbi32.so
-ifeq ($(USE_64), 1)
-# assumes there is a 32 bit version
-  SHARED32_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/shared32
-  NSS32_IMPORT = $(subst $(NS64TAG),,$(SECURITY_IMPORT))
-  NSS32_BINNAMES = modutil
-  NSS32_LIBNAMES = $(SECURITY_LIBNAMES.pkg)
-  NSS32_NEED_CHK = $(SECURITY_NEED_CHK)
-  ifeq ($(ARCH), SOLARIS)
-    NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3
-# these libs have a corresponding .chk file
-    NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-  endif
-  ifeq ($(ARCH), HPUX)
-    NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3
-# these libs have a corresponding .chk file
-    NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-  endif
-  NSSCKBI_FILE = $(LIB_PREFIX)nssckbi.$(DLL_SUFFIX)
-  NSSCKBI32_FILE = $(LIB_PREFIX)nssckbi32.$(DLL_SUFFIX)
-  NSS32_PULLFILES = bin/modutil lib/$(NSSCKBI_FILE) $(addprefix
lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSS32_LIBNAMES))) $(addprefix
lib/$(LIB_PREFIX),$(addsuffix .chk,$(NSS32_NEED_CHK)))
-
-  NSPR32_IMPORT = $(subst $(NS64TAG),,$(NSPR_IMPORT))
-  NSPR32_LIBNAMES = $(NSPR_LIBNAMES)
-  NSPR32_PULLFILES = lib/$(LIB_PREFIX)$(subst
$(SPACE),$(COMMA)lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSPR_LIBNAMES)))
-
-# we need to package the root cert file in the alias directory
-  PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE) alias
-# all other files go under shared32/bin or /lib
-  PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/bin/modutil shared32/bin
-
-# do not need redundant copy of nssckbi
-  NSS32_NSPR32_SRC_LIBS = $(filter-out
$(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*))
-  PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS))
-endif # USE_64
 
 ifdef VSFTPD_HACK
-SECURITY_FILES=lib,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS))
+SECURITY_FILES=lib
 else
-SECURITY_FILES=lib,include,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS))
+SECURITY_FILES=lib,include
 endif
 
 ifndef SECURITY_PULL_METHOD
@@ -114,20 +78,6 @@
 		-objdir $(SECURITY_BUILD_DIR) -componentdir $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)
\
 		-files include
 endif
-# if building 64 bit version, also need the 32 bit version of nssckbi.so
-# rename it as nssckbi32.so
-# also need the 32 bit modutil, other NSS shared libraries and NSPR shared libraries
-ifeq ($(USE_64), 1)
-	mkdir -p $(SHARED32_BUILD_DIR)/bin
-	mkdir -p $(SHARED32_BUILD_DIR)/lib
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(SHARED32_BUILD_DIR) -componentdir $(NSPR32_IMPORT) \
-		-files $(NSPR32_PULLFILES)
-	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-		-objdir $(SHARED32_BUILD_DIR) -componentdir $(NSS32_IMPORT) \
-		-files $(subst $(SPACE),$(COMMA),$(NSS32_PULLFILES))
-	mv $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE)
$(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
-endif # USE_64
 endif # COMPONENT_DEPS
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component NSS file $@" ; \
@@ -175,7 +125,8 @@
 endif # LDAPSDK_SOURCE_ROOT
 
 ifndef ICU_SOURCE_ROOT
-ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
+#ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
+ICU_RELEASE = $(INT_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME)
 ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h
 ifndef ICU_PULL_METHOD
 ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD)