Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver
Modified Files:
component_versions.mk components.mk
Log Message:
Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime,
and more on Solaris and HP-UX.
Use setup.inf from admin server, and make sure the admin component is in there.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- component_versions.mk 31 Oct 2005 15:55:24 -0000 1.40
+++ component_versions.mk 13 Feb 2006 22:25:27 -0000 1.41
@@ -52,12 +52,12 @@
# naming scheme.
# NSPR
ifndef NSPR_RELDATE
- NSPR_RELDATE = v4.4.1
+ NSPR_RELDATE = v4.6.1
endif
# SECURITY (NSS) LIBRARY
ifndef SECURITY_RELDATE
- SECURITY_RELDATE = NSS_3_9_3_RTM
+ SECURITY_RELDATE = NSS_3_11_RTM
endif
# LIBDB
@@ -97,7 +97,7 @@
# ANT
ifndef ANT_VERSION
- ANT_VERSION = 1.4.1
+ ANT_VERSION = 1.6.2
endif
ifndef ANT_COMP
ANT_COMP = ant
@@ -140,7 +140,7 @@
# server core
ifndef SVRCORE_RELDATE
- SVRCORE_RELDATE = SVRCORE_4_0_RTM
+ SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
endif
# admin utility library
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- components.mk 10 Feb 2006 23:21:43 -0000 1.38
+++ components.mk 13 Feb 2006 22:25:27 -0000 1.39
@@ -210,23 +210,30 @@
SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
# 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
+# as of NSS 3.11, no longer need to link with softokn3
+SECURITY_LIBNAMES = ssl3 nss3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK = softokn3
+# freebl is new for NSS 3.11
+SECURITY_NEED_CHK = softokn3 freebl3
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3
-# 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
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-endif
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+endif # SOLARIS
ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3
+# these libs have a corresponding .chk file
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+endif # HPUX
+else # USE_64
+ifeq ($(ARCH), SOLARIS)
+SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
+SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
endif
endif # USE_64
@@ -238,7 +245,7 @@
LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
ifeq ($(USE_SETUPUTIL), 1)
- PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
+ PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) # for the setup programs
endif
ifeq ($(USE_DSGW), 1)
LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw
@@ -423,7 +430,7 @@
### 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
@@ -518,10 +525,10 @@
# during the build process
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
- ADMINUTIL_INCPATH =
$(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include
+ ADMINUTIL_INCPATH =
$(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
else
ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
- ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include
+ ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
endif
PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
@@ -529,11 +536,11 @@
LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
ifeq ($(ARCH),WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH)
libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH)
libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil.$(LIB_SUFFIX)
+ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s.$(LIB_SUFFIX)
+LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX)
else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
+ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil
endif
ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
-I$(ADMINUTIL_INCPATH)/libadmsslutil
@@ -572,8 +579,8 @@
ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
# else set in internal_buildpaths.mk
endif
-# these are the only two subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base
+# these are the subcomponents we use from the adminserver package
+ADMINSERVER_SUBCOMPS=admin base setup.inf
ifdef LDAPCONSOLE_SOURCE_ROOT
LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
Show replies by date