February 2006 - 389-commits - Fedora mailing-lists

[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.13, 1.30.2.14
by Doctor Conrad 17 Feb '06

17 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2069 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Fix for the Solaris and HP-UX patch packaging Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.13 retrieving revision 1.30.2.14 diff -u -r1.30.2.13 -r1.30.2.14 --- Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13 +++ Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14 @@ -713,7 +713,14 @@ fi ifdef BUILD_PATCH -# copying a file from the component area +# take care of files in components (e.g., a file in nsadmin.zip) + -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ + zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ + afile=`echo $$pair | awk -F: '{print $$2}'` ; \ + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ + done + +# copying files from the component area -@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \ zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \

1 0

[Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.3, 1.4
by Doctor Conrad 17 Feb '06

17 Feb '06

Author: nkinder Update of /cvs/dirsec/setuputil/installer/unix/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27855 Modified Files: Makefile Log Message: Added a space to an addprefix call that was randomly failing on FC4 x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 28 Jan 2006 02:33:25 -0000 1.3 +++ Makefile 16 Feb 2006 23:57:54 -0000 1.4 @@ -36,7 +36,7 @@ STAGE=$(OBJDIR)/$(DIR) -OBJS=$(addprefix $(OBJDEST)/,ux-util.o ux-curse.o dialog.o ux-wrapper.o) +OBJS=$(addprefix $(OBJDEST)/, ux-util.o ux-curse.o dialog.o ux-wrapper.o) INCS=ux-util.h dialog.h LIBS=$(LIBDEST)/libinstall.a

1 0

[Fedora-directory-commits] adminserver nsdefs.mk,1.10,1.11
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23359 Modified Files: nsdefs.mk Log Message: NSPLATFORM_DIR is set differently for linux than for other platforms Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10 +++ nsdefs.mk 16 Feb 2006 22:22:22 -0000 1.11 @@ -189,7 +189,6 @@ INTL_DEF=-intl endif -NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG) PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(BUILD_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(BUILD_ROOT)/built/package/$(PLATFORM_DEST)

1 0

[Fedora-directory-commits] dsbuild/meta/ds Makefile,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/meta/ds Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:30:05 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:15 -0000 1.3 @@ -7,6 +7,11 @@ override DEBUG=full endif +ARCH=$(shell uname -m) +ifeq ($(ARCH), x86_64) + USE_64=1 +endif + LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd ifndef NOJAVA

1 0

[Fedora-directory-commits] dsbuild/ds/setuputil Makefile,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/setuputil Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:30:00 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:09 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-setuputil GARVERSION = 1.0.2 CATEGORIES = ds @@ -12,12 +14,12 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla +BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) -ifndef DEBUG -BUILD_ARGS += BUILD_DEBUG=optimize -else +ifeq ($(DEBUG), full) BUILD_ARGS += DEBUG=full +else +BUILD_ARGS += BUILD_DEBUG=optimize endif configure-custom:

1 0

[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/mozilla Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:29:29 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:04 -0000 1.3 @@ -18,11 +18,19 @@ ifndef DEBUG OPTFLAG="BUILD_OPT=1" -CONFIGFLAG=--disable-debug --enable-optimize +CONFIGURE_OPTS=--disable-debug --enable-optimize +OBJDIR=OPT.OBJ else -CONFIGFLAG=--enable-debug --disable-optimize +CONFIGURE_OPTS=--enable-debug --disable-optimize +OBJDIR=DBG.OBJ endif +ifeq ($(USE_64), 1) +CONFIGURE_OPTS += --enable-64bit +endif + +NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR) + # this is our "custom" patch target post-patch: ifdef MYPATCH @@ -36,13 +44,35 @@ $(MAKECOOKIE) build-custom: - cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG) - cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) - cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG) +# first, build coreconf + $(MAKE) -C work/mozilla/security/coreconf OBJDIR_NAME=$(OBJDIR) + +# next, configure and make nspr + mkdir -p work/mozilla/dist/$(OBJDIR) + mkdir -p work/mozilla/nsprpub/$(OBJDIR) + cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + + $(MAKE) -C work/mozilla/nsprpub/$(OBJDIR) + +# next, make dbm + $(MAKE) -C work/mozilla/security/dbm OBJDIR_NAME=$(OBJDIR) export libs + +# next, make nss + $(MAKE) -C work/mozilla/security/nss $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) all +# $(MAKE) -C work/mozilla/security/nss nss_build_all $(OPTFLAG) + +# next, make svrcore + cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) + +# next, configure and make the ldap c sdk + cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGURE_OPTS) cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG) + # perldap uses MakeMaker, so lots of env. vars. cd work/mozilla/directory/perldap && \ - LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \ + LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=../../dist/$(OBJDIR) perl Makefile.PL && \ $(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib $(MAKECOOKIE)

1 0

[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.3,1.4
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/ldapserver Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 15 Feb 2006 22:55:46 -0000 1.3 +++ Makefile 16 Feb 2006 21:33:58 -0000 1.4 @@ -21,6 +21,7 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \ MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ + MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \

1 0

[Fedora-directory-commits] dsbuild/ds/adminutil Makefile,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminutil Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:28:25 -0000 1.2 +++ Makefile 16 Feb 2006 21:33:53 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-adminutil GARVERSION = 1.0.2 CATEGORIES = ds @@ -12,12 +14,12 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 +BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) -ifndef DEBUG -BUILD_ARGS += BUILD_DEBUG=optimize -else +ifeq ($(DEBUG), full) BUILD_ARGS += DEBUG=full +else +BUILD_ARGS += BUILD_DEBUG=optimize endif configure-custom:

1 0

[Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminserver Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:28:18 -0000 1.2 +++ Makefile 16 Feb 2006 21:33:47 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-adminserver GARVERSION = 1.0.2 CATEGORIES = ds @@ -14,6 +16,7 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ + MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ @@ -27,7 +30,7 @@ BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work endif # NOJAVA -ifndef DEBUG +ifneq ($(DEBUG), full) BUILD_ARGS += BUILD_DEBUG=optimize endif

1 0

[Fedora-directory-commits] dsbuild objdirname.mk,1.2,1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild Modified Files: objdirname.mk Log Message: use given name for moz objdir naming Index: objdirname.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2 +++ objdirname.mk 16 Feb 2006 21:33:42 -0000 1.3 @@ -134,8 +134,10 @@ ifeq ($(DEBUG), full) NSOBJDIR_TAG=_DBG + MOZ_OBJDIR_NAME=DBG.OBJ else NSOBJDIR_TAG=_OPT + MOZ_OBJDIR_NAME=OPT.OBJ endif ifeq ($(NSOS_ARCH),WINNT) @@ -148,14 +150,20 @@ endif # Mozilla uses a slightly different naming convention -ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) -else -ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) -else - MOZ_OBJDIR_NAME = $(OBJDIR_NAME) -endif +ifndef MOZ_OBJDIR_NAME + ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(OBJDIR_NAME) + endif + endif + endif endif # figure out which imports file to use - for console builds

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c, 1.9, 1.10
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/servers/slapd Modified Files: util.c Log Message: Bug(s) fixed: 181776 Bug Description: 64bit issues with normalize_path(), make_dn(), and add_aci_v() Reviewed by: Nathan and Noriko (Thanks!) Fix Description: 1) use sizeof(char *) as the elemsize to pass to slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass as the last argument to the varargs functions. Platforms tested: RHEL4 64 Flag Day: no Doc impact: no Index: util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- util.c 12 Jan 2006 00:28:57 -0000 1.9 +++ util.c 16 Feb 2006 17:39:53 -0000 1.10 @@ -408,8 +408,8 @@ char *dname = slapi_ch_strdup(path); char *dnamep = dname; char *bnamep = NULL; - char **dirs = (char **)slapi_ch_calloc(strlen(path), 1); - char **rdirs = (char **)slapi_ch_calloc(strlen(path), 1); + char **dirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *)); + char **rdirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *)); char **dp = dirs; char **rdp; do {

1 0

[Fedora-directory-commits] ldapserver/ldap/admin/src cfg_sspt.c, 1.7, 1.8
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/admin/src Modified Files: cfg_sspt.c Log Message: Bug(s) fixed: 181776 Bug Description: 64bit issues with normalize_path(), make_dn(), and add_aci_v() Reviewed by: Nathan and Noriko (Thanks!) Fix Description: 1) use sizeof(char *) as the elemsize to pass to slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass as the last argument to the varargs functions. Platforms tested: RHEL4 64 Flag Day: no Doc impact: no Index: cfg_sspt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cfg_sspt.c 19 Apr 2005 22:06:55 -0000 1.7 +++ cfg_sspt.c 16 Feb 2006 17:39:47 -0000 1.8 @@ -54,6 +54,8 @@ #define TEST_CONFIG /* for testing cn=config40 dummy entry instead of real one */ +char* const NULLSTR = 0; + char* const class_top = "top"; char* const class_organization = "organization"; char* const class_organizationalUnit = "organizationalunit"; @@ -754,7 +756,7 @@ if (!base) entrydn = strdup(unit); else - entrydn = make_dn("%s=%s, %s", name_ou, unit, base, 0); + entrydn = make_dn("%s=%s, %s", name_ou, unit, base, NULLSTR); if (!entry_exists(ld, entrydn)) { @@ -1062,7 +1064,7 @@ return -1; } - entrydn = make_dn("%s=%s", name_cn, value_config40, 0); + entrydn = make_dn("%s=%s", name_cn, value_config40, NULLSTR); if (!entry_exists(ld, entrydn)) { LDAPMod* attrs[3]; @@ -1130,7 +1132,7 @@ return -1; } - entrydn = make_dn("%s=%s, %s", name_cn, group, base, 0); + entrydn = make_dn("%s=%s, %s", name_cn, group, base, NULLSTR); if (!entry_exists(ld, entrydn)) { @@ -1379,7 +1381,7 @@ { /* initial ACIs for o=NetscapeRoot */ - int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, 0); + int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, NULLSTR); return ret; } @@ -1418,7 +1420,7 @@ /* parent dn of admin uid entry */ if (query->netscaperoot) { parentDN = make_dn("%s, %s, %s", name_administratorsRDN, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); } if (query->config_admin_uid) { @@ -1428,12 +1430,12 @@ configAdminDN = strdup(query->config_admin_uid); } else if (parentDN) { /* create a DN for admid */ - configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, 0); + configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, NULLSTR); } else { /* create one from scratch */ configAdminDN = make_dn("%s=%s, %s, %s, %s", name_uid, query->config_admin_uid, name_administratorsRDN, name_topologyRDN, - name_netscaperootDN, 0); + name_netscaperootDN, NULLSTR); } } @@ -1444,7 +1446,7 @@ { if (configAdminDN && !is_root_user(configAdminDN, query)) { add_aci_v(connection, query->suffix, ACI_user_allow_2, - "all", configAdminDN, 0); + "all", configAdminDN, NULLSTR); } status = create_group(connection, query->suffix, name_localDAGroup); @@ -1465,13 +1467,13 @@ adminGroupDN = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); } if (query->suffix) { localDAGroupDN = make_dn("cn=%s, %s", name_localDAGroup, - query->suffix, 0); + query->suffix, NULLSTR); } else { @@ -1483,20 +1485,20 @@ add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_config_admin_group_allow, entryAndAccessList[ii].access, - adminGroupDN, 0); + adminGroupDN, NULLSTR); } if (configAdminDN && !is_root_user(configAdminDN, query)) { add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_user_allow_2, entryAndAccessList[ii].access, - configAdminDN, 0); + configAdminDN, NULLSTR); } if (localDAGroupDN) { add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_local_DA_allow, entryAndAccessList[ii].access, - localDAGroupDN, 0); + localDAGroupDN, NULLSTR); } } } @@ -1512,22 +1514,22 @@ ACI_config_admin_group_allow_all, value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = add_aci_v(connection, query->netscaperoot, ACI_anonymous_allow_with_filter, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = add_aci_v(connection, query->netscaperoot, ACI_group_expansion, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); /* create "topologyOU, netscaperoot" entry and set ACIs */ if (!status) { char *dn = make_dn("%s, %s", name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); status = create_organizational_unit(connection, NULL, dn, value_topologyDESC, 0, 0, 0); @@ -1542,7 +1544,7 @@ if (!status) { char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); status = create_organizational_unit (connection, NULL, dn, value_groupsDesc, 0, 0, 0); free(dn); @@ -1552,7 +1554,7 @@ if (!status) { char *dn = make_dn("%s, %s, %s", name_administratorsRDN, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); status = create_organizational_unit (connection, NULL, dn, value_administratorsDESC, 0, 0, 0); @@ -1564,7 +1566,7 @@ { char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); status = create_group (connection, dn, value_configAdminGroupCN); free(dn); } @@ -1575,7 +1577,7 @@ /* group to add the uid to */ char *groupdn = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); create_ssadmin_user(connection, parentDN, query->ssAdmID, query->ssAdmPW1); @@ -1585,7 +1587,7 @@ } admin_domainDN = make_dn("%s=%s, %s", name_ou, query->admin_domain, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = create_organizational_unit (connection, 0,

1 0

[Fedora-directory-commits] ldapserver/ldap/clients/dsgw Makefile, 1.6, 1.6.2.1
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1709 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [181582] Directory Server 7.1 SP2 packaging See Comment #4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Makefile,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- Makefile 19 Apr 2005 22:07:01 -0000 1.6 +++ Makefile 16 Feb 2006 01:28:12 -0000 1.6.2.1 @@ -151,7 +151,7 @@ $(LDAPLINK) $(ADMINUTIL_LINK) \ $(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \ $(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \ - $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY) + $(THREADSLIB) $(SECURITYLINK) $(NSPRLINK) $(LDAP_LIBLITEKEY) endif NSECLIBS_DEP=$(SECGLUEOBJS)

1 0

[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel DSEntrySet.java, 1.1.1.1, 1.2 PasswordPolicyPanel.java, 1.1.1.1, 1.2
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837/panel Modified Files: DSEntrySet.java PasswordPolicyPanel.java Log Message: Bug(s) fixed: 181570 Bug Description: The UI for the new password syntax enhancements needs to be created. Reviewed by: Rich, Noriko (thanks!) Files: see diffs Branch: HEAD (directoryconsole) Fix Description: This adds input fields for the new password syntax config parameters. The new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of diffs fixes an issue where the default values when setting up a per-user or per-subtree password policy were all showing up as 0. This was due to DSEntrySet overwriting the default component values with a null string if the passwordPolicy LDAP entry did not exist. Flag Day: no Doc impact: no QA impact: Console testplan will need to be updated. New Tests integrated into TET: none Index: DSEntrySet.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DSEntrySet.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSEntrySet.java 18 Jul 2005 00:55:55 -0000 1.1.1.1 +++ DSEntrySet.java 15 Feb 2006 23:00:55 -0000 1.2 @@ -152,73 +152,75 @@ // collect all attribute names for this entry into an array String[] attrNames = getAttributeNames(dn); Debug.println(9, "DSEntrySet.getAttributes(): attempting to read entry " + - dn + " from the server attrNames = " + attrNames); - try { - entry = ldc.read(dn, attrNames); - } catch (LDAPException lde) { - if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT && - _allowNoEntry ) { - entry = null; - } else { - throw lde; - } - } - if ( entry == null && !_allowNoEntry ) { - Debug.println( "DSEntrySet.getAttribytes: failed to read " + - dn ); - return false; - } else { -// Debug.println( "DSEntrySet.getAttributes(): entry = " + entry ); - } + dn + " from the server attrNames = " + attrNames); + try { + entry = ldc.read(dn, attrNames); + } catch (LDAPException lde) { + if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT && _allowNoEntry ) { + entry = null; + } else { + throw lde; + } + } + + if ( entry == null && !_allowNoEntry ) { + Debug.println( "DSEntrySet.getAttribytes: failed to read " + dn ); + return false; + } else { + // Debug.println( "DSEntrySet.getAttributes(): entry = " + entry ); + } + + Debug.println("DSEntrySet.getAttributes(): read entry from DS:" + entry); + Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" + attrNames); - Debug.println("DSEntrySet.getAttributes(): read entry from DS:" + - entry); - Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" + - attrNames); // now we have the entry; get the LDAPAttributes - boolean haveAllAttrs = true; // flag if any attribues were missing + boolean haveAllAttrs = true; // flag if any attribues were missing for (int ii = 0; ii < attrNames.length; ++ii) { String attrName = attrNames[ii]; LDAPAttribute lda = null; - if (entry != null) { - lda = entry.getAttribute(attrName); - } + if (entry != null) { + lda = entry.getAttribute(attrName); + } + if (lda == null && entry != null) { - Debug.println( "DSEntrySet.getAttributes(): failed to get " + - "attribute " + attrName + " in " + entry.getDN()); - haveAllAttrs = false; // missing at least one attr value - } + Debug.println( "DSEntrySet.getAttributes(): failed to get " + + "attribute " + attrName + " in " + entry.getDN()); + haveAllAttrs = false; // missing at least one attr value + } - // loop through all of the DSEntrys which - // correspond to this attribute name and do the - // remoteToLocal for each one - Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName); - for (int jj = 0; v != null && jj < v.size(); ++jj) { - IDSEntry dse = (IDSEntry)v.elementAt(jj); - if (lda != null) { - dse.remoteToLocal(lda.getStringValues()); - } else { - dse.remoteToLocal(""); // dummy empty value - } -// Debug.println("DSEntrySet.show(): set DSE" + -// " for attribute" + attrName + -// " to value=" + lda); -// Debug.println("DSEntrySet.show(): new val=" + -// dse); - dse.show(); - } - } - if (!haveAllAttrs) { - Debug.println("DSEntrySet.show(): some of the attributes of " + - entry.getDN() + " could not be read. Either they " + - "are not present in the entry or there is an ACI " + - "which prevents that attribute from being read. " + - "Try authenticating as a user with more access"); - if (_validate) - return false; - } - } - return true; + // loop through all of the DSEntrys which + // correspond to this attribute name and do the + // remoteToLocal for each one that was found + Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName); + for (int jj = 0; v != null && jj < v.size(); ++jj) { + IDSEntry dse = (IDSEntry)v.elementAt(jj); + if (lda != null) { + Debug.println("DSEntrySet.getAttributes(): " + attrName + + " was found, setting value from entry"); + dse.remoteToLocal(lda.getStringValues()); + } + + // Debug.println("DSEntrySet.show(): set DSE" + + // " for attribute" + attrName + + // " to value=" + lda); + // Debug.println("DSEntrySet.show(): new val=" + dse); + + dse.show(); + } + } + + if (!haveAllAttrs) { + Debug.println("DSEntrySet.show(): some of the attributes of " + + entry.getDN() + " could not be read. Either they " + + "are not present in the entry or there is an ACI " + + "which prevents that attribute from being read. " + + "Try authenticating as a user with more access"); + if (_validate) + return false; + } + } + + return true; } /** Index: PasswordPolicyPanel.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/PasswordPolicyPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- PasswordPolicyPanel.java 18 Jul 2005 00:56:02 -0000 1.1.1.1 +++ PasswordPolicyPanel.java 15 Feb 2006 23:00:55 -0000 1.2 @@ -28,6 +28,7 @@ import com.netscape.admin.dirserv.*; import com.netscape.management.client.*; import com.netscape.management.client.util.*; +import com.netscape.management.nmclf.*; import netscape.ldap.*; import netscape.ldap.util.*; @@ -90,8 +91,7 @@ createChangeArea((Container)_myPanel); createExpirationArea((Container)_myPanel); createSyntaxArea((Container)_myPanel); - createMinLengthArea((Container)_myPanel); - createStorageArea((Container)_myPanel); + createStorageArea((Container)_myPanel); addBottomGlue (); _isInitialized = true; @@ -254,46 +254,231 @@ protected void createSyntaxArea( Container myContainer ) { _cbCheckSyntax = makeJCheckBox(_section, "check", false); - DSEntrySet entries = getDSEntrySet(); - DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax ); - entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se ); - setComponentTable(_cbCheckSyntax, se); - GridBagConstraints gbc = getGBC(); - gbc.gridwidth = gbc.REMAINDER; - gbc.anchor = gbc.WEST; - gbc.fill = gbc.NONE; - gbc.weightx = 1.0; - myContainer.add(_cbCheckSyntax, gbc); - } - - protected void createMinLengthArea( Container myContainer ) { _minLengthLabel = makeJLabel(_section, "minlength"); _tfMinLengthValue = makeNumericalJTextField(_section, "minlength"); - _minLengthLabel.setLabelFor(_tfMinLengthValue); + _minLengthLabel.setLabelFor(_tfMinLengthValue); + + _minDigitsLabel = makeJLabel(_section, "mindigits"); + + _tfMinDigitsValue = makeNumericalJTextField(_section, "mindigits"); + _minDigitsLabel.setLabelFor(_tfMinDigitsValue); + + _minAlphasLabel = makeJLabel(_section, "minalphas"); + + _tfMinAlphasValue = makeNumericalJTextField(_section, "minalphas"); + _minAlphasLabel.setLabelFor(_tfMinAlphasValue); + + _minUppersLabel = makeJLabel(_section, "minuppers"); + + _tfMinUppersValue = makeNumericalJTextField(_section, "minuppers"); + _minUppersLabel.setLabelFor(_tfMinUppersValue); + + _minLowersLabel = makeJLabel(_section, "minlowers"); + + _tfMinLowersValue = makeNumericalJTextField(_section, "minlowers"); + _minLowersLabel.setLabelFor(_tfMinLowersValue); + + _minSpecialsLabel = makeJLabel(_section, "minspecials"); + + _tfMinSpecialsValue = makeNumericalJTextField(_section, "minspecials"); + _minSpecialsLabel.setLabelFor(_tfMinSpecialsValue); + + _min8bitLabel = makeJLabel(_section, "min8bit"); + + _tfMin8bitValue = makeNumericalJTextField(_section, "min8bit"); + _min8bitLabel.setLabelFor(_tfMin8bitValue); + + _maxRepeatsLabel = makeJLabel(_section, "maxrepeats"); + _tfMaxRepeatsValue = makeNumericalJTextField(_section, "maxrepeats"); + _maxRepeatsLabel.setLabelFor(_tfMaxRepeatsValue); + + _minCategoriesLabel = makeJLabel(_section, "mincategories"); + + _tfMinCategoriesValue = makeNumericalJTextField(_section, "mincategories"); + _minCategoriesLabel.setLabelFor(_tfMinCategoriesValue); + + _minTokenLengthLabel = makeJLabel(_section, "mintokenlength"); + + _tfMinTokenLengthValue = makeNumericalJTextField(_section, "mintokenlength"); + _minTokenLengthLabel.setLabelFor(_tfMinTokenLengthValue); + + // tie components to config attributes DSEntrySet entries = getDSEntrySet(); - DSEntryInteger minDSEntry = new DSEntryInteger("", _tfMinLengthValue, - _minLengthLabel,MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1); - entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minDSEntry); - setComponentTable(_tfMinLengthValue, minDSEntry); + + DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax ); + entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se ); + setComponentTable(_cbCheckSyntax, se); + + DSEntryInteger minLengthDSEntry = new DSEntryInteger(MINLENGTH_DEFAULT_VAL, + _tfMinLengthValue, _minLengthLabel, MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1); + entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minLengthDSEntry); + setComponentTable(_tfMinLengthValue, minLengthDSEntry); + + DSEntryInteger minDigitsDSEntry = new DSEntryInteger(MINDIGITS_DEFAULT_VAL, + _tfMinDigitsValue, _minDigitsLabel, MINDIGITS_MIN_VAL, MINDIGITS_MAX_VAL, 1); + entries.add(_policyspecdn, MINDIGITS_ATTR_NAME, minDigitsDSEntry); + setComponentTable(_tfMinDigitsValue, minDigitsDSEntry); + + DSEntryInteger minAlphasDSEntry = new DSEntryInteger(MINALPHAS_DEFAULT_VAL, + _tfMinAlphasValue, _minAlphasLabel, MINALPHAS_MIN_VAL, MINALPHAS_MAX_VAL, 1); + entries.add(_policyspecdn, MINALPHAS_ATTR_NAME, minAlphasDSEntry); + setComponentTable(_tfMinAlphasValue, minAlphasDSEntry); + + DSEntryInteger minUppersDSEntry = new DSEntryInteger(MINUPPERS_DEFAULT_VAL, + _tfMinUppersValue, _minUppersLabel, MINUPPERS_MIN_VAL, MINUPPERS_MAX_VAL, 1); + entries.add(_policyspecdn, MINUPPERS_ATTR_NAME, minUppersDSEntry); + setComponentTable(_tfMinUppersValue, minUppersDSEntry); + + DSEntryInteger minLowersDSEntry = new DSEntryInteger(MINLOWERS_DEFAULT_VAL, + _tfMinLowersValue, _minLowersLabel, MINLOWERS_MIN_VAL, MINLOWERS_MAX_VAL, 1); + entries.add(_policyspecdn, MINLOWERS_ATTR_NAME, minLowersDSEntry); + setComponentTable(_tfMinLowersValue, minLowersDSEntry); + + DSEntryInteger minSpecialsDSEntry = new DSEntryInteger(MINSPECIALS_DEFAULT_VAL, + _tfMinSpecialsValue, _minSpecialsLabel, MINSPECIALS_MIN_VAL, MINSPECIALS_MAX_VAL, 1); + entries.add(_policyspecdn, MINSPECIALS_ATTR_NAME, minSpecialsDSEntry); + setComponentTable(_tfMinSpecialsValue, minSpecialsDSEntry); + + DSEntryInteger min8bitDSEntry = new DSEntryInteger(MIN8BIT_DEFAULT_VAL, + _tfMin8bitValue, _min8bitLabel,MIN8BIT_MIN_VAL, MIN8BIT_MAX_VAL, 1); + entries.add(_policyspecdn, MIN8BIT_ATTR_NAME, min8bitDSEntry); + setComponentTable(_tfMin8bitValue, min8bitDSEntry); + + DSEntryInteger maxRepeatsDSEntry = new DSEntryInteger(MAXREPEATS_DEFAULT_VAL, + _tfMaxRepeatsValue, _maxRepeatsLabel,MAXREPEATS_MIN_VAL, MAXREPEATS_MAX_VAL, 1); + entries.add(_policyspecdn, MAXREPEATS_ATTR_NAME, maxRepeatsDSEntry); + setComponentTable(_tfMaxRepeatsValue, maxRepeatsDSEntry); + + DSEntryInteger minCategoriesDSEntry = new DSEntryInteger(MINCATEGORIES_DEFAULT_VAL, + _tfMinCategoriesValue, _minCategoriesLabel,MINCATEGORIES_MIN_VAL, MINCATEGORIES_MAX_VAL, 1); + entries.add(_policyspecdn, MINCATEGORIES_ATTR_NAME, minCategoriesDSEntry); + setComponentTable(_tfMinCategoriesValue, minCategoriesDSEntry); + + DSEntryInteger minTokenLengthDSEntry = new DSEntryInteger(MINTOKENLENGTH_DEFAULT_VAL, + _tfMinTokenLengthValue, _minTokenLengthLabel,MINTOKENLENGTH_MIN_VAL, MINTOKENLENGTH_MAX_VAL, 1); + entries.add(_policyspecdn, MINTOKENLENGTH_ATTR_NAME, minTokenLengthDSEntry); + setComponentTable(_tfMinTokenLengthValue, minTokenLengthDSEntry); // create containers and layouts - JPanel panel = - new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - GridBagConstraints gbc = getGBC(); - gbc.gridwidth = gbc.REMAINDER; - gbc.anchor = gbc.WEST; - gbc.fill = gbc.HORIZONTAL; + JPanel syntaxPanel = new GroupPanel( _resource.getString(_section, "syntax-title")); + syntaxPanel.setLayout(new GridBagLayout()); + GridBagConstraints gbc = getGBC(); + gbc.gridwidth = gbc.REMAINDER; + gbc.anchor = GridBagConstraints.WEST; + gbc.fill = GridBagConstraints.HORIZONTAL; gbc.weightx = 1.0; - myContainer.add(panel, gbc); - panel.add(_minLengthLabel); - int space = UIFactory.getComponentSpace(); - panel.add(Box.createHorizontalStrut(space)); - panel.add(_tfMinLengthValue); + myContainer.add(syntaxPanel, gbc); + + GridBagUtil.constrain(syntaxPanel, _cbCheckSyntax, 0, 0, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, SuiConstants.COMPONENT_SPACE, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minLengthLabel, 0, 1, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinLengthValue, 1, 1, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minDigitsLabel, 0, 2, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinDigitsValue, 1, 2, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minAlphasLabel, 0, 3, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinAlphasValue, 1, 3, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minUppersLabel, 0, 4, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinUppersValue, 1, 4, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minLowersLabel, 0, 5, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinLowersValue, 1, 5, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minSpecialsLabel, 0, 6, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinSpecialsValue, 1, 6, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _min8bitLabel, 0, 7, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMin8bitValue, 1, 7, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _maxRepeatsLabel, 0, 8, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMaxRepeatsValue, 1, 8, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minCategoriesLabel, 0, 9, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinCategoriesValue, 1, 9, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minTokenLengthLabel, 0, 10, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinTokenLengthValue, 1, 10, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); } + protected void createExpirationArea( Container myContainer) { ButtonGroup expirationButtonGroup = new ButtonGroup(); @@ -610,7 +795,7 @@ * @param e event */ public void actionPerformed(ActionEvent e) { - if (e.getSource().equals(_cbCheckSyntax)) { + if (e.getSource().equals(_cbCheckSyntax)) { enableSyntax(); } else if (e.getSource().equals(_cbKeepHistory)) { enableHistory(); @@ -709,6 +894,42 @@ _minLengthLabel.repaint(); _tfMinLengthValue.setEnabled( enable ); _tfMinLengthValue.repaint(); + _minDigitsLabel.setEnabled( enable ); + _minDigitsLabel.repaint(); + _tfMinDigitsValue.setEnabled( enable ); + _tfMinDigitsValue.repaint(); + _minAlphasLabel.setEnabled( enable ); + _minAlphasLabel.repaint(); + _tfMinAlphasValue.setEnabled( enable ); + _tfMinAlphasValue.repaint(); + _minUppersLabel.setEnabled( enable ); + _minUppersLabel.repaint(); + _tfMinUppersValue.setEnabled( enable ); + _tfMinUppersValue.repaint(); + _minLowersLabel.setEnabled( enable ); + _minLowersLabel.repaint(); + _tfMinLowersValue.setEnabled( enable ); + _tfMinLowersValue.repaint(); + _minSpecialsLabel.setEnabled( enable ); + _minSpecialsLabel.repaint(); + _tfMinSpecialsValue.setEnabled( enable ); + _tfMinSpecialsValue.repaint(); + _min8bitLabel.setEnabled( enable ); + _min8bitLabel.repaint(); + _tfMin8bitValue.setEnabled( enable ); + _tfMin8bitValue.repaint(); + _maxRepeatsLabel.setEnabled( enable ); + _maxRepeatsLabel.repaint(); + _tfMaxRepeatsValue.setEnabled( enable ); + _tfMaxRepeatsValue.repaint(); + _minCategoriesLabel.setEnabled( enable ); + _minCategoriesLabel.repaint(); + _tfMinCategoriesValue.setEnabled( enable ); + _tfMinCategoriesValue.repaint(); + _minTokenLengthLabel.setEnabled( enable ); + _minTokenLengthLabel.repaint(); + _tfMinTokenLengthValue.setEnabled( enable ); + _tfMinTokenLengthValue.repaint(); } private void enableChange (){ @@ -910,6 +1131,24 @@ private JLabel _minLengthLabel; private JTextField _tfMinLengthValue; + private JLabel _minDigitsLabel; + private JTextField _tfMinDigitsValue; + private JLabel _minAlphasLabel; + private JTextField _tfMinAlphasValue; + private JLabel _minUppersLabel; + private JTextField _tfMinUppersValue; + private JLabel _minLowersLabel; + private JTextField _tfMinLowersValue; + private JLabel _minSpecialsLabel; + private JTextField _tfMinSpecialsValue; + private JLabel _min8bitLabel; + private JTextField _tfMin8bitValue; + private JLabel _maxRepeatsLabel; + private JTextField _tfMaxRepeatsValue; + private JLabel _minCategoriesLabel; + private JTextField _tfMinCategoriesValue; + private JLabel _minTokenLengthLabel; + private JTextField _tfMinTokenLengthValue; private JRadioButton _rbNever; private JRadioButton _rbExpiresIn; @@ -995,10 +1234,64 @@ "passwordCheckSyntax"; private static final String MINLENGTH_DN = "cn=config"; - private static final String MINLENGTH_ATTR_NAME = - "passwordMinLength"; + private static final String MINLENGTH_ATTR_NAME = "passwordMinLength"; private static final int MINLENGTH_MIN_VAL = 2; private static final int MINLENGTH_MAX_VAL = 512; + private static final String MINLENGTH_DEFAULT_VAL = "8"; + + private static final String MINDIGITS_DN = "cn=config"; + private static final String MINDIGITS_ATTR_NAME = "passwordMinDigits"; + private static final int MINDIGITS_MIN_VAL = 0; + private static final int MINDIGITS_MAX_VAL = 64; + private static final String MINDIGITS_DEFAULT_VAL = "0"; + + private static final String MINALPHAS_DN = "cn=config"; + private static final String MINALPHAS_ATTR_NAME = "passwordMinAlphas"; + private static final int MINALPHAS_MIN_VAL = 0; + private static final int MINALPHAS_MAX_VAL = 64; + private static final String MINALPHAS_DEFAULT_VAL = "0"; + + private static final String MINUPPERS_DN = "cn=config"; + private static final String MINUPPERS_ATTR_NAME = "passwordMinUppers"; + private static final int MINUPPERS_MIN_VAL = 0; + private static final int MINUPPERS_MAX_VAL = 64; + private static final String MINUPPERS_DEFAULT_VAL = "0"; + + private static final String MINLOWERS_DN = "cn=config"; + private static final String MINLOWERS_ATTR_NAME = "passwordMinLowers"; + private static final int MINLOWERS_MIN_VAL = 0; + private static final int MINLOWERS_MAX_VAL = 64; + private static final String MINLOWERS_DEFAULT_VAL = "0"; + + private static final String MINSPECIALS_DN = "cn=config"; + private static final String MINSPECIALS_ATTR_NAME = "passwordMinSpecials"; + private static final int MINSPECIALS_MIN_VAL = 0; + private static final int MINSPECIALS_MAX_VAL = 64; + private static final String MINSPECIALS_DEFAULT_VAL = "0"; + + private static final String MIN8BIT_DN = "cn=config"; + private static final String MIN8BIT_ATTR_NAME = "passwordMin8bit"; + private static final int MIN8BIT_MIN_VAL = 0; + private static final int MIN8BIT_MAX_VAL = 64; + private static final String MIN8BIT_DEFAULT_VAL = "0"; + + private static final String MAXREPEATS_DN = "cn=config"; + private static final String MAXREPEATS_ATTR_NAME = "passwordMaxRepeats"; + private static final int MAXREPEATS_MIN_VAL = 0; + private static final int MAXREPEATS_MAX_VAL = 64; + private static final String MAXREPEATS_DEFAULT_VAL = "0"; + + private static final String MINCATEGORIES_DN = "cn=config"; + private static final String MINCATEGORIES_ATTR_NAME = "passwordMinCategories"; + private static final int MINCATEGORIES_MIN_VAL = 1; + private static final int MINCATEGORIES_MAX_VAL = 5; + private static final String MINCATEGORIES_DEFAULT_VAL = "3"; + + private static final String MINTOKENLENGTH_DN = "cn=config"; + private static final String MINTOKENLENGTH_ATTR_NAME = "passwordMinTokenLength"; + private static final int MINTOKENLENGTH_MIN_VAL = 1; + private static final int MINTOKENLENGTH_MAX_VAL = 64; + private static final String MINTOKENLENGTH_DEFAULT_VAL = "3"; private static final String EXPIRES_DN = "cn=config"; private static final String EXPIRES_ATTR_NAME = "passwordExp";

1 0

[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv dirserv.properties, 1.2, 1.3
by Doctor Conrad 16 Feb '06

16 Feb '06

Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837 Modified Files: dirserv.properties Log Message: Bug(s) fixed: 181570 Bug Description: The UI for the new password syntax enhancements needs to be created. Reviewed by: Rich, Noriko (thanks!) Files: see diffs Branch: HEAD (directoryconsole) Fix Description: This adds input fields for the new password syntax config parameters. The new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of diffs fixes an issue where the default values when setting up a per-user or per-subtree password policy were all showing up as 0. This was due to DSEntrySet overwriting the default component values with a null string if the passwordPolicy LDAP entry did not exist. Flag Day: no Doc impact: no QA impact: Console testplan will need to be updated. New Tests integrated into TET: none Index: dirserv.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dirserv.properties 28 Oct 2005 18:01:34 -0000 1.2 +++ dirserv.properties 15 Feb 2006 23:00:50 -0000 1.3 @@ -1586,7 +1586,6 @@ passwordpolicy-check-default=false passwordpolicy-minlength-label=Password minimum length passwordpolicy-minlength-ttip=When syntax checking is on, reject passwords with fewer than this many characters -passwordpolicy-minlength-default=6 passwordpolicy-minlength-columns=4 passwordpolicy-expiration-title=Password Expiration passwordpolicy-neverexpire-label=Password never expires @@ -1606,6 +1605,35 @@ passwordpolicy-sendwarning2-label=day(s) before password expires passwordpolicy-sendwarning2-ttip=Notify users this many days before their password expires +passwordpolicy-syntax-title=Password Syntax +passwordpolicy-mindigits-label=Minimum required digit characters +passwordpolicy-mindigits-ttip=Reject passwords with fewer than this many digit characters (0-9) +passwordpolicy-mindigits-columns=4 +passwordpolicy-minalphas-label=Minimum required alpha characters +passwordpolicy-minalphas-ttip=Reject passwords with fewer than this many alpha characters (uppercase and lowercase 7-bit ASCII) +passwordpolicy-minalphas-columns=4 +passwordpolicy-minuppers-label=Minimum required uppercase characters +passwordpolicy-minuppers-ttip=Reject passwords with fewer than this many uppercase characters (7-bit ASCII) +passwordpolicy-minuppers-columns=4 +passwordpolicy-minlowers-label=Minimum required lowercase characters +passwordpolicy-minlowers-ttip=Reject passwords with fewer than this many lowercase characters (7-bit ASCII) +passwordpolicy-minlowers-columns=4 +passwordpolicy-minspecials-label=Minimum required special characters +passwordpolicy-minspecials-ttip=Reject passwords with fewer than this many special characters (non-alphanumeric 7-bit ASCII) +passwordpolicy-minspecials-columns=4 +passwordpolicy-min8bit-label=Minimum required 8-bit characters +passwordpolicy-min8bit-ttip=Reject passwords with fewer than this many 8-bit or multi-byte characters +passwordpolicy-min8bit-columns=4 +passwordpolicy-maxrepeats-label=Maximum number of repeated characters +passwordpolicy-maxrepeats-ttip=The maximum number of times the same character can sequentially appear in a password +passwordpolicy-maxrepeats-columns=4 +passwordpolicy-mincategories-label=Minimum required character categories +passwordpolicy-mincategories-ttip=The minimum number of character categories that a password must contain (categories are upper, lower, digit, special, and 8-bit) +passwordpolicy-mincategories-columns=4 +passwordpolicy-mintokenlength-label=Minimum token length +passwordpolicy-mintokenlength-ttip=The smallest attribute value used when checking if the password contains account information +passwordpolicy-mintokenlength-columns=4 + passwordpolicy-gracelogin-label=Allow up to passwordpolicy-gracelogin-ttip=Allow this many login attempts after password has expired passwordpolicy-gracelogin-default=3

1 0

[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.2,1.3
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild/ds/ldapserver Modified Files: Makefile Log Message: Add support for x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:29:06 -0000 1.2 +++ Makefile 15 Feb 2006 22:55:46 -0000 1.3 @@ -5,7 +5,7 @@ CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule -MYPATCH = ldapserver-gcc4.patch +#MYPATCH = ldapserver-gcc4.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH) PATCHFILES = @@ -49,7 +49,9 @@ # this is our "custom" patch target post-patch: +ifdef MYPATCH cat $(addprefix download/,$(MYPATCH)) | ( cd work/$(GARNAME)-$(GARVERSION) ; patch -p1 ) +endif $(MAKECOOKIE) configure-custom:

1 0

[Fedora-directory-commits] dsbuild objdirname.mk,1.1.1.1,1.2
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild Modified Files: objdirname.mk Log Message: Add support for x86_64 Index: objdirname.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- objdirname.mk 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2 @@ -76,10 +76,16 @@ PRETTY_ARCH := Linux endif +ifeq ($(USE_64), 1) + NS64TAG=_64 +endif + NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -95,8 +101,10 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -119,6 +127,8 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -132,17 +142,17 @@ OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ else - OBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + OBJDIR_NAME_32 = $(subst $(NS64TAG),,$(OBJDIR_NAME)) + OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ endif # Mozilla uses a slightly different naming convention ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(OBJDIR_NAME) endif

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_replica.c, 1.11, 1.12
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/servers/plugins/replication Modified Files: repl5_replica.c Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: repl5_replica.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- repl5_replica.c 19 Apr 2005 22:07:32 -0000 1.11 +++ repl5_replica.c 15 Feb 2006 22:54:07 -0000 1.12 @@ -108,9 +108,9 @@ static char * _replica_get_config_dn (const Slapi_DN *root); static char * _replica_type_as_string (const Replica *r); /* DBDB, I think this is probably bogus : */ -int replica_create_ruv_tombstone(Replica *r); -void assign_csn_callback(const CSN *csn, void *data); -void abort_csn_callback(const CSN *csn, void *data); +static int replica_create_ruv_tombstone(Replica *r); +static void assign_csn_callback(const CSN *csn, void *data); +static void abort_csn_callback(const CSN *csn, void *data); static void eq_cb_reap_tombstones(time_t when, void *arg); static CSN *_replica_get_purge_csn_nolock (const Replica *r); static void replica_get_referrals_nolock (const Replica *r, char ***referrals);

1 0

[Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.8, 1.9
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm/newinst Modified Files: Makefile Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 22 Sep 2005 16:48:16 -0000 1.8 +++ Makefile 15 Feb 2006 22:54:02 -0000 1.9 @@ -41,12 +41,6 @@ .SUFFIXES: .cc -# We do this to force a 32-bit build of this stuff, even in a 64-bit build -# (because we want to avoid various complexities inherenet in having a 64-bit -# installer rubbing shoulders with other 32-bit stuff at install time). -COMPONENT_DEPS := 1 -override USE_64= - BUILD_ROOT = ../../.. LDAP_SRC = ../.. @@ -96,7 +90,7 @@ BINS=$(addprefix $(BINDEST)/, $(PROGS)) endif INFO= $(OBJDIR)/$(DIR) -PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR) +PATCHINFO= $(ABS_OBJDIR)/$(DIR) # Source for staged installation utilities INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src

1 0

[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.48,1.49
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm Modified Files: Makefile Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Makefile 13 Feb 2006 22:25:33 -0000 1.48 +++ Makefile 15 Feb 2006 22:53:56 -0000 1.49 @@ -254,11 +254,15 @@ ZIP_FLAGS=-r -T -n .gif endif +ifeq ($(ARCH), Linux) +MAKEARCH=$(ARCH) +else ifeq ($(USE_64), 1) MAKEARCH=$(ARCH)64 else MAKEARCH=$(ARCH) endif +endif PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS)) @@ -598,7 +602,7 @@ endif # copy in our product .inf files - $(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd + $(INSTALL) -m 755 $(OBJDIR)/*.inf $(INSTDIR)/slapd # strip the executables in the optimized build ifeq ($(DEBUG), optimize) @@ -668,10 +672,10 @@ # do one last check for aix. aix zip doesn't like -r -T $(ZIP) -T $(INSTDIR)/slapd/ns$(DIR).zip # install the ns-config file into the slapd package directory - $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd + $(INSTALL) -m 755 $(RELDIR)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd # if we are packaging our own version of the components, we need them during setup too - -@for file in $(PACKAGE_SETUP_LIBS_32) ; \ + -@for file in $(PACKAGE_SETUP_LIBS) ; \ do if [ -f $$file ] ; \ then $(INSTALL) -m 755 $$file $(INSTDIR)/slapd ; \ fi ; \

1 0

[Fedora-directory-commits] ldapserver/ldap Makefile, 1.11, 1.12 nsldap.mk, 1.10, 1.11
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap Modified Files: Makefile nsldap.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 22 Sep 2005 16:48:11 -0000 1.11 +++ Makefile 15 Feb 2006 22:53:51 -0000 1.12 @@ -62,16 +62,7 @@ cd systools; $(MAKE) $(MFLAGS) all # new unix installer ifeq ($(USE_SETUPUTIL), 1) - # passing $(OBJDIR) as ORIGINAL_OBJDIR since USE_64 info is cleaned up - # and lost in cm/newinst - cd cm/newinst; $(MAKE) $(MFLAGS) ORIGINAL_OBJDIR=$(ABS_OBJDIR) all -ifeq ($(USE_64),1) - # In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts - # get copied into the 32-bit output directory by the makefile above. However, we later want to package them and expect - # to see them in the 64-bit output directory. So, here we copy them over. - $(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR) - $(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR) -endif # USE_64 + cd cm/newinst; $(MAKE) $(MFLAGS) all endif # USE_SETUPUTIL else # not WINNT ifeq ($(USE_SETUPUTIL), 1) Index: nsldap.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nsldap.mk 3 Oct 2005 19:53:46 -0000 1.10 +++ nsldap.mk 15 Feb 2006 22:53:51 -0000 1.11 @@ -1490,7 +1490,7 @@ # # compiler to use, e.g. CC=cc or CC=gcc -CC=/usr/bin/gcc -fwritable-strings +CC=/usr/bin/gcc # give full path to hostname since it may not be in user's path HOSTNAME=/bin/hostname

1 0

[Fedora-directory-commits] ldapserver buildpaths.mk, 1.10, 1.11 nsarch, 1.6, 1.7 nsconfig.mk, 1.17, 1.18
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver Modified Files: buildpaths.mk nsarch nsconfig.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- buildpaths.mk 10 Feb 2006 23:21:43 -0000 1.10 +++ buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11 @@ -71,10 +71,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsarch =================================================================== RCS file: /cvs/dirsec/ldapserver/nsarch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsarch 19 Apr 2005 22:06:42 -0000 1.6 +++ nsarch 15 Feb 2006 22:53:45 -0000 1.7 @@ -607,6 +607,16 @@ fi ns_printf exit 0 + elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_x86_64"; then + #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 + GNU_NAME="${UNAME_MACHINE}-unknown-linux" + NS_NAME="${UNAME_SYSTEM}" + NS_RELEASE="${UNAME_RELEASE}" + if echo "$NS_RELEASE" | grep >/dev/null 2>&1 "2.0."; then + NS_RELEASE="2.0" + fi + ns_printf + exit 0 elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- nsconfig.mk 16 Nov 2005 03:31:05 -0000 1.17 +++ nsconfig.mk 15 Feb 2006 22:53:45 -0000 1.18 @@ -256,8 +256,10 @@ NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -273,8 +275,10 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -297,6 +301,8 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -337,13 +343,9 @@ NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ endif else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) endif @@ -667,8 +669,8 @@ else ifeq ($(ARCH), Linux) OSVERSION := $(basename $(shell uname -r)) -CC=/usr/bin/gcc -fwritable-strings -CXX=/usr/bin/g++ -fwritable-strings +CC=/usr/bin/gcc +CXX=/usr/bin/g++ CCC=$(CXX) LD=$(CXX) ARCH_DEBUG=-g

1 0

[Fedora-directory-commits] adminserver buildpaths.mk, 1.5, 1.6 nsconfig.mk, 1.23, 1.24 nsdefs.mk, 1.9, 1.10
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/adminserver Modified Files: buildpaths.mk nsconfig.mk nsdefs.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5 +++ buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6 @@ -53,10 +53,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23 +++ nsconfig.mk 15 Feb 2006 22:53:03 -0000 1.24 @@ -47,9 +47,13 @@ NSOS_TEST1 := $(shell uname -m) -ifeq (86, $(findstring 86, $(NSOS_TEST1))) - CPU_ARCH := x86 -else +ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86, $(findstring 86, $(NSOS_TEST1))) + CPU_ARCH := x86 + else + CPU_ARCH := $(NSOS_TEST1) + endif +else CPU_ARCH := $(NSOS_TEST1) endif Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9 +++ nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10 @@ -180,6 +180,9 @@ GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//')) endif endif + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE) +else + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG) endif ifdef BUILD_INTL

1 0

[Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578/setuputil Modified Files: buildpaths.mk nsconfig.mk nsdefs.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- buildpaths.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ buildpaths.mk 15 Feb 2006 22:51:00 -0000 1.2 @@ -58,10 +58,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6 +++ nsconfig.mk 15 Feb 2006 22:51:00 -0000 1.7 @@ -47,37 +47,21 @@ endif ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - ifeq (x86, $(findstring x86, $(NSOS_TEST1))) - NSOS_TMP := $(NSOS_TEST1) - else - NSOS_TMP := x86 - endif - else - NSOS_TMP := $(NSOS_TEST1) - endif ifeq ($(USE_LIBC),1) LIBC_VERSION = _libc else LIBC_VERSION = _glibc endif PTHREAD_TAG = _PTH - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)$(LIBC_VERSION)$(PTHREAD_TAG) NSCONFIG_NOTAG = $(NSCONFIG) - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ else ifeq ($(NSOS_ARCH),RHEL) - NSOS_TMP = $(NSOS_TEST1) - ifeq (86,$(findstring 86,$(NSOS_TMP))) - ifeq (x86, $(findstring x86, $(NSOS_TEST1))) - NSOS_TMP := $(NSOS_TEST1) - else - NSOS_TMP := x86 - endif - endif PTHREAD_TAG = - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) + NSOBJDIR_NAME = $(NSCONFIG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ else ifeq ($(NSOS_TEST1),i86pc) NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) @@ -95,8 +79,8 @@ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJD endif endif + NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ endif - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ endif MAKE=gmake $(BUILDOPT) USE_PTHREADS=$(USE_PTHREADS) SECURITY=$(SECURITY) MOZILLA_SOURCE_ROOT_EXT=$(MOZILLA_SOURCE_ROOT_EXT) @@ -509,18 +493,12 @@ NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) endif NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) endif # platforms without full rtl debugging versions of libraries i.e. not NT NSCP_DIST := $(ABS_ROOT_PARENT)/dist Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsdefs.mk 28 Jan 2006 02:33:14 -0000 1.5 +++ nsdefs.mk 15 Feb 2006 22:51:00 -0000 1.6 @@ -182,13 +182,15 @@ NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/$[0-9][0-9]*\.[0-9][0-9]*$.*/\1/') endif endif + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE) +else + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) endif ifdef BUILD_INTL INTL_DEF=-intl endif -NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST)

1 0

[Fedora-directory-commits] adminutil buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27551/adminutil Modified Files: buildpaths.mk internal_comp_deps.mk nsconfig.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- buildpaths.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1 +++ buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2 @@ -57,10 +57,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- internal_comp_deps.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ internal_comp_deps.mk 15 Feb 2006 22:50:15 -0000 1.2 @@ -146,7 +146,7 @@ # LDAP does not have PTH version, so here is the hack which treat non PTH # version as PTH version ifeq ($(USE_PTHREADS), 1) - LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1) + LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) else LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsconfig.mk 28 Jan 2006 02:29:52 -0000 1.7 +++ nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8 @@ -39,8 +39,12 @@ NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + # if it's x86_64, just leave it - otherwise, convert iX86 to just x86 + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -56,12 +60,11 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 - endif - ifeq ($(USE_64), 1) - NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG) - NSOS_TEST1 := $(NSOS_TEST2) + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + # if it's x86_64, just leave it - otherwise, convert iX86 to just x86 + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -84,6 +87,9 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif +# add _64 tag on all platforms except linux/rhel + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -469,17 +475,13 @@ NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) endif else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ endif # platforms without full rtl debugging versions of libraries i.e. not NT NSCP_DIST := $(ABS_ROOT_PARENT)/dist

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.4.2.2, 1.4.2.3 testdatainterop.c, 1.4.2.2, 1.4.2.3 testentry.c, 1.4.2.2, 1.4.2.3 testextendedop.c, 1.4.2.2, 1.4.2.3 testgetip.c, 1.4.2.2, 1.4.2.3 testpostop.c, 1.4.2.2, 1.4.2.3 testpreop.c, 1.4.2.3, 1.4.2.4 testsaslbind.c, 1.6.2.2, 1.6.2.3
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/servers/slapd/test-plugins Modified Files: Tag: Directory71RtmBranch testbind.c testdatainterop.c testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testbind.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testbind.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -69,7 +69,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP2", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testdatainterop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testdatainterop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP1", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP2", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testentry.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testentry.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -90,7 +90,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP2", "sample entry modification plugin" }; /* Entry store plug-in function */ Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testextendedop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testextendedop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP2", "sample extended operation plugin" }; Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testgetip.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testgetip.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP2", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testpostop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testpostop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -93,7 +93,7 @@ static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP2", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- testpreop.c 31 Aug 2005 21:41:24 -0000 1.4.2.3 +++ testpreop.c 15 Feb 2006 21:32:43 -0000 1.4.2.4 @@ -79,7 +79,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP2", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- testsaslbind.c 31 Aug 2005 21:41:24 -0000 1.6.2.2 +++ testsaslbind.c 15 Feb 2006 21:32:43 -0000 1.6.2.3 @@ -80,7 +80,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP2", "sample SASL bind pre-operation plugin" };

1 0

[Fedora-directory-commits] ldapserver/ldap/docs README.txt, 1.2.2.2, 1.2.2.3
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/docs Modified Files: Tag: Directory71RtmBranch README.txt Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: README.txt =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- README.txt 12 Sep 2005 18:13:40 -0000 1.2.2.2 +++ README.txt 15 Feb 2006 21:32:38 -0000 1.2.2.3 @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 7.1 SP1 + Fedora Directory Server 7.1 SP2 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the

1 0

[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, 1.1.2.6, 1.1.2.7 slapd-patch.inf, 1.1.2.2, 1.1.2.3
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm/newinst Modified Files: Tag: Directory71RtmBranch setup.patch slapd-patch.inf Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file setup.patch: Index: setup.patch =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- setup.patch 17 Nov 2005 23:29:42 -0000 1.1.2.6 +++ setup.patch 15 Feb 2006 21:32:32 -0000 1.1.2.7 @@ -73,8 +73,12 @@ echo "" echo "To accept the default shown in brackets, press the Enter key." echo "" -printf "Install location [/opt/fedora/servers]: " +defaultserverroot=/opt/fedora-ds +printf "Install location [$defaultserverroot]: " read serverroot +if [ "$serverroot" = "" ]; then + serverroot=$defaultserverroot +fi if [ ! -d $serverroot ]; then echo "" @@ -243,10 +247,10 @@ echo "ConfigDirectoryAdminID= $adminid" >> $inffile echo "AdminDomain= $admindomain" >> $inffile echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile -echo "Components= slapd-71sp1" >> $inffile +echo "Components= slapd-71sp2" >> $inffile echo "" >> $inffile -echo "[slapd-71sp1]" >> $inffile -echo "Components= slapd-71sp1" >> $inffile +echo "[slapd-71sp2]" >> $inffile +echo "Components= slapd-71sp2" >> $inffile clear Index: slapd-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd-patch.inf,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- slapd-patch.inf 16 Sep 2005 20:01:26 -0000 1.1.2.2 +++ slapd-patch.inf 15 Feb 2006 21:32:32 -0000 1.1.2.3 @@ -38,17 +38,17 @@ # [General] Name= %%%SERVER_NAME%%% -Components=slapd-71sp1 +Components=slapd-71sp2 -[slapd-71sp1] +[slapd-71sp2] Name= %%%SERVER_NAME%%% InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% Description= %%%SERVER_NAME%%% -NickName= slapd-71sp1 +NickName= slapd-71sp2 Version= %%%SERVER_VERSION%%% BuildNumber= %%%SERVER_BUILD_NUM%%% -Archive= nsslapd-71sp1.zip -SourcePath=slapd-71sp1 +Archive= nsslapd-71sp2.zip +SourcePath=slapd-71sp2 PreInstall= ns-config -r PostInstall= bin/slapd/admin/bin/ns-update PreUninstall= bin/slapd/admin/bin/uninstall

1 0

[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.12, 1.30.2.13 fedora-patch.inf, 1.1.2.6, 1.1.2.7 genRpmPatch.pl, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.6, 1.1.2.7
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm Modified Files: Tag: Directory71RtmBranch Makefile fedora-patch.inf genRpmPatch.pl redhat-patch.inf Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.12 retrieving revision 1.30.2.13 diff -u -r1.30.2.12 -r1.30.2.13 --- Makefile 22 Oct 2005 07:00:03 -0000 1.30.2.12 +++ Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13 @@ -106,9 +106,9 @@ endif ifdef USE_64 -VERSION=-ver 7.1SP1-64bit +VERSION=-ver 7.1SP2-64bit else -VERSION=-ver 7.1SP1 +VERSION=-ver 7.1SP2 endif ifeq ($(ARCH), HPUX) @@ -191,9 +191,6 @@ SHARETOP = $(COMPONENTS_DIR)/ldapsdk BUILD_DATE = $(shell date +%Y%m%d) SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR) -#ADM_VERSDIR = admserv40 -#ADM_RELDATE = untested/19980119 -#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME) # these are files and directories in the import adminsrv directory which we don't # make a local copy of, we just import directly into the tar file or create a @@ -235,7 +232,7 @@ ifdef BUILD_PATCH PATCHINSTDIR = $(ABS_INSTDIR)-SP -SLAPDSP = slapd-71sp1 +SLAPDSP = slapd-71sp2 endif INST_TARGET_RESKIT=$(INSTDIR)/reskit @@ -271,7 +268,7 @@ ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=7.1SP1 + RPM_VERSION=7.1SP2 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files @@ -655,21 +652,6 @@ endif endif -ifdef BUILD_PATCH -# take care of files in components (e.g., a file in nsadmin.zip) - -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ - zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ - afile=`echo $$pair | awk -F: '{print $$2}'` ; \ - cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ - done -ifdef BUILD_RPM -# create a patch - $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v - mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original - ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) -endif -endif - # create the slapd-client.zip file, which only has the ds jar file for the console and # the ldap client utility programs rm -f $(INSTDIR)/slapd/slapd-client.zip @@ -730,6 +712,26 @@ $(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \ fi +ifdef BUILD_PATCH +# copying a file from the component area + -@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \ + zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \ + sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ + dfile=`echo $$pair | awk -F: '{print $$3}'` ; \ + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \ + mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \ + echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ + $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ + done + +ifdef BUILD_RPM +# create a patch + $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v + mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original + ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) +endif #BUILD_RPM +endif #BUILD_PATCH + # we must remove the nsbase.zip file - we package those files now rm -f $(INSTDIR)/base/nsbase.zip # we also need to remove the Archive directive from the [base] section of the @@ -831,6 +833,7 @@ # create a zip file based upon the $(PATCHINF) file cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'` cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` # put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP) -@for file in $(PACKAGE_SETUP_LIBS_32) ; \ @@ -842,6 +845,7 @@ cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2 echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2 Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6 +++ fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 @@ -36,17 +36,17 @@ # All rights reserved. # END COPYRIGHT BLOCK # -# Info file to generate DS7.1 SP1 patch +# Info file to generate DS7.1 SP2 patch # base: <builddir> containing the base package -- DS7.1 # file: bug#: <patchfile> # compfile: bug#: <patch_zipfile>:<patchfile> # %DISTDIR% points <buildroot>/dist/<platform> # -base: /share/dev4/fedora-ds/fds71/ships/20050526.1 +base: ... file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.* @@ -60,5 +60,26 @@ file: 169388,169954,170071,170350: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt +file: M324525,M324529: shared/lib/libldap50.so +file: M324525,M324529: shared/lib/libprldap50.so +file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: bin/slapd/lib/libldap50.so +file: M324525,M324529: bin/slapd/lib/libprldap50.so +file: M324525,M324529: bin/slapd/lib/libssldap50.so +file: M324525,M324529: clients/lib/libldap50.so +file: M324525,M324529: clients/lib/libprldap50.so +file: M324525,M324529: clients/lib/libssldap50.so +file: M324525,M324529: shared/bin/ldapcmp +file: M324525,M324529: shared/bin/ldapcompare +file: M324525,M324529: shared/bin/ldapdelete +file: M324525,M324529: shared/bin/ldapmodify +file: M324525,M324529: shared/bin/ldapsearch + +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help Index: genRpmPatch.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3 +++ genRpmPatch.pl 15 Feb 2006 21:32:27 -0000 1.1.2.4 @@ -129,16 +129,11 @@ $pos = rindex($l, ":", $pos); $pos++; $file = substr($l, $pos); - $file =~ s/[ ]//g; - push(@newfiles, ($file)); - } elsif ($l =~ /^compfile: /) { - $pos = rindex($l, ":", $pos); - $pos++; - $file = substr($l, $pos); - $file =~ s/[ ]//g; + $file =~ s/[ ]//g; push(@newfiles, ($file)); } } +close(INFFILE); if (1 == $verbose) { print "Base: $basedir\n"; print "New Files:\n"; Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6 +++ redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 @@ -36,17 +36,17 @@ # All rights reserved. # END COPYRIGHT BLOCK # -# Info file to generate DS7.1 SP1 patch +# Info file to generate DS7.1 SP2 patch # base: <builddir> containing the base package -- DS7.1 # file: bug#: <patchfile> # compfile: bug#: <patch_zipfile>:<patchfile> # %DISTDIR% points <buildroot>/dist/<platform> # -base: /share/dev4/ds/ds71/ships/20050524.1 +base: /share/builds/products/server/directry/7.1 file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.* @@ -60,5 +60,26 @@ file: 169388,169954,170071,170350: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt +file: M324525,M324529: shared/lib/libldap50.so +file: M324525,M324529: shared/lib/libprldap50.so +file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: shared/bin/ldapcmp +file: M324525,M324529: shared/bin/ldapcompare +file: M324525,M324529: shared/bin/ldapdelete +file: M324525,M324529: shared/bin/ldapmodify +file: M324525,M324529: shared/bin/ldapsearch +file: M324525,M324529: bin/slapd/lib/libldap50.so +file: M324525,M324529: bin/slapd/lib/libprldap50.so +file: M324525,M324529: bin/slapd/lib/libssldap50.so +file: M324525,M324529: clients/lib/libldap50.so +file: M324525,M324529: clients/lib/libprldap50.so +file: M324525,M324529: clients/lib/libssldap50.so + +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help

1 0

[Fedora-directory-commits] ldapserver/include version.h, 1.6.2.1, 1.6.2.2
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/include Modified Files: Tag: Directory71RtmBranch version.h Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- version.h 31 Aug 2005 21:40:48 -0000 1.6.2.1 +++ version.h 15 Feb 2006 21:32:21 -0000 1.6.2.2 @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "7.1 SP1" +#define DIRECTORY_VERSION_DEF "7.1 SP2" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP2" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING

1 0

[Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.2, 1.35.2.3 components.mk, 1.30, 1.30.2.1 internal_comp_deps.mk, 1.24, 1.24.2.1 ldapserver.spec.tmpl, 1.10.2.7, 1.10.2.8 nsdefs.mk, 1.11.2.2, 1.11.2.3
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857 Modified Files: Tag: Directory71RtmBranch component_versions.mk components.mk internal_comp_deps.mk ldapserver.spec.tmpl nsdefs.mk Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.35.2.2 retrieving revision 1.35.2.3 diff -u -r1.35.2.2 -r1.35.2.3 --- component_versions.mk 22 Oct 2005 00:07:40 -0000 1.35.2.2 +++ component_versions.mk 15 Feb 2006 21:32:16 -0000 1.35.2.3 @@ -81,7 +81,7 @@ # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.16 + LDAP_RELDATE = v5.17 endif ifndef LDAPCOMP_DIR LDAPCOMP_DIR=ldapsdk50 Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -r1.30 -r1.30.2.1 --- components.mk 16 May 2005 21:58:00 -0000 1.30 +++ components.mk 15 Feb 2006 21:32:16 -0000 1.30.2.1 @@ -296,13 +296,15 @@ else LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib LDAPSDK_INCDIR = $(LDAP_ROOT)/include - LDAPSDK_BINPATH = $(LDAP_ROOT)/tools + LDAPSDK_BINPATH = $(LDAP_ROOT)/bin endif LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR) # package the command line programs -LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX)) -BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS) +LDAPSDK_BINNAMES = ldapcmp ldapcompare ldapdelete ldapmodify ldapsearch +LDAPSDK_TOOLS = $(addsuffix $(EXE_SUFFIX),$(LDAPSDK_BINNAMES)) +LDAPSDK_TOOLS_FULLPATH = $(addprefix $(LDAPSDK_BINPATH)/, $(LDAPSDK_TOOLS)) +BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS_FULLPATH) # package the include files - needed for the plugin API LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h) PACKAGE_SRC_DEST += $(subst $(SPACE),$(SPACE)plugins/slapd/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES)) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- internal_comp_deps.mk 18 May 2005 13:38:57 -0000 1.24 +++ internal_comp_deps.mk 15 Feb 2006 21:32:16 -0000 1.24.2.1 @@ -236,7 +236,7 @@ mkdir -p $(LDAP_LIBPATH) $(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \ -objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \ - -files include,$(LDAPSDK_PULL_LIBS),tools + -files include,$(LDAPSDK_PULL_LIBS),bin endif -@if [ ! -f $@ ] ; \ then echo "Error: could not get component LDAPSDK file $@" ; \ Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10.2.7 retrieving revision 1.10.2.8 diff -u -r1.10.2.7 -r1.10.2.8 --- ldapserver.spec.tmpl 14 Oct 2005 17:32:46 -0000 1.10.2.7 +++ ldapserver.spec.tmpl 15 Feb 2006 21:32:16 -0000 1.10.2.8 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP@-ds Version: @GEN-VERSION@ -Release: 3.@PLATFORM@ +Release: 4.@PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- nsdefs.mk 10 Sep 2005 00:41:45 -0000 1.11.2.2 +++ nsdefs.mk 15 Feb 2006 21:32:16 -0000 1.11.2.3 @@ -265,8 +265,8 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=7.1 SP1 -NOSP_DIR_VERSION:=7.1SP1 +DIR_VERSION:=7.1 SP2 +NOSP_DIR_VERSION:=7.1SP2 DIR_NORM_VERSION:=7.1 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd passwd_extop.c, 1.6, 1.7
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24719 Modified Files: passwd_extop.c Log Message: Bug(s) fixed: 181587 Bug Description: Password Modify LDAPv3 extended operation erroneously forces the client to supply old password Reviewed by: Pete & Nathan (Thanks!) Fix Description: If the BIND operation was successful, the CONN_DN field is always set to the proper DN. This is even the case during a SASL or client cert DN if the authentication was successful AND the given identity could be mapped to a real user in the directory. Also, the authmethod will be something other than NULL or none. So, if the old password was not given, that is ok if there is a non-anonymous bind DN and a real authmethod. The rest of the operation passes through the usual access control. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: passwd_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- passwd_extop.c 19 Apr 2005 22:07:36 -0000 1.6 +++ passwd_extop.c 15 Feb 2006 21:22:46 -0000 1.7 @@ -201,6 +201,7 @@ { char *oid = NULL; char *bindDN = NULL; + char *authmethod = NULL; char *dn = NULL; char *oldPasswd = NULL; char *newPasswd = NULL; @@ -297,6 +298,7 @@ { if ( ber_scanf( ber, "a", &dn) == LBER_ERROR ) { + slapi_ch_free_string(&dn); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at userID parse.\n"; @@ -313,6 +315,7 @@ { if ( ber_scanf( ber, "a", &oldPasswd ) == LBER_ERROR ) { + slapi_ch_free_string(&oldPasswd); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at oldPasswd parse.\n"; @@ -320,10 +323,6 @@ goto free_and_return; } tag = ber_peek_tag( ber, &len); - } else { - errMesg = "Current passwd must be supplied by the user.\n"; - rc = LDAP_PARAM_ERROR; - goto free_and_return; } /* identify newPasswd field by tags */ @@ -331,6 +330,7 @@ { if ( ber_scanf( ber, "a", &newPasswd ) == LBER_ERROR ) { + slapi_ch_free_string(&newPasswd); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at newPasswd parse.\n"; @@ -348,12 +348,27 @@ dn, oldPasswd, newPasswd); */ - if (oldPasswd == NULL || *oldPasswd == '\0') { - /* Refuse to handle this operation because current password is not provided */ - errMesg = "Current passwd must be supplied by the user.\n"; - rc = LDAP_PARAM_ERROR; + /* Get Bind DN */ + slapi_pblock_get( pb, SLAPI_CONN_DN, &bindDN ); + + /* If the connection is bound anonymously, we must refuse to process this operation. */ + if (bindDN == NULL || *bindDN == '\0') { + /* Refuse the operation because they're bound anonymously */ + errMesg = "Anonymous Binds are not allowed.\n"; + rc = LDAP_INSUFFICIENT_ACCESS; goto free_and_return; } + + if (oldPasswd == NULL || *oldPasswd == '\0') { + /* If user is authenticated, they already gave their password during + the bind operation (or used sasl or client cert auth) */ + slapi_pblock_get(pb, SLAPI_CONN_AUTHMETHOD, &authmethod); + if (!authmethod || !strcmp(authmethod, SLAPD_AUTH_NONE)) { + errMesg = "User must be authenticated to the directory server.\n"; + rc = LDAP_INSUFFICIENT_ACCESS; + goto free_and_return; + } + } /* We don't implement password generation, so if the request implies * that they asked us to do that, we must refuse to process it */ @@ -364,22 +379,12 @@ goto free_and_return; } - /* Get Bind DN */ - slapi_pblock_get( pb, SLAPI_CONN_DN, &bindDN ); - - /* If the connection is bound anonymously, we must refuse to process this operation. */ - if (bindDN == NULL || *bindDN == '\0') { - /* Refuse the operation because they're bound anonymously */ - errMesg = "Anonymous Binds are not allowed.\n"; - rc = LDAP_INSUFFICIENT_ACCESS; - goto free_and_return; - } /* Determine the target DN for this operation */ /* Did they give us a DN ? */ if (dn == NULL || *dn == '\0') { /* Get the DN from the bind identity on this connection */ - dn = bindDN; + dn = slapi_ch_strdup(bindDN); LDAPDebug( LDAP_DEBUG_ANY, "Missing userIdentity in request, using the bind DN instead.\n", 0, 0, 0 ); @@ -433,13 +438,15 @@ * They gave us a password (old), check it against the target entry * Is the old password valid ? */ - ret = passwd_check_pwd(targetEntry, oldPasswd); - if (ret) { - /* No, then we fail this operation */ - errMesg = "Invalid oldPasswd value.\n"; - rc = ret; - goto free_and_return; - } + if (oldPasswd && *oldPasswd) { + ret = passwd_check_pwd(targetEntry, oldPasswd); + if (ret) { + /* No, then we fail this operation */ + errMesg = "Invalid oldPasswd value.\n"; + rc = ret; + goto free_and_return; + } + } /* Now we're ready to make actual password change */ @@ -455,7 +462,17 @@ /* Free anything that we allocated above */ free_and_return: - + + slapi_ch_free_string(&oldPasswd); + slapi_ch_free_string(&newPasswd); + /* Either this is the same pointer that we allocated and set above, + or whoever used it should have freed it and allocated a new + value that we need to free here */ + slapi_pblock_get( pb, SLAPI_ORIGINAL_TARGET, &dn ); + slapi_ch_free_string(&dn); + slapi_pblock_set( pb, SLAPI_ORIGINAL_TARGET, NULL ); + slapi_ch_free_string(&authmethod); + if ( targetEntry != NULL ){ slapi_entry_free (targetEntry); } @@ -465,9 +482,8 @@ ber = NULL; } - slapi_log_error( SLAPI_LOG_PLUGIN, "passwd_modify_extop", - errMesg ); + errMesg ? errMesg : "success" ); send_ldap_result( pb, rc, NULL, errMesg, 0, NULL );

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/slapd libglobs.c, 1.7, 1.8
by Doctor Conrad 15 Feb '06

15 Feb '06

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3170 Modified Files: libglobs.c Log Message: Bug(s) fixed: 181032 Bug Description: Most of our integer based config parameters do not do a good job validating input. For example, alphabetic characters will be accepted as a value if "0" is a valid setting for a given parameter since atoi returns "0" on error. We also don't properly check for range errors for many parameters. Reviewed by: Rich, Pete, and Noriko (Thanks!) Files: ldapserver/ldap/servers/slapd/libglobs.c Branch: HEAD Fix Description: This adds better input validation for a number of integer based config settings. I replaced our usage of atoi() with strtol() so we can recognize conversion errors. I also added more descriptive error strings where they were missing. I revised the fix due to feedback from Noriko. She recommended that we check for ERANGE areas for all calls to strtol insead of only checking when LONG_MAX is a valid setting for a config parameter. Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libglobs.c 25 Jan 2006 16:51:39 -0000 1.7 +++ libglobs.c 15 Feb 2006 00:26:19 -0000 1.8 @@ -950,7 +950,8 @@ int config_set_port( const char *attrname, char *port, char *errorbuf, int apply ) { - int nPort; + long nPort; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); int retVal = LDAP_SUCCESS; @@ -958,17 +959,20 @@ return LDAP_OPERATIONS_ERROR; } - nPort = atoi( port ); + errno = 0; + nPort = strtol(port, &endp, 10); - if ( nPort == 0 ) { - LDAPDebug( LDAP_DEBUG_ANY, - "Information: Non-Secure Port Disabled, server only contactable via secure port\n", 0, 0, 0 ); - } - else if (nPort > LDAP_PORT_MAX || nPort < 0 ) { + if ( *endp != '\0' || errno == ERANGE || nPort > LDAP_PORT_MAX || nPort < 0 ) { retVal = LDAP_OPERATIONS_ERROR; PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: %d is invalid, ports must range from 1 to %d", - attrname, nPort, LDAP_PORT_MAX ); + "%s: \"%s\" is invalid, ports must range from 0 to %d", + attrname, port, LDAP_PORT_MAX ); + return retVal; + } + + if ( nPort == 0 ) { + LDAPDebug( LDAP_DEBUG_ANY, + "Information: Non-Secure Port Disabled, server only contactable via secure port\n", 0, 0, 0 ); } if ( apply ) { @@ -984,19 +988,23 @@ int config_set_secureport( const char *attrname, char *port, char *errorbuf, int apply ) { - int nPort = atoi ( port ); + long nPort; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); int retVal = LDAP_SUCCESS; if ( config_value_is_null( attrname, port, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + nPort = strtol(port, &endp, 10); - if (nPort > LDAP_PORT_MAX || nPort <= 0 ) { + if (*endp != '\0' || errno == ERANGE || nPort > LDAP_PORT_MAX || nPort <= 0 ) { retVal = LDAP_OPERATIONS_ERROR; PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: %d is invalid, ports must range from 1 to %d", - attrname, nPort, LDAP_PORT_MAX ); + "%s: \"%s\" is invalid, ports must range from 1 to %d", + attrname, port, LDAP_PORT_MAX ); } if (apply) { @@ -1159,23 +1167,27 @@ int config_set_sizelimit( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; + long sizelimit; + char *endp = NULL; Slapi_Backend *be; char *cookie; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); - int sizelimit = atoi ( value ); - if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - if ( sizelimit < -1 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: %d is too small", - attrname, sizelimit ); + errno = 0; + sizelimit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || sizelimit < -1 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: \"%s\" is invalid, sizelimit must range from -1 to %ld", + attrname, value, LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } - + if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -1347,15 +1359,20 @@ int config_set_pw_minlength( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minLength = 0; + int retVal = LDAP_SUCCESS; + long minLength = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minLength = atoi(value); - if ( minLength < 2 || minLength > 512 ) { + errno = 0; + minLength = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minLength < 2 || minLength > 512 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum length \"%s\" is invalid. " "The minimum length must range from 2 to 512.", @@ -1377,15 +1394,20 @@ int config_set_pw_mindigits( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minDigits = 0; + int retVal = LDAP_SUCCESS; + long minDigits = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minDigits = atoi(value); - if ( minDigits < 0 || minDigits > 64 ) { + errno = 0; + minDigits = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minDigits < 0 || minDigits > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of digits \"%s\" is invalid. " "The minimum number of digits must range from 0 to 64.", @@ -1407,15 +1429,20 @@ int config_set_pw_minalphas( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minAlphas = 0; + int retVal = LDAP_SUCCESS; + long minAlphas = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minAlphas = atoi(value); - if ( minAlphas < 0 || minAlphas > 64 ) { + errno = 0; + minAlphas = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minAlphas < 0 || minAlphas > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of alphas \"%s\" is invalid. " "The minimum number of alphas must range from 0 to 64.", @@ -1437,15 +1464,20 @@ int config_set_pw_minuppers( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minUppers = 0; + int retVal = LDAP_SUCCESS; + long minUppers = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minUppers = atoi(value); - if ( minUppers < 0 || minUppers > 64 ) { + errno = 0; + minUppers = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minUppers < 0 || minUppers > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of uppercase characters \"%s\" is invalid. " "The minimum number of uppercase characters must range from 0 to 64.", @@ -1467,15 +1499,20 @@ int config_set_pw_minlowers( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minLowers = 0; + int retVal = LDAP_SUCCESS; + long minLowers = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minLowers = atoi(value); - if ( minLowers < 0 || minLowers > 64 ) { + errno = 0; + minLowers = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minLowers < 0 || minLowers > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of lowercase characters \"%s\" is invalid. " "The minimum number of lowercase characters must range from 0 to 64.", @@ -1497,15 +1534,20 @@ int config_set_pw_minspecials( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minSpecials = 0; + int retVal = LDAP_SUCCESS; + long minSpecials = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minSpecials = atoi(value); - if ( minSpecials < 0 || minSpecials > 64 ) { + errno = 0; + minSpecials = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minSpecials < 0 || minSpecials > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of special characters \"%s\" is invalid. " "The minimum number of special characters must range from 0 to 64.", @@ -1527,15 +1569,20 @@ int config_set_pw_min8bit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, min8bit = 0; + int retVal = LDAP_SUCCESS; + long min8bit = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - min8bit = atoi(value); - if ( min8bit < 0 || min8bit > 64 ) { + errno = 0; + min8bit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || min8bit < 0 || min8bit > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of 8-bit characters \"%s\" is invalid. " "The minimum number of 8-bit characters must range from 0 to 64.", @@ -1557,15 +1604,20 @@ int config_set_pw_maxrepeats( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxRepeats = 0; + int retVal = LDAP_SUCCESS; + long maxRepeats = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxRepeats = atoi(value); - if ( maxRepeats < 0 || maxRepeats > 64 ) { + errno = 0; + maxRepeats = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || maxRepeats < 0 || maxRepeats > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password maximum number of repeated characters \"%s\" is invalid. " "The maximum number of repeated characters must range from 0 to 64.", @@ -1587,15 +1639,20 @@ int config_set_pw_mincategories( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minCategories = 0; + int retVal = LDAP_SUCCESS; + long minCategories = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minCategories = atoi(value); - if ( minCategories < 1 || minCategories > 5 ) { + errno = 0; + minCategories = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minCategories < 1 || minCategories > 5 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of categories \"%s\" is invalid. " "The minimum number of categories must range from 1 to 5.", @@ -1617,15 +1674,20 @@ int config_set_pw_mintokenlength( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minTokenLength = 0; + int retVal = LDAP_SUCCESS; + long minTokenLength = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minTokenLength = atoi(value); - if ( minTokenLength < 1 || minTokenLength > 64 ) { + errno = 0; + minTokenLength = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minTokenLength < 1 || minTokenLength > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum token length \"%s\" is invalid. " "The minimum token length must range from 1 to 64.", @@ -1647,15 +1709,20 @@ int config_set_pw_maxfailure( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxFailure = 0; + int retVal = LDAP_SUCCESS; + long maxFailure = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxFailure = atoi(value); - if ( maxFailure <= 0 || maxFailure > 32767 ) { + errno = 0; + maxFailure = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || maxFailure <= 0 || maxFailure > 32767 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password maximum retry \"%s\" is invalid. " "Password maximum failure must range from 1 to 32767", @@ -1679,15 +1746,20 @@ int config_set_pw_inhistory( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, history = 0; + int retVal = LDAP_SUCCESS; + long history = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - history = atoi(value); - if ( history < 2 || history > 24 ) { + errno = 0; + history = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || history < 2 || history > 24 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password history length \"%s\" is invalid. " "The password history must range from 2 to 24", @@ -1712,16 +1784,19 @@ config_set_pw_lockduration( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long duration = 0; /* in minutes */ + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - duration = strtol (value, NULL, 0); + duration = strtol(value, &endp, 10); - if ( duration <= 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + if ( *endp != '\0' || errno == ERANGE || duration <= 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password lockout duration \"%s\" seconds is invalid. ", value ); @@ -1741,15 +1816,19 @@ config_set_pw_resetfailurecount( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long duration = 0; /* in minutes */ + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - duration = strtol (value, NULL, 0); - if ( duration < 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + duration = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || duration < 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password reset count duration \"%s\" seconds is invalid. ", value ); @@ -1824,18 +1903,22 @@ int config_set_pw_gracelimit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, gracelimit = 0; + int retVal = LDAP_SUCCESS; + long gracelimit = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - - gracelimit = atoi(value); - if ( gracelimit < 0 ) { + errno = 0; + gracelimit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || gracelimit < 0 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password grace limit \"%s\" is invalid.", - value ); + "password grace limit \"%s\" is invalid, password grace limit must range from 0 to %ld", + value , LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2296,17 +2379,21 @@ int config_set_threadnumber( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, threadnum = 0; + int retVal = LDAP_SUCCESS; + long threadnum = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - threadnum = atoi ( value ); + errno = 0; + threadnum = strtol(value, &endp, 10); - if ( threadnum < 1 || threadnum > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum thread number must range from 1 to 65535", attrname, threadnum ); + if ( *endp != '\0' || errno == ERANGE || threadnum < 1 || threadnum > 65535 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum thread number must range from 1 to 65535", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } @@ -2321,17 +2408,21 @@ int config_set_maxthreadsperconn( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxthreadnum = 0; + int retVal = LDAP_SUCCESS; + long maxthreadnum = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxthreadnum = atoi ( value ); + errno = 0; + maxthreadnum = strtol(value, &endp, 10); - if ( maxthreadnum < 1 || maxthreadnum > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum thread number per connection must range from 1 to 65535", attrname, maxthreadnum ); + if ( *endp != '\0' || errno == ERANGE || maxthreadnum < 1 || maxthreadnum > 65535 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum thread number per connection must range from 1 to 65535", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } @@ -2348,29 +2439,34 @@ #include <sys/resource.h> int config_set_maxdescriptors( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; int maxVal = 65535; struct rlimit rlp; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { - maxVal = (int)rlp.rlim_max; + maxVal = (int)rlp.rlim_max; } - - if ( nValue < 1 || nValue > maxVal ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum file descriptors must range from 1 to %d (the current process limit)", - attrname, nValue, maxVal ); - if ( nValue < 1 ) { - retVal = LDAP_OPERATIONS_ERROR; - } else { - nValue = maxVal; - retVal = LDAP_UNWILLING_TO_PERFORM; - } + + errno = 0; + nValue = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum file descriptors must range from 1 to %d (the current process limit)", + attrname, value, maxVal ); + if ( nValue > maxVal ) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } if (apply) { @@ -2385,8 +2481,10 @@ int config_set_conntablesize( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; int maxVal = 65535; + char *endp = NULL; #ifndef _WIN32 struct rlimit rlp; #endif @@ -2396,27 +2494,31 @@ return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); +#ifndef _WIN32 + if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { + maxVal = (int)rlp.rlim_max; + } +#endif + + errno = 0; + nValue = strtol(value, &endp, 0); #ifdef _WIN32 - if ( nValue < 1 || nValue > 0xfffffe ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, connection table size must range from 1 to 0xfffffe", attrname, nValue ); + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > 0xfffffe ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", connection table size must range from 1 to 0xfffffe", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } #elif !defined(AIX) - if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { - maxVal = (int)rlp.rlim_max; - } - if ( nValue < 1 || nValue > maxVal ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, connection table size must range from 1 to %d (the current process maxdescriptors limit)", - attrname, nValue, maxVal ); - if ( nValue < 1 ) { - retVal = LDAP_OPERATIONS_ERROR; - } else { - nValue = maxVal; - retVal = LDAP_UNWILLING_TO_PERFORM; - } + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", connection table size must range from 1 to %d" + " (the current process maxdescriptors limit)", attrname, value, maxVal ); + if ( nValue > maxVal) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } #endif @@ -2431,18 +2533,38 @@ int config_set_reservedescriptors( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + int maxVal = 65535; + long nValue = 0; + char *endp = NULL; +#ifndef _WIN32 + struct rlimit rlp; +#endif + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); +#ifndef _WIN32 + if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { + maxVal = (int)rlp.rlim_max; + } +#endif + + errno = 0; + nValue = strtol(value, &endp, 10); - if ( nValue < 1 || nValue > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, reserved file descriptors must range from 1 to 65535", attrname, nValue ); - retVal = LDAP_OPERATIONS_ERROR; + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", reserved file descriptors must range from 1 to %d" + " (the current process maxdescriptors limit)", attrname, value, maxVal ); + if ( nValue > maxVal) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } if (apply) { @@ -2458,14 +2580,25 @@ int config_set_ioblocktimeout( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nValue < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", I/O block timeout must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } #if defined(IRIX) /* on IRIX poll can only handle timeouts up to @@ -2489,14 +2622,25 @@ int config_set_idletimeout( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); + + if (*endp != '\0' || errno == ERANGE || nValue < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", idle timeout must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -2511,19 +2655,25 @@ int config_set_groupevalnestlevel( const char *attrname, char * value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); - if ( nValue < 1 ) { + if ( *endp != '\0' || errno == ERANGE || nValue < 0 || nValue > 5 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: invalid value %d, must be a positive number", - attrname, nValue ); + "%s: invalid value \"%s\", group eval nest level must range from 0 to 5", + attrname, value ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; } if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -2571,7 +2721,9 @@ int config_set_timelimit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nVal = 0; + int retVal = LDAP_SUCCESS; + long nVal = 0; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); Slapi_Backend *be = NULL; char *cookie; @@ -2582,10 +2734,15 @@ return LDAP_OPERATIONS_ERROR; } - nVal = atoi(value); - if ( nVal < 0 ) { + errno = 0; + nVal = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nVal < 0 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: invalid value %d", attrname, nVal ); + "%s: invalid value \"%s\", time limit must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; } if ( apply ) { @@ -2699,22 +2856,27 @@ } return retVal; } + int config_set_pw_maxage( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long age; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* age in seconds */ - age = strtol(value, NULL, 0 ); - if ( age <= 0 || age > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + age = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || age <= 0 || age > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password maximum age \"%s\" seconds is invalid. ", - value ); + "%s: password maximum age \"%s\" seconds is invalid. ", + attrname, value ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2736,6 +2898,7 @@ return LDAP_OPERATIONS_ERROR; } + errno = 0; /* age in seconds */ age = strtol(value, &endPtr, 0 ); /* endPtr should never be NULL, but we check just in case; if the @@ -2750,10 +2913,11 @@ */ if ( (age < 0) || (age > (MAX_ALLOWED_TIME_IN_SECS - current_time())) || - (endPtr == NULL) || (endPtr == value) || !isdigit(*(endPtr-1)) ) { + (endPtr == NULL) || (endPtr == value) || !isdigit(*(endPtr-1)) || + errno == ERANGE ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password minimum age \"%s\" seconds is invalid. ", - value ); + "%s: password minimum age \"%s\" seconds is invalid. ", + attrname, value ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2768,19 +2932,23 @@ config_set_pw_warning( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long sec; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - sec = strtol(value, NULL, 0); - if (sec < 0) { + sec = strtol(value, &endp, 10); + + if (*endp != '\0' || errno == ERANGE || sec < 0) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password warning age \"%s\" seconds is invalid, password warning " - "age must be >= 0 seconds", - value ); + "%s: password warning age \"%s\" seconds is invalid, password warning " + "age must range from 0 to %ld seconds", + attrname, value, LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2795,16 +2963,28 @@ int config_set_errorlog_level( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, level = 0; + int retVal = LDAP_SUCCESS; + long level = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + level = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || level < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: error log level \"%s\" is invalid," + " error log level must range from 0 to %ld", attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if ( apply ) { CFG_LOCK_WRITE(slapdFrontendConfig); - level = atoi ( value ); level |= LDAP_DEBUG_ANY; #ifdef _WIN32 @@ -2821,16 +3001,28 @@ int config_set_accesslog_level( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, level = 0; + int retVal = LDAP_SUCCESS; + long level = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + level = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || level < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: access log level \"%s\" is invalid," + " access log level must range from 0 to %ld", attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if ( apply ) { CFG_LOCK_WRITE(slapdFrontendConfig); - level = atoi ( value ); g_set_accesslog_level ( level ); slapdFrontendConfig->accessloglevel = level; CFG_UNLOCK_WRITE(slapdFrontendConfig);

1 0

[Fedora-directory-commits] dsbuild/meta/ds Makefile,1.1.1.1,1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/meta/ds Modified Files: Makefile Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:30:05 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = ds -GARVERSION = 1 +GARVERSION = 1.0.2 CATEGORIES = meta # assume that if someone defines DEBUG=1 they mean DEBUG=full

1 0

[Fedora-directory-commits] dsbuild/ds/setuputil Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/setuputil Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:30:00 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-setuputil -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:30:00 -0000 1.2 @@ -1 +1,2 @@ 6bc26ba2edee75c3c8d5bf9a21bda7b8 download/fedora-setuputil-1.0.tar.gz +ad98662666e99bd737227ad6cf89abec download/fedora-setuputil-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/onlinehelp Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/onlinehelp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/onlinehelp Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/onlinehelp/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:34 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-onlinehelp -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/onlinehelp/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:34 -0000 1.2 @@ -1 +1,2 @@ cc8cece82f0dc4d3ff502129fdd590f6 download/fedora-onlinehelp-1.0.tar.gz +bd3d02c50d88848551dfa24964cfcf92 download/fedora-onlinehelp-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/mozilla Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mozilla Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:29 -0000 1.2 @@ -3,8 +3,9 @@ CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule -MYPATCH = mozilla-gcc4.patch -DISTFILES = mozilla-components-2.tar.gz $(MYPATCH) +#MYPATCH = mozilla-gcc4.patch +MYPATCH = sysfdtable.patch sysfdtable2.patch +DISTFILES = mozilla-components-1.0.2.tar.gz $(MYPATCH) PATCHFILES = LIBDEPS = @@ -16,7 +17,7 @@ INSTALL_SCRIPTS = custom ifndef DEBUG -OPTFLAG="BUILDOPT=1" +OPTFLAG="BUILD_OPT=1" CONFIGFLAG=--disable-debug --enable-optimize else CONFIGFLAG=--enable-debug --disable-optimize @@ -24,22 +25,25 @@ # this is our "custom" patch target post-patch: +ifdef MYPATCH cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 ) +endif $(MAKECOOKIE) configure-custom: # remove the stupid mozilla- directory rmdir $(WORKSRC) - cd work/mozilla/directory/c-sdk && ./configure --with-nss $(CONFIGFLAG) $(MAKECOOKIE) build-custom: cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG) cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) + cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG) cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG) # perldap uses MakeMaker, so lots of env. vars. cd work/mozilla/directory/perldap && \ - LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && $(MAKE) + LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \ + $(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib $(MAKECOOKIE) Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:29 -0000 1.2 @@ -1,3 +1,6 @@ b93ea453da4e0510130649cf827108b1 download/mozilla-components.tar.gz 39bca53b30595c69fc64a6710dd3129e download/mozilla-components-2.tar.gz a4c0724bc5b319ec7670da4cce93f920 download/mozilla-gcc4.patch +f0d13d53c37adfe5312cf44d5d992042 download/sysfdtable.patch +251df4db04cced3c22713c865289d471 download/sysfdtable2.patch +931bc65330ad6d53aeb951e9d51a6a53 download/mozilla-components-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/mod_restartd Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_restartd Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:23 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_restartd -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -41,7 +41,7 @@ CONFIGURE_ARGS = --with-apr-config -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:23 -0000 1.2 @@ -1 +1,2 @@ 5d04f72e1b1287fde46213678d8f24de download/mod_restartd-1.0.tar.gz +27121b306c0c777d7187223b4179c601 download/mod_restartd-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/mod_nss Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_nss Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:18 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_nss -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -43,7 +43,7 @@ CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:18 -0000 1.2 @@ -1 +1,2 @@ 68bb2fcd01694538e384454ee4c8ae53 download/mod_nss-1.0.tar.gz +59a6a6b2f17d2bf8f68a36d10ee378ba download/mod_nss-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/mod_admserv Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_admserv Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:12 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_admserv -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -12,7 +12,7 @@ MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist -ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0/built/adminutil/$(OBJDIR_NAME) +ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2/built/adminutil/$(OBJDIR_NAME) INSTALL_SCRIPTS = custom @@ -47,7 +47,7 @@ CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL) -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:12 -0000 1.2 @@ -1 +1,2 @@ a2615e7a400d10e6ec41565748decd3b download/mod_admserv-1.0.tar.gz +51e4a305687b48820bc8e02a28eb8fb7 download/mod_admserv-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/ldapserver Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:06 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-ds -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule @@ -21,13 +21,13 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \ MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \ + ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ + SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 \ DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \ NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 \ - ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.1 \ + ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.2 \ ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0 ifndef NOJAVA @@ -40,6 +40,9 @@ BUILD_ARGS += BUILD_JAVA_CODE=0 USE_DSMLGW= USE_CONSOLE= USE_JAVATOOLS= endif # NOJAVA +ifeq ($(DEBUG), optimize) +BUILD_ARGS += BUILD_DEBUG=optimize +endif ifndef DEBUG BUILD_ARGS += BUILD_DEBUG=optimize endif Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:06 -0000 1.2 @@ -2,3 +2,4 @@ 5c71c276c01daef37adf39a5337a6908 download/ldapserver-gcc4.patch a3209ba62911a8ea55b7c7f9cef1d965 download/fedora-ds-1.0.tar.gz 4e29cb87a7907fc0d3646036c142774e download/fedora-ds-1.0.1.tar.gz +d43cb74a6700d72fd8ee96062a35d1ce download/fedora-ds-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/icu Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/icu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/icu Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:51 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = icu -GARVERSION = 2.4 +GARVERSION = 3.4 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tgz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:51 -0000 1.2 @@ -1 +1,2 @@ 77d56e4dca9ec0fd635151ce1dc72137 download/icu-2.4.tgz +b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz

1 0

[Fedora-directory-commits] dsbuild/ds/dsmlgwjars Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/dsmlgwjars In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/dsmlgwjars Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:45 -0000 1.2 @@ -4,7 +4,7 @@ # this is the subdir of the download dir where the jar files are kept - see ds.conf.mk DSMLGWJAR_VERSION = 1.0 # this is the list of jar files -MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar +MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar jakarta-commons-codec.jar # these are the files to be downloaded DISTFILES = $(MYJARS) # do not extract the jar files, just download them Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:45 -0000 1.2 @@ -4,3 +4,4 @@ bbc59424764db89879c7216bd4480ec0 download/saaj.jar bc3a50120bbb72afe43a8d26d1633d0d download/xercesImpl.jar 2e7aed876c51af3ee6a23ed524180d37 download/xml-apis.jar +191aab4f9fd7ef02f6e514c4fd9dbdbb download/jakarta-commons-codec.jar

1 0

[Fedora-directory-commits] dsbuild/ds/directoryconsole Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/directoryconsole Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:38 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-directoryconsole -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -15,7 +15,7 @@ #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/package +IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/release/package configure-custom: $(MAKECOOKIE) Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:38 -0000 1.2 @@ -1 +1,2 @@ ea552fe1c83fb87b9ad652f0422a77fa download/fedora-directoryconsole-1.0.tar.gz +7a057db966ee7bbe59a98a82d31bc087 download/fedora-directoryconsole-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/console Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/console Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/console/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:30 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-console -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -21,7 +21,7 @@ $(MAKECOOKIE) build-custom: - cd $(WORKSRC) && ant $(IMPORTS) + cd $(WORKSRC) && ant $(IMPORTS) package $(MAKECOOKIE) install-custom: Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/console/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:30 -0000 1.2 @@ -1 +1,2 @@ 7514ba3946a23d638e7d0ab60f26255b download/fedora-console-1.0.tar.gz +31b26c651997500690de9dd186bf1e30 download/fedora-console-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/adminutil Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminutil Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:25 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-adminutil -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -12,7 +12,7 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 +BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 ifndef DEBUG BUILD_ARGS += BUILD_DEBUG=optimize Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:25 -0000 1.2 @@ -1 +1,2 @@ 08c514a30604e192a22d7a035a9dfccc download/fedora-adminutil-1.0.tar.gz +ff441f6af22846102592ad101929e02e download/fedora-adminutil-1.0.2.tar.gz

1 0

[Fedora-directory-commits] dsbuild/ds/adminserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminserver Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:18 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-adminserver -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -14,14 +14,14 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \ - ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0 \ - MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0/.libs \ - MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0/.libs \ - MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0/.libs \ - MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0 + ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ + SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ + ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.2 \ + MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \ + MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \ + MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \ + MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2 ifndef NOJAVA BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:18 -0000 1.2 @@ -1,2 +1,3 @@ b61ebbdff8d4a911ed54f94108476e37 download/fedora-adminserver-1.0.tar.gz e2e2557b9548bb3d2f54803b5fcf9103 download/fedora-adminserver-1.0.1.tar.gz +f3c89782dd1642bbc9939f07a3fd22d2 download/fedora-adminserver-1.0.2.tar.gz

1 0

[Fedora-directory-commits] ldapserver components.mk,1.39,1.40
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15427 Modified Files: components.mk Log Message: Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package. Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- components.mk 13 Feb 2006 22:25:27 -0000 1.39 +++ components.mk 14 Feb 2006 04:26:54 -0000 1.40 @@ -213,30 +213,30 @@ # as of NSS 3.11, no longer need to link with softokn3 SECURITY_LIBNAMES = ssl3 nss3 # these libs have a corresponding .chk file -# freebl is new for NSS 3.11 -SECURITY_NEED_CHK = softokn3 freebl3 +SECURITY_NEED_CHK = softokn3 -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3 +# these are the libs we need at runtime +SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 -ifneq ($(USE_64), 1) +# freebl for all platforms is new for NSS 3.11 +# there are some platform specific versions as well +FREEBL_LIBS = freebl3 +ifeq ($(USE_64), 1) ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 +FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3 +endif +else # USE_64 +ifeq ($(ARCH), SOLARIS) +FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 endif # SOLARIS ifeq ($(ARCH), HPUX) -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 +FREEBL_LIBS = 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_64fpu_3 freebl_64int_3 -endif endif # USE_64 +SECURITY_LIBNAMES.pkg += $(FREEBL_LIBS) +SECURITY_NEED_CHK += $(FREEBL_LIBS) + SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES)) SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS))

1 0

[Fedora-directory-commits] adminserver nsconfig.mk,1.22,1.23
by Doctor Conrad 14 Feb '06

14 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: nsconfig.mk Log Message: Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package. Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nsconfig.mk 13 Feb 2006 22:09:55 -0000 1.22 +++ nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23 @@ -721,30 +721,27 @@ # where secmod.db file is, rather than in the LD_LIBRARY_PATH SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi -# These files are only needed at runtime, not to link with -SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 freebl3 -# these shared libs need the corresponding .chk files at runtime -SECURITY_NEED_CHK = softokn3 freebl3 - -ifneq ($(USE_64), 1) +# freebl for all platforms is new for NSS 3.11 +# there are some platform specific versions as well +FREEBL_LIBS = freebl3 +ifeq ($(USE_64), 1) +ifeq ($(ARCH), SOLARIS) +FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3 +endif +else # USE_64 ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 +FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 endif # SOLARIS ifeq ($(ARCH), HPUX) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3 +FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3 endif # HPUX -else # USE_64 -ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_64fpu_3 freebl_64int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3 -endif endif # USE_64 +# These files are only needed at runtime, not to link with +SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS) +# these shared libs need the corresponding .chk files at runtime +SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS) + ifeq ($(ARCH), WINNT) SECURITYDLL_NAME = $(SECURITY_LIBNAMES) SECURITYOBJNAME = $(addsuffix .lib, $(SECURITY_LIBNAMES))

1 0

[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.47, 1.48 fixSetupInf.pl, 1.7, 1.8
by Doctor Conrad 13 Feb '06

13 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver/ldap/cm Modified Files: Makefile fixSetupInf.pl 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: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Makefile 10 Feb 2006 23:22:00 -0000 1.47 +++ Makefile 13 Feb 2006 22:25:33 -0000 1.48 @@ -595,7 +595,6 @@ # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL),1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) - $(PERL) -w $(FIX_SETUP_INF) $(SETUPUTIL_BINPATH)/setup.inf $(INSTDIR)/setup.inf endif # copy in our product .inf files @@ -691,6 +690,13 @@ done ; \ fi +# make sure setup.inf has everything we need +ifeq ($(USE_SETUPUTIL),1) + cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp + $(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER) + rm -f $(INSTDIR)/setup.inf.tmp +endif + # we must remove the nsbase.zip file - we package those files now rm -f $(INSTDIR)/base/nsbase.zip # we also need to remove the Archive directive from the [base] section of the @@ -714,7 +720,7 @@ # build the combined packages tar file; use h flag to follow symlinks ifdef BUILD_SHIP ifndef BUILD_PATCH - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) endif ifeq ($(DEBUG), optimize) @@ -723,7 +729,7 @@ else echo base/unzipped > $(TMPLIST) echo admin/unzipped >> $(TMPLIST) - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz rm -f $(TMPLIST) endif # BUILD_SHIP @@ -913,7 +919,7 @@ # move the tarball back after the copy mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR) # make sure our packages are in the setup.inf file - $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf + $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER) #---------------------------- slapd rules -------------------------------------------------- Index: fixSetupInf.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fixSetupInf.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fixSetupInf.pl 21 Oct 2005 19:21:12 -0000 1.7 +++ fixSetupInf.pl 13 Feb 2006 22:25:33 -0000 1.8 @@ -51,6 +51,8 @@ $input = shift; $output = shift; +$use_adminserver = shift; + die "cannot open input file $input" unless open( FILE, $input ); die "cannot open output file $output" unless open( OUT, ">$output" ); $inGeneralSection = 0; @@ -65,6 +67,10 @@ $_ .= ", slapd"; $addedSlapd = 1; } + if (! /admin/ && $use_adminserver) { + $_ .= ", admin"; + $addedAdmin = 1; + } if (! /perldap/) { $_ .= ", perldap"; $addedPerLDAP = 1; @@ -95,6 +101,11 @@ print OUT "ComponentInfoFile = slapd/slapd.inf\n"; } +if ($addedAdmin) { + print OUT "\n[admin]\n"; + print OUT "ComponentInfoFile = admin/admin.inf\n"; +} + if ($addedPerLDAP) { print OUT "\n[perldap]\n"; print OUT "ComponentInfoFile = perldap/perldap.inf\n";

1 0

[Fedora-directory-commits] ldapserver component_versions.mk, 1.40, 1.41 components.mk, 1.38, 1.39
by Doctor Conrad 13 Feb '06

13 Feb '06

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

1 0

[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.9, 1.10
by Doctor Conrad 13 Feb '06

13 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv/console Modified Files: build.properties Log Message: Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime on all platforms, and more on Solaris and HP-UX. Use admserv10.jar as the console jar file name instead of the new format - will change back once the new code is tagged. Index: build.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.properties 1 Feb 2006 23:04:04 -0000 1.9 +++ build.properties 13 Feb 2006 22:13:06 -0000 1.10 @@ -22,9 +22,10 @@ adminconsole.root=../.. mcc.version=1.0 +mcc.nodot.version=10 admin.core=admserv -admin.console=fedora-${admin.core}-${mcc.version} +admin.console=${admin.core}${mcc.nodot.version} console.root=${adminconsole.root}/../built/release/package/java ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar

1 0

[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.36, 1.37
by Doctor Conrad 13 Feb '06

13 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv Modified Files: pkgadmin.mk Log Message: Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime on all platforms, and more on Solaris and HP-UX. Use admserv10.jar as the console jar file name instead of the new format - will change back once the new code is tagged. Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36 +++ pkgadmin.mk 13 Feb 2006 22:12:55 -0000 1.37 @@ -168,7 +168,7 @@ # grab the jar files cd $(ADMIN_JARS) ; \ - cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars + cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars # # Cleanup before making distributable zip @@ -252,19 +252,6 @@ fi ; \ done -# Cert System needs chk files [154431] - cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib -# libfreebl_*.chk files only exist on the 32-bit builds. -# They should be packaged only for the 32-bit builds. -ifneq ($(USE_64), 1) -ifeq ($(ARCH), SOLARIS) - cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib -endif -ifeq ($(ARCH), HPUX) - cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib -endif -endif - # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib for file in $(ADMINUTIL_SOLIBS); do \

1 0

[Fedora-directory-commits] adminserver nsconfig.mk,1.21,1.22
by Doctor Conrad 13 Feb '06

13 Feb '06

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv840/adminserver Modified Files: nsconfig.mk Log Message: Use NSS 3.11 and NSPR 4.6.1 - This requires packaging the new freebl3 library on all platforms, and more on Solaris and HPUX. Rename the console jar file back to admserv10.jar for now to easy new fedora ds migration issues. Will rename it back to the new name once the current code is tagged.

1 0

[Fedora-directory-commits] directoryconsole build.properties, 1.2, 1.3 build.xml, 1.3, 1.4
by Doctor Conrad 13 Feb '06

13 Feb '06

Author: rmeggins Update of /cvs/dirsec/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761/directoryconsole Modified Files: build.properties build.xml Log Message: The console now builds jar files in the format brand-name-version.jar e.g. fedora-mcc-1.0.jar so change the build scripts to pick up the new jar format. We will have to add build.properties to the branding. Index: build.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.properties 28 Oct 2005 18:01:11 -0000 1.2 +++ build.properties 13 Feb 2006 22:00:39 -0000 1.3 @@ -23,3 +23,4 @@ ldapconsole.root=.. ldapconsole.version=10 ldapconsole.name=ds${ldapconsole.version} +brand=fedora Index: build.xml =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 14 Nov 2005 04:14:11 -0000 1.3 +++ build.xml 13 Feb 2006 22:00:39 -0000 1.4 @@ -79,9 +79,9 @@  <path id="ldapconsole.classpath"> <fileset dir="${console.location}"> - <include name="**/java/base.jar"/> - <include name="**/java/mcc*.jar"/> - <include name="**/java/nmclf*.jar"/> + <include name="**/java/${brand}-base-*.jar"/> + <include name="**/java/${brand}-mcc-*.jar"/> + <include name="**/java/${brand}-nmclf-*.jar"/> <include name="**/java/ldapjdk.jar"/> </fileset> <pathelement path="${built.classdir}"/>

1 0

[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.46,1.47
by Doctor Conrad 11 Feb '06

11 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 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/ldap/cm/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Makefile 7 Dec 2005 21:49:52 -0000 1.46 +++ Makefile 10 Feb 2006 23:22:00 -0000 1.47 @@ -359,7 +359,11 @@ # now time to move the necessary jars in place $(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib + if [ -f $(DSMLGWJARS_BUILD_DIR)/jaf.jar ] ; then \ + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaf.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ + else \ + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ + fi # if you use the jaxrpc.jar from the axis distribution, you don't need the api file # or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa # if so, I'm not sure where to get the implementation @@ -370,6 +374,7 @@ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jakarta-commons-codec.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib endif # USE_DSMLGW # PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install

1 0

[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway ParseValue.java, 1.4, 1.5 gatewayHandler.java, 1.8, 1.9
by Doctor Conrad 11 Feb '06

11 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway Modified Files: ParseValue.java gatewayHandler.java Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: ParseValue.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParseValue.java 19 Apr 2005 22:07:19 -0000 1.4 +++ ParseValue.java 10 Feb 2006 23:21:54 -0000 1.5 @@ -36,6 +36,8 @@ * --- END COPYRIGHT BLOCK --- */ package com.netscape.dsml.gateway; +import org.apache.commons.codec.binary.Base64; + /** * * @author elliot @@ -53,9 +55,9 @@ org.w3c.dom.Node type = n.getAttributes().getNamedItem("xsi:type"); if (type != null && type.getNodeValue().equalsIgnoreCase("xsd:base64Binary") ) { // This value is encoded in base64. decode it. - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - ret = bd.decodeBuffer( n.getFirstChild().getNodeValue() ) ; + ret = bd.decode( n.getFirstChild().getNodeValue().getBytes() ) ; } catch (org.w3c.dom.DOMException de) { ret = "".getBytes(); Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gatewayHandler.java 11 May 2005 04:29:55 -0000 1.8 +++ gatewayHandler.java 10 Feb 2006 23:21:54 -0000 1.9 @@ -62,6 +62,7 @@ import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.handlers.BasicHandler; +import org.apache.commons.codec.binary.Base64; public class gatewayHandler extends BasicHandler { private HandlerInfo handlerInfo; @@ -110,9 +111,9 @@ if ( tmp != null && tmp.startsWith("Basic ") ) { int i ; - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - tmp = new String( (bd.decodeBuffer(tmp.substring(6) ))); + tmp = new String( (bd.decode(tmp.substring(6).getBytes() ))); } catch (Exception e) { // couldn't decode auth info

1 0

[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw build.xml, 1.7, 1.8
by Doctor Conrad 11 Feb '06

11 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw Modified Files: build.xml Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: build.xml =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 29 Oct 2005 02:21:46 -0000 1.7 +++ build.xml 10 Feb 2006 23:21:49 -0000 1.8 @@ -51,16 +51,20 @@ <property name="ldapjdk.jar" value="${ldapdist.dir}/ldapjdk.jar"/> <property name="activation.jar" value="${globaldist.dir}/activation.jar"/> +<property name="jaf.jar" value="${globaldist.dir}/jaf.jar"/> <property name="jaxrpc-api.jar" value="${globaldist.dir}/jaxrpc-api.jar"/> <property name="jaxrpc.jar" value="${globaldist.dir}/jaxrpc.jar"/> <property name="saaj.jar" value="${globaldist.dir}/saaj.jar"/> <property name="xercesImpl.jar" value="${globaldist.dir}/xercesImpl.jar"/> <property name="xmlParserAPIs.jar" value="${globaldist.dir}/xml-apis.jar"/> <property name="axis.jar" value="${globaldist.dir}/axis.jar"/> +<property name="codec.jar" value="${globaldist.dir}/jakarta-commons-codec.jar"/> +<property environment="env"/> <path id="class.path"> <pathelement location="${ldapjdk.jar}"/> <pathelement location="${activation.jar}"/> +<pathelement location="${jaf.jar}"/> <pathelement location="${jaxrpc-api.jar}"/> <pathelement location="${jaxrpc.jar}"/> <pathelement location="${saaj.jar}"/> @@ -68,6 +72,7 @@ <pathelement location="${xercesImpl.jar}"/> <pathelement location="${xmlParserAPIs.jar}"/> <pathelement location="${axis.jar}"/> +<pathelement location="${codec.jar}"/> </path> <property name="build.dir" value="${mcom.root}/built/dsmlgw"/>

1 0

[Fedora-directory-commits] ldapserver buildpaths.mk, 1.9, 1.10 components.mk, 1.37, 1.38 internal_comp_deps.mk, 1.33, 1.34
by Doctor Conrad 11 Feb '06

11 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver Modified Files: buildpaths.mk components.mk internal_comp_deps.mk Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- buildpaths.mk 31 Oct 2005 15:55:24 -0000 1.9 +++ buildpaths.mk 10 Feb 2006 23:21:43 -0000 1.10 @@ -122,9 +122,13 @@ SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil #SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil -# it's customary and easier to use the pre-built jars +# it's customary and easier to use the pre-built jar +# you can get this from www.jpackage.org as well +# we usually get this from the admin server package which +# gets it from the console package #LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT) # Crimson - crimson.jar - http://xml.apache.org/crimson/ +# you can get this from www.jpackage.org as well #CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver @@ -133,9 +137,16 @@ # these are the files needed to build the java components - xmltools and dsmlgw - # and where to get them +# NOTE: www.jpackage.org has almost all of these, and you can configure yum or apt +# or up2date or whatever your package manager is to pull them, which is nice because it will +# also take care of the dependencies - http://www.jpackage.org/repos.php # Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar # Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi # JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html +# OR +# JAF - activation.jar or jaf.jar - http://www.jpackage.org +# NOTE - classpathx-jaf may also work +# Codec - jakarta-commons-codec.jar - http://jakarta.apache.org/commons/codec/ # JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html # all of these files need to be in the following directory: DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- components.mk 8 Nov 2005 15:58:16 -0000 1.37 +++ components.mk 10 Feb 2006 23:21:43 -0000 1.38 @@ -555,7 +555,7 @@ AXIS_FILES = $(AXIS) AXIS_FILE = $(CLASS_DEST)/$(AXIS) -DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar +DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar,jakarta-commons-codec.jar DSMLJAR_FILE = $(CLASS_DEST) CRIMSON_LICENSE = LICENSE.crimson Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- internal_comp_deps.mk 7 Dec 2005 21:25:50 -0000 1.33 +++ internal_comp_deps.mk 10 Feb 2006 23:21:43 -0000 1.34 @@ -450,7 +450,7 @@ DSMLJAR_RELEASE = $(COMPONENTS_DIR) #DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION) DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars -DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar +DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar $(CLASS_DEST)/jakarta-commons-codec.jar ifndef DSMLJAR_PULL_METHOD DSMLJAR_PULL_METHOD = $(COMPONENT_PULL_METHOD)

1 0

[Fedora-directory-commits] ldapserver/ldap/schema 00core.ldif, 1.7, 1.8
by Doctor Conrad 10 Feb '06

10 Feb '06

Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/schema In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071 Modified Files: 00core.ldif Log Message: Bug(s) fixed: 180744 Bug Description: If you try to add one of the new password policy attributes to a fine-grained policy, you get an objectclass violation error. Reviewed by: Rich, Noriko (thanks!) Files: ldapserver/ldap/schema/00core.ldif Branch: HEAD Fix Description: This adds new password policy config attributes need to the schema and updates the "passwordPolicy" objectclass needs to allow them. I've also updated our master schema document to keep track of the OIDs. Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: 00core.ldif =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/schema/00core.ldif,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- 00core.ldif 19 Apr 2005 22:07:27 -0000 1.7 +++ 00core.ldif 10 Feb 2006 18:33:20 -0000 1.8 @@ -190,6 +190,15 @@ attributeTypes: ( 2.16.840.1.113730.3.1.997 NAME 'pwdpolicysubentry' DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.998 NAME ( 'passwordGraceUserTime' 'pwdGraceUserTime' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.999 NAME ( 'passwordGraceLimit' 'pwdGraceLoginLimit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2075 NAME ( 'passwordMinDigits' 'pwdMinDigits' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2076 NAME ( 'passwordMinAlphas' 'pwdMinAlphas' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2077 NAME ( 'passwordMinUppers' 'pwdMinUppers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2078 NAME ( 'passwordMinLowers' 'pwdMinLowers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2079 NAME ( 'passwordMinSpecials' 'pwdMinSpecials' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2080 NAME ( 'passwordMin8bit' 'pwdMin8bit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2081 NAME ( 'passwordMaxRepeats' 'pwdMaxRepeats' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2082 NAME ( 'passwordMinCategories' 'pwdMinCategories' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2083 NAME ( 'passwordMinTokenLength' 'pwdMinTokenLength' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.198 NAME 'memberURL' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.199 NAME 'memberCertificateDescription' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.207 NAME 'vlvBase' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape Directory Server' ) @@ -344,7 +353,7 @@ objectClasses: ( 2.16.840.1.113730.3.2.1 NAME 'changeLogEntry' DESC 'LDAP changelog objectclass' SUP top MUST ( targetdn $ changeTime $ changenumber $ changeType ) MAY ( changes $ newrdn $ deleteoldrdn $ newsuperior ) X-ORIGIN 'Changelog Internet Draft' ) objectClasses: ( 2.16.840.1.113730.3.2.6 NAME 'referral' DESC 'LDAP referrals objectclass' SUP top MAY ( ref ) X-ORIGIN 'LDAPv3 referrals Internet Draft' ) objectClasses: ( 2.16.840.1.113730.3.2.12 NAME 'passwordObject' DESC 'Netscape defined password policy objectclass' SUP top MAY ( pwdpolicysubentry $ passwordExpirationTime $ passwordExpWarned $ passwordRetryCount $ retryCountResetTime $ accountUnlockTime $ passwordHistory $ passwordAllowChangeTime $ passwordGraceUserTime ) X-ORIGIN 'Netscape Directory Server' ) -objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit ) X-ORIGIN 'Netscape Directory Server' ) +objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit $ passwordMinDigits $ passwordMinAlphas $ passwordMinUppers $ passwordMinLowers $ passwordMinSpecials $ passwordMin8bit $ passwordMaxRepeats $ passwordMinCategories $ passwordMinTokenLength ) X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.30 NAME 'glue' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.32 NAME 'netscapeMachineData' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.38 NAME 'vlvSearch' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ vlvBase $ vlvScope $ vlvFilter ) MAY ( multiLineDescription ) X-ORIGIN 'Netscape Directory Server' )

1 0

[Fedora-directory-commits] dsbuild - Imported sources
by Doctor Conrad 10 Feb '06

10 Feb '06

Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4520 Log Message: import of fds 1.0.1 + changes dsbuild scripts Status: Vendor Tag: DSBUILD Release Tags: DSBUILD_1_0_1 N dsbuild/gar.mk N dsbuild/color.mk N dsbuild/README N dsbuild/category.mk N dsbuild/gar.lib.mk N dsbuild/objdirname.mk N dsbuild/gar.conf.mk.in N dsbuild/gar.conf.mk N dsbuild/ds.conf.mk N dsbuild/ds/category.mk N dsbuild/ds/setuputil/checksums N dsbuild/ds/setuputil/Makefile N dsbuild/ds/ldapjdk/checksums N dsbuild/ds/ldapjdk/Makefile N dsbuild/ds/dsmlgwjars/checksums N dsbuild/ds/dsmlgwjars/Makefile N dsbuild/ds/crimson/checksums N dsbuild/ds/crimson/Makefile N dsbuild/ds/cyrus-sasl/checksums N dsbuild/ds/cyrus-sasl/Makefile N dsbuild/ds/dsonlinehelp/checksums N dsbuild/ds/dsonlinehelp/Makefile N dsbuild/ds/mod_nss/checksums N dsbuild/ds/mod_nss/Makefile N dsbuild/ds/mod_restartd/checksums N dsbuild/ds/mod_restartd/Makefile N dsbuild/ds/net-snmp/checksums N dsbuild/ds/net-snmp/Makefile N dsbuild/ds/adminserver/checksums N dsbuild/ds/adminserver/Makefile N dsbuild/ds/console/checksums N dsbuild/ds/console/Makefile N dsbuild/ds/onlinehelp/checksums N dsbuild/ds/onlinehelp/Makefile N dsbuild/ds/icu/checksums N dsbuild/ds/icu/Makefile N dsbuild/ds/db/checksums N dsbuild/ds/db/Makefile N dsbuild/ds/db/files/4.2.52.4.diff N dsbuild/ds/db/files/4.2.52.3.diff N dsbuild/ds/db/files/4.2.52.2.diff N dsbuild/ds/db/files/4.2.52.1.diff N dsbuild/ds/mod_admserv/checksums N dsbuild/ds/mod_admserv/Makefile N dsbuild/ds/adminutil/checksums N dsbuild/ds/adminutil/Makefile N dsbuild/ds/ldapserver/checksums N dsbuild/ds/ldapserver/Makefile N dsbuild/ds/directoryconsole/checksums N dsbuild/ds/directoryconsole/Makefile N dsbuild/ds/mozilla/checksums N dsbuild/ds/mozilla/Makefile N dsbuild/meta/Makefile N dsbuild/meta/ds/Makefile No conflicts created by this import

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/util AbstractDialog.java, 1.2, 1.3
by Doctor Conrad 10 Feb '06

10 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681/src/com/netscape/management/client/util Modified Files: AbstractDialog.java Log Message: Bug(s) fixed: 175177 Bug Description: The login dialog is hidden behind the splash screen when running startconsole using Java 1.5. Reviewed by: Rich, Pete, Noriko (thanks!) Files: see diffs Branch: HEAD Fix Description: We needed to push the login dialog to the front of the window stack in addition to pushing the splash screen to the back. Ideally, we'd get rid of the splash screen, or combine the login dialog components into the splash screen, but that's much less trivial to do. Platforms tested: RHEL4 (Java 1.4 and 1.5) Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: AbstractDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/AbstractDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractDialog.java 2 Dec 2005 21:30:20 -0000 1.2 +++ AbstractDialog.java 9 Feb 2006 23:57:25 -0000 1.3 @@ -324,6 +324,7 @@ center(); } super.show(); + this.toFront(); } /**

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.4, 1.5
by Doctor Conrad 10 Feb '06

10 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681/src/com/netscape/management/client/console Modified Files: Console.java Log Message: Bug(s) fixed: 175177 Bug Description: The login dialog is hidden behind the splash screen when running startconsole using Java 1.5. Reviewed by: Rich, Pete, Noriko (thanks!) Files: see diffs Branch: HEAD Fix Description: We needed to push the login dialog to the front of the window stack in addition to pushing the splash screen to the back. Ideally, we'd get rid of the splash screen, or combine the login dialog components into the splash screen, but that's much less trivial to do. Platforms tested: RHEL4 (Java 1.4 and 1.5) Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Console.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Console.java 2 Dec 2005 21:30:15 -0000 1.4 +++ Console.java 9 Feb 2006 23:57:20 -0000 1.5 @@ -565,6 +565,7 @@ dialog.setInitialLocation(x, y); _splashScreen.setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + _splashScreen.toBack(); dialog.showModal(); if (dialog.isCancel()) System.exit(0);

1 0

[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSExportImport.java, 1.1.1.1, 1.2
by Doctor Conrad 09 Feb '06

09 Feb '06

Author: rmeggins Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22906 Modified Files: DSExportImport.java Log Message: Bug(s) fixed: 178478 Bug Description: DSExportImport.java uses non-standard sun.io class Reviewed by: Nathan, Noriko (Thanks!) Fix Description: Use java.io.CharConversionException instead. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: DSExportImport.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSExportImport.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSExportImport.java 18 Jul 2005 00:55:39 -0000 1.1.1.1 +++ DSExportImport.java 9 Feb 2006 19:10:09 -0000 1.2 @@ -452,8 +452,9 @@ } } /* Create error message */ - String msg; - if (e instanceof sun.io.MalformedInputException) { + String msg; + /* see if there was an invalid char in the input e.g. a non-utf8 8 bit char */ + if (e instanceof java.io.CharConversionException) { String[] args = {String.valueOf(_numEntry), e.toString()}; msg = DSUtil._resource.getString("import", "malformedinputerror-label", args);

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/util DirUtil.java, 1.2, 1.3
by Doctor Conrad 09 Feb '06

09 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30959 Modified Files: DirUtil.java Log Message: Checked in a modification the the cast used when calling Method.invoke(). This is needed to maintain Java 1.4 compatibility. Reviewed by Noriko. Index: DirUtil.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/DirUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DirUtil.java 8 Feb 2006 22:13:30 -0000 1.2 +++ DirUtil.java 8 Feb 2006 23:56:49 -0000 1.3 @@ -141,7 +141,7 @@ try { Class c = Class.forName( SSL_CIPHERS ); Method m = c.getMethod( "getCipherSuite", new Class[0] ); - _cipherSuite = m.invoke( null, (Object)null ); + _cipherSuite = m.invoke( null, (Object[])null ); } catch (Exception e) { Debug.println("DirUtil.getCipherSuite: Cannot load class, " + e );

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/util DirUtil.java, 1.1.1.1, 1.2
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/util Modified Files: DirUtil.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. 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: DirUtil.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/DirUtil.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DirUtil.java 18 Jul 2005 00:34:26 -0000 1.1.1.1 +++ DirUtil.java 8 Feb 2006 22:13:30 -0000 1.2 @@ -141,7 +141,7 @@ try { Class c = Class.forName( SSL_CIPHERS ); Method m = c.getMethod( "getCipherSuite", new Class[0] ); - _cipherSuite = m.invoke( null, null ); + _cipherSuite = m.invoke( null, (Object)null ); } catch (Exception e) { Debug.println("DirUtil.getCipherSuite: Cannot load class, " + e );

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/topology/customview CustomView.java, 1.1.1.1, 1.2 ViewInfo.java, 1.1.1.1, 1.2
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/customview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/topology/customview Modified Files: CustomView.java ViewInfo.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. 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: CustomView.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/CustomView.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- CustomView.java 18 Jul 2005 00:34:20 -0000 1.1.1.1 +++ CustomView.java 8 Feb 2006 22:13:24 -0000 1.2 @@ -134,10 +134,10 @@ String name) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - if (enum != null) + Enumeration attr_enum = attr.getStringValues(); + if (attr_enum != null) try { - return (String) enum.nextElement(); + return (String) attr_enum.nextElement(); } catch (Exception e)// if value stored was null, enum fails { Debug.println(0, "CustomView: no configuration data"); @@ -159,9 +159,9 @@ return; } - Enumeration enum = attr.getStringValues(); - while (enum != null && enum.hasMoreElements()) { - String flag = ((String)enum.nextElement()).trim(); + Enumeration attr_enum = attr.getStringValues(); + while (attr_enum != null && attr_enum.hasMoreElements()) { + String flag = ((String)attr_enum.nextElement()).trim(); if (flag.equalsIgnoreCase("showTopContainer")) { _fShowTopContainer = true; } Index: ViewInfo.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/ViewInfo.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ViewInfo.java 18 Jul 2005 00:34:20 -0000 1.1.1.1 +++ ViewInfo.java 8 Feb 2006 22:13:24 -0000 1.2 @@ -87,10 +87,10 @@ String name) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - if (enum != null) + Enumeration attr_enum = attr.getStringValues(); + if (attr_enum != null) try { - return (String) enum.nextElement(); + return (String) attr_enum.nextElement(); } catch (Exception e)// if value stored was null, enum fails { } @@ -110,9 +110,9 @@ String name, String value) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - while (enum.hasMoreElements()) { - String v = (String)enum.nextElement(); + Enumeration attr_enum = attr.getStringValues(); + while (attr_enum.hasMoreElements()) { + String v = (String)attr_enum.nextElement(); if (v.equalsIgnoreCase(value)) { return true; } @@ -305,4 +305,4 @@ } return null; } -} \ No newline at end of file +}

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/security CertInstallCertPage.java, 1.1.1.1, 1.2 CertRequestWizard.java, 1.2, 1.3 ClientAuthPanel.java, 1.1.1.1, 1.2 EncryptionPanel.java, 1.1.1.1, 1.2
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/security In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/security Modified Files: CertInstallCertPage.java CertRequestWizard.java ClientAuthPanel.java EncryptionPanel.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. 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: CertInstallCertPage.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertInstallCertPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- CertInstallCertPage.java 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ CertInstallCertPage.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -282,9 +282,9 @@ ); Debug.println("Restore session data"); - Enumeration enum = pref.getNames(); - while (enum.hasMoreElements()) { - String name = enum.nextElement().toString(); + Enumeration names_enum = pref.getNames(); + while (names_enum.hasMoreElements()) { + String name = names_enum.nextElement().toString(); ic.setProperty(name, pref.getString(name)); } Index: CertRequestWizard.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CertRequestWizard.java 29 Nov 2005 18:37:06 -0000 1.2 +++ CertRequestWizard.java 8 Feb 2006 22:13:18 -0000 1.3 @@ -214,9 +214,9 @@ "cn=CSRSession,"+consoleInfo.getCurrentDN() ); - Enumeration enum = ic.getPropertyNames(); - while (enum.hasMoreElements()) { - String attr = enum.nextElement().toString(); + Enumeration names_enum = ic.getPropertyNames(); + while (names_enum.hasMoreElements()) { + String attr = names_enum.nextElement().toString(); pref.set(attr, ic.getProperty(attr)); } Index: ClientAuthPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/ClientAuthPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ClientAuthPanel.java 18 Jul 2005 00:34:16 -0000 1.1.1.1 +++ ClientAuthPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -113,9 +113,9 @@ * @param enable true to enable all buttons, false to disable and gray out all buttons */ public void setEnabled(boolean enable) { - Enumeration enum = buttonGroup.getElements(); - while (enum.hasMoreElements()) { - ((JRadioButton)(enum.nextElement())).setEnabled(enable); + Enumeration button_enum = buttonGroup.getElements(); + while (button_enum.hasMoreElements()) { + ((JRadioButton)(button_enum.nextElement())).setEnabled(enable); } } Index: EncryptionPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/EncryptionPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- EncryptionPanel.java 18 Jul 2005 00:34:17 -0000 1.1.1.1 +++ EncryptionPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -308,10 +308,10 @@ cert.setActionCommand("EVENT_HANDLE_DISABLED"); cert.removeAllItems(); Hashtable selectedDev = (Hashtable)(_secDevice.get((String)(device.getSelectedItem()))); - Enumeration enum = selectedDev.keys(); + Enumeration device_enum = selectedDev.keys(); DefaultComboBoxModel comboModel = (DefaultComboBoxModel) cert.getModel(); - while (enum.hasMoreElements()) { - String key = (String)(enum.nextElement()); + while (device_enum.hasMoreElements()) { + String key = (String)(device_enum.nextElement()); if (key.startsWith("CERT")) { String certName = (String)selectedDev.get(key); // Multiple certs with the same name can exit (bug 558903)

1 0

[Fedora-directory-commits] console/src/com/netscape/management/client/comm HttpsChannel.java, 1.1.1.1, 1.2
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/comm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/comm Modified Files: HttpsChannel.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. 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: HttpsChannel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/comm/HttpsChannel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- HttpsChannel.java 18 Jul 2005 00:34:12 -0000 1.1.1.1 +++ HttpsChannel.java 8 Feb 2006 22:13:12 -0000 1.2 @@ -326,9 +326,9 @@ public void setCertList(Vector nicknames) { certList.removeAllItems(); - Enumeration enum = nicknames.elements(); - while (enum.hasMoreElements()) { - certList.addItem(enum.nextElement()); + Enumeration nicks_enum = nicknames.elements(); + while (nicks_enum.hasMoreElements()) { + certList.addItem(nicks_enum.nextElement()); } if (certList.getItemCount() > 0) { certList.setSelectedIndex(0);

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication replutil.c, 1.7, 1.8
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20758 Modified Files: replutil.c Log Message: Bug(s) fixed: 180515 Bug Description: Chain BIND requests with chain on update + global pw policy Reviewed by: Nathan, Pete (Thanks!) Fix Description: When using global password policy, we need to chain the BIND request back to a master so that it can update the pw policy op attrs in the user's entry and replicate them to all other servers. The call to config_get_pw_is_global_policy() is expensive (acquires a lock) so we delay it as long as possible. The reason we have to use config_get_pw_is_global_policy() is because the entry distribution plugin interface is poor - we have no way to register an init or start function to get the config, and no way to register a statechange callback to be notified of changes to the global password policy. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: replutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/replutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- replutil.c 16 Jan 2006 19:06:03 -0000 1.7 +++ replutil.c 8 Feb 2006 21:52:22 -0000 1.8 @@ -889,7 +889,6 @@ op_type = slapi_op_get_type(op); if (local_online && ((op_type == SLAPI_OPERATION_SEARCH) || - (op_type == SLAPI_OPERATION_BIND) || (op_type == SLAPI_OPERATION_UNBIND) || (op_type == SLAPI_OPERATION_COMPARE))) { #ifdef DEBUG_CHAIN_ON_UPDATE @@ -930,6 +929,19 @@ return local_backend; } + /* if using global password policy, chain the bind request so that the + master can update and replicate the password policy op attrs */ + if (op_type == SLAPI_OPERATION_BIND) { + extern int config_get_pw_is_global_policy(); + if (!config_get_pw_is_global_policy()) { +#ifdef DEBUG_CHAIN_ON_UPDATE + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "repl_chain_on_update: conn=%d op=%d using " + "local backend for local password policy\n", connid, opid); +#endif + return local_backend; + } + } + /* all other case (update while not directory manager) : * or any normal non replicated client operation while local is disabled (import) : * use the chaining backend

1 0

[Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptpreop.c, 1.4, 1.5
by Doctor Conrad 08 Feb '06

08 Feb '06

Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778 Modified Files: ptpreop.c Log Message: Bug(s) fixed: 176302 Bug Description: crash in PTA plugin when bind returned controls Reviewed by: Pete (Thanks!) Fix Description: Fix by Ulf. We are passing the ***LDAPControl when it needs the **LDAPControl. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: ptpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptpreop.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptpreop.c 8 Feb 2006 18:59:22 -0000 1.5 @@ -253,7 +253,7 @@ * Send a result to our client. */ if ( resctrls != NULL ) { - (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, &resctrls ); + (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, resctrls ); } slapi_send_ldap_result( pb, rc, matcheddn, errmsg, 0, urls ); }

1 0

[Fedora-directory-commits] adminserver/base Makefile,1.17,1.18
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/base Modified Files: Makefile Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/base/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile 18 Jan 2006 18:24:25 -0000 1.17 +++ Makefile 1 Feb 2006 23:04:57 -0000 1.18 @@ -131,10 +131,14 @@ cd $(CORE_DIR) ; \ $(IZIP) $(COREDIR)/ns$(CORE_MAIN).zip * ; -ifeq ($(ARCH), Linux) +ifdef INTERNAL_BUILD + ifeq ($(ARCH), Linux) $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf -else + else $(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf + endif +else + $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf endif pkgSBC: @@ -195,7 +199,11 @@ # Copy JSS lib -$(MKDIR) $(CLIENT_DIR)/lib ifeq ($(ARCH), HPUX) + ifeq ($(HPUX_ARCH), ia64) + cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib + else cp -p $(JSSSDK_PATH)/libjss3.sl $(CLIENT_DIR)/lib + endif else cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib endif @@ -217,8 +225,12 @@ touch $(BASEDIR)/ns$(BASE_CLIENT).zip endif # NOJAVA -ifeq ($(ARCH), Linux) +ifdef INTERNAL_BUILD + ifeq ($(ARCH), Linux) $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf -else + else $(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf + endif +else + $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf endif

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/src Makefile, 1.7, 1.8
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/src Modified Files: Makefile Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 29 Sep 2005 22:12:00 -0000 1.7 +++ Makefile 1 Feb 2006 23:04:41 -0000 1.8 @@ -32,7 +32,7 @@ include $(BUILD_ROOT)/nsconfig.mk -MODULE_CFLAGS = -DUSE_ADMSERV +MODULE_CFLAGS += -DUSE_ADMSERV OBJDEST=$(ADMSERV_OBJDIR)/install/obj BINDEST=$(ADMSERV_OBJDIR)/install/bin @@ -98,7 +98,7 @@ CURSES=-lHcurses EXTRA_LIBS+= -ld4r else - CURSES=/usr/lib/libcurses.a + CURSES=-lcurses endif endif endif

1 0

[Fedora-directory-commits] adminserver/admserv/newinst/insadm config.c, 1.6, 1.7
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/insadm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/insadm Modified Files: config.c Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: config.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config.c 28 Oct 2005 22:44:12 -0000 1.6 +++ config.c 1 Feb 2006 23:04:33 -0000 1.7 @@ -334,7 +334,7 @@ "nsInstalledLocation: %s\n" "nsExpirationDate: %s\n" "nsBuildSecurity: %s\n" - "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct(a)admserv10.jar\n", + "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct(a)fedora-admserv-1.0.jar\n", cd.szVendor, cd.szDescription, cd.szName, @@ -378,7 +378,7 @@ "nsAdminAccessAddresses: *\n" "nsAdminOneACLDir: adminacl\n" "nsDefaultAcceptLanguage: %s\n" - "nsClassName: com.netscape.management.admserv.AdminServer@admserv10.jar@%s\n" + "nsClassName: com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar@%s\n" "nsServerPort: %d\n" "nsSuiteSpotUser: nobody\n" "nsAdminUsers: admin-serv/config/admpw\n" @@ -396,7 +396,7 @@ ); sprintf(szUpgrade, - "nsClassName: com.netscape.management.admserv.AdminServer@admserv10.jar@%s\n" + "nsClassName: com.netscape.management.admserv.AdminServer@fedora-admserv-1.0.jar@%s\n" "nsServerPort: %d\n" "nsSuiteSpotUser: nobody\n", szTemp,

1 0

[Fedora-directory-commits] adminserver/admserv/console/smartupdate start-console.html, 1.7, 1.8
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console/smartupdate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/smartupdate Modified Files: start-console.html Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: start-console.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/start-console.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- start-console.html 18 Aug 2005 19:00:40 -0000 1.7 +++ start-console.html 1 Feb 2006 23:04:27 -0000 1.8 @@ -102,7 +102,7 @@ </tr> <tr valign="TOP"> <td><img src="../java/html/goto.gif" width="10" height="15"> </td> - <td><a href='http://fedora.redhat.com/'>Fedora Project Home Page</a> + <td><a href='http://fedora.redhat.com/'>Fedora Home Page</a> Check for upgrades and information about Fedora server products. </td> </tr>

1 0

[Fedora-directory-commits] adminserver/admserv/console/cmdln admconfig, 1.5, 1.6
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console/cmdln In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/cmdln Modified Files: admconfig Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: admconfig =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- admconfig 28 Oct 2005 22:43:40 -0000 1.5 +++ admconfig 1 Feb 2006 23:04:21 -0000 1.6 @@ -35,7 +35,7 @@ SHLIB_PATH=$SRVROOT/lib/jss:$SRVROOT/lib LIBPATH=$SRVROOT/lib/jss:$SRVROOT/lib JAVAOPTIONS=-Djava.library.path=$LD_LIBRARY_PATH -CLASSPATH=./java/nmclf10.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc10.jar:./java/jars/admserv10.jar +CLASSPATH=./java/fedora-nmclf-1.0.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/fedora-mcc-1.0.jar:./java/jars/fedora-admserv-1.0.jar MAINCLASS=com.netscape.management.admserv.cmdln.CommandLine PLATFORM=`uname`

1 0

[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.8, 1.9
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console Modified Files: build.properties Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: build.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.properties 28 Oct 2005 22:43:34 -0000 1.8 +++ build.properties 1 Feb 2006 23:04:04 -0000 1.9 @@ -21,14 +21,14 @@ # END COPYRIGHT BLOCK adminconsole.root=../.. -mcc.version=10 +mcc.version=1.0 admin.core=admserv -admin.console=${admin.core}${mcc.version} +admin.console=fedora-${admin.core}-${mcc.version} -console.root=${adminconsole.root}/../dist/classes -ldapjdk.jar=${adminconsole.root}/../dist/classes/ldapjdk.jar -base.jar=${console.root}/base.jar +console.root=${adminconsole.root}/../built/release/package/java +ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar +base.jar=${console.root}/fedora-base-${mcc.version}.jar caplugin.jar=${console.root}/caplugin/default.jar -mcc.core=${console.root}/mcc${mcc.version} -nmclf.core=${console.root}/nmclf${mcc.version} +mcc.core=${console.root}/fedora-mcc-${mcc.version} +nmclf.core=${console.root}/fedora-nmclf-${mcc.version}

1 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.7, 1.8 security.c, 1.5, 1.6
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/cgi-src40 Modified Files: Makefile security.c Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 21 Oct 2005 19:19:11 -0000 1.7 +++ Makefile 1 Feb 2006 23:03:57 -0000 1.8 @@ -382,30 +382,33 @@ $*.c /link /INCREMENTAL:no /SUBSYSTEM:console else +ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) +SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(BINDIR)/security: security.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/security \ $(SRCDIR)/security.c -L$(NSCP_DISTDIR)/lib \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/sec-activate: sec-activate.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-activate \ $(SRCDIR)/sec-activate.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/sec-migrate: sec-migrate.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-migrate \ $(SRCDIR)/sec-migrate.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/admpw: admpw.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o admpw \ $(SRCDIR)/admpw.c \ $(OBJDIR)/lib/libadmin.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/config: config.c $(GLUEOBJS) cd $(BINDIR); \ @@ -415,7 +418,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/dsconfig: dsconfig.c $(GLUEOBJS) cd $(BINDIR); \ @@ -424,7 +427,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/ugdsconfig: ugdsconfig.c $(GLUEOBJS) cd $(BINDIR); \ @@ -432,13 +435,13 @@ $(SRCDIR)/ugdsconfig.c \ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/mergeConfig: mergeConfig.cpp $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o mergeConfig \ $(SRCDIR)/mergeConfig.cpp \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/monreplication: monreplication.c $(GLUEOBJS) cd $(BINDIR); \ @@ -448,7 +451,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/viewlog: viewlog.c $(GLUEOBJS) cd $(BINDIR); \ @@ -458,7 +461,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/viewdata: viewdata.c $(GLUEOBJS) @@ -469,13 +472,13 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/statpingserv: statpingserv.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o statpingserv \ $(SRCDIR)/statpingserv.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/htmladmin: htmladmin.c $(GLUEOBJS) cd $(BINDIR); \ @@ -485,12 +488,12 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/%: %.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $* $(SRCDIR)/$*.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) endif Index: security.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- security.c 22 Aug 2005 23:21:02 -0000 1.5 +++ security.c 1 Feb 2006 23:03:57 -0000 1.6 @@ -597,10 +597,10 @@ { int version; - switch ((int)(crl->crl.version.data)) { + switch ((int)DER_GetInteger(&(crl->crl.version))) { case SEC_CRL_VERSION_1: version = 1; break; case SEC_CRL_VERSION_2: version = 2; break; - default: version = (int)((crl->crl.version.data)+1); break; + default: version = (int)(DER_GetInteger(&(crl->crl.version))+1); break; } fprintf(stdout, "\t<VERSION>%d</VERSION>\n", version); }

1 0

[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.35, 1.36
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv Modified Files: pkgadmin.mk Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- pkgadmin.mk 18 Jan 2006 18:24:20 -0000 1.35 +++ pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36 @@ -168,7 +168,7 @@ # grab the jar files cd $(ADMIN_JARS) ; \ - cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars + cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars # # Cleanup before making distributable zip @@ -245,6 +245,12 @@ # Copy LIB ICU cd $(ICU_LIBPATH); cp -p $(ICU_SOLIBS) $(ADMIN_DIR)/bin/admin/lib + for file in $(ICU_SOLIBS); do \ + if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \ + mytmpfile=`echo $$file | sed -e "s/$.*$\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \ + (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \ + fi ; \ + done # Cert System needs chk files [154431] cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib @@ -261,6 +267,12 @@ # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib + for file in $(ADMINUTIL_SOLIBS); do \ + if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \ + mytmpfile=`echo $$file | sed -e "s/$.*$\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \ + (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \ + fi ; \ + done if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \ @@ -379,6 +391,16 @@ cp -p $(SETUPUTIL_BIN)/setup $(PKGTOP) cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP) + -if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \ + components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \ + if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \ + cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&, admin/" > $(PKGTOP)/setup.inf; \ + fi; \ + echo "" >> $(PKGTOP)/setup.inf; \ + echo "# added in the adminserver package phase" >> $(PKGTOP)/setup.inf; \ + echo "[admin]" >> $(PKGTOP)/setup.inf; \ + echo "ComponentInfoFile = admin/admin.inf" >> $(PKGTOP)/setup.inf; \ + fi cp -p $(ADMSERV_OBJDIR)/LICENSE.txt $(PKGTOP) cp -p $(ADMSERV_OBJDIR)/README.txt $(PKGTOP) cp -p $(SETUPUTIL_BIN)/unzip_wrapper.pl $(PKGTOP)

1 0

[Fedora-directory-commits] adminserver components.mk, 1.40, 1.41 nsarch, 1.4, 1.5 nsconfig.mk, 1.20, 1.21 nsdefs.mk, 1.8, 1.9 nsperl.mk, 1.5, 1.6
by Doctor Conrad 02 Feb '06

02 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006 Modified Files: components.mk nsarch nsconfig.mk nsdefs.mk nsperl.mk Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- components.mk 9 Nov 2005 23:22:50 -0000 1.40 +++ components.mk 1 Feb 2006 23:03:41 -0000 1.41 @@ -313,10 +313,10 @@ # Console java classes ############################################################# -NMCJDK_SUF = 10 +NMCJDK_SUF = 1.0 NMCJDK_RELDATE = 20051027 -NMCJDK_COMP = console/1.0 +NMCJDK_COMP = console/$(NMCJDK_SUF) NMCJDK_VERSION = $(NMCJDK_RELDATE) @@ -339,11 +339,11 @@ ifdef INTERNAL_BUILD mkdir -p $(CLASS_DEST) # grab the jar files - $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files base.jar,mcc$(NMCJDK_SUF).jar,mcc$(NMCJDK_SUF)_en.jar,nmclf$(NMCJDK_SUF).jar,nmclf$(NMCJDK_SUF)_en.jar,caplugin + $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files fedora-base-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF)_en.jar,fedora-nmclf-$(NMCJDK_SUF).jar,fedora-nmclf-$(NMCJDK_SUF)_en.jar,caplugin # grab the startconsole program $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(BASE_NMCSDK) -files startconsole && chmod +x $(CLASS_DEST)/startconsole else # INTERNAL_BUILD - @if [ ! -f $(CONSOLE_JAR_DIR)/base.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi + @if [ ! -f $(CONSOLE_JAR_DIR)/fedora-base-1.0.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi endif ############################################################# Index: nsarch =================================================================== RCS file: /cvs/dirsec/adminserver/nsarch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsarch 18 Aug 2005 18:57:33 -0000 1.4 +++ nsarch 1 Feb 2006 23:03:41 -0000 1.5 @@ -1,35 +1,33 @@ #! /bin/sh +# # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation version +# 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# - +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK # # Name: nsarch # # Description: this file determines the system name and outputs the -# platform information in a format used by Fedora build +# platform information in a format used by build # scripts and utilities; this file is based on the GNU # "config.guess" utility; the GNU copyleft is provided # somewhere below... # -# For each platform supported by Fedora, we need to provide the +# For each platform supported, we need to provide the # following definitions: # # Variable Description @@ -95,7 +93,7 @@ echo "Usage: $0 [ [-full {-under | -dash | -none} {-pretty} ] | -gnu ]" echo echo " <no args> Default to output OS name only; suitable for use" - echo " in Fedora's makefiles and compiler defines" + echo " in makefiles and compiler defines" echo " -f, -full, --full) Full output includes OS name and release number" echo " -d, -dash, --dash) use with -f to specify a dash separator" echo " -u, -under, --under) use with -f to specify a underscore separator" @@ -179,7 +177,7 @@ #-------------------------------------------------------------------------- # everything that follows is GNU's config.guess slightly modified -# for Fedora's use +# for our use # NT doesn't have /dev/null #UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown @@ -453,6 +451,14 @@ NS_RELEASE="${HPUX_REV}" ns_printf exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + GNU_NAME="${UNAME_MACHINE}-hp-hpux${HPUX_REV}" + NS_NAME="HPUX" + NS_PRETTY_NAME="HP-UX" + NS_RELEASE="${HPUX_REV}" + ns_printf + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >dummy.c #include <unistd.h> @@ -572,7 +578,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nsconfig.mk 23 Nov 2005 01:25:45 -0000 1.20 +++ nsconfig.mk 1 Feb 2006 23:03:41 -0000 1.21 @@ -208,7 +208,12 @@ #------------------- ifeq ($(ARCH), HPUX) #------------------- -DLL_SUFFIX=sl +HPUX_ARCH = $(shell uname -m) +ifeq ($(HPUX_ARCH), ia64) + DLL_SUFFIX=so +else + DLL_SUFFIX=sl +endif LDAP_DLL_SUFFIX=$(DLL_SUFFIX) ifeq ($(NSOS_RELEASE), B.11.00) @@ -217,17 +222,33 @@ ifeq ($(NSOS_RELEASE), B.11.11) MODERNHP=1 endif - -ifdef MODERNHP -CC=cc -Ae +ESlit -CXX=aCC -ifeq ($(USE_64), 1) -BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s -else -BIT_SWITCH=+DAportable +DS1.1 -Wl,+s +ifeq ($(NSOS_RELEASE), B.11.23) + MODERNHP=1 endif -ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 -EXTRA_LIBS= -ldld -lm -lpthread + +ifeq ($(MODERNHP), 1) +CXX=/opt/aCC/bin/aCC +CC=cc -Ae +ifeq ($(NSOS_RELEASE), B.11.23) + CC+=+Olit=all + ifeq ($(USE_64), 1) + BIT_SWITCH=+DD64 + else + BIT_SWITCH=+DD32 + endif + IPF_CFLAGS=-DPIC + EXTRA_LIBS= -ldld -lm -lpthread +else # 11.11 or earlier + CC+=+ESlit + ifeq ($(USE_64), 1) + BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s + else + BIT_SWITCH=+DAportable +DS1.1 -Wl,+s + endif + IPF_CFLAGS= + EXTRA_LIBS= -ldld -lm -lpthread +endif # B.11.23 +ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 $(IPF_CFLAGS) else CC=cc ARCH_CFLAGS=-D_HPUX_SOURCE -Aa +DA1.0 +z @@ -505,7 +526,7 @@ endif endif -ADM_SUF=10 +ADM_SUF=1.0 # CLEAN THIS UP @@ -700,10 +721,10 @@ SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi ifeq ($(ARCH), HPUX) -SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3 +SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl3 endif ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3 +SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_32fpu_3 freebl_32int_3 freebl_32int64_3 endif ifeq ($(ARCH), WINNT) @@ -725,7 +746,7 @@ # ICU ########################################## -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 @@ -790,25 +811,25 @@ # ADMINUTIL ######################################## -ADMINUTIL_LIB_VERSION=10 +ADMINUTIL_LIB_VERSION=1.0 ifdef ADMINUTIL_SOURCE_ROOT ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib - ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-1.0 + ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-$(ADMINUTIL_LIB_VERSION) else ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include endif ifeq ($(ARCH), WINNT) - ADMINUTIL_LIBNAMES = libadmsslutil_s$(ADMINUTIL_LIB_VERSION) libadminutil$(ADMINUTIL_LIB_VERSION) + ADMINUTIL_LIBNAMES = libadmsslutil_s libadminutil ADMINUTIL_LIBS = $(addsuffix .lib, $(ADMINUTIL_LIBNAMES)) LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_LIBS)) ADMINUTILOBJNAME = $(ADMINUTIL_LIBNAMES) else - ADMINUTIL_LIBNAMES = admsslutil$(ADMINUTIL_LIB_VERSION) adminutil$(ADMINUTIL_LIB_VERSION) - ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF)$(ADMINUTIL_LIB_VERSION), $(addprefix lib, adminutil admsslutil)) + ADMINUTIL_LIBNAMES = admsslutil adminutil + ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix lib, adminutil admsslutil)) ADMINUTIL_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMINUTIL_LIBNAMES))) - ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(ADMINUTIL_SOLIB_NAMES)) + ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX).$(MAJOR_VERSION), $(ADMINUTIL_SOLIB_NAMES)) ADMINUTILOBJNAME = $(ADMINUTIL_SOLIBS) LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_SOLIBS)) ADMINUTILLINK = -L$(ADMINUTIL_LIBPATH) $(addprefix -l, $(ADMINUTIL_LIBNAMES)) @@ -886,7 +907,7 @@ endif ifdef CONSOLE_SOURCE_DIR - CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/package + CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/release/package CONSOLE_JAR_DIR = $(CONSOLE_BASE_DIR)/java else CONSOLE_BASE_DIR = $(CLASS_DEST) Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsdefs.mk 29 Sep 2005 22:11:57 -0000 1.8 +++ nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9 @@ -73,6 +73,7 @@ NSOS_ARCH := $(subst /,_,$(shell uname -s)) +ARCHTYPE= ifeq ($(TMP_ARCH), SunOS) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), i86pc) @@ -80,8 +81,13 @@ else ARCHTYPE= endif -else - ARCHTYPE= +endif + +ifeq ($(TMP_ARCH), HP-UX) + NSOS_TEST1 := $(shell uname -m) + ifeq ($(NSOS_TEST1), ia64) + ARCHTYPE=_ia64 + endif endif ifeq ($(NSOS_ARCH),WINNT) @@ -274,8 +280,10 @@ DO_SEARCH= NODE_FLAG=-DNO_NODELOCK -MAJOR_VERSION:="6" -MINOR_VERSION:="2" +MAJOR_VERSION_NUM:=1 +MINOR_VERSION_NUM:=0 +MAJOR_VERSION:="$(MAJOR_VERSION_NUM)" +MINOR_VERSION:="$(MINOR_VERSION_NUM)" DIRVERDIR=$(COMMON_OBJDIR)/include DIRVER_H=$(DIRVERDIR)/dirver.h Index: nsperl.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsperl.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsperl.mk 10 Nov 2005 01:12:54 -0000 1.5 +++ nsperl.mk 1 Feb 2006 23:03:41 -0000 1.6 @@ -71,6 +71,9 @@ ifeq ($(OSVER),SunOS5.5.1) PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5 endif +ifeq ($(OSVER), HP-UXB.11.23) +PERL5=perl +endif ifeq ($(OSVER), HP-UXB.11.11) PERL5=/u/robobld/nsperl/hpux/nsperl endif

1 0

[Fedora-directory-commits] adminutil nscore.mk,1.1.1.1,1.2
by Doctor Conrad 01 Feb '06

01 Feb '06

Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001 Modified Files: nscore.mk Log Message: [Bug 172166] Admin Util build (IPF) set an appropriate macro CPU_ia64 to reflect the cpu type Index: nscore.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nscore.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nscore.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ nscore.mk 1 Feb 2006 22:47:51 -0000 1.2 @@ -51,7 +51,12 @@ endif # HP-UX ifeq ($(ARCH), HPUX) - CFLAGS += -DCPU_hppa -DOS_hpux + HPUX_ARCH := $(shell uname -m) + ifeq ($(HPUX_ARCH), ia64) + CFLAGS += -DCPU_ia64 -DOS_hpux + else + CFLAGS += -DCPU_hppa -DOS_hpux + endif CFLAGS += -D_NO_THREADS_ endif # AIX

1 0

[Fedora-directory-commits] setuputil nsconfig.mk, 1.5, 1.6 nscore.mk, 1.1.1.1, 1.2
by Doctor Conrad 01 Feb '06

01 Feb '06

Author: nhosoi Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971 Modified Files: nsconfig.mk nscore.mk Log Message: [175900] SetupUtil build (IPF) 1) set an appropriate macro CPU_ia64 to reflect the cpu type 2) set -AA to support the standard C++ runtime Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsconfig.mk 28 Jan 2006 02:33:14 -0000 1.5 +++ nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6 @@ -232,19 +232,21 @@ CC=cc -Ae +ESlit CXX=aCC ifeq ($(NSOS_RELEASE), B.11.23) + ARCH_CFLAGS=-AA ifeq ($(USE_64), 1) BIT_SWITCH=+DD64 else BIT_SWITCH=+DD32 endif else # 11.11 or earlier + ARCH_CFLAGS= ifeq ($(USE_64), 1) BIT_SWITCH=+DA2.0W +DS2.0 else BIT_SWITCH=+DAportable +DS1.1 endif endif # B.11.23 -ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 +ARCH_CFLAGS+=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 EXTRA_LIBS= -ldld -lm -lpthread else CC=cc Index: nscore.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nscore.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nscore.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ nscore.mk 1 Feb 2006 22:46:18 -0000 1.2 @@ -51,7 +51,12 @@ endif # HP-UX ifeq ($(ARCH), HPUX) - CFLAGS += -DCPU_hppa -DOS_hpux + HPUX_ARCH := $(shell uname -m) + ifeq ($(HPUX_ARCH), ia64) + CFLAGS += -DCPU_ia64 -DOS_hpux + else + CFLAGS += -DCPU_hppa -DOS_hpux + endif CFLAGS += -D_NO_THREADS_ endif # AIX

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits February 2006