Author: nhosoi

Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10342

Modified Files: Tag: Directory71RtmBranch component_versions.mk internal_comp_deps.mk Log Message: Resolves: #240583 Summary: add SASL support for LDCLT and Rsearch tools Description: applied the patch to Directory71RtmBranch - SASL Mutex Support - switched cyrus sasl version to v2.1.22

Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/component_versions.mk,v retrieving revision 1.35.2.10 retrieving revision 1.35.2.11 diff -u -r1.35.2.10 -r1.35.2.11 --- component_versions.mk 26 Jul 2006 06:17:58 -0000 1.35.2.10 +++ component_versions.mk 15 Jan 2008 21:19:19 -0000 1.35.2.11 @@ -198,7 +198,7 @@ SASL_VERSDIR=cyrus endif ifndef SASL_RELDATE - SASL_RELDATE=v2.1.20 + SASL_RELDATE=v2.1.22/20080115.1 endif

# jakarta/axis for DSMLGW

Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/Attic/internal_comp_deps.mk,v retrieving revision 1.24.2.3 retrieving revision 1.24.2.4 diff -u -r1.24.2.3 -r1.24.2.4 --- internal_comp_deps.mk 26 May 2006 23:43:39 -0000 1.24.2.3 +++ internal_comp_deps.mk 15 Jan 2008 21:19:19 -0000 1.24.2.4 @@ -255,8 +255,8 @@ endif # LDAPSDK_SOURCE_ROOT

ifndef SASL_SOURCE_ROOT -#SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME) -SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME) +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 SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)