Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver Modified Files: Makefile component_versions.mk internal_comp_deps.mk nsdefs.mk Log Message: Bug(s) fixed: 172005 Bug Description: Change ldapserver version to 1.0 Reviewed by: Noriko (Thanks!) Fix Description: This also fixes some lingering build issues involving perldap, which is no longer a separate setup package, but just gets included into DS in a similar manner to nspr, nss, etc. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile 2 Sep 2005 20:40:46 -0000 1.26 +++ Makefile 29 Oct 2005 02:25:50 -0000 1.27 @@ -132,7 +132,7 @@ ifeq ($(INTERNAL_BUILD), 1) COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_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) + $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP) endif # Pull WiX MSI toolkit on Windows. Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- component_versions.mk 3 Oct 2005 19:53:40 -0000 1.38 +++ component_versions.mk 29 Oct 2005 02:25:50 -0000 1.39 @@ -114,10 +114,10 @@ # admin server ifndef ADM_RELDATE - ADM_RELDATE = 20050901 + ADM_RELDATE = 20051028 endif ifndef ADM_VERSDIR - ADM_VERSDIR = adminserver/7.1 + ADM_VERSDIR = adminserver/1.0 endif # Net-SNMP @@ -127,22 +127,17 @@ # setuputil ifndef SETUPUTIL_RELDATE - SETUPUTIL_RELDATE = 20050831 + SETUPUTIL_RELDATE = 20051027 endif ifndef SETUPUTIL_VER - SETUPUTIL_VER = 71 - SETUPUTIL_DOT_VER = 7.1 + SETUPUTIL_VER = 10 + SETUPUTIL_DOT_VER = 1.0 endif ifndef SETUPUTIL_VERSDIR SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER) endif -# infozip utilities -ifndef INFOZIP_RELDATE - INFOZIP_RELDATE = CMSTOOLS_7_x -endif - # server core ifndef SVRCORE_RELDATE SVRCORE_RELDATE = SVRCORE_4_0_RTM @@ -150,11 +145,11 @@ # admin utility library ifndef ADMINUTIL_VER - ADMINUTIL_VER=71 - ADMINUTIL_DOT_VER=7.1 + ADMINUTIL_VER=10 + ADMINUTIL_DOT_VER=1.0 endif ifndef ADMINUTIL_RELDATE - ADMINUTIL_RELDATE=20050721 + ADMINUTIL_RELDATE=20051026 endif ifndef ADMINUTIL_VERSDIR @@ -163,17 +158,17 @@ # LDAP Console ifndef LDAPCONSOLE_REL - LDAPCONSOLE_REL=71 + LDAPCONSOLE_REL=10 endif ifndef LDAPCONSOLE_COMP LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL) endif ifndef LDAPCONSOLE_RELDATE - LDAPCONSOLE_RELDATE=20050913 + LDAPCONSOLE_RELDATE=20051028 endif ifndef PERLDAP_VERSION - PERLDAP_VERSION=20050330 + PERLDAP_VERSION=20051028 endif ifndef JSS_COMP @@ -236,9 +231,9 @@ endif ifndef ADSYNC_VERSION - ADSYNC_VERSION=20050912 + ADSYNC_VERSION=20051017 endif ifndef NT4SYNC_VERSION - NT4SYNC_VERSION=20050912 + NT4SYNC_VERSION=20051017 endif Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- internal_comp_deps.mk 5 Oct 2005 01:29:14 -0000 1.28 +++ internal_comp_deps.mk 29 Oct 2005 02:25:50 -0000 1.29 @@ -574,7 +574,26 @@ #PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) -PERLDAP_ZIP_FILE = perldap14.zip +PERLDAP_FILES=lib,arch +PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib + +# this is the rule to pull PerLDAP +ifndef PERLDAP_PULL_METHOD +PERLDAP_PULL_METHOD = FTP +endif + +$(PERLDAP_DEP): +ifdef INTERNAL_BUILD + $(RM) $@ + $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \ + -objdir $(dir $@) \ + -componentdir $(PERLDAP_COMPONENT_DIR) \ + -files $(PERLDAP_FILES) + @if [ ! -f $@ ] ; \ + then echo "Error: could not get component PERLDAP file $@" ; \ + exit 1 ; \ + fi +endif ########################################################### ### Admin Server package ################################## Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nsdefs.mk 3 Oct 2005 19:53:40 -0000 1.14 +++ nsdefs.mk 29 Oct 2005 02:25:50 -0000 1.15 @@ -141,10 +141,10 @@ endif endif -MAJOR_VERSION:="7" -MINOR_VERSION:="1" -MAJOR_VERSION_NOQUOTES:=7 -MINOR_VERSION_NOQUOTES:=1 +MAJOR_VERSION:="1" +MINOR_VERSION:="0" +MAJOR_VERSION_NOQUOTES:=1 +MINOR_VERSION_NOQUOTES:=0 # the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME) ifeq ($(BUILD_ARCH), WINNT) @@ -232,9 +232,9 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=7.1 -NOSP_DIR_VERSION:=7.1 -DIR_NORM_VERSION:=7.1 +DIR_VERSION:=1.0 +NOSP_DIR_VERSION:=1.0 +DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must # update all of the .exp and .def files by executing the following command: