From fedora-directory-commits at redhat.com Thu Sep 1 01:11:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 31 Aug 2005 21:11:22 -0400 Subject: [Fedora-directory-commits] ldapserver Makefile, 1.24, 1.25 nsdefs.mk, 1.11, 1.12 Message-ID: <200509010111.j811BMcm027984@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27953 Modified Files: Makefile nsdefs.mk Log Message: [167264] Update branding script data to include the revision info 1) Makefile: Added debrandDirectory target for debranding 2) nsdefs.mk: Introduced a new macro NOSP_DIR_VERSION. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile 16 May 2005 03:10:04 -0000 1.24 +++ Makefile 1 Sep 2005 01:11:19 -0000 1.25 @@ -206,9 +206,14 @@ $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec @echo ==== Finished Branding LDAP Server ========== +debrandDirectory: $(RELTOOLSPATH)/brandver.pl + @echo ==== Debranding LDAP Server ========== + $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec + @echo ==== Finished Debranding LDAP Server ========== + normalizeDirectory: $(RELTOOLSPATH)/brandver.pl @echo ==== Normalizing LDAP Server ========== - $(RELTOOLSPATH)/brandver.pl -i branding/rhds/normalize.dat -s redhat-ds.spec + $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec @echo ==== Normalizing Branding LDAP Server ========== buildAndPkgDirectory: buildDirectory pkgDirectory Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nsdefs.mk 19 Apr 2005 22:06:42 -0000 1.11 +++ nsdefs.mk 1 Sep 2005 01:11:19 -0000 1.12 @@ -265,6 +265,7 @@ OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no DIR_VERSION:=7.1 +NOSP_DIR_VERSION:=7.1 DIR_NORM_VERSION:=7.1 # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must # update all of the .exp and .def files by executing the following command: From fedora-directory-commits at redhat.com Thu Sep 1 01:11:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 31 Aug 2005 21:11:22 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt dsinst.rc, 1.6, 1.7 Message-ID: <200509010111.j811BMEe027990@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27953/ldap/cm/newinstnt Modified Files: dsinst.rc Log Message: [167264] Update branding script data to include the revision info 1) Makefile: Added debrandDirectory target for debranding 2) nsdefs.mk: Introduced a new macro NOSP_DIR_VERSION. Index: dsinst.rc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dsinst.rc 19 Apr 2005 22:07:21 -0000 1.6 +++ dsinst.rc 1 Sep 2005 01:11:20 -0000 1.7 @@ -190,7 +190,7 @@ IDD_SUITESPOTID DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION -"Directory Server 7.0 Fedora configuration directory server administrator " +"Directory Server 7.1 Fedora configuration directory server administrator " FONT 8, "MS Sans Serif" BEGIN @@ -489,7 +489,7 @@ IDD_ADMIN_ID_ONLY DIALOG DISCARDABLE 0, 0, 297, 163 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION -"Directory Server 7.0 Fedora configuration directory server administrator " +"Directory Server 7.1 Fedora configuration directory server administrator " FONT 8, "MS Sans Serif" BEGIN From fedora-directory-commits at redhat.com Fri Sep 2 20:41:02 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:41:02 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinstnt Makefile, 1.6, 1.7 dsinst.c, 1.11, 1.12 Message-ID: <200509022041.j82Kf2Fg032193@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm/newinstnt Modified Files: Makefile dsinst.c Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 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/newinstnt/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:21 -0000 1.6 +++ Makefile 2 Sep 2005 20:40:54 -0000 1.7 @@ -54,7 +54,7 @@ OUTDIR=$(OBJDIR)/setup -CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPSDK_INCLUDE) $(LDAPSDK_INCLUDE) \ +CFLAGS=/nologo /MD /W3 /Gm /GX /Zi /Od $(SETUPUTIL_INCLUDE) $(LDAPSDK_INCLUDE) \ /I "$(LDAP_SRC)/admin/include" /I "$(LDAP_SRC)/admin/lib" \ /I "$(LDAP_SRC)/admin/src" /D \ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(OUTDIR)/dsinst.pch" /YX \ @@ -71,7 +71,7 @@ kernel32.lib user32.lib gdi32.lib comdlg32.lib\ comctl32.lib advapi32.lib shell32.lib uuid.lib\ wsock32.lib\ - $(SETUPSDKLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK) + $(SETUPUTILLINK) $(LDAP_SDK_LIBLDAP_DLL) $(NSPRLINK) DSOBJS= \ $(OUTDIR)/dsinst_dsalib_dn.obj \ @@ -92,7 +92,7 @@ RM=erase /F /Q FIXINF= ../newinst/fixINF.pl -all: $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf +all: $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(NSPR_DEP) $(ADMINUTIL_DEP) $(OUTDIR)/dsinst.dll $(OUTDIR)/slapd.inf clean: -rm -rf "$(OUTDIR)" Index: dsinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dsinst.c 19 Apr 2005 22:07:21 -0000 1.11 +++ dsinst.c 2 Sep 2005 20:40:54 -0000 1.12 @@ -7455,7 +7455,7 @@ return FALSE; } - // hack to work around potential bug in setupsdk . . . + // hack to work around potential bug in setuputil . . . SetCurrentDirectory("../slapd"); my_snprintf(infFile, sizeof(infFile), "slapd.inf"); GetProductInfoStringWithTok(NSPERL_POST_INSTALL_PROG, "=", nsPerlPostInstall, From fedora-directory-commits at redhat.com Fri Sep 2 20:40:49 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:40:49 -0400 Subject: [Fedora-directory-commits] ldapserver Makefile, 1.25, 1.26 component_versions.mk, 1.35, 1.36 components.mk, 1.30, 1.31 internal_comp_deps.mk, 1.24, 1.25 nsconfig.mk, 1.14, 1.15 Message-ID: <200509022041.j82KfJli032198@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver Modified Files: Makefile component_versions.mk components.mk internal_comp_deps.mk nsconfig.mk Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile 1 Sep 2005 01:11:19 -0000 1.25 +++ Makefile 2 Sep 2005 20:40:46 -0000 1.26 @@ -79,7 +79,7 @@ @echo " USE_ORGCHART=1 - build/bundle the Org Chart webapp" @echo " USE_DSGW=1 - build/bundle the Phonebook/DS Gateway webapp" @echo " USE_JAVATOOLS=1 - build/bundle the Java command line tools" - @echo " USE_SETUPSDK=1 - build/bundle programs that use Setup SDK" + @echo " USE_SETUPUTIL=1 - build/bundle programs that use Setuputil" ###### Implementation notes: # @@ -131,7 +131,7 @@ ifeq ($(INTERNAL_BUILD), 1) COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \ - $(ICU_DEP) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \ + $(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \ $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) endif @@ -316,7 +316,7 @@ setupDirectory: cd ldap/cm; $(MAKE) $(MFLAGS) releaseDirectory; -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) cd ldap/cm; $(MAKE) $(MFLAGS) packageDirectory; endif Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- component_versions.mk 17 May 2005 02:09:34 -0000 1.35 +++ component_versions.mk 2 Sep 2005 20:40:46 -0000 1.36 @@ -122,10 +122,10 @@ # admin server ifndef ADM_RELDATE - ADM_RELDATE = 20050512 + ADM_RELDATE = 20050901 endif ifndef ADM_VERSDIR - ADM_VERSDIR = adminserver/70$(BUILD_MODE) + ADM_VERSDIR = adminserver/7.1 endif # Net-SNMP @@ -133,16 +133,17 @@ NETSNMP_VER = v5.2.1 endif -# setup sdk -ifndef SETUP_SDK_RELDATE - SETUP_SDK_RELDATE = 20050426 +# setuputil +ifndef SETUPUTIL_RELDATE + SETUPUTIL_RELDATE = 20050831 endif -ifndef SETUPSDK_VER - SETUPSDK_VER = 70 +ifndef SETUPUTIL_VER + SETUPUTIL_VER = 71 + SETUPUTIL_DOT_VER = 7.1 endif -ifndef SETUPSDK_VERSDIR - SETUPSDK_VERSDIR=setupsdk$(SETUPSDK_VER)$(BUILD_MODE) +ifndef SETUPUTIL_VERSDIR + SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER) endif # infozip utilities @@ -157,14 +158,15 @@ # admin utility library ifndef ADMINUTIL_VER - ADMINUTIL_VER=70 + ADMINUTIL_VER=71 + ADMINUTIL_DOT_VER=7.1 endif ifndef ADMINUTIL_RELDATE - ADMINUTIL_RELDATE=20050330 + ADMINUTIL_RELDATE=20050721 endif ifndef ADMINUTIL_VERSDIR - ADMINUTIL_VERSDIR=adminsdk$(ADMINUTIL_VER)$(BUILD_MODE) + ADMINUTIL_VERSDIR=adminutil/$(ADMINUTIL_DOT_VER) endif # LDAP Console Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- components.mk 16 May 2005 21:58:00 -0000 1.30 +++ components.mk 2 Sep 2005 20:40:46 -0000 1.31 @@ -152,7 +152,7 @@ LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG) LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG) endif ifeq ($(USE_DSGW), 1) @@ -237,7 +237,7 @@ SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK))) LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG) LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) endif ifeq ($(USE_DSGW), 1) @@ -318,7 +318,7 @@ LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME))) LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME))) - ifeq ($(USE_SETUPSDK), 1) + ifeq ($(USE_SETUPUTIL), 1) PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME))) endif ifeq ($(USE_DSGW), 1) @@ -339,7 +339,7 @@ LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) - ifeq ($(USE_SETUPSDK), 1) + ifeq ($(USE_SETUPUTIL), 1) PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) endif ifeq ($(USE_DSGW), 1) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- internal_comp_deps.mk 18 May 2005 13:38:57 -0000 1.24 +++ internal_comp_deps.mk 2 Sep 2005 20:40:46 -0000 1.25 @@ -322,10 +322,14 @@ # ADMINUTIL library ####################################### ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE) -ADMINUTIL_BASE=adminsdk/$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} -ADMSDKOBJDIR = $(FULL_RTL_OBJDIR) -ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) -#ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} +ifeq ($(BUILD_MODE), int) + ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +else + ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +endif # this is the base directory under which the component's files will be found # during the build process ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil @@ -339,7 +343,7 @@ # # Libadminutil # -ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX) +ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(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) @@ -376,7 +380,7 @@ ifndef NETSNMP_PULL_METHOD NETSNMP_PULL_METHOD = $(COMPONENT_PULL_METHOD) endif - + $(NETSNMP_DEP): $(NSCP_DISTDIR_FULL_RTL) ifneq ($(ARCH), WINNT) ifdef COMPONENT_DEPS @@ -392,41 +396,45 @@ ########################################################### -### SETUPSDK ############################# +### SETUPUTIL ############################# # this is where the build looks for setupsdk components -SETUP_SDK_BUILD_DIR = $(NSCP_DISTDIR)/setupsdk -SETUPSDK_VERSION = $(SETUP_SDK_RELDATE) -SETUPSDK_RELEASE = $(COMPONENTS_DIR)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME) -#SETUPSDK_RELEASE = $(COMPONENTS_DIR_DEV)/setupsdk/$(SETUPSDK_VERSDIR)/$(SETUPSDK_VERSION)/$(NSOBJDIR_NAME) -SETUPSDK_LIBPATH = $(SETUP_SDK_BUILD_DIR)/lib -SETUPSDK_INCDIR = $(SETUP_SDK_BUILD_DIR)/include -SETUPSDK_BINPATH = $(SETUP_SDK_BUILD_DIR)/bin -SETUPSDK_INCLUDE = -I$(SETUPSDK_INCDIR) +SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR)/setuputil +SETUPUTIL_VERSION = $(SETUPUTIL_RELDATE) +ifeq ($(BUILD_MODE), int) + SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) +# SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) +else + SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) +endif +SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib +SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include +SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin +SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR) ifeq ($(ARCH), WINNT) -SETUP_SDK_FILES = setupsdk.tar.gz -unzip $(NSCP_DISTDIR)/setupsdk -SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/nssetup32.$(LIB_SUFFIX) -SETUPSDKLINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32.$(LIB_SUFFIX) -SETUPSDK_S_LINK = /LIBPATH:$(SETUPSDK_LIBPATH) nssetup32_s.$(LIB_SUFFIX) +SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil +SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX) +SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX) +SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX) else -SETUP_SDK_FILES = bin,lib,include -SETUPSDK_DEP = $(SETUPSDK_LIBPATH)/libinstall.$(LIB_SUFFIX) -SETUPSDKLINK = -L$(SETUPSDK_LIBPATH) -linstall -SETUPSDK_S_LINK = $(SETUPSDKLINK) +SETUPUTIL_FILES = bin,lib,include +SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX) +SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall +SETUPUTIL_S_LINK = $(SETUPUTILLINK) endif -ifndef SETUPSDK_PULL_METHOD -SETUPSDK_PULL_METHOD = $(COMPONENT_PULL_METHOD) +ifndef SETUPUTIL_PULL_METHOD +SETUPUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD) endif -$(SETUPSDK_DEP): $(NSCP_DISTDIR) +$(SETUPUTIL_DEP): $(NSCP_DISTDIR) ifdef COMPONENT_DEPS - $(FTP_PULL) -method $(SETUPSDK_PULL_METHOD) \ - -objdir $(SETUP_SDK_BUILD_DIR) -componentdir $(SETUPSDK_RELEASE) \ - -files $(SETUP_SDK_FILES) + $(FTP_PULL) -method $(SETUPUTIL_PULL_METHOD) \ + -objdir $(SETUPUTIL_BUILD_DIR) -componentdir $(SETUPUTIL_RELEASE) \ + -files $(SETUPUTIL_FILES) endif - at if [ ! -f $@ ] ; \ - then echo "Error: could not get component SETUPSDK file $@" ; \ + then echo "Error: could not get component SETUPUTIL file $@" ; \ fi # apache-axis java classes ####################################### AXIS = axis-$(AXIS_VERSION).zip @@ -702,28 +710,13 @@ ADMIN_REL = $(ADM_VERSDIR) ADMIN_REL_DATE = $(ADM_VERSION) -ADMIN_FILE = admserv.tar.gz -ADMIN_FILE_TAR = admserv.tar -ADMSDKOBJDIR = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ -IMPORTADMINSRV_BASE=$(COMPONENTS_DIR)/$(ADMIN_REL)/$(ADMIN_REL_DATE) -#IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE) +#ADMIN_FILE = adminserver.tar.gz +ADMIN_FILE = admin,base +ADMIN_FILE_TAR = adminserver.tar +IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE) IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) -ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/admserv -ADMSERV_DEP = $(ADMSERV_DIR)/setup$(EXE_SUFFIX) - -ifdef FORTEZZA - ADM_VERSION = $(ADM_RELDATE)F -else - ifeq ($(SECURITY), domestic) - ADM_VERSION = $(ADM_RELDATE)D - else - ifneq ($(ARCH), IRIX) - ADM_VERSION = $(ADM_RELDATE)E - else - ADM_VERSION = $(ADM_RELDATE)D - endif - endif -endif +ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver +ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf ADM_VERSION = $(ADM_RELDATE) ADM_RELEASE = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(NSOBJDIR_NAME) @@ -741,7 +734,7 @@ ifdef ADMSERV_DEPS $(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \ -objdir $(ADMSERV_DIR) -componentdir $(IMPORTADMINSRV) \ - -files $(ADMIN_FILE) -unzip $(ADMSERV_DIR) + -files $(ADMIN_FILE) endif @if [ ! -f $@ ] ; \ then echo "Error: could not get component ADMINSERV file $@" ; \ @@ -755,7 +748,7 @@ DSDOC_VERSDIR = $(DIR_NORM_VERSION)$(BUILD_MODE) #DSDOC_RELEASE = $(COMPONENTS_DIR_DEV)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE) DSDOC_RELEASE = $(COMPONENTS_DIR)/ldapserverdoc/$(DSDOC_VERSDIR)/$(DSDOC_RELDATE) - + DSDOC_CLIENTS = slapd_clients.zip DSDOC_COPYRIGHT = slapd_copyright.zip DSDOC_FILES = $(DSDOC_COPYRIGHT),$(DSDOC_CLIENTS) Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nsconfig.mk 10 May 2005 23:16:59 -0000 1.14 +++ nsconfig.mk 2 Sep 2005 20:40:46 -0000 1.15 @@ -66,7 +66,7 @@ USE_ORGCHART:=1 USE_DSGW:=1 USE_JAVATOOLS:=1 - USE_SETUPSDK:=1 + USE_SETUPUTIL:=1 endif include $(BUILD_ROOT)/nsdefs.mk @@ -373,14 +373,15 @@ COMPONENTS_DIR_DEV = /share/builds/sbsintegration endif +# internal repository for all pre-built RTM components, including Red Hat branded ones ifndef COMPONENTS_DIR COMPONENTS_DIR = /share/builds/components endif -# For now, we need to pick up a private build of the LDAP SDK -#ifndef LDAP_SBC -#LDAP_SBC = /share/builds/sbsintegration/ds/ds70-bozeman -#endif +# internal repository for pre-built RTM Fedora branded components +ifndef FED_COMPONENTS_DIR +FED_COMPONENTS_DIR = /fedora/components +endif ########################################################### @@ -1303,7 +1304,7 @@ NSCP_ABS_DISTDIR_FULL_RTL = $(ABS_ROOT_PARENT)/dist/$(FULL_RTL_OBJDIR) # these components may have additional RTL debugging support built in on NT -# adminsdk (adminutil), dbm, ldapsdk, NLS, NSPR, NSS (security) +# adminutil, dbm, ldapsdk, NLS, NSPR, NSS (security) # we cannot simply redefine NSOBJDIR_NAME and NSCP_DISTDIR because other # components do not have this RTL support stuff and the .OBJD directory # does not exist From fedora-directory-commits at redhat.com Fri Sep 2 20:40:50 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:40:50 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.10 Message-ID: <200509022041.j82KfKgO032203@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap Modified Files: Makefile Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 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/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 9 May 2005 22:11:21 -0000 1.9 +++ Makefile 2 Sep 2005 20:40:47 -0000 1.10 @@ -61,7 +61,7 @@ ifneq ($(ARCH), WINNT) cd systools; $(MAKE) $(MFLAGS) all # new unix installer -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) cd cm/newinst; $(MAKE) $(MFLAGS) 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 @@ -70,11 +70,11 @@ $(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 -endif # USE_SETUPSDK +endif # USE_SETUPUTIL else # not WINNT -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) cd cm/newinstnt; $(MAKE) $(MFLAGS) all -endif # USE_SETUPSDK +endif # USE_SETUPUTIL endif # WINNT cd admin; $(MAKE) $(MFLAGS) all ifeq ($(ARCH), WINNT) From fedora-directory-commits at redhat.com Fri Sep 2 20:40:55 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:40:55 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src DSAdmin.mk, 1.6, 1.7 Makefile, 1.11, 1.12 create_instance.c, 1.20, 1.21 ds_newinst.c, 1.3, 1.4 ds_remove_uninst.cpp, 1.5, 1.6 Message-ID: <200509022041.j82KfQmU032208@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/admin/src Modified Files: DSAdmin.mk Makefile create_instance.c ds_newinst.c ds_remove_uninst.cpp Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: DSAdmin.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/DSAdmin.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DSAdmin.mk 19 Apr 2005 22:06:54 -0000 1.6 +++ DSAdmin.mk 2 Sep 2005 20:40:48 -0000 1.7 @@ -62,7 +62,7 @@ EXTRALDFLAGS += $(SSLLIBFLAG) endif -EXTRA_LIBS += $(LIBPERL_A) $(SETUPSDK_S_LINK) $(LDAP_ADMLIB) \ +EXTRA_LIBS += $(LIBPERL_A) $(SETUPUTIL_S_LINK) $(LDAP_ADMLIB) \ $(LDAPLINK) $(DEPLINK) $(ADMINUTIL_LINK) \ $(NSPRLINK) $(NLSLINK) \ $(NLSLINK_CONV_STATIC) @@ -102,7 +102,7 @@ OBJS= $(addprefix $(OBJDEST)/, $(DSADMIN_OBJS)) DSADMIN_SO = $(addprefix $(BINDIR)/, $(DSADMIN_BASENAME)) -EXTRA_LIBS_DEP = $(SETUPSDK_DEP) +EXTRA_LIBS_DEP = $(SETUPUTIL_DEP) # for Solaris, our most common unix build platform, we check for undefined # symbols at link time so we don't catch them at run time. To do this, we Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 19 Apr 2005 22:06:55 -0000 1.11 +++ Makefile 2 Sep 2005 20:40:48 -0000 1.12 @@ -95,8 +95,8 @@ EXTRA_LIBS += $(ADMINUTIL_LINK) endif EXTRA_LIBS += $(SECURITYLINK) $(NSPRLINK) -ifeq ($(USE_SETUPSDK), 1) - EXTRA_LIBS += $(SETUPSDK_S_LINK) +ifeq ($(USE_SETUPUTIL), 1) + EXTRA_LIBS += $(SETUPUTIL_S_LINK) endif EXTRA_LIBS += $(ICULINK) $(OLD_EXTRA_LIBS) @@ -220,7 +220,7 @@ ifeq ($(ARCH), WINNT) OBJECTS += namegen.o latest_file.o -ifeq ($(USE_SETUPSDK), 1) +ifeq ($(USE_SETUPUTIL), 1) OBJECTS += ds_remove_uninst.o endif endif @@ -308,7 +308,7 @@ $(LINK_EXE) $(NT_NOLIBS) $(OBJDEST)/instindex.o \ $(OBJDEST)/create_instance.o $(OBJDEST)/cfg_sspt.o \ $(OBJDEST)/configure_instance.o $(OBJDEST)/script-gen.o \ - $(SETUPSDK_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \ + $(SETUPUTIL_S_LINK) $(LDAP_SDK_LIBS) $(LIBNT) \ $(NSPRLINK) $(EXTRA_LIBS) $(DB_LIB) # linking this file causes a .exp and a .lib file to be generated which don't seem # to be required while running, so I get rid of them @@ -317,10 +317,10 @@ $(BINDIR)/ds_remove: $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP) $(LINK_EXE_NOLIBSOBJS) $(SHARED) $(EXTRALDFLAGS) \ $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/init_ds_env.o \ - $(SETUPSDK_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS) + $(SETUPUTIL_S_LINK) $(GLUEOBJ) $(EXTRA_LIBS) $(BINDIR)/ds_remove.exe: $(OBJDEST)/ds_remove.o $(OBJDEST)/ds_remove_uninst.o $(DEPLIBS) $(EXTRA_LIBS_DEP) - $(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPSDK_S_LINK) $(NT_NOLIBS) + $(LINK_EXE) $(OBJDEST)/ds_remove_uninst.o $(OBJDEST)/ds_remove.o $(OBJDEST)/init_ds_env.o $(LDAP_SDK_LIBS) $(NSPRLINK) $(SETUPUTIL_S_LINK) $(NT_NOLIBS) # linking this file causes a .exp and a .lib file to be generated which don't seem # to be required while running, so I get rid of them $(RM) $(subst .exe,.exp,$@) $(subst .exe,.lib,$@) @@ -330,9 +330,9 @@ $(OBJDEST)/%.o: %.cpp ifeq ($(ARCH), WINNT) - $(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@ + $(CC) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@ else - $(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPSDK_INCLUDE) $< $(OFFLAG)$@ + $(CXX) $(EXCEPTIONS) -c $(CFLAGS) $(MCC_INCLUDE) $(SETUPUTIL_INCLUDE) $< $(OFFLAG)$@ endif ifneq ($(ARCH), WINNT) Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- create_instance.c 26 Aug 2005 19:41:40 -0000 1.20 +++ create_instance.c 2 Sep 2005 20:40:48 -0000 1.21 @@ -1161,7 +1161,7 @@ " sleep 1;\n" " else\n" " PID=`cat $PIDFILE`\n" - /* rbyrne: setupsdk takes any message here as an error: + /* rbyrne: setuputil takes any message here as an error: " echo Server has been started. ns-slapd process started: $PID\n"*/ " exit 0;\n" " fi\n" @@ -1218,7 +1218,7 @@ " sleep 1;\n" " else\n" " PID=`cat $PIDFILE`\n" - /* rbyrne: setupsdk takes any message here as an error: + /* rbyrne: setuputil takes any message here as an error: " echo Server has been started. ns-slapd process started: $PID\n"*/ " exit 0;\n" " fi\n" @@ -1297,7 +1297,7 @@ " fi\n" " else\n" " PID=`cat $PIDFILE`\n" - /* rbyrne: setupsdk takes any message here as an error: + /* rbyrne: setuputil takes any message here as an error: " echo Server has been started. ns-slapd process started: $PID\n"*/ " exit 0;\n" " fi\n" @@ -1345,7 +1345,7 @@ " if test -f $PIDFILE ; then\n" " rm -f $PIDFILE\n" " fi\n" - /* rbyrne: setupsdk takes any message here as an error: + /* rbyrne: setuputil takes any message here as an error: " echo Server has been stopped. ns-slapd process stopped: $PID\n"*/ " exit 0\n" " fi\n" Index: ds_newinst.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ds_newinst.c 19 Apr 2005 22:06:55 -0000 1.3 +++ ds_newinst.c 2 Sep 2005 20:40:48 -0000 1.4 @@ -37,7 +37,7 @@ /* * ds_newinst.c - creates a new instance of directory server, scripts, * configuration, etc. Does not create any Admin Server stuff or - * deal with any setupsdk stuff, but may be optionally used to create + * deal with any setuputil stuff, but may be optionally used to create * and configure the config suffix (o=NetscapeRoot) */ Index: ds_remove_uninst.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_remove_uninst.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ds_remove_uninst.cpp 19 Apr 2005 22:06:55 -0000 1.5 +++ ds_remove_uninst.cpp 2 Sep 2005 20:40:48 -0000 1.6 @@ -37,7 +37,7 @@ * END COPYRIGHT BLOCK **/ // ds_remove_uninst.cpp // -// ds_remove routines that use c++ calls in adminsdk +// ds_remove routines that use c++ calls in adminutil // #include #include From fedora-directory-commits at redhat.com Fri Sep 2 20:40:56 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:40:56 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.6, 1.7 ux-config.cc, 1.8, 1.9 Message-ID: <200509022041.j82KfREQ032215@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm/newinst Modified Files: Makefile ux-config.cc Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 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/newinst/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:20 -0000 1.6 +++ Makefile 2 Sep 2005 20:40:54 -0000 1.7 @@ -57,8 +57,8 @@ include $(LDAP_SRC)/nsldap.mk test: - echo $(SETUPSDK_VERSION) - echo $(SETUPSDK_RELEASE) + echo $(SETUPUTIL_VERSION) + echo $(SETUPUTIL_RELEASE) # MODULE_CFLAGS = -DUSE_ADMSERV @@ -98,12 +98,12 @@ INFO= $(OBJDIR)/$(DIR) # Source for staged installation utilities -INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src +INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src # ADM_VERSDIR = admserv40 # ADM_RELDATE = 19980112 -all: $(OBJDEST) $(BINDEST) $(SETUPSDK_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall +all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(SECURITY_DEP) $(NSPR_DEP) $(OSOBJS) $(OBJS1) $(OBJS2) $(BINS) $(INFO) $(BINDEST)/ns-update $(BINDEST)/uninstall # removed ns-keygen from build - it was only used for Dir Lite # $(BINDEST)/ns-keygen ifeq ($(ARCH), BSDI) @@ -172,7 +172,7 @@ $(BINDEST)/ns-config: $(OBJS1) $(OBJS2) $(PURIFY) $(CXX) $(SHARED_FLAG) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \ - -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPSDKLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \ + -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \ $(EXTRA_LIBS) $(CURSES) ifeq ($(ARCH), WINNT) @@ -191,5 +191,5 @@ ns-config-gt: $(OBJS1GT) $(PURIFY) $(CXX) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) $(INCDIR) \ - -o ns-config-gt $(OBJS1GT) $(SETUPSDKLINK) $(LIBLDAP) \ + -o ns-config-gt $(OBJS1GT) $(SETUPUTILLINK) $(LIBLDAP) \ $(EXTRA_LIBS) $(CURSES) Index: ux-config.cc =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ux-config.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ux-config.cc 19 Apr 2005 22:07:21 -0000 1.8 +++ ux-config.cc 2 Sep 2005 20:40:54 -0000 1.9 @@ -206,11 +206,6 @@ if (installMode() != Silent) { -/* richm 20011005 - we can't do this until we get setupsdk46 - if ever - if (iDSISolaris) - Dialog::initDisplay("Directory", (const char *) NULL, "Configuration"); - else -*/ Dialog::initDisplay("Directory"); } From fedora-directory-commits at redhat.com Fri Sep 2 20:40:56 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 2 Sep 2005 16:40:56 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.30,1.31 Message-ID: <200509022041.j82KfQes032213@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32096/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bug(s) fixed: 167453 Bug Description: Use all open source components Reviewed by: Noriko (Thanks!) Fix Description: This changes the DS 72 build to pick up the new Admin Server open source candidate (using Apache, modules, etc), and the new adminutil and setuputil components. The code has been changed to reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) and new versions of these components (7.1) and new /s/b/c disk layout where applicable. We don't really get very much from the admin server anymore, just the admin and base packages. All of the other setup stuff (setup, setup.inf, svrcore, etc.) come directly from the setuputil package. Platforms tested: RHEL3 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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- Makefile 28 Apr 2005 17:32:32 -0000 1.30 +++ Makefile 2 Sep 2005 20:40:53 -0000 1.31 @@ -194,12 +194,12 @@ #ADM_VERSDIR = admserv40 #ADM_RELDATE = untested/19980119 #IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) -IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME) +IMPORTADMINSRVNOTARBASE = $(COMPONENTS_DIR_DEV)/$(ADM_VERSDIR)/$(ADM_VERSION)/$(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 # symlink to -ADMIN_IMPORTS=setup base admin svrcore silent.inf LICENSE.txt README.txt -ADMIN_SERVER_TARGZ=admserv.tar.gz +ADMIN_IMPORTS=base admin +ADMIN_SERVER_TARGZ=adminserver.tar.gz ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ) # Release directory for ldapsdk @@ -610,9 +610,11 @@ $(INSTDIR)/tools/infozip.zip \ $(ADMSERV_DEP) -# copy over the setup sdk stuff -# hack - remove once admin server bundles setupsdk 6.02 -# cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR) +# 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 $(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd @@ -675,23 +677,17 @@ # if the untar directory is there, hooray; otherwise, we will have to unpack the # binaries ourselves . . . - @curdir=`pwd`; cd $(INSTDIR) ; \ - if [ ! -d $(IMPORTADMINSRVNOTAR) ] ; \ + curdir=`pwd`; cd $(INSTDIR) ; \ + if [ ! -d $(IMPORTADMINSRVNOTARBASE)/admin ] ; \ then for file in $(ADMIN_IMPORTS_TARGZ) ; \ do rm -rf $$file ; \ $(GUNZIP) -c $(ADMSERV_DIR)/$$file | $(TAR) xvf - ; \ done ; \ - cd $$curdir ; \ - $(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf \ - $(INSTDIR)/setup.inf.tmp ; \ - mv $(INSTDIR)/setup.inf.tmp \ - $(INSTDIR)/setup.inf ; \ else \ for file in $(ADMIN_IMPORTS) ; \ do rm -rf $$file ; \ - ln -s $(IMPORTADMINSRVNOTAR)/$$file $$file ; \ + cp -r $(IMPORTADMINSRVNOTARBASE)/$$file $$file ; \ done ; \ - $(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \ fi # we must remove the nsbase.zip file - we package those files now @@ -700,11 +696,6 @@ # base.inf file $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf -# We must remove the JRE per Red Hat. The user will download the jre -ifneq ($(ARCH), Linux) - rm -f $(INSTDIR)/base/nsjre.zip -endif - # Move setup binary to dssetup mv $(INSTDIR)/setup $(INSTDIR)/dssetup # Move the new setup wrappers into place @@ -734,11 +725,6 @@ # Install dsktune at root of Installation cp $(RELDIR)/bin/slapd/server/dsktune $(INSTDIR) -# copy the sample silent.inf from setup - if [ ! -f $(INSTDIR)/silent.inf ] ; \ - then cp $(SETUPSDK_BINPATH)/silent.inf $(INSTDIR) ; \ - fi - ifndef NO_INSTALLER_TAR_FILES # build the slapd package tar file cd $(INSTDIR); $(TAR) cvf - slapd \ From fedora-directory-commits at redhat.com Fri Sep 2 23:30:51 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 2 Sep 2005 19:30:51 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9, 1.9.2.1 Message-ID: <200509022330.j82NUpRA004600@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584 Modified Files: Tag: Directory71RtmBranch setup Log Message: [167478] setup script needs to check the DS instance if the instance dir exists, run ns-config with "-r". Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- setup 19 Apr 2005 22:07:20 -0000 1.9 +++ setup 2 Sep 2005 23:30:49 -0000 1.9.2.1 @@ -248,9 +248,20 @@ echo "SuiteSpotGroup = $group" >> $inffile echo ServerRoot = `pwd` >> $inffile + # check if ds instance directory exists or not + # if it does, run ns-config with the reconfigure option + doreconfig="" + for x in `ls -d slapd-*` + do + if [ -d $x ]; then + doreconfig="-r" + break + fi + done + # first, run ds cd bin/slapd/admin/bin - ./ns-config -f $inffile -l $logfile -m $installmode || doExit + ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit cd ../../../.. # next, run admin From fedora-directory-commits at redhat.com Fri Sep 2 23:33:50 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 2 Sep 2005 19:33:50 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9, 1.10 Message-ID: <200509022333.j82NXpGV004632@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4616 Modified Files: setup Log Message: [167478] setup script needs to check the DS instance if the instance dir exists, run ns-config with "-r". Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setup 19 Apr 2005 22:07:20 -0000 1.9 +++ setup 2 Sep 2005 23:33:48 -0000 1.10 @@ -248,9 +248,20 @@ echo "SuiteSpotGroup = $group" >> $inffile echo ServerRoot = `pwd` >> $inffile + # check if ds instance directory exists or not + # if it does, run ns-config with the reconfigure option + doreconfig="" + for x in `ls -d slapd-*` + do + if [ -d $x ]; then + doreconfig="-r" + break + fi + done + # first, run ds cd bin/slapd/admin/bin - ./ns-config -f $inffile -l $logfile -m $installmode || doExit + ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit cd ../../../.. # next, run admin From fedora-directory-commits at redhat.com Tue Sep 6 17:30:05 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 6 Sep 2005 13:30:05 -0400 Subject: [Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.25, 1.26 Message-ID: <200509061730.j86HU55M014392@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14376 Modified Files: internal_comp_deps.mk Log Message: Pull setuputil from sbsint, not sbc. Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- internal_comp_deps.mk 2 Sep 2005 20:40:46 -0000 1.25 +++ internal_comp_deps.mk 6 Sep 2005 17:30:03 -0000 1.26 @@ -401,8 +401,8 @@ SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR)/setuputil SETUPUTIL_VERSION = $(SETUPUTIL_RELDATE) ifeq ($(BUILD_MODE), int) - SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) -# SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) +# SETUPUTIL_RELEASE = $(COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) + SETUPUTIL_RELEASE = $(COMPONENTS_DIR_DEV)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) else SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME) endif From fedora-directory-commits at redhat.com Tue Sep 6 21:15:23 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 6 Sep 2005 17:15:23 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd plugin.c, 1.9, 1.10 Message-ID: <200509062115.j86LFN29023297@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/ldap/servers/slapd Modified Files: plugin.c Log Message: 167441 - Added SHA2 hashed password storage support. Index: plugin.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plugin.c 19 Apr 2005 22:07:36 -0000 1.9 +++ plugin.c 6 Sep 2005 21:15:15 -0000 1.10 @@ -463,8 +463,11 @@ struct slapdplugin *p; for ( p = global_plugin_list[index]; p != NULL; p = p->plg_next ) { - if (strncasecmp(p->plg_pwdstorageschemename, name, len) == 0) - return( p ); + if (strlen(p->plg_pwdstorageschemename) == len) { + if (strncasecmp(p->plg_pwdstorageschemename, name, len) == 0) { + return( p ); + } + } } return( NULL ); } From fedora-directory-commits at redhat.com Tue Sep 6 21:15:17 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 6 Sep 2005 17:15:17 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.21, 1.22 Message-ID: <200509062115.j86LFlv6023343@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/ldap/admin/src Modified Files: create_instance.c Log Message: 167441 - Added SHA2 hashed password storage support. Index: create_instance.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- create_instance.c 2 Sep 2005 20:40:48 -0000 1.21 +++ create_instance.c 6 Sep 2005 21:15:14 -0000 1.22 @@ -3194,6 +3194,36 @@ fprintf(f, "nsslapd-pluginenabled: on\n"); fprintf(f, "\n"); + fprintf(f, "dn: cn=SSHA256,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SSHA256\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: ssha256_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=SSHA384,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SSHA384\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: ssha384_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=SSHA512,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SSHA512\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: ssha512_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + fprintf(f, "dn: cn=SHA,cn=Password Storage Schemes,cn=plugins,cn=config\n"); fprintf(f, "objectclass: top\n"); fprintf(f, "objectclass: nsSlapdPlugin\n"); @@ -3204,6 +3234,36 @@ fprintf(f, "nsslapd-pluginenabled: on\n"); fprintf(f, "\n"); + fprintf(f, "dn: cn=SHA256,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SHA256\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: sha256_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=SHA384,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SHA384\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: sha384_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + + fprintf(f, "dn: cn=SHA512,cn=Password Storage Schemes,cn=plugins,cn=config\n"); + fprintf(f, "objectclass: top\n"); + fprintf(f, "objectclass: nsSlapdPlugin\n"); + fprintf(f, "cn: SHA512\n"); + fprintf(f, "nsslapd-pluginpath: %s/lib/pwdstorage-plugin%s\n", sroot, shared_lib); + fprintf(f, "nsslapd-plugininitfunc: sha512_pwd_storage_scheme_init\n"); + fprintf(f, "nsslapd-plugintype: pwdstoragescheme\n"); + fprintf(f, "nsslapd-pluginenabled: on\n"); + fprintf(f, "\n"); + #if !defined(_WIN32) fprintf(f, "dn: cn=CRYPT,cn=Password Storage Schemes,cn=plugins,cn=config\n"); fprintf(f, "objectclass: top\n"); From fedora-directory-commits at redhat.com Tue Sep 6 21:15:17 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 6 Sep 2005 17:15:17 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage pwd_init.c, 1.6, 1.7 pwdstorage.h, 1.6, 1.7 sha_pwd.c, 1.4, 1.5 ssha_pwd.c, 1.5, 1.6 Message-ID: <200509062115.j86LFl8E023345@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217/ldap/servers/plugins/pwdstorage Modified Files: pwd_init.c pwdstorage.h sha_pwd.c ssha_pwd.c Log Message: 167441 - Added SHA2 hashed password storage support. Index: pwd_init.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwd_init.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pwd_init.c 14 Jun 2005 15:44:19 -0000 1.6 +++ pwd_init.c 6 Sep 2005 21:15:15 -0000 1.7 @@ -47,6 +47,18 @@ static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA)" }; +static Slapi_PluginDesc sha256_pdesc = { "sha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA256)" }; + +static Slapi_PluginDesc ssha256_pdesc = { "ssha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA256)" }; + +static Slapi_PluginDesc sha384_pdesc = { "sha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA384)" }; + +static Slapi_PluginDesc ssha384_pdesc = { "ssha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA384)" }; + +static Slapi_PluginDesc sha512_pdesc = { "sha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA512)" }; + +static Slapi_PluginDesc ssha512_pdesc = { "ssha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA512)" }; + #ifndef _WIN32 static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Unix crypt algorithm (CRYPT)" }; #endif @@ -108,6 +120,153 @@ return( rc ); } +int +sha256_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> sha256_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&sha256_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) sha256_pw_enc); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha256_pw_cmp ); + name = slapi_ch_strdup("SHA256"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= sha256_pwd_storage_scheme_init %d\n\n", rc ); + + return( rc ); +} + +int +ssha256_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> ssha256_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&ssha256_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) salted_sha256_pw_enc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha256_pw_cmp ); + name = slapi_ch_strdup("SSHA256"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= ssha256_pwd_storage_scheme_init %d\n\n", rc ); + return( rc ); +} + +int +sha384_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> sha384_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&sha384_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) sha384_pw_enc); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha384_pw_cmp ); + name = slapi_ch_strdup("SHA384"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= sha384_pwd_storage_scheme_init %d\n\n", rc ); + + return( rc ); +} + +int +ssha384_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> ssha384_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&ssha384_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) salted_sha384_pw_enc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha384_pw_cmp ); + name = slapi_ch_strdup("SSHA384"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= ssha384_pwd_storage_scheme_init %d\n\n", rc ); + return( rc ); +} + +int +sha512_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> sha512_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&sha512_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) sha512_pw_enc); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha512_pw_cmp ); + name = slapi_ch_strdup("SHA512"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= sha512_pwd_storage_scheme_init %d\n\n", rc ); + + return( rc ); +} + +int +ssha512_pwd_storage_scheme_init( Slapi_PBlock *pb ) +{ + int rc; + char *name; + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> ssha512_pwd_storage_scheme_init\n" ); + + rc = slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, + (void *) SLAPI_PLUGIN_VERSION_01 ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_DESCRIPTION, + (void *)&ssha512_pdesc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_ENC_FN, + (void *) salted_sha512_pw_enc ); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_CMP_FN, + (void *) sha512_pw_cmp ); + name = slapi_ch_strdup("SSHA512"); + rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_PWD_STORAGE_SCHEME_NAME, + name ); + + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= ssha512_pwd_storage_scheme_init %d\n\n", rc ); + return( rc ); +} + #ifndef _WIN32 int crypt_pwd_storage_scheme_init( Slapi_PBlock *pb ) Index: pwdstorage.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/pwdstorage.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pwdstorage.h 14 Jun 2005 15:44:19 -0000 1.6 +++ pwdstorage.h 6 Sep 2005 21:15:15 -0000 1.7 @@ -49,10 +49,24 @@ #define PWD_HASH_PREFIX_START '{' #define PWD_HASH_PREFIX_END '}' +#define MAX_SHA_HASH_SIZE 64 + #define SHA1_SCHEME_NAME "SHA" #define SHA1_NAME_LEN 3 #define SALTED_SHA1_SCHEME_NAME "SSHA" #define SALTED_SHA1_NAME_LEN 4 +#define SHA256_SCHEME_NAME "SHA256" +#define SHA256_NAME_LEN 6 +#define SALTED_SHA256_SCHEME_NAME "SSHA256" +#define SALTED_SHA256_NAME_LEN 7 +#define SHA384_SCHEME_NAME "SHA384" +#define SHA384_NAME_LEN 6 +#define SALTED_SHA384_SCHEME_NAME "SSHA384" +#define SALTED_SHA384_NAME_LEN 7 +#define SHA512_SCHEME_NAME "SHA512" +#define SHA512_NAME_LEN 6 +#define SALTED_SHA512_SCHEME_NAME "SSHA512" +#define SALTED_SHA512_NAME_LEN 7 #define CRYPT_SCHEME_NAME "crypt" #define CRYPT_NAME_LEN 5 #define NS_MTA_MD5_SCHEME_NAME "NS-MTA-MD5" @@ -62,10 +76,22 @@ #define MD5_SCHEME_NAME "MD5" #define MD5_NAME_LEN 3 -SECStatus sha1_salted_hash(unsigned char *hash_out, char *pwd, struct berval *salt); +SECStatus sha_salted_hash(unsigned char *hash_out, char *pwd, struct berval *salt, unsigned int secOID); +int sha_pw_cmp( char *userpwd, char *dbpwd, unsigned int shaLen ); +char * sha_pw_enc( char *pwd, unsigned int shaLen ); +char * salted_sha_pw_enc( char *pwd, unsigned int shaLen ); int sha1_pw_cmp( char *userpwd, char *dbpwd ); char * sha1_pw_enc( char *pwd ); char * salted_sha1_pw_enc( char *pwd ); +int sha256_pw_cmp( char *userpwd, char *dbpwd ); +char * sha256_pw_enc( char *pwd ); +char * salted_sha256_pw_enc( char *pwd ); +int sha384_pw_cmp( char *userpwd, char *dbpwd ); +char * sha384_pw_enc( char *pwd ); +char * salted_sha384_pw_enc( char *pwd ); +int sha512_pw_cmp( char *userpwd, char *dbpwd ); +char * sha512_pw_enc( char *pwd ); +char * salted_sha512_pw_enc( char *pwd ); int clear_pw_cmp( char *userpwd, char *dbpwd ); char *clear_pw_enc( char *pwd ); #ifndef _WIN32 @@ -121,6 +147,9 @@ * Number of bytes each hash algorithm produces */ #define SHA1_LENGTH 20 +#define SHA256_LENGTH 32 +#define SHA384_LENGTH 48 +#define SHA512_LENGTH 64 /******************************************/ /* Index: sha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/sha_pwd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sha_pwd.c 19 Apr 2005 22:07:32 -0000 1.4 +++ sha_pwd.c 6 Sep 2005 21:15:15 -0000 1.5 @@ -50,7 +50,7 @@ #include #endif /* NET_SSL */ -#define SHA1_SALT_LENGTH 8 /* number of bytes of data in salt */ +#define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */ #define NOT_FIRST_TIME (time_t)1 /* not the first logon */ static char *hasherrmsg = "pw_cmp: %s userPassword \"%s\" is the wrong length or is not properly encoded BASE64\n"; @@ -62,21 +62,46 @@ * 8 bytes of salt plus the first 10 bytes of the SHA-1 digest. * It's obsolescent now, but we still handle such stored values. */ - + int -sha1_pw_cmp (char *userpwd, char *dbpwd ) +sha_pw_cmp (char *userpwd, char *dbpwd, unsigned int shaLen ) { /* - * SHA1 passwords are stored in the database as SHA1_LENGTH bytes of + * SHA passwords are stored in the database as shaLen bytes of * hash, followed by zero or more bytes of salt, all BASE64 encoded. */ int result = 1; /* failure */ - unsigned char userhash[SHA1_LENGTH]; - unsigned char quick_dbhash[SHA1_LENGTH + SHA1_SALT_LENGTH + 3]; + unsigned char userhash[MAX_SHA_HASH_SIZE]; + unsigned char quick_dbhash[MAX_SHA_HASH_SIZE + SHA_SALT_LENGTH + 3]; unsigned char *dbhash = quick_dbhash; struct berval salt; int hash_len; /* must be a signed valued -- see below */ - + unsigned int secOID; + char *schemeName; + + /* Determine which algorithm we're using */ + switch (shaLen) { + case SHA1_LENGTH: + schemeName = SHA1_SCHEME_NAME; + secOID = SEC_OID_SHA1; + break; + case SHA256_LENGTH: + schemeName = SHA256_SCHEME_NAME; + secOID = SEC_OID_SHA256; + break; + case SHA384_LENGTH: + schemeName = SHA384_SCHEME_NAME; + secOID = SEC_OID_SHA384; + break; + case SHA512_LENGTH: + schemeName = SHA512_SCHEME_NAME; + secOID = SEC_OID_SHA512; + break; + default: + /* An unknown shaLen was passed in. We shouldn't get here. */ + goto loser; + } + /* * Decode hash stored in database. * @@ -90,54 +115,137 @@ if ( dbhash == NULL ) goto loser; } hash_len = ldif_base64_decode( dbpwd, dbhash ); - if ( hash_len >= SHA1_LENGTH ) { - salt.bv_val = (void*)(dbhash + SHA1_LENGTH); - salt.bv_len = hash_len - SHA1_LENGTH; + if ( hash_len >= shaLen ) { + salt.bv_val = (void*)(dbhash + shaLen); + salt.bv_len = hash_len - shaLen; } else if ( hash_len == DS40B1_SALTED_SHA_LENGTH ) { salt.bv_val = (void*)dbhash; salt.bv_len = 8; } else { /* unsupported, invalid BASE64 (hash_len < 0), or similar */ - slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, hasherrmsg, SHA1_SCHEME_NAME, dbpwd ); + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, hasherrmsg, schemeName, dbpwd ); goto loser; } - - /* SHA1 hash the user's key */ - if ( sha1_salted_hash( userhash, userpwd, &salt ) != SECSuccess ) { - slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "sha1_pw_cmp: SHA1_Hash() failed\n"); + + /* hash the user's key */ + if ( sha_salted_hash( userhash, userpwd, &salt, secOID ) != SECSuccess ) { + slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "sha_pw_cmp: sha_salted_hash() failed\n"); goto loser; } - + /* the proof is in the comparison... */ result = ( hash_len == DS40B1_SALTED_SHA_LENGTH ) ? ( memcmp( userhash, dbhash + 8, hash_len - 8 )) : - ( memcmp( userhash, dbhash, SHA1_LENGTH )); - + ( memcmp( userhash, dbhash, shaLen )); + loser: if ( dbhash && dbhash != quick_dbhash ) slapi_ch_free( (void**)&dbhash ); return result; } - - + char * -sha1_pw_enc( char *pwd ) +sha_pw_enc( char *pwd, unsigned int shaLen ) { - unsigned char hash[ SHA1_LENGTH ]; + unsigned char hash[MAX_SHA_HASH_SIZE]; char *enc; - - /* SHA1 hash the user's key */ - if ( sha1_salted_hash( hash, pwd, NULL ) != SECSuccess ) { + char *schemeName; + unsigned int schemeNameLen; + unsigned int secOID; + + /* Determine which algorithm we're using */ + switch (shaLen) { + case SHA1_LENGTH: + schemeName = SHA1_SCHEME_NAME; + schemeNameLen = SHA1_NAME_LEN; + secOID = SEC_OID_SHA1; + break; + case SHA256_LENGTH: + schemeName = SHA256_SCHEME_NAME; + schemeNameLen = SHA256_NAME_LEN; + secOID = SEC_OID_SHA256; + break; + case SHA384_LENGTH: + schemeName = SHA384_SCHEME_NAME; + schemeNameLen = SHA384_NAME_LEN; + secOID = SEC_OID_SHA384; + break; + case SHA512_LENGTH: + schemeName = SHA512_SCHEME_NAME; + schemeNameLen = SHA512_NAME_LEN; + secOID = SEC_OID_SHA512; + break; + default: + /* An unknown shaLen was passed in. We shouldn't get here. */ + return( NULL ); + } + + /* hash the user's key */ + if ( sha_salted_hash( hash, pwd, NULL, secOID ) != SECSuccess ) { return( NULL ); } - - if (( enc = slapi_ch_malloc( 3 + SHA1_NAME_LEN + - LDIF_BASE64_LEN( SHA1_LENGTH ))) == NULL ) { + + if (( enc = slapi_ch_malloc( 3 + schemeNameLen + + LDIF_BASE64_LEN( shaLen ))) == NULL ) { return( NULL ); } - - sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, SHA1_SCHEME_NAME, + + sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, schemeName, PWD_HASH_PREFIX_END ); - (void)ldif_base64_encode( hash, enc + 2 + SHA1_NAME_LEN, - SHA1_LENGTH, -1 ); - + (void)ldif_base64_encode( hash, enc + 2 + schemeNameLen, + shaLen, -1 ); + return( enc ); } + +/* + * Wrapper password comparison functions + */ +int +sha1_pw_cmp (char *userpwd, char *dbpwd ) +{ + return sha_pw_cmp( userpwd, dbpwd, SHA1_LENGTH ); +} + +int +sha256_pw_cmp (char *userpwd, char *dbpwd ) +{ + return sha_pw_cmp( userpwd, dbpwd, SHA256_LENGTH ); +} + +int +sha384_pw_cmp (char *userpwd, char *dbpwd ) +{ + return sha_pw_cmp( userpwd, dbpwd, SHA384_LENGTH ); +} + +int +sha512_pw_cmp (char *userpwd, char *dbpwd ) +{ + return sha_pw_cmp( userpwd, dbpwd, SHA512_LENGTH ); +} + +/* + * Wrapper password encryption functions + */ +char * +sha1_pw_enc( char *pwd ) +{ + return sha_pw_enc( pwd, SHA1_LENGTH ); +} + +char * +sha256_pw_enc( char *pwd ) +{ + return sha_pw_enc( pwd, SHA256_LENGTH ); +} + +char * +sha384_pw_enc( char *pwd ) +{ + return sha_pw_enc( pwd, SHA384_LENGTH ); +} + +char * +sha512_pw_enc( char *pwd ) +{ + return sha_pw_enc( pwd, SHA512_LENGTH ); +} Index: ssha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ssha_pwd.c 19 Apr 2005 22:07:32 -0000 1.5 +++ ssha_pwd.c 6 Sep 2005 21:15:15 -0000 1.6 @@ -53,7 +53,7 @@ #include #endif /* NET_SSL */ -#define SHA1_SALT_LENGTH 8 /* number of bytes of data in salt */ +#define SHA_SALT_LENGTH 8 /* number of bytes of data in salt */ static void ssha_rand_array(void *randx, size_t len); @@ -70,75 +70,146 @@ PK11_GenerateRandom((unsigned char *)randx, (int)len); } -/* - * A salted SHA1 hash - * if salt is null, no salt is used (this is for backward compatibility) -*/ SECStatus -sha1_salted_hash(unsigned char *hash_out, char *pwd, struct berval *salt) +sha_salted_hash(unsigned char *hash_out, char *pwd, struct berval *salt, unsigned int secOID) { PK11Context *ctx; unsigned int outLen; + unsigned int shaLen; SECStatus rc; + + switch (secOID) { + case SEC_OID_SHA1: + shaLen = SHA1_LENGTH; + break; + case SEC_OID_SHA256: + shaLen = SHA256_LENGTH; + break; + case SEC_OID_SHA384: + shaLen = SHA384_LENGTH; + break; + case SEC_OID_SHA512: + shaLen = SHA512_LENGTH; + break; + default: + /* An unknown secOID was passed in. We shouldn't get here. */ + rc = SECFailure; + return rc; + } if (salt && salt->bv_len) { - ctx = PK11_CreateDigestContext(SEC_OID_SHA1); - if (ctx == NULL) { - rc = SECFailure; - } - else { - PK11_DigestBegin(ctx); - PK11_DigestOp(ctx, (unsigned char*)pwd, strlen(pwd)); - PK11_DigestOp(ctx, (unsigned char*)(salt->bv_val), salt->bv_len); - PK11_DigestFinal(ctx, hash_out, &outLen, SHA1_LENGTH); - PK11_DestroyContext(ctx, 1); - if (outLen == SHA1_LENGTH) - rc = SECSuccess; - else - rc = SECFailure; - } + ctx = PK11_CreateDigestContext(secOID); + if (ctx == NULL) { + rc = SECFailure; + } else { + PK11_DigestBegin(ctx); + PK11_DigestOp(ctx, (unsigned char*)pwd, strlen(pwd)); + PK11_DigestOp(ctx, (unsigned char*)(salt->bv_val), salt->bv_len); + PK11_DigestFinal(ctx, hash_out, &outLen, shaLen); + PK11_DestroyContext(ctx, 1); + if (outLen == shaLen) + rc = SECSuccess; + else + rc = SECFailure; + } } else { /*backward compatibility*/ - rc = PK11_HashBuf(SEC_OID_SHA1, hash_out, (unsigned char *)pwd, strlen(pwd)); + rc = PK11_HashBuf(secOID, hash_out, (unsigned char *)pwd, strlen(pwd)); } - + return rc; } char * -salted_sha1_pw_enc( char *pwd ) +salted_sha_pw_enc( char *pwd, unsigned int shaLen ) { - unsigned char hash[ SHA1_LENGTH + SHA1_SALT_LENGTH ]; - unsigned char *salt = hash + SHA1_LENGTH; + unsigned char hash[ MAX_SHA_HASH_SIZE + SHA_SALT_LENGTH ]; + unsigned char *salt = hash + shaLen; struct berval saltval; char *enc; - + char *schemeName; + unsigned int schemeNameLen; + unsigned int secOID; + + /* Determine which algorithm we're using */ + switch (shaLen) { + case SHA1_LENGTH: + schemeName = SALTED_SHA1_SCHEME_NAME; + schemeNameLen = SALTED_SHA1_NAME_LEN; + secOID = SEC_OID_SHA1; + break; + case SHA256_LENGTH: + schemeName = SALTED_SHA256_SCHEME_NAME; + schemeNameLen = SALTED_SHA256_NAME_LEN; + secOID = SEC_OID_SHA256; + break; + case SHA384_LENGTH: + schemeName = SALTED_SHA384_SCHEME_NAME; + schemeNameLen = SALTED_SHA384_NAME_LEN; + secOID = SEC_OID_SHA384; + break; + case SHA512_LENGTH: + schemeName = SALTED_SHA512_SCHEME_NAME; + schemeNameLen = SALTED_SHA512_NAME_LEN; + secOID = SEC_OID_SHA512; + break; + default: + /* An unknown shaLen was passed in. We shouldn't get here. */ + return( NULL ); + } + saltval.bv_val = (void*)salt; - saltval.bv_len = SHA1_SALT_LENGTH; - + saltval.bv_len = SHA_SALT_LENGTH; + /* generate a new random salt */ - /* Note: the uninitialized salt array provides a little extra entropy - * to the random array generation, but it is not really needed since - * PK11_GenerateRandom takes care of seeding. In any case, it doesn't - * hurt. */ - ssha_rand_array( salt, SHA1_SALT_LENGTH ); - - /* SHA1 hash the user's key */ - if ( sha1_salted_hash( hash, pwd, &saltval ) != SECSuccess ) { + /* Note: the uninitialized salt array provides a little extra entropy + * to the random array generation, but it is not really needed since + * PK11_GenerateRandom takes care of seeding. In any case, it doesn't + * hurt. */ + ssha_rand_array( salt, SHA_SALT_LENGTH ); + + /* hash the user's key */ + if ( sha_salted_hash( hash, pwd, &saltval, secOID ) != SECSuccess ) { return( NULL ); } - - if (( enc = slapi_ch_malloc( 3 + SALTED_SHA1_NAME_LEN + + + if (( enc = slapi_ch_malloc( 3 + schemeNameLen + LDIF_BASE64_LEN(sizeof(hash)))) == NULL ) { return( NULL ); } - - sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, SALTED_SHA1_SCHEME_NAME, + + sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, schemeName, PWD_HASH_PREFIX_END ); - (void)ldif_base64_encode( hash, enc + 2 + SALTED_SHA1_NAME_LEN, + (void)ldif_base64_encode( hash, enc + 2 + schemeNameLen, sizeof(hash), -1 ); - + return( enc ); } +/* + * Wrapper functions for password encoding + */ +char * +salted_sha1_pw_enc( char *pwd ) +{ + return salted_sha_pw_enc( pwd, SHA1_LENGTH ); +} + +char * +salted_sha256_pw_enc( char *pwd ) +{ + return salted_sha_pw_enc( pwd, SHA256_LENGTH ); +} + +char * +salted_sha384_pw_enc( char *pwd ) +{ + return salted_sha_pw_enc( pwd, SHA384_LENGTH ); +} + +char * +salted_sha512_pw_enc( char *pwd ) +{ + return salted_sha_pw_enc( pwd, SHA512_LENGTH ); +} From fedora-directory-commits at redhat.com Wed Sep 7 00:51:57 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Sep 2005 20:51:57 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src upgradeServer, 1.5, 1.5.2.1 Message-ID: <200509070051.j870pvro029118@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29102 Modified Files: Tag: Directory71RtmBranch upgradeServer Log Message: [167679] modify upgradeServer to upgrade db2index.pl To fix the bug "[160003] db2index.pl cannot find libldap50.so if only certain parameters are used", template-db2index.pl has been modified. When upgrading existing servers, the perl scripts are not touched unless forced to. This upgradeServer provides the framework. Index: upgradeServer =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- upgradeServer 19 Apr 2005 22:06:55 -0000 1.5 +++ upgradeServer 7 Sep 2005 00:51:53 -0000 1.5.2.1 @@ -419,7 +419,7 @@ sub instantiate_new_scripts { @newtemplates = ( - "$sroot/bin/slapd/admin/scripts/template-ns-newpwpolicy.pl" + "$sroot/bin/slapd/admin/scripts/template-db2index.pl" ); $host = localhost; @@ -435,7 +435,6 @@ foreach $src ( @newtemplates ) { $dest = "$sroot/$prefix/$1" if $src =~ /.*template-(.*)$/; - next if -f $dest; unless ( open ( template, $src )) { print "Can't open $src: $!\n"; next; @@ -451,6 +450,7 @@ s#{{ROOT-DN}}#$rootdn#g; s#{{SERVER-PORT}}#$port#g; s#{{SERVER-NAME}}#$host#g; + s#{{MY-DS-ROOT}}#$sroot/$prefix#g; printf target; } close template; From fedora-directory-commits at redhat.com Wed Sep 7 00:54:22 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 6 Sep 2005 20:54:22 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src upgradeServer, 1.5, 1.6 Message-ID: <200509070054.j870sMa9029146@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29129 Modified Files: upgradeServer Log Message: [167679] modify upgradeServer to upgrade db2index.pl To fix the bug "[160003] db2index.pl cannot find libldap50.so if only certain parameters are used", template-db2index.pl has been modified. When upgrading existing servers, the perl scripts are not touched unless forced to. This upgradeServer provides the framework. Index: upgradeServer =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- upgradeServer 19 Apr 2005 22:06:55 -0000 1.5 +++ upgradeServer 7 Sep 2005 00:54:20 -0000 1.6 @@ -419,7 +419,7 @@ sub instantiate_new_scripts { @newtemplates = ( - "$sroot/bin/slapd/admin/scripts/template-ns-newpwpolicy.pl" + "$sroot/bin/slapd/admin/scripts/template-db2index.pl" ); $host = localhost; @@ -435,7 +435,6 @@ foreach $src ( @newtemplates ) { $dest = "$sroot/$prefix/$1" if $src =~ /.*template-(.*)$/; - next if -f $dest; unless ( open ( template, $src )) { print "Can't open $src: $!\n"; next; @@ -451,6 +450,7 @@ s#{{ROOT-DN}}#$rootdn#g; s#{{SERVER-PORT}}#$port#g; s#{{SERVER-NAME}}#$host#g; + s#{{MY-DS-ROOT}}#$sroot/$prefix#g; printf target; } close template; From fedora-directory-commits at redhat.com Wed Sep 7 16:14:18 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 7 Sep 2005 12:14:18 -0400 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10, 1.11 Message-ID: <200509071614.j87GEIlK025892@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25876 Modified Files: ldapserver.spec.tmpl Log Message: 165228 - Don't have RPM auto-generate provides list Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ldapserver.spec.tmpl 10 May 2005 20:49:43 -0000 1.10 +++ ldapserver.spec.tmpl 7 Sep 2005 16:14:16 -0000 1.11 @@ -55,6 +55,8 @@ # Without Autoreq: 0, rpmbuild finds all sorts of crazy # dependencies that we don't care about, and refuses to install Autoreq: 0 +# Don't automatically generate provides list +AutoProv: 0 # Without Requires: something, rpmbuild will abort! Requires: perl Prefix: /opt/%{name} From fedora-directory-commits at redhat.com Wed Sep 7 16:24:46 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 7 Sep 2005 12:24:46 -0400 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.1, 1.10.2.2 Message-ID: <200509071624.j87GOkWT025969@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25953 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: 165228 - Don't have RPM auto-generate provides list. Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -u -r1.10.2.1 -r1.10.2.2 --- ldapserver.spec.tmpl 31 Aug 2005 21:40:45 -0000 1.10.2.1 +++ ldapserver.spec.tmpl 7 Sep 2005 16:24:44 -0000 1.10.2.2 @@ -55,6 +55,8 @@ # Without Autoreq: 0, rpmbuild finds all sorts of crazy # dependencies that we don't care about, and refuses to install Autoreq: 0 +# Don't automatically generate provides list +AutoProv: 0 # Without Requires: something, rpmbuild will abort! Requires: perl Prefix: /opt/%{name} From fedora-directory-commits at redhat.com Fri Sep 9 00:49:26 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 8 Sep 2005 20:49:26 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd libslapd.def, 1.11.2.1, 1.11.2.2 Message-ID: <200509090049.j890nQFR013914@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13898 Modified Files: Tag: Directory71RtmBranch libslapd.def Log Message: Fix for NT build failure: undefined symbols in index.c Index: libslapd.def =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- libslapd.def 26 Aug 2005 15:44:35 -0000 1.11.2.1 +++ libslapd.def 9 Sep 2005 00:49:24 -0000 1.11.2.2 @@ -773,10 +773,10 @@ slapi_mod_done @752 slapi_mods_done @753 operation_set_csn @754 -; entry_update_deleted_attribute @755 + valueset_add_valuearray @755 entry_first_deleted_attribute @756 entry_next_deleted_attribute @757 -; config_get_storestateinfo @758 + valuearray_remove_value @758 ; config_set_storestateinfo @759 slapi_value_set_string @760 slapi_is_loglevel_set @761 From fedora-directory-commits at redhat.com Fri Sep 9 00:51:54 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 8 Sep 2005 20:51:54 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd libslapd.def, 1.12, 1.13 Message-ID: <200509090051.j890psjF013946@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930 Modified Files: libslapd.def Log Message: Fix for NT build failure: undefined symbols in index.c Index: libslapd.def =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libslapd.def 12 Aug 2005 05:49:54 -0000 1.12 +++ libslapd.def 9 Sep 2005 00:51:52 -0000 1.13 @@ -773,10 +773,10 @@ slapi_mod_done @752 slapi_mods_done @753 operation_set_csn @754 -; entry_update_deleted_attribute @755 + valueset_add_valuearray @755 entry_first_deleted_attribute @756 entry_next_deleted_attribute @757 -; config_get_storestateinfo @758 + valuearray_remove_value @758 ; config_set_storestateinfo @759 slapi_value_set_string @760 slapi_is_loglevel_set @761 From fedora-directory-commits at redhat.com Fri Sep 9 18:23:14 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 9 Sep 2005 14:23:14 -0400 Subject: [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSContentPage.java, 1.1.1.1, 1.2 Message-ID: <200509091823.j89INF0O009850@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834 Modified Files: DSContentPage.java Log Message: Bug(s) fixed: 167761 Bug Description: Directory Server issue with Admin Console Reviewed by: Nathan (Thanks!) Fix Description: DSContentPage.actionSearchUG clones an LDAPConnection for use by the search and edit windows. After invoking the search window, it closed the connection. While this works for the actionEdit and actionAdvancedEdit callbacks, it doesn't work here because the search results window is invoked in a separate thread, which means the connection was being closed out from under the result list and edit windows. The solution is to have the LDAPConnection be closed after the edit list window dialog is finished. I also added some additional debugging. 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: DSContentPage.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSContentPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSContentPage.java 18 Jul 2005 00:55:38 -0000 1.1.1.1 +++ DSContentPage.java 9 Sep 2005 18:23:11 -0000 1.2 @@ -1310,15 +1310,22 @@ info.setUserHost(rpLdc.getHost()); info.setUserPort(rpLdc.getPort()); // user/group window search + Debug.println(9, "DSContentPage.actionSearchUG: cloned connection [" + + rpLdc + "] isConnected=" + rpLdc.isConnected() + + " isAuthenticated=" + rpLdc.isAuthenticated()); ResourcePickerDlg resourcePickerDlg = new ResourcePickerDlg( info, new SearchUG(_framework, _iconPool, rpLdc, _entryEditor), _framework ); resourcePickerDlg.appendSearchInterface( new DSSearchPanel() ); resourcePickerDlg.show(); + + /* richm 09/09/2005 + although actionEdit and actionAdvancedEdit close the ldc cloned for editing + purposes, we cannot do that here, because SearchUG will eventually spawn + a separate thread on which the editing occurs - if we close it here, we + may close it out from underneath the editor + */ - try { - rpLdc.disconnect(); // prepareReferralConnection clones connection - } catch (Exception ignore) {} _connectionPool.releaseConnection(ldc); } } @@ -2742,7 +2749,10 @@ protected LDAPConnection getConnectionForNode(IBrowserNodeInfo node) throws LDAPException { - LDAPConnection ldc = _connectionPool.getConnection(node.getURL()); + LDAPConnection ldc = _connectionPool.getConnection(node.getURL()); + Debug.println(9, "DSContentPage.getConnectionForNode: for node [" + node + "] getting " + + "connection [" + ldc + "] isConnected=" + ldc.isConnected() + + " isAuthenticated=" + ldc.isAuthenticated()); return ldc; } @@ -2751,14 +2761,23 @@ * the original one and should be closed after use */ protected LDAPConnection prepareReferralConnection(LDAPConnection ldc) { + Debug.println(9, "DSContentPage.prepareReferralConnection: original connection [" + + ldc + "] isConnected=" + ldc.isConnected() + + " isAuthenticated=" + ldc.isAuthenticated()); LDAPConnection result =(LDAPConnection)ldc.clone(); LDAPSearchConstraints lsc = (LDAPSearchConstraints)ldc.getSearchConstraints(); if (!getFollowReferrals()) { // disable referrals lsc.setServerControls(_manageDSAITControl); + Debug.println(9, "DSContentPage.prepareReferralConnection: no follow referrals connection [" + + result + "] isConnected=" + result.isConnected() + + " isAuthenticated=" + result.isAuthenticated()); } else { // follow referrals using the current credentials + Debug.println(9, "DSContentPage.prepareReferralConnection: follow referrals connection [" + + result + "] isConnected=" + result.isConnected() + + " isAuthenticated=" + result.isAuthenticated()); final String dn = ldc.getAuthenticationDN(); final String pw = ldc.getAuthenticationPassword(); lsc.setRebindProc(new LDAPRebind() { @@ -2934,6 +2953,8 @@ _iconPool = iconPool; _ldc = ldc; _entryEditor = entryEditor; + Debug.println(9, "DSContentPage.SearchUG: _ldc [" + _ldc + "] isConnected=" + ldc.isConnected() + + " isAuthenticated=" + ldc.isAuthenticated()); } /** @@ -2976,9 +2997,29 @@ if (dlg.getWidth() > _frame.getWidth()) { dlg.setSize(_frame.getWidth(), dlg.getHeight()); } + Debug.println(9, "DSContentPage.SearchUG.getResults: _ldc [" + _ldc + "] isConnected=" + _ldc.isConnected() + + " isAuthenticated=" + _ldc.isAuthenticated()); SwingUtilities.invokeLater(new Runnable() { public void run() { dlg.showModal(); + /* + We need to close the connection that was opened in actionSearchUG and passed + to the constructor of SearchUG + */ + try { + Debug.println(9, "DSContentPage.SearchUG.getResults: before disconnect connection [" + + _ldc + "] isConnected=" + _ldc.isConnected() + + " isAuthenticated=" + _ldc.isAuthenticated()); + _ldc.disconnect(); // prepareReferralConnection clones connection + Debug.println(9, "DSContentPage.SearchUG.getResults: after disconnect connection [" + + _ldc + "] isConnected=" + _ldc.isConnected() + + " isAuthenticated=" + _ldc.isAuthenticated()); + } catch (Exception ignore) { + Debug.println(9, "DSContentPage.SearchUG.getResults: caught exception [" + + ignore + "] disconnecting connection [" + + _ldc + "] isConnected=" + _ldc.isConnected() + + " isAuthenticated=" + _ldc.isAuthenticated()); + } } }); } @@ -4673,7 +4714,10 @@ * @param isAdvanced set this option to true in order to display ALWAYS the generic property editor. * * @return true if the entry was modified, false otherwise */ - public boolean editObject(String entryDn, LDAPConnection ldc, boolean isAdvanced) { + public boolean editObject(String entryDn, LDAPConnection ldc, boolean isAdvanced) { + Debug.println(9, "DSContentPage.editObject: begin entryDN [" + entryDn + + "] ldc [" + ldc + "] isConnected=" + ldc.isConnected() + + " isAuthenticated=" + ldc.isAuthenticated()); boolean objectModified = false; _editedObjectDn = null; _ldc = ldc; @@ -4693,6 +4737,15 @@ } _allAttrs = allAttributes; } + + if (_allAttrs == null) { + Debug.println(9, "DSContentPage.editObject: _allAttrs == null"); + } else { + for (int ii = 0; ii < _allAttrs.length; ++ii) { + Debug.println(9, "DSContentPage.editObject: _allAttrs[" + ii + "]=[" + + _allAttrs[ii] + "]"); + } + } LDAPSearchConstraints searchConstraints = (LDAPSearchConstraints)_ldc.getSearchConstraints().clone(); if (!entryDn.trim().equals("")) { @@ -4703,6 +4756,7 @@ try { entry = _ldc.read(entryDn, _allAttrs, searchConstraints); } catch (LDAPException lde) { + Debug.println("DSContentPage.editObject: LDAPException [" + lde + "]"); /* The entry could not be read... */ String[] args = { entryDn, From fedora-directory-commits at redhat.com Fri Sep 9 20:29:17 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 9 Sep 2005 16:29:17 -0400 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/console console.properties, 1.1.1.1, 1.2 Message-ID: <200509092029.j89KTH5w013055@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008/src/com/netscape/management/client/console Modified Files: console.properties Log Message: 167864 - Additional version 70 -> 71 changes Index: console.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- console.properties 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ console.properties 9 Sep 2005 20:29:09 -0000 1.2 @@ -18,7 +18,7 @@ # END COPYRIGHT BLOCK # console-title=Fedora Management Console -console-displayVersion=7.0 +console-displayVersion=7.1 login-username=User ID: login-password=Password: From fedora-directory-commits at redhat.com Fri Sep 9 20:29:11 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 9 Sep 2005 16:29:11 -0400 Subject: [Fedora-directory-commits] console build.xml, 1.3, 1.4 startconsole, 1.2, 1.3 Message-ID: <200509092029.j89KTfRc013062@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008 Modified Files: build.xml startconsole Log Message: 167864 - Additional version 70 -> 71 changes Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 31 Aug 2005 17:05:22 -0000 1.3 +++ build.xml 9 Sep 2005 20:29:08 -0000 1.4 @@ -200,7 +200,7 @@
- +
Index: startconsole =================================================================== RCS file: /cvs/dirsec/console/startconsole,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- startconsole 18 Jul 2005 18:07:07 -0000 1.2 +++ startconsole 9 Sep 2005 20:29:08 -0000 1.3 @@ -66,4 +66,4 @@ # # Launch the Console # -cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc70_en.jar:./jss3.jar:./ldapjdk.jar:./mcc70.jar:./nmclf70_en.jar:./nmclf70.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $* +cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc71_en.jar:./jss3.jar:./ldapjdk.jar:./mcc71.jar:./nmclf71_en.jar:./nmclf71.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $* From fedora-directory-commits at redhat.com Fri Sep 9 20:29:11 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 9 Sep 2005 16:29:11 -0400 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.1.1.1, 1.2 default.properties, 1.1.1.1, 1.2 defaultLicense.properties, 1.1.1.1, 1.2 Message-ID: <200509092029.j89KTfdX013067@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008/src/com/netscape/management/client Modified Files: AboutDialog.java default.properties defaultLicense.properties Log Message: 167864 - Additional version 70 -> 71 changes Index: AboutDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- AboutDialog.java 18 Jul 2005 00:34:06 -0000 1.1.1.1 +++ AboutDialog.java 9 Sep 2005 20:29:09 -0000 1.2 @@ -180,7 +180,7 @@ AboutDialog dialog = new AboutDialog(f, "Fedora Management Console"); - dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 7.0\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms"); + dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 7.1\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms"); dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright © 1998 Phaos Technology Corporation. All Rights Reserved"); dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains encryption software from RSA Data Security, Inc. Copyright © 1994 RSA Data Security, Inc. All rights reserved."); Index: default.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- default.properties 18 Jul 2005 00:34:08 -0000 1.1.1.1 +++ default.properties 9 Sep 2005 20:29:09 -0000 1.2 @@ -123,5 +123,5 @@ fontTab-fontProfile=Font Profile fontTab-table_tt=Font table of screen elements and corresponding sample font -banner-console=Fedora Management Console 7.0 +banner-console=Fedora Management Console 7.1 Index: defaultLicense.properties =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- defaultLicense.properties 18 Jul 2005 00:34:08 -0000 1.1.1.1 +++ defaultLicense.properties 9 Sep 2005 20:29:09 -0000 1.2 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK # -defaultAbout-dialogTitle=Fedora Management Console 7.0 +defaultAbout-dialogTitle=Fedora Management Console 7.1 defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved. defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission. From fedora-directory-commits at redhat.com Fri Sep 9 22:50:40 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 9 Sep 2005 18:50:40 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9.2.1, 1.9.2.2 Message-ID: <200509092250.j89Moe20017177@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17156 Modified Files: Tag: Directory71RtmBranch setup Log Message: [160589] IBM JVM breaks on some machines/kernels : admin server fails to start 1) set an environment variable JAVA_COMPILER=NONE 2) added -Djava.compiler=NONE to jvm.option in admin-serv/config/jvm12.conf 3) added reconfig option "-r" to admin server ns-config and ns-update. Without passing the option, admin server's config file (e.g., server.xml) are not properly updated. Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -r1.9.2.1 -r1.9.2.2 --- setup 2 Sep 2005 23:30:49 -0000 1.9.2.1 +++ setup 9 Sep 2005 22:50:37 -0000 1.9.2.2 @@ -172,6 +172,10 @@ rm -f $sroot/setup/install.inf +# Fix for "[160589] IBM JVM breaks on some machines/kernels : +# admin server fails to start +JAVA_COMPILER=NONE; export JAVA_COMPILER + echo "INFO Begin Setup . . ." | tee -a $logfile # cat LICENSE.txt if ! [ $silent ]; then @@ -251,13 +255,10 @@ # check if ds instance directory exists or not # if it does, run ns-config with the reconfigure option doreconfig="" - for x in `ls -d slapd-*` - do - if [ -d $x ]; then - doreconfig="-r" - break - fi - done + ls -d slapd-* > /dev/null 2>&1 + if [ $? -eq 0 ]; then + doreconfig="-r" + fi # first, run ds cd bin/slapd/admin/bin @@ -266,7 +267,7 @@ # next, run admin cd bin/admin - ./ns-config -f $inffile -l $logfile -m $installmode || doExit + ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit cd ../.. fi @@ -278,7 +279,12 @@ `pwd`/bin/slapd/admin/bin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit -`pwd`/bin/admin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit +`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit + +# Fix for "[160589] IBM JVM breaks on some machines/kernels : +# admin server fails to start +sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp +mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile if [ -f setup/setup.log ] ; then From fedora-directory-commits at redhat.com Sat Sep 10 00:41:48 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 9 Sep 2005 20:41:48 -0400 Subject: [Fedora-directory-commits] ldapserver nsdefs.mk, 1.11.2.1, 1.11.2.2 ldapserver.spec.tmpl, 1.10.2.2, 1.10.2.3 Message-ID: <200509100041.j8A0fmkU020006@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966 Modified Files: Tag: Directory71RtmBranch nsdefs.mk ldapserver.spec.tmpl Log Message: [167982] Service Pack framework 1) added patch info files and a perl script to process the info (RPM) 2) modified makefiles to create RPM based as well as setupsdk based SP package Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- nsdefs.mk 31 Aug 2005 21:40:45 -0000 1.11.2.1 +++ nsdefs.mk 10 Sep 2005 00:41:45 -0000 1.11.2.2 @@ -238,7 +238,8 @@ NSPR_DIR=nspr endif NSPR_BASENAME=libnspr21 -PRODUCT="Fedora Directory Server" +PRODUCTCORE=Fedora Directory Server +PRODUCT="$(PRODUCTCORE)" PRODUCT_IS_DIRECTORY_SERVER=1 INSTANCE_NAME_PREFIX="Directory Server" DIR=slapd @@ -267,6 +268,7 @@ DIR_VERSION:=7.1 SP1 NOSP_DIR_VERSION:=7.1SP1 DIR_NORM_VERSION:=7.1 +PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must # update all of the .exp and .def files by executing the following command: # cd ldap/libraries; gmake exportfiles Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -u -r1.10.2.2 -r1.10.2.3 --- ldapserver.spec.tmpl 7 Sep 2005 16:24:44 -0000 1.10.2.2 +++ ldapserver.spec.tmpl 10 Sep 2005 00:41:46 -0000 1.10.2.3 @@ -91,10 +91,44 @@ %defattr(-,root,root,-) %{prefix} +%pre +# in case upgrade, need to shutdown the servers before the installation +ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1 +if [ $? -eq 0 ]; then + for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*` + do + if [ -f $instance/logs/pid ]; then + pid=`cat $instance/logs/pid` + psval=`ps -ef | egrep $pid` + if [ "$psval" != "" ]; then + $instance/stop-slapd + fi + fi + done +fi +if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then + pid=`cat $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid` + psval=`ps -ef | egrep $pid` + if [ "$psval" != "" ]; then + $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/stop-admin + fi +fi + %post +# in case upgrade, need to start the servers before running setup +ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1 +if [ $? -eq 0 ]; then + for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*` + do + $instance/start-slapd + done +fi +if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin ]; then + $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin +fi echo "" if [ -z "$RPM_INSTALL_PREFIX" ]; then - RPM_INSTALL_PREFIX=%{prefix} + RPM_INSTALL_PREFIX=%{prefix} fi echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." From fedora-directory-commits at redhat.com Sat Sep 10 00:41:50 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 9 Sep 2005 20:41:50 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, NONE, 1.1.2.1 redhat-patch.inf, NONE, 1.1.2.1 genRpmPatch.pl, NONE, 1.1.2.1 Makefile, 1.30.2.1, 1.30.2.2 Message-ID: <200509100041.j8A0foPD020011@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966/ldap/cm Modified Files: Tag: Directory71RtmBranch Makefile Added Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf genRpmPatch.pl Log Message: [167982] Service Pack framework 1) added patch info files and a perl script to process the info (RPM) 2) modified makefiles to create RPM based as well as setupsdk based SP package --- NEW FILE fedora-patch.inf --- # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # Info file to generate DS7.1 SP1 patch # base: containing the base package -- DS7.1 # file: # base: /share/dev4/fedora-ds/fds71/ships/20050526.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: 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.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* file: 167478,160589: setup/setup file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar --- NEW FILE redhat-patch.inf --- # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # Info file to generate DS7.1 SP1 patch # base: containing the base package -- DS7.1 # file: # base: /share/dev4/ds/ds71/ships/20050524.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: 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.* file: 160003: bin/slapd/admin/scripts/template-db2index.pl file: 160003: bin/slapd/admin/bin/upgradeServer file: 164836,165600: lib/attr-unique-plugin.* file: 165640: lib/views-plugin.* file: 167478,160589: setup/setup file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar --- NEW FILE genRpmPatch.pl --- #!/usr/bin/perl # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # # sub usage { print(STDERR "Usage : $0 -r -o -e -i -f \n"); print(STDERR " -r : built/release dir\n"); print(STDERR " -o : e.g., RHEL4-domestic-full-normal-pth-slapd\n"); print(STDERR " -e : extension for the patch dir\n"); print(STDERR " -i : fedora or redhat\n"); print(STDERR " -f : file containing the patch info\n"); print(STDERR "sample \n"); print(STDERR " ======================================================\n"); print(STDERR " base: /share/dev4/fedora-ds/fds71/ships/20050526.1\n"); print(STDERR " file: 147585: plugins/slapd/slapi/examples/testpreop.c\n"); print(STDERR " file: 164834,165641: bin/slapd/server/ns-slapd\n"); print(STDERR " ======================================================\n"); } $verbose = 0; $inffile = ""; $builtdirname = ""; $releasedir = ""; $extension = ""; $identity = ""; $i = 0; while ($i <= $#ARGV) { if ("$ARGV[$i]" eq "-o") { $i++; $builtdirname = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-r") { $i++; $releasedir = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-e") { $i++; $extension = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-i") { $i++; $identity = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-f") { $i++; $inffile = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-v") { $verbose = 1; } $i++; } if ("$builtdirname" eq "") { print(STDERR "ERROR: builtdirname is not given\n"); &usage; exit(1); } if ("$releasedir" eq "") { print(STDERR "ERROR: releasedir is not given\n"); &usage; exit(1); } if ("$extension" eq "") { print(STDERR "ERROR: extension is not given\n"); &usage; exit(1); } if ("$identity" eq "" || (("$identity" ne "fedora") && ("$identity" ne "redhat"))) { print(STDERR "ERROR: $identity is not fedora or redhat\n"); &usage; exit(1); } if ("$inffile" eq "") { print(STDERR "ERROR: inffile is not given\n"); &usage; exit(1); } if (!(-d "$releasedir")) { print(STDERR "ERROR: $releasedir does not exist\n"); exit(1); } unless (open (INFFILE, $inffile)) { die "Error, cannot open info file $inffile\n"; } $basedir = 0; @newfiles = (); while ($l = ) { chop($l); $pos = length($l); if ($l =~ /^base: /) { $pos = rindex($l, ":", $pos); $pos++; $basedir = substr($l, $pos); $basedir =~ s/[ ]//g; } elsif ($l =~ /^file: /) { $pos = rindex($l, ":", $pos); $pos++; $file = substr($l, $pos); $file =~ s/[ ]//g; push(@newfiles, ($file)); } } if (1 == $verbose) { print "Base: $basedir\n"; print "New Files:\n"; foreach $afile (@newfiles) { print " $afile\n"; } } if ($builtdirname !~ /RHEL/) { print(STDERR "ERROR: Not RHEL\n"); exit(1); } # Get info from $builtdirname (e.g., RHEL4-domestic-full-normal-pth-slapd\n") $rhelversion = ""; $rhelversionl = ""; if ($builtdirname =~ /RHEL3/) { $rhelversion = "RHEL3"; $rhelversionl = "rhel3"; } elsif ($builtdirname =~ /RHEL4/) { $rhelversion = "RHEL4"; $rhelversionl = "rhel4"; } else { print(STDERR "ERROR: $builtdirname is not supported\n"); exit(1); } $optordbg = ""; if ($builtdirname =~ /full/) { $optordbg = "dbg"; } elsif ($builtdirname =~ /optimized/) { $optordbg = "opt"; } else { print(STDERR "ERROR: $builtdirname has no opt/debug info\n"); exit(1); } # Get fullpath to the RPM file $fullrpmfile = ""; $iddir = ""; opendir(BASEDIR, $basedir) or die "ERROR: Could not open $basedir\n"; while ( defined ( $subdir = readdir(BASEDIR))) { if ($subdir =~ /$rhelversionl/ || $subdir =~ /$rhelversion/) { $fullsubdir = $basedir . "/" . $subdir; opendir(SUBDIR, $fullsubdir) or die "ERROR: Could not open $fullsubdir\n"; while ( defined ( $rpmfile = readdir(SUBDIR))) { if (($rpmfile =~ /$rhelversionl/ || $rpmfile =~ /$rhelversion/) && $rpmfile =~ /$optordbg/ && $rpmfile =~ /\.rpm$/) { $fullrpmfile = $fullsubdir . "/" . $rpmfile; ($org, $ds, $rest) = split('-', $rpmfile, 3); $iddir = $org . "-" . $ds; if ("$org" ne "$identity") { print "ERROR: rpmfile name $rpmfile does not match the given identity $identity\n"; exit(1); } closedir(SUBDIR); last; } } closedir(BASEDIR); last; } } if ("$fullrpmfile" eq "") { print(STDERR "ERROR: Cannot file an rpm file under $basedir\n"); exit(1); } if (1 == $verbose) { print "RPM File: $fullrpmfile\n"; } # Expand the RPM file to the $releasedir $workdir = $releasedir . "/slapd/" . $builtdirname . $extension; mkdir($workdir, 0700); chdir($workdir); if (1 == $verbose) { print "Work Dir: $workdir\n"; } open(RPM2CPIO, "rpm2cpio $fullrpmfile | cpio -id | ") or die "Cannot run program: $!\n"; close(RPM2CPIO); # Copy new files onto the expanded files foreach $afile (@newfiles) { $srcfile = $releasedir . "/slapd/" . $builtdirname . "/" . $afile; $destfile = $workdir . "/opt/" . $iddir . "/" . $afile; $destdir = substr($destfile, 0, rindex($destfile, "/", length($destfile))); if (!(-d $destdir)) { print "WARNING: $destdir does not exist. Skipping ...\n"; next; } if (1 == $verbose) { print "Copy: $srcfile => $destdir\n"; } open(COPY, "cp $srcfile $destdir | ") or print "Copy $srcfile to $destdir failed: $!\n"; close(COPY); } Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.1 retrieving revision 1.30.2.2 diff -u -r1.30.2.1 -r1.30.2.2 --- Makefile 31 Aug 2005 21:40:49 -0000 1.30.2.1 +++ Makefile 10 Sep 2005 00:41:46 -0000 1.30.2.2 @@ -214,6 +214,13 @@ FIX_SETUP_INF = $(BUILD_ROOT)/ldap/cm/fixSetupInf.pl FIX_BASE_INF = $(BUILD_ROOT)/ldap/cm/fixBaseInf.pl +ABSBUILD_ROOT = $(shell cd $(BUILD_ROOT); pwd) +ABSRELDIR = $(ABSBUILD_ROOT)/built/release +GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl +PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf +DATETIME = $(shell date +%Y%m%d-%H%M%S) +SPEXT = .SP.$(DATETIME) + # This is the directory where we put what we're making: the files which go on the CD. ifndef INSTDIR ifeq ($(ARCH), WINNT) @@ -224,6 +231,13 @@ endif ABS_INSTDIR = $(shell cd $(INSTDIR); pwd) +ifdef BUILD_PATCH +ifndef BUILD_RPM +PATCHINSTDIR = $(ABS_INSTDIR)-SP +SLAPDSP = slapd-71sp1 +endif +endif + INST_TARGET_RESKIT=$(INSTDIR)/reskit INST_TARGET_INTL=./$(PRODUCT_MARKET)dir @@ -610,6 +624,15 @@ $(INSTDIR)/tools/infozip.zip \ $(ADMSERV_DEP) +ifdef BUILD_PATCH +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 + # copy over the setup sdk stuff # hack - remove once admin server bundles setupsdk 6.02 # cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR) @@ -779,6 +802,29 @@ endif # BUILD_SHIP endif # BUILD_RPM +ifdef BUILD_PATCH +ifndef BUILD_RPM + mkdir -p $(PATCHINSTDIR)/$(SLAPDSP) + cp $(INSTDIR)/dssetup $(PATCHINSTDIR) + cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR) + cp $(INSTDIR)/README.txt $(PATCHINSTDIR) +# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf + sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf + echo "" >> $(PATCHINSTDIR)/setup.inf + echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf + echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf +# create a zip file based upon the $(PATCHINF) file + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` +# create patch inf file: $(SLAPD).inf + cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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 + cd $(PATCHINSTDIR); $(TAR) cvf - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz +endif +endif + else # ---THE NT PACKAGE--- From fedora-directory-commits at redhat.com Sat Sep 10 00:41:50 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 9 Sep 2005 20:41:50 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd-patch.inf, NONE, 1.1.2.1 Makefile, 1.6.2.1, 1.6.2.2 Message-ID: <200509100041.j8A0fokc020018@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966/ldap/cm/newinst Modified Files: Tag: Directory71RtmBranch Makefile Added Files: Tag: Directory71RtmBranch slapd-patch.inf Log Message: [167982] Service Pack framework 1) added patch info files and a perl script to process the info (RPM) 2) modified makefiles to create RPM based as well as setupsdk based SP package --- NEW FILE slapd-patch.inf --- # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # [General] Name= %%%SERVER_NAME%%% Components=slapd-71sp1 [slapd-71sp1] Name= %%%SERVER_NAME%%% Description= %%%SERVER_NAME%%% NickName= slapd-71sp1 Version= %%%SERVER_VERSION%%% BuildNumber= %%%SERVER_BUILD_NUM%%% Archive= nsslapd-71sp1.zip SourcePath=slapd-71sp1 Checked=True Mandatory=False Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- Makefile 31 Aug 2005 21:40:50 -0000 1.6.2.1 +++ Makefile 10 Sep 2005 00:41:48 -0000 1.6.2.2 @@ -181,6 +181,9 @@ else $(INFO): $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" +ifdef BUILD_PATCH + $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" +endif endif $(OBJDEST)/%.o: %.c From fedora-directory-commits at redhat.com Mon Sep 12 18:13:42 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 12 Sep 2005 14:13:42 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/docs README.txt, 1.2.2.1, 1.2.2.2 Message-ID: <200509121813.j8CIDgZ1003221@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3204 Modified Files: Tag: Directory71RtmBranch README.txt Log Message: Updated "Fedora Directory Server 7.1" to "Fedora Directory Server 7.1 SP1" Index: README.txt =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- README.txt 31 Aug 2005 21:40:52 -0000 1.2.2.1 +++ README.txt 12 Sep 2005 18:13:40 -0000 1.2.2.2 @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 7.1 + Fedora Directory Server 7.1 SP1 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the From fedora-directory-commits at redhat.com Mon Sep 12 19:10:51 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 12 Sep 2005 15:10:51 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.1, 1.1.2.2 redhat-patch.inf, 1.1.2.1, 1.1.2.2 Message-ID: <200509121910.j8CJApBL005338@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3616 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Package updated README.txt (with "SP1" info) Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-patch.inf,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- fedora-patch.inf 10 Sep 2005 00:41:46 -0000 1.1.2.1 +++ fedora-patch.inf 12 Sep 2005 19:10:48 -0000 1.1.2.2 @@ -56,3 +56,6 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar +file: bin/slapd/README.txt +file: README.txt + Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-patch.inf,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- redhat-patch.inf 10 Sep 2005 00:41:46 -0000 1.1.2.1 +++ redhat-patch.inf 12 Sep 2005 19:10:48 -0000 1.1.2.2 @@ -56,3 +56,5 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar +file: bin/slapd/README.txt +file: README.txt From fedora-directory-commits at redhat.com Mon Sep 12 20:05:26 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 12 Sep 2005 16:05:26 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.2, 1.1.2.3 redhat-patch.inf, 1.1.2.2, 1.1.2.3 Message-ID: <200509122005.j8CK5Q4n007108@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7092 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: Package updated README.txt (with "SP1" info) -- revised Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/fedora-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 --- fedora-patch.inf 12 Sep 2005 19:10:48 -0000 1.1.2.2 +++ fedora-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3 @@ -56,6 +56,6 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar -file: bin/slapd/README.txt -file: README.txt +file: xxxxxx: bin/slapd/README.txt +file: xxxxxx: README.txt Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/redhat-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 --- redhat-patch.inf 12 Sep 2005 19:10:48 -0000 1.1.2.2 +++ redhat-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3 @@ -56,5 +56,5 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar -file: bin/slapd/README.txt -file: README.txt +file: xxxxxx: bin/slapd/README.txt +file: xxxxxx: README.txt From fedora-directory-commits at redhat.com Tue Sep 13 17:22:11 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 13 Sep 2005 13:22:11 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.2, 1.30.2.3 Message-ID: <200509131722.j8DHMBqa012717@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687/ldap/cm Modified Files: Tag: Directory71RtmBranch Makefile Log Message: 168222 - Added xorg-x11-deprecated-libs dependency for RHEL4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.2 retrieving revision 1.30.2.3 diff -u -r1.30.2.2 -r1.30.2.3 --- Makefile 10 Sep 2005 00:41:46 -0000 1.30.2.2 +++ Makefile 13 Sep 2005 17:22:04 -0000 1.30.2.3 @@ -285,6 +285,12 @@ RPM_RPMDIR = --define "_rpmdir $(ABS_TOPDIR)" # location of source RPM RPM_SRPMDIR = --define "_srcrpmdir $(ABS_TOPDIR)" +# required packages +ifeq ($(NSOS_ARCH)$(NSOS_RELEASE), RHEL4) + RPM_REQUIRES = --define "_requireslist perl,xorg-x11-deprecated-libs" +else + RPM_REQUIRES = --define "_requireslist perl" +endif ifneq ($(BUILD_DEBUG), optimize) RPM_FLAVOR = dbg else @@ -795,7 +801,7 @@ rm $(RPM_FILE_BASE) ; \ fi # execute the RPM build - rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec + rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) $(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec ifdef BUILD_SHIP cp $(ABS_TOPDIR)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm $(BUILD_SHIP) From fedora-directory-commits at redhat.com Tue Sep 13 17:22:06 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 13 Sep 2005 13:22:06 -0400 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.3, 1.10.2.4 Message-ID: <200509131722.j8DHMaxD012720@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687 Modified Files: Tag: Directory71RtmBranch ldapserver.spec.tmpl Log Message: 168222 - Added xorg-x11-deprecated-libs dependency for RHEL4 Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -u -r1.10.2.3 -r1.10.2.4 --- ldapserver.spec.tmpl 10 Sep 2005 00:41:46 -0000 1.10.2.3 +++ ldapserver.spec.tmpl 13 Sep 2005 17:22:03 -0000 1.10.2.4 @@ -58,7 +58,7 @@ # Don't automatically generate provides list AutoProv: 0 # Without Requires: something, rpmbuild will abort! -Requires: perl +Requires: %{_requireslist} Prefix: /opt/%{name} %description @@ -143,6 +143,9 @@ fi %changelog +* Tue Sep 13 2005 Nathan Kinder 7.1-3 +- use a macro for require list that is passed in via rpmbuild + * Tue May 10 2005 Richard Megginson 7.1-2 - Change release to 2 From fedora-directory-commits at redhat.com Tue Sep 13 21:25:28 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 13 Sep 2005 17:25:28 -0400 Subject: [Fedora-directory-commits] ldapserver component_versions.mk, 1.35, 1.35.2.1 Message-ID: <200509132125.j8DLPSDo019704@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688 Modified Files: Tag: Directory71RtmBranch component_versions.mk Log Message: upgrade winsync to 20050912 for bug 159037 and upgrade directory console to 20050913 for bug 167761 Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -u -r1.35 -r1.35.2.1 --- component_versions.mk 17 May 2005 02:09:34 -0000 1.35 +++ component_versions.mk 13 Sep 2005 21:25:26 -0000 1.35.2.1 @@ -175,7 +175,7 @@ LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL) endif ifndef LDAPCONSOLE_RELDATE - LDAPCONSOLE_RELDATE=20050513 + LDAPCONSOLE_RELDATE=20050913 endif ifndef PERLDAP_VERSION @@ -250,9 +250,9 @@ endif ifndef ADSYNC_VERSION - ADSYNC_VERSION=20050516 + ADSYNC_VERSION=20050912 endif ifndef NT4SYNC_VERSION - NT4SYNC_VERSION=20050516 + NT4SYNC_VERSION=20050912 endif From fedora-directory-commits at redhat.com Wed Sep 14 01:07:16 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 13 Sep 2005 21:07:16 -0400 Subject: [Fedora-directory-commits] ldapserver component_versions.mk, 1.36, 1.37 Message-ID: <200509140107.j8E17G91028167@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28148 Modified Files: component_versions.mk Log Message: upgrade winsync to 20050912 for bug 159037 and upgrade directory console to 20050913 for bug 167761 Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- component_versions.mk 2 Sep 2005 20:40:46 -0000 1.36 +++ component_versions.mk 14 Sep 2005 01:06:59 -0000 1.37 @@ -177,7 +177,7 @@ LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL) endif ifndef LDAPCONSOLE_RELDATE - LDAPCONSOLE_RELDATE=20050513 + LDAPCONSOLE_RELDATE=20050913 endif ifndef PERLDAP_VERSION @@ -252,9 +252,9 @@ endif ifndef ADSYNC_VERSION - ADSYNC_VERSION=20050516 + ADSYNC_VERSION=20050912 endif ifndef NT4SYNC_VERSION - NT4SYNC_VERSION=20050516 + NT4SYNC_VERSION=20050912 endif From fedora-directory-commits at redhat.com Wed Sep 14 18:25:58 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 14 Sep 2005 14:25:58 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.3, 1.30.2.4 Message-ID: <200509141825.j8EIPwWE022935@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22719 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Fixed the 64-bit patch build; when building the installer USE_64 flag is cleared. The patch info file had to be explicitly copied as the slapd info file being done. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.3 retrieving revision 1.30.2.4 diff -u -r1.30.2.3 -r1.30.2.4 --- Makefile 13 Sep 2005 17:22:04 -0000 1.30.2.3 +++ Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4 @@ -1009,6 +1009,9 @@ _setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \ +ifdef BUILD_PATCH + $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \ +endif $(INSTDIR)/admin $(INSTDIR)/base \ $(INSTDIR)/svrcore $(INSTDIR)/tools # see components.mk for a description of PACKAGE_SETUP_LIBS @@ -1024,6 +1027,11 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf cp $< $@ +ifdef BUILD_PATCH +$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf + cp $< $@ +endif + $(INSTDIR)/admin: $(ADMSERV_DIR)/admin cp -R $< $@ From fedora-directory-commits at redhat.com Wed Sep 14 18:25:58 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 14 Sep 2005 14:25:58 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.3, 1.30.2.4 Message-ID: <200509141825.j8EIPwWE022935@cvs-int.fedora.redhat.com> <<< No Message Collected >>> From fedora-directory-commits at redhat.com Wed Sep 14 16:16:41 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 14 Sep 2005 12:16:41 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm genRpmPatch.pl, 1.1.2.1, 1.1.2.2 Message-ID: <200509141616.j8EGGf9f019394@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379 Modified Files: Tag: Directory71RtmBranch genRpmPatch.pl Log Message: Fixed a build failure; "optimized" should have been "optimize". Index: genRpmPatch.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Attic/genRpmPatch.pl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- genRpmPatch.pl 10 Sep 2005 00:41:46 -0000 1.1.2.1 +++ genRpmPatch.pl 14 Sep 2005 16:16:38 -0000 1.1.2.2 @@ -163,7 +163,7 @@ $optordbg = ""; if ($builtdirname =~ /full/) { $optordbg = "dbg"; -} elsif ($builtdirname =~ /optimized/) { +} elsif ($builtdirname =~ /optimize/) { $optordbg = "opt"; } else { print(STDERR "ERROR: $builtdirname has no opt/debug info\n"); From fedora-directory-commits at redhat.com Wed Sep 14 21:34:43 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 14 Sep 2005 17:34:43 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.4, 1.30.2.5 Message-ID: <200509142134.j8ELYhCr028955@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28895 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Fix the patch build on Solaris/HP: Removed an obsolete copy line Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.4 retrieving revision 1.30.2.5 diff -u -r1.30.2.4 -r1.30.2.5 --- Makefile 14 Sep 2005 18:25:51 -0000 1.30.2.4 +++ Makefile 14 Sep 2005 21:34:39 -0000 1.30.2.5 @@ -821,8 +821,7 @@ echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf # create a zip file based upon the $(PATCHINF) file cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` -# create patch inf file: $(SLAPD).inf - cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf +# create patch inf file: $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPD).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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 @@ -1010,8 +1009,10 @@ _setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \ ifdef BUILD_PATCH +ifndef BUILD_RPM $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \ endif +endif $(INSTDIR)/admin $(INSTDIR)/base \ $(INSTDIR)/svrcore $(INSTDIR)/tools # see components.mk for a description of PACKAGE_SETUP_LIBS @@ -1028,9 +1029,11 @@ cp $< $@ ifdef BUILD_PATCH +ifndef BUILD_RPM $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf cp $< $@ endif +endif $(INSTDIR)/admin: $(ADMSERV_DIR)/admin cp -R $< $@ From fedora-directory-commits at redhat.com Wed Sep 14 21:39:50 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 14 Sep 2005 17:39:50 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.31,1.32 Message-ID: <200509142139.j8ELdo2f029004@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28974/ldap/cm Modified Files: Makefile Log Message: 168309 - Removed setup wrappers used for Java packaging and added RPM dependency for java-1.4.2-ibm package. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Makefile 2 Sep 2005 20:40:53 -0000 1.31 +++ Makefile 14 Sep 2005 21:39:42 -0000 1.32 @@ -696,25 +696,6 @@ # base.inf file $(PERL) -w $(FIX_BASE_INF) $(INSTDIR)/base/base.inf -# Move setup binary to dssetup - mv $(INSTDIR)/setup $(INSTDIR)/dssetup -# Move the new setup wrappers into place - cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR)/setup.pl - cp $(BUILD_ROOT)/ldap/cm/newinst/setup.sh $(INSTDIR)/setup - -# We need to package perl for the new setup wrapper to run - mkdir $(INSTDIR)/tmp - $(UNZIP) $(INSTDIR)/nsperl/$(NSPERL_ZIP_FILE) \ - lib/nsPerl5.6.1/\* -d $(INSTDIR)/tmp - cp -R $(INSTDIR)/tmp/lib/nsPerl5.6.1 \ - $(INSTDIR)/tools - rm -rf $(INSTDIR)/tmp - -# We also need to package the infozip utilities - $(UNZIP) -j $(INSTDIR)/tools/infozip.zip \ - -d $(INSTDIR)/tools - rm -f $(INSTDIR)/tools/infozip.zip - # Install LDAP Readme and License files at root of Installation (dated pre-packaging) directory. # And, replace the License.txt file that is packaged in nssvrcore.zip. if [ -d $(LDAPDIR)/docs ] ; then \ @@ -731,13 +712,13 @@ | gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz # build the combined packages tar file; use h flag to follow symlinks ifdef BUILD_SHIP - cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \ + cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \ perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) ifeq ($(DEBUG), optimize) # $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld" endif else - cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \ + cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd nsperl \ perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz endif # BUILD_SHIP #cp $(INSTDIR).tar.gz $(BUILD_SHIP) @@ -892,11 +873,6 @@ 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 -# move setup.exe to dssetup.exe - mv $(INSTDIR)/setup.exe $(INSTDIR)/dssetup.exe -# copy in the new setup wrapper script - cp $(BUILD_ROOT)/ldap/cm/newinst/setup.pl $(INSTDIR) - cp $(BUILD_ROOT)/ldap/cm/newinstnt/setup.bat $(INSTDIR) #---------------------------- slapd rules -------------------------------------------------- From fedora-directory-commits at redhat.com Wed Sep 14 21:39:44 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 14 Sep 2005 17:39:44 -0400 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.11, 1.12 Message-ID: <200509142140.j8ELeEtF029012@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28974 Modified Files: ldapserver.spec.tmpl Log Message: 168309 - Removed setup wrappers used for Java packaging and added RPM dependency for java-1.4.2-ibm package. Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ldapserver.spec.tmpl 7 Sep 2005 16:14:16 -0000 1.11 +++ ldapserver.spec.tmpl 14 Sep 2005 21:39:42 -0000 1.12 @@ -58,7 +58,7 @@ # Don't automatically generate provides list AutoProv: 0 # Without Requires: something, rpmbuild will abort! -Requires: perl +Requires: perl,java-1.4.2-ibm Prefix: /opt/%{name} %description @@ -109,6 +109,9 @@ fi %changelog +* Wed Sep 14 2005 Nathan Kinder 7.1-2 +- Added a dependency on the java-1.4.2-ibm package + * Tue May 10 2005 Richard Megginson 7.1-2 - Change release to 2 From fedora-directory-commits at redhat.com Wed Sep 14 23:37:40 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 14 Sep 2005 19:37:40 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/pwdstorage ssha_pwd.c, 1.6, 1.7 Message-ID: <200509142337.j8ENbeN3032582@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32566 Modified Files: ssha_pwd.c Log Message: 168322 - Check size of hash needed before base64 encoding password hashes Index: ssha_pwd.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pwdstorage/ssha_pwd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ssha_pwd.c 6 Sep 2005 21:15:15 -0000 1.6 +++ ssha_pwd.c 14 Sep 2005 23:37:37 -0000 1.7 @@ -175,14 +175,14 @@ } if (( enc = slapi_ch_malloc( 3 + schemeNameLen + - LDIF_BASE64_LEN(sizeof(hash)))) == NULL ) { + LDIF_BASE64_LEN(shaLen + SHA_SALT_LENGTH))) == NULL ) { return( NULL ); } sprintf( enc, "%c%s%c", PWD_HASH_PREFIX_START, schemeName, PWD_HASH_PREFIX_END ); (void)ldif_base64_encode( hash, enc + 2 + schemeNameLen, - sizeof(hash), -1 ); + (shaLen + SHA_SALT_LENGTH), -1 ); return( enc ); } From fedora-directory-commits at redhat.com Thu Sep 15 22:06:58 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 15 Sep 2005 18:06:58 -0400 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/console genverinfo.sh, 1.1.1.1, 1.2 Message-ID: <200509152206.j8FM6xvq008460@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8427/src/com/netscape/management/client/console Modified Files: genverinfo.sh Log Message: 168418 - Dynamically generate versioninfo.properties at build time Index: genverinfo.sh =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/genverinfo.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- genverinfo.sh 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ genverinfo.sh 15 Sep 2005 22:06:49 -0000 1.2 @@ -1,3 +1,4 @@ +#!/bin/sh # BEGIN COPYRIGHT BLOCK # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. From fedora-directory-commits at redhat.com Thu Sep 15 22:06:54 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 15 Sep 2005 18:06:54 -0400 Subject: [Fedora-directory-commits] console buildnum.pl, NONE, 1.1 build.properties, 1.3, 1.4 build.xml, 1.4, 1.5 Message-ID: <200509152206.j8FM6sHK008447@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8427 Modified Files: build.properties build.xml Added Files: buildnum.pl Log Message: 168418 - Dynamically generate versioninfo.properties at build time --- NEW FILE buildnum.pl --- #!/usr/bin/perl # --- BEGIN COPYRIGHT BLOCK --- # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # --- END COPYRIGHT BLOCK --- #-------------------------------------------- # buildnum.pl # # Generates a dated build number and writes # out a buildnum.dat file in a user specified # subdirectory. # # Usage: buildnum.pl -p #-------------------------------------------- use Getopt::Std; use FileHandle; autoflush STDERR 1; getopts('p:H'); if ($opt_H) {exitHelp();} # Load arguments $platdir = $opt_p || exitHelp(); $buildnum_file = "./$platdir/buildnum.dat"; # Get current time @now = gmtime; # Format buildnum as YYYY.DDD.HHMM $year = $now[5] + 1900; $doy = $now[7] + 1; if ($doy < 100) { $doy = 0 . $doy; } $tod = $now[2] . $now[1]; $buildnum = "$year.$doy.$tod"; # Write buildnum.dat open(BUILDNUM,">$buildnum_file") || die "Error: Can't create $buildnum_file: $!\n"; print BUILDNUM "\\\"$buildnum\\\""; close(BUILDNUM); #---------- exitHelp subroutine ---------- sub exitHelp { print(STDERR "$0: Generates a dated build number. \tUsage: $0 -p \t-p Platform subdirectory. \t-H Print this help message\n"); exit(0); } Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.properties 31 Aug 2005 17:04:59 -0000 1.3 +++ build.properties 15 Sep 2005 22:06:32 -0000 1.4 @@ -23,6 +23,7 @@ console.root=.. console.version=71 +console.dotversion=7.1 mcc.core=mcc mcc.name=${mcc.core}${console.version} Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 9 Sep 2005 20:29:08 -0000 1.4 +++ build.xml 15 Sep 2005 22:06:33 -0000 1.5 @@ -68,6 +68,16 @@ + + + + + + + + + + @@ -271,6 +281,7 @@ + From fedora-directory-commits at redhat.com Fri Sep 16 00:31:48 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Sep 2005 20:31:48 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.5, 1.30.2.6 Message-ID: <200509160031.j8G0VmVr011680@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11659 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [168400] Solaris and HP-UX 7.1 SP1 packages should only contain the fixes not the full install BUILD_PATCH & BUILD_SHIP being set, SP1 packages contain just patch files. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.5 retrieving revision 1.30.2.6 diff -u -r1.30.2.5 -r1.30.2.6 --- Makefile 14 Sep 2005 21:34:39 -0000 1.30.2.5 +++ Makefile 16 Sep 2005 00:31:45 -0000 1.30.2.6 @@ -232,11 +232,9 @@ ABS_INSTDIR = $(shell cd $(INSTDIR); pwd) ifdef BUILD_PATCH -ifndef BUILD_RPM PATCHINSTDIR = $(ABS_INSTDIR)-SP SLAPDSP = slapd-71sp1 endif -endif INST_TARGET_RESKIT=$(INSTDIR)/reskit INST_TARGET_INTL=./$(PRODUCT_MARKET)dir @@ -774,8 +772,10 @@ | gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz # build the combined packages tar file; use h flag to follow symlinks ifdef BUILD_SHIP +ifndef BUILD_PATCH cd $(INSTDIR); $(TAR) cvfh - setup.inf dssetup setup.pl slapd nsperl \ perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) +endif ifeq ($(DEBUG), optimize) # $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld" endif @@ -809,7 +809,6 @@ endif # BUILD_RPM ifdef BUILD_PATCH -ifndef BUILD_RPM mkdir -p $(PATCHINSTDIR)/$(SLAPDSP) cp $(INSTDIR)/dssetup $(PATCHINSTDIR) cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR) @@ -821,12 +820,16 @@ echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf # create a zip file based upon the $(PATCHINF) file cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` -# create patch inf file: $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPD).inf +# create patch inf file: $(SLAPD).inf + cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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 - cd $(PATCHINSTDIR); $(TAR) cvf - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz +ifdef BUILD_SHIP + cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) +else + cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz endif endif @@ -1008,11 +1011,6 @@ _setup_files: $(INSTDIR)/$(SLAPD_DIR)/dsinst.dll \ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf \ -ifdef BUILD_PATCH -ifndef BUILD_RPM - $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf \ -endif -endif $(INSTDIR)/admin $(INSTDIR)/base \ $(INSTDIR)/svrcore $(INSTDIR)/tools # see components.mk for a description of PACKAGE_SETUP_LIBS @@ -1028,13 +1026,6 @@ $(INSTDIR)/$(SLAPD_DIR)/slapd.inf: $(OBJDIR)/setup/slapd.inf cp $< $@ -ifdef BUILD_PATCH -ifndef BUILD_RPM -$(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf: $(OBJDIR)/setup/slapd-patch.inf - cp $< $@ -endif -endif - $(INSTDIR)/admin: $(ADMSERV_DIR)/admin cp -R $< $@ From fedora-directory-commits at redhat.com Fri Sep 16 00:35:38 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Sep 2005 20:35:38 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.6.2.2, 1.6.2.3 Message-ID: <200509160035.j8G0ZcS3011734@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704/cm/newinst Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [168402] patch info file for 64-bit system gets broken ldap/cm/Makefile uses the full OBJDIR name including "_64" for the patch inf location. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- Makefile 10 Sep 2005 00:41:48 -0000 1.6.2.2 +++ Makefile 16 Sep 2005 00:35:30 -0000 1.6.2.3 @@ -96,6 +96,7 @@ BINS=$(addprefix $(BINDEST)/, $(PROGS)) endif INFO= $(OBJDIR)/$(DIR) +PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR) # Source for staged installation utilities INCDIR=$(SETUPSDK_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src @@ -182,7 +183,7 @@ $(INFO): $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" ifdef BUILD_PATCH - $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" + $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(PATCHINFO)-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" endif endif From fedora-directory-commits at redhat.com Fri Sep 16 00:35:32 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 15 Sep 2005 20:35:32 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.9.2.1 Message-ID: <200509160036.j8G0a2bK011737@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11704 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [168402] patch info file for 64-bit system gets broken ldap/cm/Makefile uses the full OBJDIR name including "_64" for the patch inf location. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -u -r1.9 -r1.9.2.1 --- Makefile 9 May 2005 22:11:21 -0000 1.9 +++ Makefile 16 Sep 2005 00:35:30 -0000 1.9.2.1 @@ -62,7 +62,9 @@ cd systools; $(MAKE) $(MFLAGS) all # new unix installer ifeq ($(USE_SETUPSDK), 1) - cd cm/newinst; $(MAKE) $(MFLAGS) all + # 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 From fedora-directory-commits at redhat.com Fri Sep 16 12:59:36 2005 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 16 Sep 2005 08:59:36 -0400 Subject: [Fedora-directory-commits] mod_nss NOTICE, NONE, 1.1 LICENSE, NONE, 1.1 Message-ID: <200509161259.j8GCxaAm031908@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31892 Added Files: NOTICE LICENSE Log Message: Adding files required by the Apache 2.0 License --- NEW FILE NOTICE --- This product includes software developed by The Apache Software Foundation (http://www.apache.org/). Portions of this software were developed at the National Center for Supercomputing Applications (NCSA) at the University of Illinois at Urbana-Champaign. This software contains code derived from the RSA Data Security Inc. MD5 Message-Digest Algorithm, including various modifications by Spyglass Inc., Carnegie Mellon University, and Bell Communications Research, Inc (Bellcore). Regular expression support is provided by the PCRE library package, which is open source software, written by Philip Hazel, and copyright by the University of Cambridge, England. The original software is available from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ --- NEW FILE LICENSE --- Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. APACHE HTTP SERVER SUBCOMPONENTS: The Apache HTTP Server includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. For the mod_mime_magic component: /* * mod_mime_magic: MIME type lookup via file magic numbers * Copyright (c) 1996-1997 Cisco Systems, Inc. * * This software was submitted by Cisco Systems to the Apache Group in July * 1997. Future revisions and derivatives of this source code must * acknowledge Cisco Systems as the original contributor of this module. * All other licensing and usage conditions are those of the Apache Group. * * Some of this code is derived from the free version of the file command * originally posted to comp.sources.unix. Copyright info for that program * is included below as required. * --------------------------------------------------------------------------- * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin. * * This software is not subject to any license of the American Telephone and * Telegraph Company or of the Regents of the University of California. * * Permission is granted to anyone to use this software for any purpose on any * computer system, and to alter it and redistribute it freely, subject to * the following restrictions: * * 1. The author is not responsible for the consequences of use of this * software, no matter how awful, even if they arise from flaws in it. * * 2. The origin of this software must not be misrepresented, either by * explicit claim or by omission. Since few users ever read sources, credits * must appear in the documentation. * * 3. Altered versions must be plainly marked as such, and must not be * misrepresented as being the original software. Since few users ever read * sources, credits must appear in the documentation. * * 4. This notice may not be removed or altered. * ------------------------------------------------------------------------- * */ For the modules\mappers\mod_imap.c component: "macmartinized" polygon code copyright 1992 by Eric Haines, erich at eye.com For the server\util_md5.c component: /************************************************************************ * NCSA HTTPd Server * Software Development Group * National Center for Supercomputing Applications * University of Illinois at Urbana-Champaign * 605 E. Springfield, Champaign, IL 61820 * httpd at ncsa.uiuc.edu * * Copyright (C) 1995, Board of Trustees of the University of Illinois * ************************************************************************ * * md5.c: NCSA HTTPd code which uses the md5c.c RSA Code * * Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc. * Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon * University (see Copyright below). * Portions of Content-MD5 code Copyright (C) 1991 Bell Communications * Research, Inc. (Bellcore) (see Copyright below). * Portions extracted from mpack, John G. Myers - jgm+ at cmu.edu * Content-MD5 Code contributed by Martin Hamilton (martin at net.lut.ac.uk) * */ /* these portions extracted from mpack, John G. Myers - jgm+ at cmu.edu */ /* (C) Copyright 1993,1994 by Carnegie Mellon University * All Rights Reserved. * * Permission to use, copy, modify, distribute, and sell this software * and its documentation for any purpose is hereby granted without * fee, provided that the above copyright notice appear in all copies * and that both that copyright notice and this permission notice * appear in supporting documentation, and that the name of Carnegie * Mellon University not be used in advertising or publicity * pertaining to distribution of the software without specific, * written prior permission. Carnegie Mellon University makes no * representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. * * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ /* * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore) * * Permission to use, copy, modify, and distribute this material * for any purpose and without fee is hereby granted, provided * that the above copyright notice and this permission notice * appear in all copies, and that the name of Bellcore not be * used in advertising or publicity pertaining to this * material without the specific, prior written permission * of an authorized representative of Bellcore. BELLCORE * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY * OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ For the srclib\apr\include\apr_md5.h component: /* * This is work is derived from material Copyright RSA Data Security, Inc. * * The RSA copyright statement and Licence for that original material is * included below. This is followed by the Apache copyright statement and * licence for the modifications made to that material. */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ For the srclib\apr\passwd\apr_md5.c component: /* * This is work is derived from material Copyright RSA Data Security, Inc. * * The RSA copyright statement and Licence for that original material is * included below. This is followed by the Apache copyright statement and * licence for the modifications made to that material. */ /* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights reserved. License to copy and use this software is granted provided that it is identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing this software or this function. License is also granted to make and use derivative works provided that such works are identified as "derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm" in all material mentioning or referencing the derived work. RSA Data Security, Inc. makes no representations concerning either the merchantability of this software or the suitability of this software for any particular purpose. It is provided "as is" without express or implied warranty of any kind. These notices must be retained in any copies of any part of this documentation and/or software. */ /* * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0 * MD5 crypt() function, which is licenced as follows: * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- */ For the srclib\apr-util\crypto\apr_md4.c component: * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All * rights reserved. * * License to copy and use this software is granted provided that it * is identified as the "RSA Data Security, Inc. MD4 Message-Digest * Algorithm" in all material mentioning or referencing this software * or this function. * * License is also granted to make and use derivative works provided * that such works are identified as "derived from the RSA Data * Security, Inc. MD4 Message-Digest Algorithm" in all material * mentioning or referencing the derived work. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the srclib\apr-util\include\apr_md4.h component: * * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All * rights reserved. * * License to copy and use this software is granted provided that it * is identified as the "RSA Data Security, Inc. MD4 Message-Digest * Algorithm" in all material mentioning or referencing this software * or this function. * * License is also granted to make and use derivative works provided * that such works are identified as "derived from the RSA Data * Security, Inc. MD4 Message-Digest Algorithm" in all material * mentioning or referencing the derived work. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the srclib\apr-util\test\testdbm.c component: /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache at apache.org. * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . * * This file came from the SDBM package (written by oz at nexus.yorku.ca). * That package was under public domain. This file has been ported to * APR, updated to ANSI C and other, newer idioms, and added to the Apache * codebase under the above copyright and license. */ For the srclib\apr-util\test\testmd4.c component: * * This is derived from material copyright RSA Data Security, Inc. * Their notice is reproduced below in its entirety. * * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All * rights reserved. * * RSA Data Security, Inc. makes no representations concerning either * the merchantability of this software or the suitability of this * software for any particular purpose. It is provided "as is" * without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this * documentation and/or software. */ For the srclib\apr-util\xml\expat\conftools\install-sh component: # # install - install a program, script, or datafile # This comes from X11R5 (mit/util/scripts/install.sh). # # Copyright 1991 by the Massachusetts Institute of Technology # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting # documentation, and that the name of M.I.T. not be used in advertising or # publicity pertaining to distribution of the software without specific, # written prior permission. M.I.T. makes no representations about the # suitability of this software for any purpose. It is provided "as is" # without express or implied warranty. # For the srclib\pcre\install-sh component: # # Copyright 1991 by the Massachusetts Institute of Technology # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting # documentation, and that the name of M.I.T. not be used in advertising or # publicity pertaining to distribution of the software without specific, # written prior permission. M.I.T. makes no representations about the # suitability of this software for any purpose. It is provided "as is" # without express or implied warranty. For the pcre component: PCRE LICENCE ------------ PCRE is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. Written by: Philip Hazel University of Cambridge Computing Service, Cambridge, England. Phone: +44 1223 334714. Copyright (c) 1997-2001 University of Cambridge Permission is granted to anyone to use this software for any purpose on any computer system, and to redistribute it freely, subject to the following restrictions: 1. This software 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. 2. The origin of this software must not be misrepresented, either by explicit claim or by omission. In practice, this means that if you use PCRE in software which you distribute to others, commercially or otherwise, you must put a sentence like this Regular expression support is provided by the PCRE library package, which is open source software, written by Philip Hazel, and copyright by the University of Cambridge, England. somewhere reasonably visible in your documentation and in any relevant files or online help data or similar. A reference to the ftp site for the source, that is, to ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ should also be given in the documentation. 3. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. 4. If PCRE is embedded in any software that is released under the GNU General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), then the terms of that licence shall supersede any condition above with which it is incompatible. The documentation for PCRE, supplied in the "doc" directory, is distributed under the same terms as the software itself. End PCRE LICENCE For the test\zb.c component: /* ZeusBench V1.01 =============== This program is Copyright (C) Zeus Technology Limited 1996. This program may be used and copied freely providing this copyright notice is not removed. This software is provided "as is" and any express or implied waranties, including but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, exemplary, or consequential damaged (including, but not limited to, procurement of substitute good or services; loss of use, data, or profits; or business interruption) however caused and on theory of liability. Whether in contract, strict liability or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. Written by Adam Twiss (adam at zeus.co.uk). March 1996 Thanks to the following people for their input: Mike Belshe (mbelshe at netscape.com) Michael Campanella (campanella at stevms.enet.dec.com) */ For the expat xml parser component: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ==================================================================== From fedora-directory-commits at redhat.com Fri Sep 16 13:07:41 2005 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Fri, 16 Sep 2005 09:07:41 -0400 Subject: [Fedora-directory-commits] mod_nss/docs mod_nss.html,1.7,1.8 Message-ID: <200509161307.j8GD7fLq000782@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv766 Modified Files: mod_nss.html Log Message: Add missing copyright block Index: mod_nss.html =================================================================== RCS file: /cvs/dirsec/mod_nss/docs/mod_nss.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_nss.html 13 Sep 2005 19:35:01 -0000 1.7 +++ mod_nss.html 16 Sep 2005 13:07:37 -0000 1.8 @@ -1,4 +1,18 @@ + Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11520 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [160003] db2index.pl cannot find libldap50.so if only certain parameters are used 1) Makefile: SP packages ns-config and needed libraries 2) slapd-patch.inf: call "ns-config -r" in the pre install phase; "ns-update" in the post install phase. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.6 retrieving revision 1.30.2.7 diff -u -r1.30.2.6 -r1.30.2.7 --- Makefile 16 Sep 2005 00:31:45 -0000 1.30.2.6 +++ Makefile 16 Sep 2005 20:01:17 -0000 1.30.2.7 @@ -820,6 +820,13 @@ echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf # create a zip file based upon the $(PATCHINF) file cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` +# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory + $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP) + - at for file in $(PACKAGE_SETUP_LIBS_32) ; \ + do if [ -f $$file ] ; \ + then $(INSTALL) -m 755 $$file $(PATCHINSTDIR)/$(SLAPDSP) ; \ + fi ; \ + done # create patch inf file: $(SLAPD).inf cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp From fedora-directory-commits at redhat.com Fri Sep 16 20:01:30 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 16 Sep 2005 16:01:30 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd-patch.inf, 1.1.2.1, 1.1.2.2 Message-ID: <200509162001.j8GK1Uxs012862@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11520/newinst Modified Files: Tag: Directory71RtmBranch slapd-patch.inf Log Message: [160003] db2index.pl cannot find libldap50.so if only certain parameters are used 1) Makefile: SP packages ns-config and needed libraries 2) slapd-patch.inf: call "ns-config -r" in the pre install phase; "ns-update" in the post install phase. Index: slapd-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Attic/slapd-patch.inf,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- slapd-patch.inf 10 Sep 2005 00:41:48 -0000 1.1.2.1 +++ slapd-patch.inf 16 Sep 2005 20:01:26 -0000 1.1.2.2 @@ -42,11 +42,17 @@ [slapd-71sp1] Name= %%%SERVER_NAME%%% +InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% Description= %%%SERVER_NAME%%% NickName= slapd-71sp1 Version= %%%SERVER_VERSION%%% BuildNumber= %%%SERVER_BUILD_NUM%%% Archive= nsslapd-71sp1.zip SourcePath=slapd-71sp1 +PreInstall= ns-config -r +PostInstall= bin/slapd/admin/bin/ns-update +PreUninstall= bin/slapd/admin/bin/uninstall +PostUninstall= Checked=True Mandatory=False +IsLdap=True From fedora-directory-commits at redhat.com Thu Sep 22 16:48:18 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 22 Sep 2005 12:48:18 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1, 1.2 genRpmPatch.pl, 1.1, 1.2 redhat-patch.inf, 1.1, 1.2 Makefile, 1.32, 1.33 Message-ID: <200509221648.j8MGmIBq019052@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18968/ldap/cm Modified Files: Makefile Added Files: fedora-patch.inf genRpmPatch.pl redhat-patch.inf Log Message: [167982] Service Pack framework Ported the patch making code to the trunk. Index: fedora-patch.inf =================================================================== RCS file: fedora-patch.inf diff -N fedora-patch.inf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ fedora-patch.inf 22 Sep 2005 16:48:16 -0000 1.2 @@ -0,0 +1,47 @@ +# +# BEGIN COPYRIGHT BLOCK +# 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; version 2 of the License. +# +# This Program 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., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# Sample Info file to generate service pack +# base: containing the base package -- e.g., DS7.1 +# file: : +# +base: /share/dev4/fedora-ds/fds71/ships/20050526.1 + +file: 000001: README.txt +file: 000002: COPYRIGHT.txt + Index: genRpmPatch.pl =================================================================== RCS file: genRpmPatch.pl diff -N genRpmPatch.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ genRpmPatch.pl 22 Sep 2005 16:48:16 -0000 1.2 @@ -0,0 +1,231 @@ +#!/usr/bin/perl +# +# BEGIN COPYRIGHT BLOCK +# 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; version 2 of the License. +# +# This Program 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., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# +# + +sub usage { + print(STDERR "Usage : $0 -r -o -e -i -f \n"); + print(STDERR " -r : built/release dir\n"); + print(STDERR " -o : e.g., RHEL4-domestic-full-normal-pth-slapd\n"); + print(STDERR " -e : extension for the patch dir\n"); + print(STDERR " -i : fedora or redhat\n"); + print(STDERR " -f : file containing the patch info\n"); + print(STDERR "sample \n"); + print(STDERR " ======================================================\n"); + print(STDERR " base: /share/dev4/fedora-ds/fds71/ships/20050526.1\n"); + print(STDERR " file: 147585: plugins/slapd/slapi/examples/testpreop.c\n"); + print(STDERR " file: 164834,165641: bin/slapd/server/ns-slapd\n"); + print(STDERR " ======================================================\n"); +} + +$verbose = 0; +$inffile = ""; +$builtdirname = ""; +$releasedir = ""; +$extension = ""; +$identity = ""; + +$i = 0; +while ($i <= $#ARGV) { + if ("$ARGV[$i]" eq "-o") { + $i++; + $builtdirname = $ARGV[$i]; + } elsif ("$ARGV[$i]" eq "-r") { + $i++; + $releasedir = $ARGV[$i]; + } elsif ("$ARGV[$i]" eq "-e") { + $i++; + $extension = $ARGV[$i]; + } elsif ("$ARGV[$i]" eq "-i") { + $i++; + $identity = $ARGV[$i]; + } elsif ("$ARGV[$i]" eq "-f") { + $i++; + $inffile = $ARGV[$i]; + } elsif ("$ARGV[$i]" eq "-v") { + $verbose = 1; + } + $i++; +} + +if ("$builtdirname" eq "") { + print(STDERR "ERROR: builtdirname is not given\n"); + &usage; exit(1); +} +if ("$releasedir" eq "") { + print(STDERR "ERROR: releasedir is not given\n"); + &usage; exit(1); +} +if ("$extension" eq "") { + print(STDERR "ERROR: extension is not given\n"); + &usage; exit(1); +} +if ("$identity" eq "" || + (("$identity" ne "fedora") && ("$identity" ne "redhat"))) { + print(STDERR "ERROR: $identity is not fedora or redhat\n"); + &usage; exit(1); +} +if ("$inffile" eq "") { + print(STDERR "ERROR: inffile is not given\n"); + &usage; exit(1); +} +if (!(-d "$releasedir")) { + print(STDERR "ERROR: $releasedir does not exist\n"); + exit(1); +} + +unless (open (INFFILE, $inffile)) { + die "Error, cannot open info file $inffile\n"; +} + +$basedir = 0; + at newfiles = (); +while ($l = ) { + chop($l); + $pos = length($l); + if ($l =~ /^base: /) { + $pos = rindex($l, ":", $pos); + $pos++; + $basedir = substr($l, $pos); + $basedir =~ s/[ ]//g; + } elsif ($l =~ /^file: /) { + $pos = rindex($l, ":", $pos); + $pos++; + $file = substr($l, $pos); + $file =~ s/[ ]//g; + push(@newfiles, ($file)); + } +} +if (1 == $verbose) { + print "Base: $basedir\n"; + print "New Files:\n"; + foreach $afile (@newfiles) { + print " $afile\n"; + } +} + +if ($builtdirname !~ /RHEL/) { + print(STDERR "ERROR: Not RHEL\n"); + exit(1); +} + +# Get info from $builtdirname (e.g., RHEL4-domestic-full-normal-pth-slapd\n") +$rhelversion = ""; +$rhelversionl = ""; +if ($builtdirname =~ /RHEL3/) { + $rhelversion = "RHEL3"; + $rhelversionl = "rhel3"; +} elsif ($builtdirname =~ /RHEL4/) { + $rhelversion = "RHEL4"; + $rhelversionl = "rhel4"; +} else { + print(STDERR "ERROR: $builtdirname is not supported\n"); + exit(1); +} + +$optordbg = ""; +if ($builtdirname =~ /full/) { + $optordbg = "dbg"; +} elsif ($builtdirname =~ /optimize/) { + $optordbg = "opt"; +} else { + print(STDERR "ERROR: $builtdirname has no opt/debug info\n"); + exit(1); +} + +# Get fullpath to the RPM file +$fullrpmfile = ""; +$iddir = ""; +opendir(BASEDIR, $basedir) or die "ERROR: Could not open $basedir\n"; +while ( defined ( $subdir = readdir(BASEDIR))) { + if ($subdir =~ /$rhelversionl/ || $subdir =~ /$rhelversion/) { + $fullsubdir = $basedir . "/" . $subdir; + opendir(SUBDIR, $fullsubdir) or die "ERROR: Could not open $fullsubdir\n"; + while ( defined ( $rpmfile = readdir(SUBDIR))) { + if (($rpmfile =~ /$rhelversionl/ || $rpmfile =~ /$rhelversion/) && + $rpmfile =~ /$optordbg/ && $rpmfile =~ /\.rpm$/) { + $fullrpmfile = $fullsubdir . "/" . $rpmfile; + ($org, $ds, $rest) = split('-', $rpmfile, 3); + $iddir = $org . "-" . $ds; + if ("$org" ne "$identity") { + print "ERROR: rpmfile name $rpmfile does not match the given identity $identity\n"; + exit(1); + } + closedir(SUBDIR); + last; + } + } + closedir(BASEDIR); + last; + } +} +if ("$fullrpmfile" eq "") { + print(STDERR "ERROR: Cannot file an rpm file under $basedir\n"); + exit(1); +} +if (1 == $verbose) { + print "RPM File: $fullrpmfile\n"; +} + +# Expand the RPM file to the $releasedir +$workdir = $releasedir . "/slapd/" . $builtdirname . $extension; +mkdir($workdir, 0700); +chdir($workdir); +if (1 == $verbose) { + print "Work Dir: $workdir\n"; +} +open(RPM2CPIO, "rpm2cpio $fullrpmfile | cpio -id | ") or die "Cannot run program: $!\n"; +close(RPM2CPIO); + +# Copy new files onto the expanded files +foreach $afile (@newfiles) { + $srcfile = $releasedir . "/slapd/" . $builtdirname . "/" . $afile; + $destfile = $workdir . "/opt/" . $iddir . "/" . $afile; + $destdir = substr($destfile, 0, rindex($destfile, "/", length($destfile))); + if (!(-d $destdir)) { + print "WARNING: $destdir does not exist. Skipping ...\n"; + next; + } + if (1 == $verbose) { + print "Copy: $srcfile => $destdir\n"; + } + open(COPY, "cp $srcfile $destdir | ") or print "Copy $srcfile to $destdir failed: $!\n"; + close(COPY); +} Index: redhat-patch.inf =================================================================== RCS file: redhat-patch.inf diff -N redhat-patch.inf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ redhat-patch.inf 22 Sep 2005 16:48:16 -0000 1.2 @@ -0,0 +1,47 @@ +# +# BEGIN COPYRIGHT BLOCK +# 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; version 2 of the License. +# +# This Program 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., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# Sample Info file to generate service pack +# base: containing the base package -- e.g., DS7.1 +# file: : +# +base: /share/dev4/fedora-ds/fds71/ships/20050526.1 + +file: 000001: README.txt +file: 000002: COPYRIGHT.txt + Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Makefile 14 Sep 2005 21:39:42 -0000 1.32 +++ Makefile 22 Sep 2005 16:48:16 -0000 1.33 @@ -214,6 +214,13 @@ FIX_SETUP_INF = $(BUILD_ROOT)/ldap/cm/fixSetupInf.pl FIX_BASE_INF = $(BUILD_ROOT)/ldap/cm/fixBaseInf.pl +ABSBUILD_ROOT = $(shell cd $(BUILD_ROOT); pwd) +ABSRELDIR = $(ABSBUILD_ROOT)/built/release +GENRPMPATCH = $(ABSBUILD_ROOT)/ldap/cm/genRpmPatch.pl +PATCHINF = $(ABSBUILD_ROOT)/ldap/cm/fedora-patch.inf +DATETIME = $(shell date +%Y%m%d-%H%M%S) +SPEXT = .SP.$(DATETIME) + # This is the directory where we put what we're making: the files which go on the CD. ifndef INSTDIR ifeq ($(ARCH), WINNT) @@ -224,6 +231,11 @@ endif ABS_INSTDIR = $(shell cd $(INSTDIR); pwd) +ifdef BUILD_PATCH +PATCHINSTDIR = $(ABS_INSTDIR)-SP +SLAPDSP = slapd-71 +endif + INST_TARGET_RESKIT=$(INSTDIR)/reskit INST_TARGET_INTL=./$(PRODUCT_MARKET)dir @@ -610,6 +622,15 @@ $(INSTDIR)/tools/infozip.zip \ $(ADMSERV_DEP) +ifdef BUILD_PATCH +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 + # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL),1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) @@ -712,8 +733,10 @@ | gzip -f > ../$(NS_BUILD_FLAVOR).tar.gz # 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 nsperl \ perldap dsktune tools $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) +endif ifeq ($(DEBUG), optimize) # $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld" endif @@ -739,13 +762,44 @@ rm $(RPM_FILE_BASE) ; \ fi # execute the RPM build - rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec + rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) $(RPM_REQUIRES) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-ds.spec ifdef BUILD_SHIP cp $(ABS_TOPDIR)/$(RPM_FILE_BASE)*$(NSOS_ARCH)$(NSOS_RELEASE).$(RPM_ARCH).$(RPM_FLAVOR).rpm $(BUILD_SHIP) endif # BUILD_SHIP endif # BUILD_RPM +ifdef BUILD_PATCH + mkdir -p $(PATCHINSTDIR)/$(SLAPDSP) + cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR) + cp $(INSTDIR)/README.txt $(PATCHINSTDIR) +# prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf + sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf + echo "" >> $(PATCHINSTDIR)/setup.inf + echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf + echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf +# create a zip file based upon the $(PATCHINF) file + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` +# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory + $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP) + - at for file in $(PACKAGE_SETUP_LIBS_32) ; \ + do if [ -f $$file ] ; \ + then $(INSTALL) -m 755 $$file $(PATCHINSTDIR)/$(SLAPDSP) ; \ + fi ; \ + done +# create patch inf file: $(SLAPD).inf + cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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 +ifdef BUILD_SHIP + cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) +else + cd $(PATCHINSTDIR); $(TAR) cvfh - * | gzip -f > ../$(NS_BUILD_FLAVOR)-SP.tar.gz +endif +endif + else # ---THE NT PACKAGE--- From fedora-directory-commits at redhat.com Thu Sep 22 16:48:18 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 22 Sep 2005 12:48:18 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap Makefile,1.10,1.11 Message-ID: <200509221648.j8MGmICY019046@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18968/ldap Modified Files: Makefile Log Message: [167982] Service Pack framework Ported the patch making code to the trunk. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 2 Sep 2005 20:40:47 -0000 1.10 +++ Makefile 22 Sep 2005 16:48:11 -0000 1.11 @@ -62,7 +62,9 @@ cd systools; $(MAKE) $(MFLAGS) all # new unix installer ifeq ($(USE_SETUPUTIL), 1) - cd cm/newinst; $(MAKE) $(MFLAGS) all + # 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 From fedora-directory-commits at redhat.com Thu Sep 22 16:48:19 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 22 Sep 2005 12:48:19 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd-patch.inf, 1.1, 1.2 Makefile, 1.7, 1.8 Message-ID: <200509221648.j8MGmJrf019067@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18968/ldap/cm/newinst Modified Files: Makefile Added Files: slapd-patch.inf Log Message: [167982] Service Pack framework Ported the patch making code to the trunk. Index: slapd-patch.inf =================================================================== RCS file: slapd-patch.inf diff -N slapd-patch.inf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ slapd-patch.inf 22 Sep 2005 16:48:16 -0000 1.2 @@ -0,0 +1,58 @@ +# +# BEGIN COPYRIGHT BLOCK +# 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; version 2 of the License. +# +# This Program 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., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2005 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +[General] +Name= %%%SERVER_NAME%%% +Components=slapd-71 + +[slapd-71] +Name= %%%SERVER_NAME%%% +InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% +Description= %%%SERVER_NAME%%% +NickName= slapd-71 +Version= %%%SERVER_VERSION%%% +BuildNumber= %%%SERVER_BUILD_NUM%%% +Archive= nsslapd-71.zip +SourcePath=slapd-71 +PreInstall= ns-config -r +PostInstall= bin/slapd/admin/bin/ns-update +PreUninstall= bin/slapd/admin/bin/uninstall +PostUninstall= +Checked=True +Mandatory=False +IsLdap=True Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 2 Sep 2005 20:40:54 -0000 1.7 +++ Makefile 22 Sep 2005 16:48:16 -0000 1.8 @@ -96,6 +96,7 @@ BINS=$(addprefix $(BINDEST)/, $(PROGS)) endif INFO= $(OBJDIR)/$(DIR) +PATCHINFO= $(ORIGINAL_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 @@ -177,10 +178,13 @@ ifeq ($(ARCH), WINNT) $(INFO): - $(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so" + $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "bin/admin/ns-admin,bin/admin/ns-admin.so" else $(INFO): - $(PERL) fixINF.pl $(BUILD_MODULE) $(DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" + $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd.inf $(SECURITY) $(PRODUCT) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $@.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" +ifdef BUILD_PATCH + $(PERL) fixINF.pl $(BUILD_MODULE) $(NOSP_DIR_VERSION) $(BUILD_ROOT)/$(BUILD_ARCH)/buildnum.dat slapd-patch.inf $(SECURITY) $(PRODUCT_NAME) $(IS_DIR_LITE) $(INSTANCE_NAME_PREFIX) $(PATCHINFO)-patch.inf $(BUILD_BOMB) "$(addprefix lib/,$(LDAP_SOLIBS)) bin/admin/libnsslapd.sl bin/slapd/bin/ns-slapd bin/slapd/bin/ns-slapd.so bin/slapd/bin/libnsslapd_shr.a" +endif endif $(OBJDEST)/%.o: %.c From fedora-directory-commits at redhat.com Thu Sep 22 16:48:13 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 22 Sep 2005 12:48:13 -0400 Subject: [Fedora-directory-commits] ldapserver nsdefs.mk,1.12,1.13 Message-ID: <200509221648.j8MGmhoE019162@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18968 Modified Files: nsdefs.mk Log Message: [167982] Service Pack framework Ported the patch making code to the trunk. Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nsdefs.mk 1 Sep 2005 01:11:19 -0000 1.12 +++ nsdefs.mk 22 Sep 2005 16:48:10 -0000 1.13 @@ -238,7 +238,8 @@ NSPR_DIR=nspr endif NSPR_BASENAME=libnspr21 -PRODUCT="Fedora Directory Server" +PRODUCTCORE=Fedora Directory Server +PRODUCT="$(PRODUCTCORE)" PRODUCT_IS_DIRECTORY_SERVER=1 INSTANCE_NAME_PREFIX="Directory Server" DIR=slapd @@ -267,6 +268,7 @@ DIR_VERSION:=7.1 NOSP_DIR_VERSION:=7.1 DIR_NORM_VERSION:=7.1 +PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must # update all of the .exp and .def files by executing the following command: # cd ldap/libraries; gmake exportfiles From fedora-directory-commits at redhat.com Sat Sep 24 02:58:23 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 23 Sep 2005 22:58:23 -0400 Subject: [Fedora-directory-commits] mod_admserv configure.in,1.7,1.8 Message-ID: <200509240258.j8O2wNwG011588@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572 Modified Files: configure.in Log Message: added separate inc and lib directives for nspr, nss, and ldapsdk to facilitate building from mozilla build tree Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.in 14 Sep 2005 01:08:27 -0000 1.7 +++ configure.in 24 Sep 2005 02:58:19 -0000 1.8 @@ -57,7 +57,7 @@ # if no apxs found yet, check /usr/local/apache/sbin # since it's the default Apache location if test -z "$APXS"; then - AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin) + AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin and /usr/sbin) if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.]) @@ -101,7 +101,7 @@ AC_MSG_CHECKING(for --with-nspr) AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory], [ - if test -e "$withval"/include/nspr.h + if test -e "$withval"/include/nspr.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) NSPRDIR=$withval @@ -114,10 +114,40 @@ ], AC_MSG_RESULT(no)) +# check for --with-nspr-inc +AC_MSG_CHECKING(for --with-nspr-inc) +AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory], +[ + if test -e "$withval"/nspr.h + then + AC_MSG_RESULT([using $withval]) + nspr_inc="-I$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# check for --with-nspr-lib +AC_MSG_CHECKING(for --with-nspr-lib) +AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + nspr_lib="-L$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + # if NSPR is not found yet, try pkg-config # last resort -if test -z "$NSPRDIR"; then +if test -z "$nspr_inc" -o -z "$nspr_lib"; then AC_MSG_CHECKING(for nspr with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then @@ -136,7 +166,7 @@ AC_MSG_CHECKING(for --with-ldapsdk) AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory], [ - if test -e "$withval"/include/ldap.h + if test -e "$withval"/include/ldap.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) LDAPSDKDIR=$withval @@ -149,8 +179,38 @@ ], AC_MSG_RESULT(no)) -if test -z "$LDAPSDKDIR"; then - AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk.]) +# check for --with-ldapsdk-inc +AC_MSG_CHECKING(for --with-ldapsdk-inc) +AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory], +[ + if test -e "$withval"/ldap.h + then + AC_MSG_RESULT([using $withval]) + ldapsdk_inc="-I$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# check for --with-ldapsdk-lib +AC_MSG_CHECKING(for --with-ldapsdk-lib) +AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + ldapsdk_lib="-L$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then + AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi AC_CHECKING(for ADMINUTIL) @@ -159,7 +219,7 @@ AC_MSG_CHECKING(for --with-adminutil) AC_ARG_WITH(adminutil, [ --with-adminutil=PATH Adminutil directory], [ - if test -e "$withval"/include/libadminutil/admutil.h + if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) ADMINUTILDIR=$withval @@ -182,7 +242,7 @@ AC_MSG_CHECKING(for --with-nss) AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory], [ - if test -e "$withval"/include/nss.h + if test -e "$withval"/include/nss.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) NSSDIR=$withval @@ -195,10 +255,40 @@ ], AC_MSG_RESULT(no)) +# check for --with-nss-inc +AC_MSG_CHECKING(for --with-nss-inc) +AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory], +[ + if test -e "$withval"/nss.h + then + AC_MSG_RESULT([using $withval]) + nss_inc="-I$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# check for --with-nss-lib +AC_MSG_CHECKING(for --with-nss-lib) +AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + nss_lib="-L$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + # if NSS is not found yet, try pkg-config # last resort -if test -z "$NSSDIR"; then +if test -z "$nss_inc" -o -z "$nss_lib"; then AC_MSG_CHECKING(for nss with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then From fedora-directory-commits at redhat.com Sat Sep 24 03:09:27 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 23 Sep 2005 23:09:27 -0400 Subject: [Fedora-directory-commits] mod_admserv aclocal.m4, 1.2, 1.3 Makefile.in, 1.8, 1.9 configure, 1.8, 1.9 Message-ID: <200509240309.j8O39RVQ012956@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12936 Modified Files: aclocal.m4 Makefile.in configure Log Message: added separate directives for nspr, nss, and ldapsdk include and library paths to facilitate building with mozilla source tree Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 14 Sep 2005 14:32:34 -0000 1.8 +++ configure 24 Sep 2005 03:09:23 -0000 1.9 @@ -1021,9 +1021,15 @@ --with-apr-config Use apr-config to determine the APR directory --with-apxs=PATH Path to apxs --with-nspr=PATH Netscape Portable Runtime (NSPR) directory + --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory + --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory --with-ldapsdk=PATH Mozilla LDAP SDK directory + --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory + --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory --with-adminutil=PATH Adminutil directory --with-nss=PATH Network Security Services (NSS) directory + --with-nss-inc=PATH Network Security Services (NSS) include directory + --with-nss-lib=PATH Network Security Services (NSS) library directory Some influential environment variables: CC C compiler command @@ -4538,7 +4544,7 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4541 "configure"' > conftest.$ac_ext + echo '#line 4547 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5067,7 +5073,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6251,7 +6257,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 6254 "configure"' > conftest.$ac_ext + echo '#line 6260 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6923,7 +6929,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -echo $ECHO_N "checking for apxs in /usr/local/apache/sbin... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin and /usr/sbin" >&5 +echo $ECHO_N "checking for apxs in /usr/local/apache/sbin and /usr/sbin... $ECHO_C" >&6 if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5 @@ -8352,7 +8358,7 @@ if test "${with_nspr+set}" = set; then withval="$with_nspr" - if test -e "$withval"/include/nspr.h + if test -e "$withval"/include/nspr.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8371,10 +8377,60 @@ echo "${ECHO_T}no" >&6 fi; +# check for --with-nspr-inc +echo "$as_me:$LINENO: checking for --with-nspr-inc" >&5 +echo $ECHO_N "checking for --with-nspr-inc... $ECHO_C" >&6 + +# Check whether --with-nspr-inc or --without-nspr-inc was given. +if test "${with_nspr_inc+set}" = set; then + withval="$with_nspr_inc" + + if test -e "$withval"/nspr.h + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nspr_inc="-I$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-nspr-lib +echo "$as_me:$LINENO: checking for --with-nspr-lib" >&5 +echo $ECHO_N "checking for --with-nspr-lib... $ECHO_C" >&6 + +# Check whether --with-nspr-lib or --without-nspr-lib was given. +if test "${with_nspr_lib+set}" = set; then + withval="$with_nspr_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nspr_lib="-L$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + # if NSPR is not found yet, try pkg-config # last resort -if test -z "$NSPRDIR"; then +if test -z "$nspr_inc" -o -z "$nspr_lib"; then echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5 echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -8439,7 +8495,7 @@ if test "${with_ldapsdk+set}" = set; then withval="$with_ldapsdk" - if test -e "$withval"/include/ldap.h + if test -e "$withval"/include/ldap.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8458,9 +8514,59 @@ echo "${ECHO_T}no" >&6 fi; -if test -z "$LDAPSDKDIR"; then - { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk." >&5 -echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk." >&2;} +# check for --with-ldapsdk-inc +echo "$as_me:$LINENO: checking for --with-ldapsdk-inc" >&5 +echo $ECHO_N "checking for --with-ldapsdk-inc... $ECHO_C" >&6 + +# Check whether --with-ldapsdk-inc or --without-ldapsdk-inc was given. +if test "${with_ldapsdk_inc+set}" = set; then + withval="$with_ldapsdk_inc" + + if test -e "$withval"/ldap.h + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + ldapsdk_inc="-I$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-ldapsdk-lib +echo "$as_me:$LINENO: checking for --with-ldapsdk-lib" >&5 +echo $ECHO_N "checking for --with-ldapsdk-lib... $ECHO_C" >&6 + +# Check whether --with-ldapsdk-lib or --without-ldapsdk-lib was given. +if test "${with_ldapsdk_lib+set}" = set; then + withval="$with_ldapsdk_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + ldapsdk_lib="-L$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then + { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5 +echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;} { (exit 1); exit 1; }; } fi @@ -8475,7 +8581,7 @@ if test "${with_adminutil+set}" = set; then withval="$with_adminutil" - if test -e "$withval"/include/libadminutil/admutil.h + if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8511,7 +8617,7 @@ if test "${with_nss+set}" = set; then withval="$with_nss" - if test -e "$withval"/include/nss.h + if test -e "$withval"/include/nss.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8530,10 +8636,60 @@ echo "${ECHO_T}no" >&6 fi; +# check for --with-nss-inc +echo "$as_me:$LINENO: checking for --with-nss-inc" >&5 +echo $ECHO_N "checking for --with-nss-inc... $ECHO_C" >&6 + +# Check whether --with-nss-inc or --without-nss-inc was given. +if test "${with_nss_inc+set}" = set; then + withval="$with_nss_inc" + + if test -e "$withval"/nss.h + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nss_inc="-I$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-nss-lib +echo "$as_me:$LINENO: checking for --with-nss-lib" >&5 +echo $ECHO_N "checking for --with-nss-lib... $ECHO_C" >&6 + +# Check whether --with-nss-lib or --without-nss-lib was given. +if test "${with_nss_lib+set}" = set; then + withval="$with_nss_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nss_lib="-L$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + # if NSS is not found yet, try pkg-config # last resort -if test -z "$NSSDIR"; then +if test -z "$nss_inc" -o -z "$nss_lib"; then echo "$as_me:$LINENO: checking for nss with pkg-config" >&5 echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. From fedora-directory-commits at redhat.com Mon Sep 26 19:38:55 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 26 Sep 2005 15:38:55 -0400 Subject: [Fedora-directory-commits] mod_nss configure, 1.5, 1.6 configure.in, 1.5, 1.6 Message-ID: <200509261938.j8QJctu8022362@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22339 Modified Files: configure configure.in Log Message: separate with options for include and lib directories - use nspr and nss instead of mozilla-nspr and -nss Index: configure =================================================================== RCS file: /cvs/dirsec/mod_nss/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure 13 Sep 2005 19:34:39 -0000 1.5 +++ configure 26 Sep 2005 19:38:52 -0000 1.6 @@ -1022,7 +1022,11 @@ --with-apr-config Use apr-config to determine the APR directory --with-apxs=PATH Path to apxs --with-nspr=PATH Netscape Portable Runtime (NSPR) directory + --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory + --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory --with-nss=PATH Network Security Services (NSS) directory + --with-nss-inc=PATH Network Security Services (NSS) include directory + --with-nss-lib=PATH Network Security Services (NSS) library directory Some influential environment variables: CC C compiler command @@ -4537,7 +4541,7 @@ case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4540 "configure"' > conftest.$ac_ext + echo '#line 4544 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5066,7 +5070,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6250,7 +6254,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*) - echo '#line 6253 "configure"' > conftest.$ac_ext + echo '#line 6257 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6922,7 +6926,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "$as_me: checking for apr-config..." >&6;} # check for --with-apr-config @@ -8569,12 +8572,16 @@ # if no apxs found yet, check /usr/local/apache/sbin # since it's the default Apache location if test -z "$APXS"; then - echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin" >&5 -echo $ECHO_N "checking for apxs in /usr/local/apache/sbin... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin and /usr/sbin" >&5 +echo $ECHO_N "checking for apxs in /usr/local/apache/sbin and /usr/sbin... $ECHO_C" >&6 if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5 echo "${ECHO_T}found $APXS. Use --with-apxs to specify another." >&6 + elif test -x /usr/sbin/apxs; then + APXS=/usr/sbin/apxs + echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5 +echo "${ECHO_T}found $APXS. Use --with-apxs to specify another." >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -8662,7 +8669,7 @@ if test "${with_nspr+set}" = set; then withval="$with_nspr" - if test -e "$withval"/include/nspr.h + if test -e "$withval"/include/nspr.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8681,10 +8688,60 @@ echo "${ECHO_T}no" >&6 fi; +# check for --with-nspr-inc +echo "$as_me:$LINENO: checking for --with-nspr-inc" >&5 +echo $ECHO_N "checking for --with-nspr-inc... $ECHO_C" >&6 + +# Check whether --with-nspr-inc or --without-nspr-inc was given. +if test "${with_nspr_inc+set}" = set; then + withval="$with_nspr_inc" + + if test -e "$withval"/nspr.h + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nspr_inc="-I$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-nspr-lib +echo "$as_me:$LINENO: checking for --with-nspr-lib" >&5 +echo $ECHO_N "checking for --with-nspr-lib... $ECHO_C" >&6 + +# Check whether --with-nspr-lib or --without-nspr-lib was given. +if test "${with_nspr_lib+set}" = set; then + withval="$with_nspr_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nspr_lib="-L$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + # if NSPR is not found yet, try pkg-config # last resort -if test -z "$NSPRDIR"; then +if test -z "$nspr_inc" -o -z "$nspr_lib"; then echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5 echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -8727,9 +8784,9 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nspr; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr` - nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr` + if $PKG_CONFIG --exists nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L nspr` else { { echo "$as_me:$LINENO: error: NSPR not found, specify with --with-nspr." >&5 echo "$as_me: error: NSPR not found, specify with --with-nspr." >&2;} @@ -8749,7 +8806,7 @@ if test "${with_nss+set}" = set; then withval="$with_nss" - if test -e "$withval"/include/nss.h + if test -e "$withval"/include/nss.h -a -d "$withval"/lib then echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 @@ -8768,10 +8825,60 @@ echo "${ECHO_T}no" >&6 fi; +# check for --with-nss-inc +echo "$as_me:$LINENO: checking for --with-nss-inc" >&5 +echo $ECHO_N "checking for --with-nss-inc... $ECHO_C" >&6 + +# Check whether --with-nss-inc or --without-nss-inc was given. +if test "${with_nss_inc+set}" = set; then + withval="$with_nss_inc" + + if test -e "$withval"/nss.h + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nss_inc="-I$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-nss-lib +echo "$as_me:$LINENO: checking for --with-nss-lib" >&5 +echo $ECHO_N "checking for --with-nss-lib... $ECHO_C" >&6 + +# Check whether --with-nss-lib or --without-nss-lib was given. +if test "${with_nss_lib+set}" = set; then + withval="$with_nss_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nss_lib="-L$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + # if NSS is not found yet, try pkg-config # last resort -if test -z "$NSSDIR"; then +if test -z "$nss_inc" -o -z "$nss_lib"; then echo "$as_me:$LINENO: checking for nss with pkg-config" >&5 echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -8814,9 +8921,9 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nss; then - nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss` - nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss` + if $PKG_CONFIG --exists nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I nss` + nss_lib=`$PKG_CONFIG --libs-only-L nss` else { { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5 echo "$as_me: error: NSS not found, specify with --with-nss." >&2;} Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_nss/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in 13 Sep 2005 19:34:39 -0000 1.5 +++ configure.in 26 Sep 2005 19:38:52 -0000 1.6 @@ -73,10 +73,13 @@ # if no apxs found yet, check /usr/local/apache/sbin # since it's the default Apache location if test -z "$APXS"; then - AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin) + AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin and /usr/sbin) if test -x /usr/local/apache/sbin/apxs; then APXS=/usr/local/apache/sbin/apxs AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.]) + elif test -x /usr/sbin/apxs; then + APXS=/usr/sbin/apxs + AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.]) else AC_MSG_RESULT(no) fi @@ -114,7 +117,7 @@ AC_MSG_CHECKING(for --with-nspr) AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory], [ - if test -e "$withval"/include/nspr.h + if test -e "$withval"/include/nspr.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) NSPRDIR=$withval @@ -127,16 +130,46 @@ ], AC_MSG_RESULT(no)) +# check for --with-nspr-inc +AC_MSG_CHECKING(for --with-nspr-inc) +AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory], +[ + if test -e "$withval"/nspr.h + then + AC_MSG_RESULT([using $withval]) + nspr_inc="-I$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# check for --with-nspr-lib +AC_MSG_CHECKING(for --with-nspr-lib) +AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + nspr_lib="-L$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + # if NSPR is not found yet, try pkg-config # last resort -if test -z "$NSPRDIR"; then +if test -z "$nspr_inc" -o -z "$nspr_lib"; then AC_MSG_CHECKING(for nspr with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nspr; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr` - nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr` + if $PKG_CONFIG --exists nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L nspr` else AC_MSG_ERROR([NSPR not found, specify with --with-nspr.]) fi @@ -149,7 +182,7 @@ AC_MSG_CHECKING(for --with-nss) AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory], [ - if test -e "$withval"/include/nss.h + if test -e "$withval"/include/nss.h -a -d "$withval"/lib then AC_MSG_RESULT([using $withval]) NSSDIR=$withval @@ -162,16 +195,46 @@ ], AC_MSG_RESULT(no)) +# check for --with-nss-inc +AC_MSG_CHECKING(for --with-nss-inc) +AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory], +[ + if test -e "$withval"/nss.h + then + AC_MSG_RESULT([using $withval]) + nss_inc="-I$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# check for --with-nss-lib +AC_MSG_CHECKING(for --with-nss-lib) +AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + nss_lib="-L$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + # if NSS is not found yet, try pkg-config # last resort -if test -z "$NSSDIR"; then +if test -z "$nss_inc" -o -z "$nss_lib"; then AC_MSG_CHECKING(for nss with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nss; then - nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss` - nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss` + if $PKG_CONFIG --exists nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I nss` + nss_lib=`$PKG_CONFIG --libs-only-L nss` else AC_MSG_ERROR([NSS not found, specify with --with-nss.]) fi From fedora-directory-commits at redhat.com Mon Sep 26 19:40:10 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 26 Sep 2005 15:40:10 -0400 Subject: [Fedora-directory-commits] mod_admserv configure, 1.9, 1.10 configure.in, 1.8, 1.9 Message-ID: <200509261940.j8QJeAxE022438@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22420 Modified Files: configure configure.in Log Message: use nspr and nss instead of mozilla-nspr and -nss Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure 24 Sep 2005 03:09:23 -0000 1.9 +++ configure 26 Sep 2005 19:40:08 -0000 1.10 @@ -8473,9 +8473,9 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nspr; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr` - nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr` + if $PKG_CONFIG --exists nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L nspr` else { { echo "$as_me:$LINENO: error: NSPR not found, specify with --with-nspr." >&5 echo "$as_me: error: NSPR not found, specify with --with-nspr." >&2;} @@ -8732,9 +8732,9 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nss; then - nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss` - nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss` + if $PKG_CONFIG --exists nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I nss` + nss_lib=`$PKG_CONFIG --libs-only-L nss` else { { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5 echo "$as_me: error: NSS not found, specify with --with-nss." >&2;} Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure.in 24 Sep 2005 02:58:19 -0000 1.8 +++ configure.in 26 Sep 2005 19:40:08 -0000 1.9 @@ -151,9 +151,9 @@ AC_MSG_CHECKING(for nspr with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nspr; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozilla-nspr` - nspr_lib=`$PKG_CONFIG --libs-only-L mozilla-nspr` + if $PKG_CONFIG --exists nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L nspr` else AC_MSG_ERROR([NSPR not found, specify with --with-nspr.]) fi @@ -292,9 +292,9 @@ AC_MSG_CHECKING(for nss with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozilla-nss; then - nss_inc=`$PKG_CONFIG --cflags-only-I mozilla-nss` - nss_lib=`$PKG_CONFIG --libs-only-L mozilla-nss` + if $PKG_CONFIG --exists nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I nss` + nss_lib=`$PKG_CONFIG --libs-only-L nss` else AC_MSG_ERROR([NSS not found, specify with --with-nss.]) fi From fedora-directory-commits at redhat.com Mon Sep 26 19:52:03 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 26 Sep 2005 15:52:03 -0400 Subject: [Fedora-directory-commits] mod_admserv aclocal.m4, 1.3, 1.4 Makefile.in, 1.9, 1.10 configure, 1.10, 1.11 Message-ID: <200509261952.j8QJq3CN022696@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22674 Modified Files: aclocal.m4 Makefile.in configure Log Message: force aclocal.m4 and Makefile.in checkin From fedora-directory-commits at redhat.com Mon Sep 26 20:01:36 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 26 Sep 2005 16:01:36 -0400 Subject: [Fedora-directory-commits] mod_nss aclocal.m4, 1.2, 1.3 Makefile.in, 1.8, 1.9 configure, 1.6, 1.7 Message-ID: <200509262001.j8QK1aaP023922@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22775 Modified Files: aclocal.m4 Makefile.in configure Log Message: force checkin of autoconf files From fedora-directory-commits at redhat.com Wed Sep 28 20:21:22 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 28 Sep 2005 16:21:22 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.20, 1.21 Message-ID: <200509282021.j8SKLMqB015435@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15419 Modified Files: windows_protocol_util.c Log Message: 169388 - Fixed attribute comparision helper function that was causing certain changes to not get synched. Index: windows_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- windows_protocol_util.c 12 May 2005 03:46:20 -0000 1.20 +++ windows_protocol_util.c 28 Sep 2005 20:21:20 -0000 1.21 @@ -1532,7 +1532,7 @@ slapi_attr_first_value(a, &va); slapi_attr_first_value(b, &vb); - if (va->bv.bv_len == va->bv.bv_len) + if (va->bv.bv_len == vb->bv.bv_len) { if (0 != memcmp(va->bv.bv_val,vb->bv.bv_val,va->bv.bv_len)) { From fedora-directory-commits at redhat.com Wed Sep 28 20:27:55 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 28 Sep 2005 16:27:55 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_protocol_util.c, 1.20, 1.20.2.1 Message-ID: <200509282027.j8SKRtFk015526@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15510 Modified Files: Tag: Directory71RtmBranch windows_protocol_util.c Log Message: 169388 - Fixed attribute comparision helper function that was causing certain changes to not get synched. Index: windows_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- windows_protocol_util.c 12 May 2005 03:46:20 -0000 1.20 +++ windows_protocol_util.c 28 Sep 2005 20:27:53 -0000 1.20.2.1 @@ -1532,7 +1532,7 @@ slapi_attr_first_value(a, &va); slapi_attr_first_value(b, &vb); - if (va->bv.bv_len == va->bv.bv_len) + if (va->bv.bv_len == vb->bv.bv_len) { if (0 != memcmp(va->bv.bv_val,vb->bv.bv_val,va->bv.bv_len)) { From fedora-directory-commits at redhat.com Wed Sep 28 22:47:16 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 28 Sep 2005 18:47:16 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.7, 1.30.2.8 fedora-patch.inf, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.3, 1.1.2.4 Message-ID: <200509282247.j8SMlGOj019009@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/ldap/cm Modified Files: Tag: Directory71RtmBranch Makefile fedora-patch.inf redhat-patch.inf Log Message: [167982] Service Pack framework To make patch installation easier and less confusing, 1) adding a setup wrapper (ldap/cm/newinst/setup.patch) for Solaris and HP as well as 2) adding some code to RPM setup script (ldap/cm/newinst/setup) for RHELs, which checks the existing server config files and retrieves the values needed for the upgrade. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.7 retrieving revision 1.30.2.8 diff -u -r1.30.2.7 -r1.30.2.8 --- Makefile 16 Sep 2005 20:01:17 -0000 1.30.2.7 +++ Makefile 28 Sep 2005 22:47:13 -0000 1.30.2.8 @@ -813,13 +813,14 @@ cp $(INSTDIR)/dssetup $(PATCHINSTDIR) cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR) cp $(INSTDIR)/README.txt $(PATCHINSTDIR) + cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup # prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf echo "" >> $(PATCHINSTDIR)/setup.inf echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf # create a zip file based upon the $(PATCHINF) file - cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'` + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep "^file:" $(PATCHINF) | awk -F: '{print $$3}'` # put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP) - at for file in $(PACKAGE_SETUP_LIBS_32) ; \ @@ -829,7 +830,7 @@ done # create patch inf file: $(SLAPD).inf cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf - cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- fedora-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3 +++ fedora-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4 @@ -38,7 +38,7 @@ # # Info file to generate DS7.1 SP1 patch # base: containing the base package -- DS7.1 -# file: +# file: bug#: # base: /share/dev4/fedora-ds/fds71/ships/20050526.1 @@ -56,6 +56,7 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar +file: 169388: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- redhat-patch.inf 12 Sep 2005 20:05:15 -0000 1.1.2.3 +++ redhat-patch.inf 28 Sep 2005 22:47:13 -0000 1.1.2.4 @@ -38,7 +38,7 @@ # # Info file to generate DS7.1 SP1 patch # base: containing the base package -- DS7.1 -# file: +# file: bug#: # base: /share/dev4/ds/ds71/ships/20050524.1 @@ -56,5 +56,6 @@ file: 156120,159037: winsync/PassSync.msi file: 156120,159037: winsync/ntds.msi file: 167761: java/jars/ds71.jar +file: 169388: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt From fedora-directory-commits at redhat.com Wed Sep 28 22:47:16 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 28 Sep 2005 18:47:16 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, NONE, 1.1.2.1 setup, 1.9.2.2, 1.9.2.3 Message-ID: <200509282247.j8SMlGSG019017@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/ldap/cm/newinst Modified Files: Tag: Directory71RtmBranch setup Added Files: Tag: Directory71RtmBranch setup.patch Log Message: [167982] Service Pack framework To make patch installation easier and less confusing, 1) adding a setup wrapper (ldap/cm/newinst/setup.patch) for Solaris and HP as well as 2) adding some code to RPM setup script (ldap/cm/newinst/setup) for RHELs, which checks the existing server config files and retrieves the values needed for the upgrade. setup.patch: --- NEW FILE setup.patch --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # 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; version 2 of the License. # # This Program 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., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA. # # In addition, as a special exception, Red Hat, Inc. gives You the additional # right to link the code of this Program with code not covered under the GNU # General Public License ("Non-GPL Code") and to distribute linked combinations # including the two, subject to the limitations in this paragraph. Non-GPL Code # permitted under this exception must only link to the code of this Program # through those well defined interfaces identified in the file named EXCEPTION # found in the source code files (the "Approved Interfaces"). The files of # Non-GPL Code may instantiate templates or use macros or inline functions from # the Approved Interfaces without causing the resulting work to be covered by # the GNU General Public License. Only Red Hat, Inc. may make changes or # additions to the list of Approved Interfaces. You must obey the GNU General # Public License in all respects for all of the Program code and other code used # in conjunction with the Program except the Non-GPL Code covered by this # exception. If you modify this file, you may extend this exception to your # version of the file, but you are not obligated to do so. If you do not wish to # provide this exception without modification, you must delete this exception # statement from your version and license this file solely under the GPL without # exception. # # # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # # This script is a wrapper for dssetup used for inplace upgrade / patch # installation. # clear echo " Fedora Project" echo " Fedora Server Products Installation/Uninstallation" echo "-------------------------------------------------------------------------------" echo "" echo "" echo "BY INSTALLING THIS SOFTWARE YOU ARE CONSENTING TO BE BOUND BY" echo "AND ARE BECOMING A PARTY TO THE AGREEMENT FOUND IN THE" echo "LICENSE.TXT FILE. IF YOU DO NOT AGREE TO ALL OF THE TERMS" echo "OF THIS AGREEMENT, PLEASE DO NOT INSTALL OR USE THIS SOFTWARE." echo "" printf "Do you agree to the license terms? [No]: " read ans if [ "$ans" != "Y" -a "$ans" != "YES" -a "$ans" != "Yes" -a "$ans" != "y" -a "$ans" != "yes" ]; then exit 1; fi clear echo " Fedora Project" echo " Fedora Server Products Installation/Uninstallation" echo "-------------------------------------------------------------------------------" echo "" echo "" echo "This program will extract the patch files and install them" echo "into a directory where the Directory Server is already installed." echo "" echo "To accept the default shown in brackets, press the Enter key." echo "" printf "Install location [/opt/fedora/servers]: " read serverroot if [ ! -d $serverroot ]; then echo "" echo "Directory $serverroot does not exist." exit 1 fi if [ ! -f $serverroot/admin-serv/config/adm.conf ]; then echo "" echo "Administration Server's configuration file $serverroot/admin-serv/config/adm.conf does not exist." exit 1 fi getValFromAdminConf() { cattr=$1 cfile=$2 rval=`grep -i $cattr $serverroot/admin-serv/config/$cfile | awk '{print $2}'` echo $rval } dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'` dsconffile=$serverroot/$dsinst/config/dse.ldif if [ ! -f $dsconffile ]; then echo "" echo "Directory Server's configuration file $dsconffile does not exist." exit 1 fi clear ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"` ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"` siepid=`getValFromAdminConf "siepid:" "adm.conf"` suitespotuser=`ls -l $dsconffile | awk '{print $3}'` suitespotgroup=`ls -l $dsconffile | awk '{print $4}'` admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'` if [ "$admindomain" = "" ]; then admindomain=`domainname` fi echo " Fedora Project" echo " Directory Installation/Uninstallation" echo "-------------------------------------------------------------------------------" echo "" echo "In order to reconfigure your installation, the Configuration Directory" echo "Administrator password is required. Here is your current information:" echo "" echo "Configuration Directory: ldap://$ldaphost:$ldapport/o=NetscapeRoot" echo "Configuration Administrator ID: $siepid" echo "" echo "At the prompt, please enter the password for the Configuration Administrator." echo "" echo "administrator ID: $siepid" siepasswd="" while [ "$siepasswd" = "" ]; do printf "Password: " read siepasswd done inffile=./myinstall.inf echo "[General]" > $inffile echo "FullMachineName= $ldaphost" >> $inffile echo "SuiteSpotUserID= $suitespotuser" >> $inffile echo "SuitespotGroup= $suitespotgroup" >> $inffile echo "ServerRoot= $serverroot" >> $inffile echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/" >> $inffile echo "ConfigDirectoryAdminID= $siepid" >> $inffile echo "AdminDomain= $admindomain" >> $inffile echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile echo "Components= slapd-71sp1" >> $inffile echo "" >> $inffile echo "[slapd-71sp1]" >> $inffile echo "Components= slapd-71sp1" >> $inffile clear ./dssetup -s -f $inffile Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -u -r1.9.2.2 -r1.9.2.3 --- setup 9 Sep 2005 22:50:37 -0000 1.9.2.2 +++ setup 28 Sep 2005 22:47:14 -0000 1.9.2.3 @@ -130,6 +130,13 @@ echo $maxhost } +getValFromAdminConf() { + cattr=$1 + cfile=$2 + rval=`grep -i $cattr $sroot/admin-serv/config/$cfile | awk '{print $2}'` + echo $rval +} + logfile=`doMktmp log` myargs= silent= @@ -192,6 +199,61 @@ askYN "Continue?" fi +# check whether it is an in-place installation +if [ -f $sroot/admin-serv/config/adm.conf ]; then + dsinst=`getValFromAdminConf "ldapStart:" "adm.conf" | awk -F/ '{print $1}'` + if [ -f $sroot/$dsinst/config/dse.ldif ]; then + # it is an in=place installation + ldaphost=`getValFromAdminConf "ldapHost:" "adm.conf"` + ldapport=`getValFromAdminConf "ldapPort:" "adm.conf"` + adminport=`getValFromAdminConf "\ $inffile + echo "FullMachineName= $ldaphost" >> $inffile + echo "SuiteSpotUserID= $suitespotuser" >> $inffile + echo "SuitespotGroup= $suitespotgroup" >> $inffile + echo "ServerRoot= $sroot" >> $inffile + echo "ConfigDirectoryLdapURL= ldap://$ldaphost:$ldapport/o=NetscapeRoot" >> $inffile + echo "ConfigDirectoryAdminID= $siepid" >> $inffile + echo "AdminDomain= $admindomain" >> $inffile + echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile + echo "" >> $inffile + echo "[admin]" >> $inffile + echo "ServerAdminID= $siepid" >> $inffile + echo "ServerAdminPwd= $siepasswd" >> $inffile + echo "SysUser= $sysuser" >> $inffile + echo "Port= $adminport" >> $inffile + echo "ServerIpAddress=" >> $inffile + + # set silent mode + silent=1 + fi +fi + # dsktune if ! [ $silent ]; then bin/slapd/server/dsktune | tee -a $logfile From fedora-directory-commits at redhat.com Thu Sep 29 17:18:25 2005 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 29 Sep 2005 13:18:25 -0400 Subject: [Fedora-directory-commits] console build.xml, 1.5, 1.6 buildnum.pl, 1.1, 1.2 Message-ID: <200509291718.j8THIPA9016717@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16699 Modified Files: build.xml buildnum.pl Log Message: 169552 - Minor build changes to support build and debug from Eclipse Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 15 Sep 2005 22:06:33 -0000 1.5 +++ build.xml 29 Sep 2005 17:18:23 -0000 1.6 @@ -70,9 +70,10 @@ - + + @@ -131,7 +132,9 @@ Index: buildnum.pl =================================================================== RCS file: /cvs/dirsec/console/buildnum.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- buildnum.pl 15 Sep 2005 22:06:33 -0000 1.1 +++ buildnum.pl 29 Sep 2005 17:18:23 -0000 1.2 @@ -58,7 +58,7 @@ # Load arguments $platdir = $opt_p || exitHelp(); -$buildnum_file = "./$platdir/buildnum.dat"; +$buildnum_file = "$platdir/buildnum.dat"; # Get current time @now = gmtime; From fedora-directory-commits at redhat.com Thu Sep 29 19:35:46 2005 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Thu, 29 Sep 2005 15:35:46 -0400 Subject: [Fedora-directory-commits] mod_nss mod_nss.c, 1.7, 1.8 mod_nss.h, 1.6, 1.7 nss_engine_config.c, 1.7, 1.8 nss_engine_init.c, 1.12, 1.13 Message-ID: <200509291935.j8TJZk8a021069@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038 Modified Files: mod_nss.c mod_nss.h nss_engine_config.c nss_engine_init.c Log Message: Add proxy support to mod_nss. Most of the changes are related to adding new configuration directives. For the others we need to initialize an NSS socket differently whether we will be acting as a client or a server. Index: mod_nss.c =================================================================== RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_nss.c 6 Sep 2005 14:51:43 -0000 1.7 +++ mod_nss.c 29 Sep 2005 19:35:43 -0000 1.8 @@ -15,6 +15,7 @@ #include "mod_nss.h" #include +#include "sslerr.h" /* * the table of configuration directives we provide @@ -101,7 +102,6 @@ SSL_CMD_DIR(Require, AUTHCFG, RAW_ARGS, "Require a boolean expression to evaluate to true for granting access" "(arbitrary complex boolean expression - see manual)") -#ifdef PROXY /* * Proxy configuration for remote SSL connections */ @@ -114,31 +114,11 @@ SSL_CMD_SRV(ProxyCipherSuite, TAKE1, "SSL Proxy: colon-delimited list of permitted SSL ciphers " "(`XXX:...:XXX' - see manual)") - SSL_CMD_SRV(ProxyVerify, TAKE1, - "SSL Proxy: whether to verify the remote certificate " - "(`on' or `off')") - SSL_CMD_SRV(ProxyVerifyDepth, TAKE1, - "SSL Proxy: maximum certificate verification depth " - "(`N' - number of intermediate certificates)") - SSL_CMD_SRV(ProxyCACertificateFile, TAKE1, - "SSL Proxy: file containing server certificates " - "(`/path/to/file' - PEM encoded certificates)") - SSL_CMD_SRV(ProxyCACertificatePath, TAKE1, - "SSL Proxy: directory containing server certificates " - "(`/path/to/dir' - contains PEM encoded certificates)") - SSL_CMD_SRV(ProxyCARevocationPath, TAKE1, - "SSL Proxy: CA Certificate Revocation List (CRL) path " - "(`/path/to/dir' - contains PEM encoded files)") - SSL_CMD_SRV(ProxyCARevocationFile, TAKE1, - "SSL Proxy: CA Certificate Revocation List (CRL) file " - "(`/path/to/file' - PEM encoded)") - SSL_CMD_SRV(ProxyMachineCertificateFile, TAKE1, - "SSL Proxy: file containing client certificates " - "(`/path/to/file' - PEM encoded certificates)") - SSL_CMD_SRV(ProxyMachineCertificatePath, TAKE1, - "SSL Proxy: directory containing client certificates " - "(`/path/to/dir' - contains PEM encoded certificates)") + SSL_CMD_SRV(ProxyNickname, TAKE1, + "SSL Proxy: client certificate Nickname to be for proxy connections " + "(`nickname')") +#ifdef IGNORE /* Deprecated directives. */ AP_INIT_RAW_ARGS("NSSLog", ap_set_deprecated, NULL, OR_ALL, "SSLLog directive is no longer supported - use ErrorLog."), @@ -183,7 +163,6 @@ return sslconn; } -#ifdef PROXY int nss_proxy_enable(conn_rec *c) { SSLSrvConfigRec *sc = mySrvConfig(c->base_server); @@ -193,7 +172,7 @@ if (!sc->proxy_enabled) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, "SSL Proxy requested for %s but not enabled " - "[Hint: SSLProxyEngine]", sc->vhost_id); + "[Hint: NSSProxyEngine]", sc->vhost_id); return 0; } @@ -203,7 +182,6 @@ return 1; } -#endif int nss_engine_disable(conn_rec *c) { @@ -222,6 +200,76 @@ return 1; } +/* Callback for an incoming certificate that is not valid */ + +SECStatus NSSBadCertHandler(void *arg, PRFileDesc * socket) +{ + conn_rec *c = (conn_rec *)arg; + PRErrorCode err = PR_GetError(); + SECStatus rv = SECFailure; + CERTCertificate *peerCert = SSL_PeerCertificate(socket); + + switch (err) { + case SSL_ERROR_BAD_CERT_DOMAIN: + if (c->remote_host != NULL) { + rv = CERT_VerifyCertName(peerCert, c->remote_host); + if (rv != SECSuccess) { + char *remote = CERT_GetCommonName(&peerCert->subject); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL Proxy: Possible man-in-the-middle attack. The remove server is %s, we expected %s", remote, c->remote_host, rv); + PORT_Free(remote); + } + } else { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "SSL Proxy: I don't have the name of the host we're supposed to connect to so I can't verify that we are connecting to who we think we should be. Giving up. Hint: See Apache bug 36468."); + } + break; + default: + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "Bad remote server certificate.", err); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + break; + } + return rv; +} + +/* Callback to pull the client certificate upon server request */ + +static SECStatus NSSGetClientAuthData(void *arg, PRFileDesc *socket, + CERTDistNames *caNames, + CERTCertificate **pRetCert,/*return */ + SECKEYPrivateKey **pRetKey) +{ + CERTCertificate * cert; + SECKEYPrivateKey * privKey; + void * proto_win = NULL; + SECStatus rv = SECFailure; + char * localNickName = (char *)arg; + + proto_win = SSL_RevealPinArg(socket); + + if (localNickName) { + cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), + localNickName, certUsageSSLClient, + PR_FALSE, proto_win); + if (cert) { + privKey = PK11_FindKeyByAnyCert(cert, proto_win); + if (privKey) { + rv = SECSuccess; + } else { + CERT_DestroyCertificate(cert); + } + } + + if (rv == SECSuccess) { + *pRetCert = cert; + *pRetKey = privKey; + } + } + + return rv; +} + static int nss_hook_pre_connection(conn_rec *c, void *csd) { SSLSrvConfigRec *sc = mySrvConfig(c->base_server); @@ -285,7 +333,28 @@ nss_io_filter_init(c, ssl); - SSL_ResetHandshake(ssl, PR_TRUE); + SSL_ResetHandshake(ssl, mctx->as_server); + + /* If we are doing a client connection, set our own bad certificate + * handler and register the nickname we want to use in case client + * authentication is requested. + */ + if (!mctx->as_server) { + if (SSL_BadCertHook(ssl, (SSLBadCertHandler) NSSBadCertHandler, c) != SECSuccess) + { + /* errors are reported in the certificate handler */ + return DECLINED; + } + if (mctx->nickname) { + if (SSL_GetClientAuthDataHook(ssl, NSSGetClientAuthData, + (void*)mctx->nickname) != SECSuccess) + { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, c->base_server, + "Unable to register client authentication callback"); + return DECLINED; + } + } + } return APR_SUCCESS; } @@ -335,9 +404,7 @@ nss_var_register(); -#ifdef PROXY APR_REGISTER_OPTIONAL_FN(nss_proxy_enable); -#endif APR_REGISTER_OPTIONAL_FN(nss_engine_disable); } Index: mod_nss.h =================================================================== RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_nss.h 6 Sep 2005 14:51:43 -0000 1.6 +++ mod_nss.h 29 Sep 2005 19:35:43 -0000 1.7 @@ -238,6 +238,8 @@ char *cipherSuite; + int as_server; + int ssl2; int ssl3; int tls; @@ -278,9 +280,7 @@ int nOptionsAdd; int nOptionsDel; const char *szCipherSuite; - nss_verify_t nVerifyClient; - const char *szCACertificatePath; - const char *szCACertificateFile; + nss_verify_t nVerifyClient; const char *szUserName; } SSLDirConfigRec; @@ -333,6 +333,11 @@ const char *nss_cmd_NSSRequireSSL(cmd_parms *cmd, void *dcfg); const char *nss_cmd_NSSRequire(cmd_parms *, void *, const char *); +const char *nss_cmd_NSSProxyEngine(cmd_parms *cmd, void *dcfg, int flag); +const char *nss_cmd_NSSProxyProtocol(cmd_parms *, void *, const char *); +const char *nss_cmd_NSSProxyCipherSuite(cmd_parms *, void *, const char *); +const char *nss_cmd_NSSProxyNickname(cmd_parms *cmd, void *dcfg, const char *arg); + /* module initialization */ int nss_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *); void nss_init_Child(apr_pool_t *, server_rec *); @@ -363,8 +368,11 @@ APR_DECLARE_OPTIONAL_FN(int, nss_is_https, (conn_rec *)); /* Proxy Support */ +int nss_proxy_enable(conn_rec *c); int nss_engine_disable(conn_rec *c); +APR_DECLARE_OPTIONAL_FN(int, nss_proxy_enable, (conn_rec *)); + APR_DECLARE_OPTIONAL_FN(int, nss_engine_disable, (conn_rec *)); /* I/O */ Index: nss_engine_config.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nss_engine_config.c 6 Sep 2005 14:51:43 -0000 1.7 +++ nss_engine_config.c 29 Sep 2005 19:35:43 -0000 1.8 @@ -69,6 +69,8 @@ { mctx->sc = NULL; /* set during module init */ + mctx->as_server = PR_TRUE; + mctx->ssl2 = PR_FALSE; mctx->ssl3 = PR_FALSE; mctx->tls = PR_FALSE; @@ -87,6 +89,18 @@ } +static void modnss_ctx_init_proxy(SSLSrvConfigRec *sc, + apr_pool_t *p) +{ + modnss_ctx_t *mctx; + + mctx = sc->proxy = apr_palloc(p, sizeof(*sc->proxy)); + + modnss_ctx_init(mctx); + + mctx->as_server = PR_FALSE; +} + static void modnss_ctx_init_server(SSLSrvConfigRec *sc, apr_pool_t *p) { @@ -95,6 +109,8 @@ mctx = sc->server = apr_palloc(p, sizeof(*sc->server)); modnss_ctx_init(mctx); + + mctx->as_server = PR_TRUE; } static SSLSrvConfigRec *nss_config_server_new(apr_pool_t *p) @@ -111,9 +127,7 @@ sc->proxy = NULL; sc->server = NULL; -#ifdef PROXY modnss_ctx_init_proxy(sc, p); -#endif modnss_ctx_init_server(sc, p); @@ -149,6 +163,13 @@ cfgMerge(enforce, PR_TRUE); } +static void modnss_ctx_cfg_merge_proxy(modnss_ctx_t *base, + modnss_ctx_t *add, + modnss_ctx_t *mrg) +{ + modnss_ctx_cfg_merge(base, add, mrg); +} + static void modnss_ctx_cfg_merge_server(modnss_ctx_t *base, modnss_ctx_t *add, modnss_ctx_t *mrg) @@ -170,9 +191,7 @@ cfgMergeBool(enabled); cfgMergeBool(proxy_enabled); -#ifdef PROXY modnss_ctx_cfg_merge_proxy(base->proxy, add->proxy, mrg->proxy); -#endif modnss_ctx_cfg_merge_server(base->server, add->server, mrg->server); @@ -270,7 +289,7 @@ const char *nss_cmd_NSSFIPS(cmd_parms *cmd, void *dcfg, int flag) { SSLSrvConfigRec *sc = mySrvConfig(cmd->server); - + sc->fips = flag ? TRUE : FALSE; return NULL; @@ -281,7 +300,7 @@ SSLSrvConfigRec *sc = mySrvConfig(cmd->server); sc->ocsp = flag ? TRUE : FALSE; - + return NULL; } @@ -395,6 +414,46 @@ return NULL; } +const char *nss_cmd_NSSProxyEngine(cmd_parms *cmd, void *dcfg, int flag) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->proxy_enabled = flag ? TRUE : FALSE; + + return NULL; +} + +const char *nss_cmd_NSSProxyProtocol(cmd_parms *cmd, + void *dcfg, + const char *arg) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->proxy->auth.protocols = arg; +} + +const char *nss_cmd_NSSProxyCipherSuite(cmd_parms *cmd, + void *dcfg, + const char *arg) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->proxy->auth.cipher_suite = arg; + + return NULL; +} + +const char *nss_cmd_NSSProxyNickname(cmd_parms *cmd, + void *dcfg, + const char *arg) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->proxy->nickname = arg; + + return NULL; +} + const char *nss_cmd_NSSEnforceValidCerts(cmd_parms *cmd, void *dcfg, int flag) Index: nss_engine_init.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- nss_engine_init.c 13 Sep 2005 19:34:39 -0000 1.12 +++ nss_engine_init.c 29 Sep 2005 19:35:43 -0000 1.13 @@ -16,7 +16,9 @@ #include "mod_nss.h" #include "apr_thread_proc.h" #include "ap_mpm.h" -#include +#include "secmod.h" +#include "sslerr.h" +#include "pk11func.h" static SECStatus ownBadCertHandler(void *arg, PRFileDesc * socket); static SECStatus ownHandshakeCallback(PRFileDesc * socket, void *arg); @@ -111,6 +113,7 @@ SSLModConfigRec *mc = myModConfig(s); SSLSrvConfigRec *sc; int forked = 0; + char cwd[PATH_MAX]; sc = mySrvConfig(s); @@ -172,8 +175,14 @@ /* Set the PKCS #11 strings for the internal token. */ PK11_ConfigurePKCS11(NULL,NULL,NULL, INTERNAL_TOKEN_NAME, NULL, NULL,NULL,NULL,8,1); + /* We need to be in the same directory as libnssckbi.so to load the + * root certificates properly. + */ + getcwd(cwd, PATH_MAX); + chdir(mc->pCertificateDatabase); /* Initialize NSS and open the certificate database read-only. */ rv = NSS_Initialize(mc->pCertificateDatabase, mc->pDBPrefix, mc->pDBPrefix, "secmod.db", NSS_INIT_READONLY); + chdir(cwd); /* Assuming everything is ok so far, check the cert database password(s). */ if (sslenabled && (rv != SECSuccess)) { @@ -287,11 +296,9 @@ sc->server->sc = sc; } -#ifdef PROXY if (sc->proxy) { sc->proxy->sc = sc; } -#endif /* * Create the server host:port string because we need it a lot @@ -366,8 +373,8 @@ /* - * Announce mod_ssl and SSL library in HTTP Server field - * as ``mod_ssl/X.X.X OpenSSL/X.X.X'' + * Announce mod_nss and SSL library in HTTP Server field + * as ``mod_nss/X.X.X NSS/X.X.X'' */ nss_add_version_components(p, base_server); @@ -391,20 +398,28 @@ nss_die(); } - if (SSL_OptionSet(mctx->model, SSL_HANDSHAKE_AS_SERVER, PR_TRUE) + if (SSL_OptionSet(mctx->model, SSL_HANDSHAKE_AS_SERVER, mctx->as_server) != SECSuccess) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Unable to set SSL server handshake mode."); nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); nss_die(); } - if (SSL_OptionSet(mctx->model, SSL_HANDSHAKE_AS_CLIENT, PR_FALSE) + if (SSL_OptionSet(mctx->model, SSL_HANDSHAKE_AS_CLIENT, !mctx->as_server) != SECSuccess) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, - "Unable to disable handshake as client"); + "Unable to set handshake as client"); nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); nss_die(); } + if (!mctx->as_server) { + if ((SSL_OptionSet(mctx->model, SSL_NO_CACHE, PR_TRUE)) != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + "Unable to disable SSL client caching"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); + nss_die(); + } + } } static void nss_init_ctx_protocol(server_rec *s, @@ -622,7 +637,8 @@ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "FIPS mode enabled, permitted SSL ciphers are: [%s]", fipsciphers); - } + } + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Configuring permitted SSL ciphers [%s]", suite); @@ -666,7 +682,7 @@ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "Cipher %s is enabled but this is not a FIPS cipher, disabling.", ciphers_def[i].name); cipher_state[i] = PR_FALSE; - } + } } } @@ -728,18 +744,20 @@ * Get own certificate and private key. */ - if (mctx->nickname == NULL) { + if (mctx->nickname == NULL && mctx->as_server) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "No certificate nickname provided."); nss_die(); } - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, - "Using nickname %s.", mctx->nickname); + + if (mctx->nickname != NULL) + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "Using nickname %s.", mctx->nickname); mctx->servercert = FindServerCertFromNickname(mctx->nickname); /* Verify the certificate chain. */ - if (mctx->servercert != NULL) { + if (mctx->servercert != NULL && mctx->as_server) { SECCertificateUsage usage = certificateUsageSSLServer; if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), mctx->servercert, PR_TRUE, usage, NULL, NULL) != SECSuccess) { @@ -754,14 +772,14 @@ } } - if (NULL == mctx->servercert) + if (NULL == mctx->servercert && mctx->as_server) { ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Certificate not found: '%s'", mctx->nickname); nss_die(); } - if (strchr(mctx->nickname, ':')) + if (mctx->nickname && strchr(mctx->nickname, ':')) { char* token = strdup(mctx->nickname); char* colon = strchr(token, ':'); @@ -786,17 +804,20 @@ slot = PK11_GetInternalKeySlot(); } - mctx->serverkey = PK11_FindPrivateKeyFromCert(slot, mctx->servercert, NULL); - PK11_FreeSlot(slot); + if (mctx->servercert) { + mctx->serverkey = PK11_FindPrivateKeyFromCert(slot, mctx->servercert, NULL); + PK11_FreeSlot(slot); + } - if (mctx->serverkey == NULL) { + if (mctx->as_server && mctx->serverkey == NULL) { ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "Key not found for: '%s'", mctx->nickname); nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); nss_die(); } - mctx->serverKEAType = NSS_FindCertKEAType(mctx->servercert); + if (mctx->as_server) { + mctx->serverKEAType = NSS_FindCertKEAType(mctx->servercert); /* * Check for certs that are expired or not yet valid and WARN about it @@ -824,6 +845,7 @@ "Unhandled Certificate time type %d for: '%s'", certtimestatus, mctx->nickname); break; } + } secstatus = (SECStatus)SSL_SetPKCS11PinArg(mctx->model, NULL); if (secstatus != SECSuccess) { @@ -832,15 +854,15 @@ nss_die(); } -#if 1 - secstatus = SSL_ConfigSecureServer(mctx->model, mctx->servercert, mctx->serverkey, mctx->serverKEAType); - if (secstatus != SECSuccess) { - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, - "SSL error configuring server: '%s'", mctx->nickname); - nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); - nss_die(); + if (mctx->as_server) { + secstatus = SSL_ConfigSecureServer(mctx->model, mctx->servercert, mctx->serverkey, mctx->serverKEAType); + if (secstatus != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "SSL error configuring server: '%s'", mctx->nickname); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, s); + nss_die(); + } } -#endif secstatus = (SECStatus)SSL_HandshakeCallback(mctx->model, (SSLHandshakeCallback)NSSHandshakeCallback, NULL); if (secstatus != SECSuccess) @@ -852,6 +874,16 @@ } } +static void nss_init_proxy_ctx(server_rec *s, + apr_pool_t *p, + apr_pool_t *ptemp, + SSLSrvConfigRec *sc) +{ + nss_init_ctx(s, p, ptemp, sc->proxy); + + nss_init_server_certs(s, p, ptemp, sc->proxy); +} + static void nss_init_server_ctx(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp, @@ -876,11 +908,11 @@ nss_init_server_ctx(s, p, ptemp, sc); } -#ifdef PROXY if (sc->proxy_enabled) { + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "Enabling proxy."); nss_init_proxy_ctx(s, p, ptemp, sc); } -#endif } void nss_init_Child(apr_pool_t *p, server_rec *s) @@ -936,10 +968,14 @@ { PRErrorCode err = PR_GetError(); - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "Bad certificate: %d", err); - - return SECFailure; + switch (err) { + default: + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "Bad remote server certificate.", err); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + return SECFailure; + break; + } } /* @@ -1028,6 +1064,9 @@ PRUint32 bestCertMatchedUsage = 0; PRBool bestCertIsValid = PR_FALSE; + if (name == NULL) + return NULL; + clist = PK11_ListCerts(PK11CertListUser, NULL); for (cln = CERT_LIST_HEAD(clist); !CERT_LIST_END(cln,clist); From fedora-directory-commits at redhat.com Thu Sep 29 19:35:46 2005 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Thu, 29 Sep 2005 15:35:46 -0400 Subject: [Fedora-directory-commits] mod_nss/docs mod_nss.html,1.8,1.9 Message-ID: <200509291935.j8TJZlN5021077@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21038/docs Modified Files: mod_nss.html Log Message: Add proxy support to mod_nss. Most of the changes are related to adding new configuration directives. For the others we need to initialize an NSS socket differently whether we will be acting as a client or a server. Index: mod_nss.html =================================================================== RCS file: /cvs/dirsec/mod_nss/docs/mod_nss.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mod_nss.html 16 Sep 2005 13:07:37 -0000 1.8 +++ mod_nss.html 29 Sep 2005 19:35:44 -0000 1.9 @@ -1,4 +1,6 @@ + + - - mod_nss @@ -32,25 +32,18 @@ Environment Variables
Database Management
Why is SSLv2 disabled?
-
+Frequently Asked Questions

Introduction

The mod_ssl package was created in April 1998 by Ralf S. Engelschall and was originally derived from the Apache-SSL package developed by Ben Laurie. It stays under a -BSD-style -license which is equivalent to the license used by The Apache Group for the Apache -webserver -itself. This means, in short, that you are free to use it both for -commercial -and non-commercial purposes as long as you retain the authors' -copyright -notices and give the proper credit. -
+ href="mailto:ben at algroup.co.uk">Ben Laurie. It is licensed under +the Apache 2.0 +license.

-mod_nss is based directly on the mod_ssl package from Apache +mod_nss is based directly on the mod_ssl package from Apache 2.0.54.  It is a conversion from using OpenSSL calls to using NSS calls instead.
@@ -94,6 +87,20 @@ + --with-nss-inc=PATH
+ + The file system path to the NSS +include directory (e.g. /usr/local/include/nss3)
+ + + + --with-nss-lib=PATH
+ + The file system path to the NSS +lib directory (e.g. /usr/local/lib)
+ + + --with-nspr=[PATH]
The file system path of the NSPR @@ -101,6 +108,20 @@ PATH/include, etc. + --with-nspr-inc=PATH
+ + The file system path to the NSPR +include directory (e.g. /usr/local/include/nspr4)
+ + + + --with-nspr-lib=PATH
+ + The file system path to the NSPR +lib directory (e.g. /usr/local/lib)
+ + + --with-apxs=[PATH]
The location of the apxs binary @@ -117,7 +138,7 @@
 If --with-nss or --with-nspr are not passed configure will look -for the mozilla-[nss|nspr]-devel packages and use the libraries with +for the [nss|nspr]-devel packages and use the libraries with that if found.

 It is strongly recommended that the mozilla.org version be used.
@@ -371,12 +392,12 @@ included in the NSSCipherSuite entry are automatically disabled. The allowable ciphers are:
    -
  • rsa_3des_sha
    • -
  • rsa_des_sha
    • -
  • fips_3des_sha
    • -
  • fips_des_sha
    • -
  • rsa_des_56_sha
    • -
  • fortezza
    • +
  • rsa_3des_sha
    • +
  • rsa_des_sha
    • +
  • fips_3des_sha
    • +
  • fips_des_sha
    • +
  • rsa_des_56_sha
    • +
  • fortezza

FIPS is disabled by default.
@@ -404,7 +425,8 @@ A space-separated list of the SSL ciphers used, with the prefix + to enable or - to disable.

-All ciphers are disabled by default. The SSLv2 ciphers cannot be enabled because +All ciphers are disabled by default. The SSLv2 ciphers cannot be +enabled because SSLv2 is not allowed in mod_nss.

Available ciphers are:
@@ -622,7 +644,7 @@ NSSNickname Server-Cert
NSSNickname "This contains a space"

-NSSEnforceValidCerts
+NSSEnforceValidCerts

By default mod_nss will not start up if the server certificate is not valid. This means that if the certificate has @@ -636,7 +658,7 @@
NSSEnforceValidCerts on

-NSSVerifyClient
+NSSVerifyClient

Determines whether Client Certificate Authentication will be requested or required. This may be set in a @@ -646,18 +668,17 @@ requested from the client.

Available options are:
-
  • none: no client certificate is required or requested
    -
    • -
  • code>optional: a client +
    • +
  • code>optional: a client certificate is requested but if one is not available, the connection may continue.
    -
    • +
  • require: a valid client certificate is required for the connection to continue.
    -
    • +
The mod_ssl option option_no_ca is not supported.
@@ -732,7 +753,45 @@ may be restricted (or allowed) based on any number of variables such as components of the client certificate, the remote IP address, etc.

-NSSRequire
+Example
+
+NSSRequire
+
+NSSProxyEngine
+
+Enables or disables mod_nss HTTPS support for mod_proxy.
+
+Example
+
+NSSProxyEngine on
+
+NSSProxyProtocol
+
+Specifies the SSL protocols that may be used in proxy connections. The +syntax is identical to NSSProtocol.
+
+Example
+
+NSSProxyProtocol SSLv3
+
+NSSProxyCipherSuite
+
+Specifies the SSL ciphers available for proxy connections. They syntax +is identical to NSSCipherSuite.
+
+Example
+
+NSSProxyCipherSuite ++rsa_3des_sha,-rsa_null_md5,-rsa_null_sha,+rsa_rc4_128_md5
+
+NSSProxyNickname
+
+The nickname of the client certificate to send if the remote server +requests client authentication.
+
+Example
+
+NSSProxyNickname beta

Environment Variables

Quite a few environment variables (for CGI and SSI) may be set depending on the NSSOptions configuration. It can be expensive to set @@ -1121,10 +1180,53 @@ % certutil -V -n Server-Cert -u V -d .
certutil: certificate is valid

Why is SSLv2 disabled?

-All major browsers (Firefox, Internet Explorer, Mozilla, Netscape, Opera, and -Safari) support SSL 3 and TLS so there is no need for a web server to support +All major browsers (Firefox, Internet Explorer, Mozilla, Netscape, +Opera, and +Safari) support SSL 3 and TLS so there is no need for a web server to +support SSL 2. There are some known attacks against SSL 2 that are handled by -SSL 3/TLS. SSL2 also doesn't support useful features like client authentication. +SSL 3/TLS. SSL2 also doesn't support useful features like client +authentication. +
+

Frequently Asked Questions

+Q. Does mod_nss support mod_proxy?

+A. In order to use the mod_nss proxy support you will need to build +your own mod_proxy by applying a patch found in bug 36468. +The patch is needed so we can compare the hostname contained in the +remote certificate with the hostname you meant to visit. This prevents +man-in-the-middle attacks.
+
+You also have to change the SSL functions that mod_proxy looks to use. +You'll need to apply this patch:
+
+1038,1039c1038,1039
+< APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
+< APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
+---
+> APR_DECLARE_OPTIONAL_FN(int, nss_proxy_enable, (conn_rec *));
+> APR_DECLARE_OPTIONAL_FN(int, nss_engine_disable, (conn_rec *));
+1041,1042c1041,1042
+< static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *proxy_ssl_enable = +NULL;
+< static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *proxy_ssl_disable += NULL;
+---
+> static APR_OPTIONAL_FN_TYPE(nss_proxy_enable) *proxy_ssl_enable = +NULL;
+> static APR_OPTIONAL_FN_TYPE(nss_engine_disable) *proxy_ssl_disable += NULL;
+1069,1070c1069,1070
+<     proxy_ssl_enable = +APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable);
+<     proxy_ssl_disable = +APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable);
+---
+>     proxy_ssl_enable = +APR_RETRIEVE_OPTIONAL_FN(nss_proxy_enable);
+>     proxy_ssl_disable = +APR_RETRIEVE_OPTIONAL_FN(nss_engine_disable);
+
From fedora-directory-commits at redhat.com Thu Sep 29 19:36:12 2005 From: fedora-directory-commits at redhat.com (Robert Crittenden (rcritten)) Date: Thu, 29 Sep 2005 15:36:12 -0400 Subject: [Fedora-directory-commits] mod_nss nss_engine_io.c,1.3,1.4 Message-ID: <200509291936.j8TJaCs4021099@cvs-int.fedora.redhat.com> Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083 Modified Files: nss_engine_io.c Log Message: Remove a debug msg that was left in on accident. Index: nss_engine_io.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_io.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nss_engine_io.c 29 Jun 2005 22:29:02 -0000 1.3 +++ nss_engine_io.c 29 Sep 2005 19:36:10 -0000 1.4 @@ -504,8 +504,6 @@ outctx = filter_ctx->outctx; res = PR_Write(filter_ctx->pssl, (char *)data, len); - ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, - "Sent returned %d", res); if (res < 0) { int nss_err = PR_GetError(); From fedora-directory-commits at redhat.com Thu Sep 29 20:52:02 2005 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 29 Sep 2005 16:52:02 -0400 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200509292052.j8TKq2Pp023108@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23090 Modified Files: Tag: Directory71RtmBranch setup.patch Log Message: [169580] awk used in setup.patch had GNU specific syntax setup.patch: Index: setup.patch =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Attic/setup.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- setup.patch 28 Sep 2005 22:47:14 -0000 1.1.2.1 +++ setup.patch 29 Sep 2005 20:51:59 -0000 1.1.2.2 @@ -110,7 +110,7 @@ siepid=`getValFromAdminConf "siepid:" "adm.conf"` suitespotuser=`ls -l $dsconffile | awk '{print $3}'` suitespotgroup=`ls -l $dsconffile | awk '{print $4}'` -admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'` +admindomain=`echo $ldaphost | awk -F. '{if ($5) {print $2 "." $3 "." $4 "." $5} else if ($4) {print $2 "." $3 "." $4} else if ($3) {print $2 "." $3} else if ($2) {print $2} else {print ""}}'` if [ "$admindomain" = "" ]; then admindomain=`domainname` fi From fedora-directory-commits at redhat.com Thu Sep 29 22:09:16 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:09:16 -0400 Subject: [Fedora-directory-commits] setuputil/installer/test Makefile, 1.1.1.1, 1.2 Message-ID: <200509292209.j8TM9Gje026017@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil/installer/test In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947/setuputil/installer/test Modified Files: Makefile Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/test/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 29 Jul 2005 22:16:30 -0000 1.1.1.1 +++ Makefile 29 Sep 2005 22:09:13 -0000 1.2 @@ -28,9 +28,9 @@ include $(BUILD_ROOT)/nsdefs.mk ifneq ($(ARCH), WINNT) -PKGTOP=$(BUILD_ROOT)/built/package/$(ARCH)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS)/installer +PKGTOP=$(BUILD_ROOT)/built/package/$(PLATFORM_DEST)/installer else -PKGTOP=$(BUILD_ROOT)/built/package/$(ARCH)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS)/setup +PKGTOP=$(BUILD_ROOT)/built/package/$(PLATFORM_DEST)/setup endif OBJDEST=$(OBJDIR)/test/obj From fedora-directory-commits at redhat.com Thu Sep 29 22:09:15 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:09:15 -0400 Subject: [Fedora-directory-commits] setuputil/installer/lib Makefile, 1.1.1.1, 1.2 Message-ID: <200509292209.j8TM9F2N026002@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil/installer/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947/setuputil/installer/lib Modified Files: Makefile Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/lib/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 29 Jul 2005 22:16:28 -0000 1.1.1.1 +++ Makefile 29 Sep 2005 22:09:06 -0000 1.2 @@ -31,7 +31,7 @@ # Build artifacts ifeq ($(ARCH), WINNT) -OBJDIR=$(BUILD_ROOT)/built/$(NSOS_ARCH)$(NSOS_RELEASE)$(64BIT_TAG)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)-$(DIR) +OBJDIR=$(BUILD_ROOT)/built/$(PLATFORM_DEST) LIBDEST=$(OBJDIR)/lib OBJDEST=$(LIBDEST)/nssetup else From fedora-directory-commits at redhat.com Thu Sep 29 22:09:08 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:09:08 -0400 Subject: [Fedora-directory-commits] setuputil/installer Makefile, 1.1.1.1, 1.2 Message-ID: <200509292209.j8TM9ccF026045@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil/installer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947/setuputil/installer Modified Files: Makefile Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ Makefile 29 Sep 2005 22:08:59 -0000 1.2 @@ -38,10 +38,10 @@ include $(BUILD_ROOT)/nsconfig.mk endif -PKGDIR_NAME=$(NSPLATFORM_DIR)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) +PKGDIR_NAME=$(PLATFORM_DEST) PKGTOP=$(ABS_ROOT)/built/package/$(PKGDIR_NAME) ifdef BUILD_INTL -PKGDIR_NAME=$(NSPLATFORM_DIR)-$(SECURITY)-intl-$(DEBUG)-$(B_FORTEZZA)$(NSOBJDIR_NAME) +PKGDIR_NAME+=-intl PKGTOP=$(ABS_ROOT)/built/package/$(PKGDIR_NAME) endif PKGDIR=$(PKGTOP) From fedora-directory-commits at redhat.com Thu Sep 29 22:09:04 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:09:04 -0400 Subject: [Fedora-directory-commits] setuputil nsdefs.mk,1.1.1.1,1.2 Message-ID: <200509292209.j8TM9YcJ026034@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25947/setuputil Modified Files: nsdefs.mk Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsdefs.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ nsdefs.mk 29 Sep 2005 22:08:54 -0000 1.2 @@ -60,11 +60,6 @@ else BUILD_PTHREADS= endif -ifdef FORTEZZA -BUILD_FORTEZZA=fortezza -else -BUILD_FORTEZZA=normal -endif ifeq ($(USE_64), 1) NS64TAG = _64 @@ -184,19 +179,10 @@ endif NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) -PLATFORM_DEST=$(NSPLATFORM_DIR)-$(SECURITY)$(INTL_DEF)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) +PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST) -DEFAULT_OBJDIR=$(PLATFORM_OBJDIR)-installer - -#NSPR_BASENAME=nspr4 - -ifeq ($(BUILD_MODULE), CONSOLE) -PRODUCT="Fedora Console" -DIR=console -NO_BUILD_NUM=true -NOSTDCLEAN=true -endif +DEFAULT_OBJDIR=$(PLATFORM_OBJDIR) ifneq ($(NO_BUILD_NUM), true) GET_BUILD_NUM := $(shell cat $(ABS_ROOT)/$(NSPLATFORM_DIR)/buildnum.dat) @@ -273,7 +259,6 @@ ARCH=$(BUILD_ARCH) SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) -B_FORTEZZA=$(BUILD_FORTEZZA) BOMB=$(BUILD_BOMB) BUILD_DLL=$(BUILD_DLL_VERSION) ADMINDLL_NAME=$(BUILD_ADMIN_NAME) From fedora-directory-commits at redhat.com Thu Sep 29 22:10:17 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:10:17 -0400 Subject: [Fedora-directory-commits] adminutil/include/libadminutil admutil.h, 1.1.1.1, 1.2 distadm.h, 1.1.1.1, 1.2 Message-ID: <200509292210.j8TMAH8M026102@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/include/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/adminutil/include/libadminutil Modified Files: admutil.h distadm.h Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: admutil.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/admutil.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- admutil.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ admutil.h 29 Sep 2005 22:10:10 -0000 1.2 @@ -46,11 +46,6 @@ #define BIG_LINE 1024 #endif -#ifdef FORTEZZA -#ifndef ADM_PIN_STRING -#define ADM_PIN_STRING "Pin: " -#endif -#endif /* FORTEZZA */ /* safs/cgi.h */ #ifdef __cplusplus Index: distadm.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/libadminutil/distadm.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- distadm.h 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ distadm.h 29 Sep 2005 22:10:10 -0000 1.2 @@ -84,10 +84,6 @@ /* distadm.c */ PR_IMPLEMENT(int) ADM_GetUserDNString(int *errcode, char **userdn); -#ifdef FORTEZZA -PR_IMPLEMENT(int) ADM_GetPinString(int *errcode, char **pinstr); -#endif /* FORTEZZA */ - #ifdef __cplusplus } #endif From fedora-directory-commits at redhat.com Thu Sep 29 22:10:18 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:10:18 -0400 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil distadm.c, 1.1.1.1, 1.2 Message-ID: <200509292210.j8TMAIWm026108@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/adminutil/lib/libadminutil Modified Files: distadm.c Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: distadm.c =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/distadm.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- distadm.c 20 Jul 2005 22:51:32 -0000 1.1.1.1 +++ distadm.c 29 Sep 2005 22:10:15 -0000 1.2 @@ -141,9 +141,6 @@ static char *pass = ADM_NOT_INITIALIZED; static char *auth = ADM_NOT_INITIALIZED; static char *userDN = ADM_NOT_INITIALIZED; -#ifdef FORTEZZA -static char *pin = ADM_NOT_INITIALIZED; -#endif /* FORTEZZA */ /* The function to use when reading the stuff from the pipe */ #ifdef XP_WIN32 @@ -250,18 +247,6 @@ } } -#ifdef FORTEZZA - head = tail; - tail = PL_strchr(head, '\n'); - *tail++ = '\0'; - if(!PL_strncmp(head, ADM_PIN_STRING, PL_strlen(ADM_PIN_STRING))) { - pin = PL_strdup(&(head[PL_strlen(ADM_PIN_STRING)])); - if(!PL_strcmp(pin, ADM_NO_VALUE_STRING)) { - pin = NULL; - } - } -#endif /* FORTEZZA */ - head = tail; tail = PL_strchr(head, '\n'); *tail++ = '\0'; @@ -348,20 +333,3 @@ *userdn = userDN; return 0; } - -#ifdef FORTEZZA -PR_IMPLEMENT(int) -ADM_GetPinString(int *errcode, char **pinstr) -{ - int err; - - if((pin) && (!PL_strcmp(pin, ADM_NOT_INITIALIZED))) { - if(ADM_InitializePermissions(&err)) { - *errcode = err; - return -1; - } - } - *pinstr = pin; - return 0; -} -#endif /* FORTEZZA */ From fedora-directory-commits at redhat.com Thu Sep 29 22:10:12 2005 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 29 Sep 2005 18:10:12 -0400 Subject: [Fedora-directory-commits] adminutil nsdefs.mk, 1.1.1.1, 1.2 pkgadminutil.mk, 1.1.1.1, 1.2 Message-ID: <200509292210.j8TMAgBh026114@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26058/adminutil Modified Files: nsdefs.mk pkgadminutil.mk Log Message: change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nsdefs.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ nsdefs.mk 29 Sep 2005 22:10:09 -0000 1.2 @@ -62,11 +62,6 @@ else BUILD_PTHREADS= endif -ifdef FORTEZZA -BUILD_FORTEZZA=fortezza -else -BUILD_FORTEZZA=normal -endif ifeq ($(USE_64), 1) NS64TAG = _64 @@ -212,7 +207,6 @@ echo BUILD_MODULE=$(BUILD_MODULE) echo BUILD_SECURITY=$(BUILD_SECURITY) echo BUILD_DEBUG=$(BUILD_DEBUG) -echo BUILD_FORTEZZA=$(BUILD_FORTEZZA) echo BUILD_NSPR_THREADS=$(BUILD_NSPR_THREADS) echo BUILD_BOMB=$(BUILD_BOMB) echo BUILD_DLL_VERSION=$(BUILD_DLL_VERSION) @@ -228,7 +222,6 @@ ARCH=$(BUILD_ARCH) SECURITY=$(BUILD_SECURITY) DEBUG=$(BUILD_DEBUG) -B_FORTEZZA=$(BUILD_FORTEZZA) BOMB=$(BUILD_BOMB) NSPR_THREADS=$(BUILD_NSPR_THREADS) BUILD_DLL=$(BUILD_DLL_VERSION) @@ -255,7 +248,7 @@ # ifndef OBJDIR -OBJDIR=$(ABS_ROOT)/built/$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) +OBJDIR=$(ABS_ROOT)/built/$(FULL_RTL_OBJDIR) endif ifndef COMMON_OBJDIR Index: pkgadminutil.mk =================================================================== RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- pkgadminutil.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ pkgadminutil.mk 29 Sep 2005 22:10:09 -0000 1.2 @@ -25,28 +25,18 @@ BUILD_ROOT:=. include $(BUILD_ROOT)/nsdefs.mk +include $(BUILD_ROOT)/nsconfig.mk MKDIR=mkdir -p # Destination directories for package -ifeq ($(USE_PTHREADS), 1) - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) - PKGDIR=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -else - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-$(DEBUG)-$(B_FORTEZZA) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) - PKGDIR=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -endif +PKGDIR_NAME=$(FULL_RTL_OBJDIR) +PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) +PKGDIR=$(PKGTOP) ifdef BUILD_INTL -ifeq ($(USE_PTHREADS), 1) - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-intl-$(DEBUG)-$(B_FORTEZZA)$(BUILD_PTHREADS) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -else - PKGDIR_NAME=$(NSPLATFORM_ID)-$(SECURITY)-intl-$(DEBUG)-$(B_FORTEZZA) - PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) -endif +PKGDIR_NAME+=-intl +PKGTOP=$(ABS_ROOT)/built/adminutil/$(PKGDIR_NAME) PKGDIR=$(PKGTOP) endif