Author: rmeggins
Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10720
Modified Files: components.mk nsconfig.mk Log Message: use new ldapcsdk 6.0.0; upgrade other components
Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- components.mk 29 Sep 2006 18:25:06 -0000 1.53 +++ components.mk 9 Oct 2006 15:21:09 -0000 1.54 @@ -54,7 +54,7 @@ # NSPR Library ############################################
-NSPR_RELDATE = v4.6.2 +NSPR_RELDATE = v4.6.3
NSPR_NSOBJDIR=$(NSOBJDIR_NAME)
@@ -85,7 +85,7 @@ # SECURITY LIBRARY ################################################
-SECURITY_RELDATE = NSS_3_11_1_RTM +SECURITY_RELDATE = NSS_3_11_3_RTM
ifeq ($(INT_NSS), 1) BASE_NSS = $(INT_DIR)/nss/$(SECURITY_RELDATE) @@ -235,14 +235,14 @@ # LDAP C SDK Library #############################################################
-LDAP_RELDATE = v5.17 -LDAP_SUF = 50 +LDAP_RELDATE = v6.0.0 +LDAP_SUF = 60 LDAP_VERSION = $(LDAP_RELDATE)
ifeq ($(INT_LDAPSDK), 1) -BASE_LDAPSDK = $(INT_DIR)/ldapsdk$(LDAP_SUF)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) +BASE_LDAPSDK = $(INT_DIR)/ldapcsdk/$(LDAP_VERSION)/$(NSOBJDIR_NAME) else -BASE_LDAPSDK = $(COMPONENTS_DIR)/ldapsdk$(LDAP_SUF)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) +BASE_LDAPSDK = $(COMPONENTS_DIR)/ldapcsdk/$(LDAP_VERSION)/$(NSOBJDIR_NAME) endif
$(LIBLDAP):
Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- nsconfig.mk 29 Sep 2006 18:25:06 -0000 1.31 +++ nsconfig.mk 9 Oct 2006 15:21:09 -0000 1.32 @@ -840,7 +840,7 @@ # LDAPSDK #######################################
-LDAP_LIB_VERSION = 50 +LDAP_LIB_VERSION = 60 ifdef LDAPSDK_SOURCE_ROOT LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib LDAPSDK_INCLUDE = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap