From 2ab1b4d64d3d2a718bade5161c2ec2c834111f7b Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Tue, 28 Feb 2006 03:00:14 +0000 Subject: Fixing nightly build Changes: 1) NSPR_RELDATE: v4.6.1 --> v4.6 2) ICU_LIB_VERSION: 34 --> 24 This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4. 3) lib/base/systhr.cpp: Applied NSPR sysfd table patch 4) DS version: 7.1 --> 7.2 --- component_versions.mk | 4 ++-- components.mk | 4 ++-- internal_comp_deps.mk | 7 ++++--- lib/base/systhr.cpp | 26 +++++++++++++++++++++++++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/component_versions.mk b/component_versions.mk index ea8b79c7..fe676cdd 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -52,7 +52,7 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.6.1 + NSPR_RELDATE = v4.6 endif # SECURITY (NSS) LIBRARY @@ -205,7 +205,7 @@ endif # DOC ifndef DSDOC_RELDATE - DSDOC_RELDATE = 20051028 + DSDOC_RELDATE = 20050311 endif # WIX diff --git a/components.mk b/components.mk index 464110cf..31b39b2e 100644 --- a/components.mk +++ b/components.mk @@ -439,7 +439,7 @@ endif ### ICU package ########################################## -ICU_LIB_VERSION = 34 +ICU_LIB_VERSION = 24 ifdef ICU_SOURCE_ROOT ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin @@ -589,7 +589,7 @@ ifdef ADMINSERVER_SOURCE_ROOT # else set in internal_buildpaths.mk endif # these are the subcomponents we use from the adminserver package -ADMINSERVER_SUBCOMPS=admin base setup.inf +ADMINSERVER_SUBCOMPS=admin base ifdef LDAPCONSOLE_SOURCE_ROOT LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 7b437da0..7889255a 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -273,6 +273,7 @@ endif # SASL_SOURCE_ROOT ifndef ICU_SOURCE_ROOT ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) +#ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h ifndef ICU_PULL_METHOD ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -330,8 +331,8 @@ endif # DB_SOURCE_ROOT ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE) ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} ifeq ($(BUILD_MODE), int) - ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) -# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) + ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) else # ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) @@ -501,7 +502,7 @@ ifeq ($(BUILD_JAVA_CODE),1) ifndef GET_ANT_FROM_PATH # (we use ant for building some Java code) ANTJAR = ant.jar -JAXPJAR = jaxp.jar +#JAXPJAR = jaxp.jar # ??? ANT_FILES = $(ANTJAR) $(JAXPJAR) ANT_RELEASE = $(COMPONENTS_DIR) ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION) diff --git a/lib/base/systhr.cpp b/lib/base/systhr.cpp index 8bbfc55f..1f611fb3 100644 --- a/lib/base/systhr.cpp +++ b/lib/base/systhr.cpp @@ -47,11 +47,19 @@ #ifdef USE_NSPR #include "nspr.h" #include "private/prpriv.h" +#ifdef LINUX +# include +# include +#else +/* This declaration should be removed when NSPR newer than v4.6 is picked up, + which should have the fix for bug 326110 + */ extern "C" { int32 PR_GetSysfdTableMax(void); int32 PR_SetSysfdTableSize(int table_size); } #endif +#endif #include "systems.h" #ifdef THREAD_WIN32 @@ -161,9 +169,25 @@ NSAPI_PUBLIC void systhread_init(char *name) { PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256); #ifdef XP_UNIX - /* XXXrobm allocate all the fd's we can... */ +#ifdef LINUX + /* + * NSPR 4.6 does not export PR_SetSysfdTableSize + * and PR_GetSysfdTableMax by mistake (NSPR Bugzilla + * bug 326110) on platforms that use GCC with symbol + * visibility, so we have to call the system calls + * directly. + */ + { + struct rlimit rlim; + if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) + return; + rlim.rlim_cur = rlim.rlim_max; + (void) setrlimit(RLIMIT_NOFILE, &rlim); + } +#else PR_SetSysfdTableSize(PR_GetSysfdTableMax()); #endif +#endif } -- cgit From 9a8d95ef1d9dffbb63b0b9c6bdf26203b0541afa Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Tue, 28 Feb 2006 20:46:12 +0000 Subject: Fixing the internal build (to build dsmlgw w/ ant, ant-launcher.jar is needed) --- internal_comp_deps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 7889255a..20520943 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -501,7 +501,7 @@ endif ifeq ($(BUILD_JAVA_CODE),1) ifndef GET_ANT_FROM_PATH # (we use ant for building some Java code) -ANTJAR = ant.jar +ANTJAR = ant.jar ant-launcher.jar #JAXPJAR = jaxp.jar # ??? ANT_FILES = $(ANTJAR) $(JAXPJAR) ANT_RELEASE = $(COMPONENTS_DIR) -- cgit From 73128d9e3cac31c1461c5b76c202d0e5b312900c Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Tue, 28 Feb 2006 21:51:26 +0000 Subject: Fixing Solaris build 1) NSCONFIG accidentally got a white space (for non-Linux platforms) 2) Solaris needs to include limits.h explicitly --- ldap/servers/slapd/slap.h | 3 +++ nsconfig.mk | 18 ++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h index ca3f68e4..1e957f4c 100644 --- a/ldap/servers/slapd/slap.h +++ b/ldap/servers/slapd/slap.h @@ -91,6 +91,9 @@ void *dlsym(void *a, char *b); #include #include #include +#if defined(SOLARIS) +#include /* for LONG_MAX */ +#endif /* there's a bug in the dbm code we import (from where?) -- FIXME */ #ifdef LINUX diff --git a/nsconfig.mk b/nsconfig.mk index cb2fa5da..d2490272 100644 --- a/nsconfig.mk +++ b/nsconfig.mk @@ -286,23 +286,21 @@ else ifeq ($(NSOS_ARCH),HP-UX) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), ia64) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif else ifeq ($(NSOS_TEST1),i86pc) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif endif - NSCONFIG += $(NS64TAG) - NSCONFIG_NOTAG += $(NS64TAG) endif endif -- cgit From 9c428b5b97db979514be45030cca235cb1133bc1 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 1 Mar 2006 14:58:27 +0000 Subject: added patch file for upgrading from 1.0.1 - fixes the use of admpw for basic auth --- ldapserver.spec.tmpl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl index 7b7b643c..13af4317 100644 --- a/ldapserver.spec.tmpl +++ b/ldapserver.spec.tmpl @@ -139,6 +139,10 @@ if [ "$1" -gt 1 ] ; then if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1 fi +# patch file to fix use of admpw for basic auth + if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1 + fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf if [ ! -f $testfile ] ; then @@ -172,6 +176,9 @@ if [ "$1" = 0 ] ; then fi %changelog +* Wed Mar 1 2006 Rich Megginson - 1.0.2-1 +- Added admserv-conf-tmpl.patch to fix the use of admpw for basic auth + * Wed Feb 22 2006 Rich Megginson - 1.0.2-1 - Add patch to fix admin server httpd module load order; you - must now run setup after an upgrade; copy in the new 00core.ldif -- cgit From 20b37715c9c4daa5b87837fb99ed84ec85e0e65e Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 1 Mar 2006 15:21:47 +0000 Subject: Added admserv-conf-admpw.patch to fix the use of admpw for basic auth in the actual config file --- ldapserver.spec.tmpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl index 13af4317..3b1518a0 100644 --- a/ldapserver.spec.tmpl +++ b/ldapserver.spec.tmpl @@ -139,10 +139,14 @@ if [ "$1" -gt 1 ] ; then if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1 fi -# patch file to fix use of admpw for basic auth +# patch file to fix use of admpw for basic auth in the template file if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1 fi +# patch file to fix use of admpw for basic auth in the real config file + if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch ] ; then + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch > /dev/null 2>&1 + fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf if [ ! -f $testfile ] ; then @@ -177,7 +181,7 @@ fi %changelog * Wed Mar 1 2006 Rich Megginson - 1.0.2-1 -- Added admserv-conf-tmpl.patch to fix the use of admpw for basic auth +- Added admserv-conf-tmpl.patch and admserv-conf-admpw.patch to fix the use of admpw for basic auth * Wed Feb 22 2006 Rich Megginson - 1.0.2-1 - Add patch to fix admin server httpd module load order; you -- cgit