From fedora-directory-commits at redhat.com Wed Feb 1 22:46:25 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 17:46:25 -0500 Subject: [Fedora-directory-commits] setuputil nsconfig.mk, 1.5, 1.6 nscore.mk, 1.1.1.1, 1.2 Message-ID: <200602012246.k11MkP8I016990@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16971 Modified Files: nsconfig.mk nscore.mk Log Message: [175900] SetupUtil build (IPF) 1) set an appropriate macro CPU_ia64 to reflect the cpu type 2) set -AA to support the standard C++ runtime Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsconfig.mk 28 Jan 2006 02:33:14 -0000 1.5 +++ nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6 @@ -232,19 +232,21 @@ CC=cc -Ae +ESlit CXX=aCC ifeq ($(NSOS_RELEASE), B.11.23) + ARCH_CFLAGS=-AA ifeq ($(USE_64), 1) BIT_SWITCH=+DD64 else BIT_SWITCH=+DD32 endif else # 11.11 or earlier + ARCH_CFLAGS= ifeq ($(USE_64), 1) BIT_SWITCH=+DA2.0W +DS2.0 else BIT_SWITCH=+DAportable +DS1.1 endif endif # B.11.23 -ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 +ARCH_CFLAGS+=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 EXTRA_LIBS= -ldld -lm -lpthread else CC=cc Index: nscore.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nscore.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nscore.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ nscore.mk 1 Feb 2006 22:46:18 -0000 1.2 @@ -51,7 +51,12 @@ endif # HP-UX ifeq ($(ARCH), HPUX) - CFLAGS += -DCPU_hppa -DOS_hpux + HPUX_ARCH := $(shell uname -m) + ifeq ($(HPUX_ARCH), ia64) + CFLAGS += -DCPU_ia64 -DOS_hpux + else + CFLAGS += -DCPU_hppa -DOS_hpux + endif CFLAGS += -D_NO_THREADS_ endif # AIX From fedora-directory-commits at redhat.com Wed Feb 1 22:47:58 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 17:47:58 -0500 Subject: [Fedora-directory-commits] adminutil nscore.mk,1.1.1.1,1.2 Message-ID: <200602012247.k11Mlwq5017021@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17001 Modified Files: nscore.mk Log Message: [Bug 172166] Admin Util build (IPF) set an appropriate macro CPU_ia64 to reflect the cpu type Index: nscore.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nscore.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nscore.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ nscore.mk 1 Feb 2006 22:47:51 -0000 1.2 @@ -51,7 +51,12 @@ endif # HP-UX ifeq ($(ARCH), HPUX) - CFLAGS += -DCPU_hppa -DOS_hpux + HPUX_ARCH := $(shell uname -m) + ifeq ($(HPUX_ARCH), ia64) + CFLAGS += -DCPU_ia64 -DOS_hpux + else + CFLAGS += -DCPU_hppa -DOS_hpux + endif CFLAGS += -D_NO_THREADS_ endif # AIX From fedora-directory-commits at redhat.com Wed Feb 1 23:04:50 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:50 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/insadm config.c, 1.6, 1.7 Message-ID: <200602012305.k11N5KXi019271@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/insadm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/insadm Modified Files: config.c Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: config.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config.c 28 Oct 2005 22:44:12 -0000 1.6 +++ config.c 1 Feb 2006 23:04:33 -0000 1.7 @@ -334,7 +334,7 @@ "nsInstalledLocation: %s\n" "nsExpirationDate: %s\n" "nsBuildSecurity: %s\n" - "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at admserv10.jar\n", + "nsServerMigrationClassname: com.netscape.management.admserv.AdminServerProduct at fedora-admserv-1.0.jar\n", cd.szVendor, cd.szDescription, cd.szName, @@ -378,7 +378,7 @@ "nsAdminAccessAddresses: *\n" "nsAdminOneACLDir: adminacl\n" "nsDefaultAcceptLanguage: %s\n" - "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n" + "nsClassName: com.netscape.management.admserv.AdminServer at fedora-admserv-1.0.jar@%s\n" "nsServerPort: %d\n" "nsSuiteSpotUser: nobody\n" "nsAdminUsers: admin-serv/config/admpw\n" @@ -396,7 +396,7 @@ ); sprintf(szUpgrade, - "nsClassName: com.netscape.management.admserv.AdminServer at admserv10.jar@%s\n" + "nsClassName: com.netscape.management.admserv.AdminServer at fedora-admserv-1.0.jar@%s\n" "nsServerPort: %d\n" "nsSuiteSpotUser: nobody\n", szTemp, From fedora-directory-commits at redhat.com Wed Feb 1 23:04:23 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:23 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console build.properties, 1.8, 1.9 Message-ID: <200602012305.k11N5NMv019296@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console Modified Files: build.properties Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: build.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.properties 28 Oct 2005 22:43:34 -0000 1.8 +++ build.properties 1 Feb 2006 23:04:04 -0000 1.9 @@ -21,14 +21,14 @@ # END COPYRIGHT BLOCK adminconsole.root=../.. -mcc.version=10 +mcc.version=1.0 admin.core=admserv -admin.console=${admin.core}${mcc.version} +admin.console=fedora-${admin.core}-${mcc.version} -console.root=${adminconsole.root}/../dist/classes -ldapjdk.jar=${adminconsole.root}/../dist/classes/ldapjdk.jar -base.jar=${console.root}/base.jar +console.root=${adminconsole.root}/../built/release/package/java +ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar +base.jar=${console.root}/fedora-base-${mcc.version}.jar caplugin.jar=${console.root}/caplugin/default.jar -mcc.core=${console.root}/mcc${mcc.version} -nmclf.core=${console.root}/nmclf${mcc.version} +mcc.core=${console.root}/fedora-mcc-${mcc.version} +nmclf.core=${console.root}/fedora-nmclf-${mcc.version} From fedora-directory-commits at redhat.com Wed Feb 1 23:05:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:05:20 -0500 Subject: [Fedora-directory-commits] adminserver/base Makefile,1.17,1.18 Message-ID: <200602012305.k11N5KTb019277@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/base Modified Files: Makefile Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/base/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile 18 Jan 2006 18:24:25 -0000 1.17 +++ Makefile 1 Feb 2006 23:04:57 -0000 1.18 @@ -131,10 +131,14 @@ cd $(CORE_DIR) ; \ $(IZIP) $(COREDIR)/ns$(CORE_MAIN).zip * ; -ifeq ($(ARCH), Linux) +ifdef INTERNAL_BUILD + ifeq ($(ARCH), Linux) $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf -else + else $(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf + endif +else + $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf endif pkgSBC: @@ -195,7 +199,11 @@ # Copy JSS lib -$(MKDIR) $(CLIENT_DIR)/lib ifeq ($(ARCH), HPUX) + ifeq ($(HPUX_ARCH), ia64) + cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib + else cp -p $(JSSSDK_PATH)/libjss3.sl $(CLIENT_DIR)/lib + endif else cp -p $(JSSSDK_PATH)/libjss3.so $(CLIENT_DIR)/lib endif @@ -217,8 +225,12 @@ touch $(BASEDIR)/ns$(BASE_CLIENT).zip endif # NOJAVA -ifeq ($(ARCH), Linux) +ifdef INTERNAL_BUILD + ifeq ($(ARCH), Linux) $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf -else + else $(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf + endif +else + $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf endif From fedora-directory-commits at redhat.com Wed Feb 1 23:03:50 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:03:50 -0500 Subject: [Fedora-directory-commits] adminserver components.mk, 1.40, 1.41 nsarch, 1.4, 1.5 nsconfig.mk, 1.20, 1.21 nsdefs.mk, 1.8, 1.9 nsperl.mk, 1.5, 1.6 Message-ID: <200602012305.k11N5Lg3019291@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006 Modified Files: components.mk nsarch nsconfig.mk nsdefs.mk nsperl.mk Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- components.mk 9 Nov 2005 23:22:50 -0000 1.40 +++ components.mk 1 Feb 2006 23:03:41 -0000 1.41 @@ -313,10 +313,10 @@ # Console java classes ############################################################# -NMCJDK_SUF = 10 +NMCJDK_SUF = 1.0 NMCJDK_RELDATE = 20051027 -NMCJDK_COMP = console/1.0 +NMCJDK_COMP = console/$(NMCJDK_SUF) NMCJDK_VERSION = $(NMCJDK_RELDATE) @@ -339,11 +339,11 @@ ifdef INTERNAL_BUILD mkdir -p $(CLASS_DEST) # grab the jar files - $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files base.jar,mcc$(NMCJDK_SUF).jar,mcc$(NMCJDK_SUF)_en.jar,nmclf$(NMCJDK_SUF).jar,nmclf$(NMCJDK_SUF)_en.jar,caplugin + $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(NMCJDK_DIR) -files fedora-base-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF).jar,fedora-mcc-$(NMCJDK_SUF)_en.jar,fedora-nmclf-$(NMCJDK_SUF).jar,fedora-nmclf-$(NMCJDK_SUF)_en.jar,caplugin # grab the startconsole program $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(NMCJDK_METHOD) -objdir $(CLASS_DEST) -componentdir $(BASE_NMCSDK) -files startconsole && chmod +x $(CLASS_DEST)/startconsole else # INTERNAL_BUILD - @if [ ! -f $(CONSOLE_JAR_DIR)/base.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi + @if [ ! -f $(CONSOLE_JAR_DIR)/fedora-base-1.0.jar ]; then echo The console jar files are missing from $(CONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi endif ############################################################# Index: nsarch =================================================================== RCS file: /cvs/dirsec/adminserver/nsarch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nsarch 18 Aug 2005 18:57:33 -0000 1.4 +++ nsarch 1 Feb 2006 23:03:41 -0000 1.5 @@ -1,35 +1,33 @@ #! /bin/sh +# # BEGIN COPYRIGHT BLOCK -# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation version +# 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# - +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK # # Name: nsarch # # Description: this file determines the system name and outputs the -# platform information in a format used by Fedora build +# platform information in a format used by build # scripts and utilities; this file is based on the GNU # "config.guess" utility; the GNU copyleft is provided # somewhere below... # -# For each platform supported by Fedora, we need to provide the +# For each platform supported, we need to provide the # following definitions: # # Variable Description @@ -95,7 +93,7 @@ echo "Usage: $0 [ [-full {-under | -dash | -none} {-pretty} ] | -gnu ]" echo echo " Default to output OS name only; suitable for use" - echo " in Fedora's makefiles and compiler defines" + echo " in makefiles and compiler defines" echo " -f, -full, --full) Full output includes OS name and release number" echo " -d, -dash, --dash) use with -f to specify a dash separator" echo " -u, -under, --under) use with -f to specify a underscore separator" @@ -179,7 +177,7 @@ #-------------------------------------------------------------------------- # everything that follows is GNU's config.guess slightly modified -# for Fedora's use +# for our use # NT doesn't have /dev/null #UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown @@ -453,6 +451,14 @@ NS_RELEASE="${HPUX_REV}" ns_printf exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + GNU_NAME="${UNAME_MACHINE}-hp-hpux${HPUX_REV}" + NS_NAME="HPUX" + NS_PRETTY_NAME="HP-UX" + NS_RELEASE="${HPUX_REV}" + ns_printf + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >dummy.c #include @@ -572,7 +578,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: .*elf_i[345]86"; then #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linux" NS_NAME="${UNAME_SYSTEM}" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nsconfig.mk 23 Nov 2005 01:25:45 -0000 1.20 +++ nsconfig.mk 1 Feb 2006 23:03:41 -0000 1.21 @@ -208,7 +208,12 @@ #------------------- ifeq ($(ARCH), HPUX) #------------------- -DLL_SUFFIX=sl +HPUX_ARCH = $(shell uname -m) +ifeq ($(HPUX_ARCH), ia64) + DLL_SUFFIX=so +else + DLL_SUFFIX=sl +endif LDAP_DLL_SUFFIX=$(DLL_SUFFIX) ifeq ($(NSOS_RELEASE), B.11.00) @@ -217,17 +222,33 @@ ifeq ($(NSOS_RELEASE), B.11.11) MODERNHP=1 endif - -ifdef MODERNHP -CC=cc -Ae +ESlit -CXX=aCC -ifeq ($(USE_64), 1) -BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s -else -BIT_SWITCH=+DAportable +DS1.1 -Wl,+s +ifeq ($(NSOS_RELEASE), B.11.23) + MODERNHP=1 endif -ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 -EXTRA_LIBS= -ldld -lm -lpthread + +ifeq ($(MODERNHP), 1) +CXX=/opt/aCC/bin/aCC +CC=cc -Ae +ifeq ($(NSOS_RELEASE), B.11.23) + CC+=+Olit=all + ifeq ($(USE_64), 1) + BIT_SWITCH=+DD64 + else + BIT_SWITCH=+DD32 + endif + IPF_CFLAGS=-DPIC + EXTRA_LIBS= -ldld -lm -lpthread +else # 11.11 or earlier + CC+=+ESlit + ifeq ($(USE_64), 1) + BIT_SWITCH=+DA2.0W +DS2.0 -DHPUX_64 -Wl,+s + else + BIT_SWITCH=+DAportable +DS1.1 -Wl,+s + endif + IPF_CFLAGS= + EXTRA_LIBS= -ldld -lm -lpthread +endif # B.11.23 +ARCH_CFLAGS=$(BIT_SWITCH) -D_HPUX_SOURCE -D_POSIX_C_SOURCE=199506L -D__STDC_EXT__ +z -DHPUX11 $(IPF_CFLAGS) else CC=cc ARCH_CFLAGS=-D_HPUX_SOURCE -Aa +DA1.0 +z @@ -505,7 +526,7 @@ endif endif -ADM_SUF=10 +ADM_SUF=1.0 # CLEAN THIS UP @@ -700,10 +721,10 @@ SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi ifeq ($(ARCH), HPUX) -SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3 +SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl3 endif ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_hybrid_3 freebl_pure32_3 +SECURITY_EXTRA_RUNTIME_LIBNAMES = freebl_32fpu_3 freebl_32int_3 freebl_32int64_3 endif ifeq ($(ARCH), WINNT) @@ -725,7 +746,7 @@ # ICU ########################################## -ICU_LIB_VERSION = 24 +ICU_LIB_VERSION = 34 ifdef ICU_SOURCE_ROOT ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin @@ -790,25 +811,25 @@ # ADMINUTIL ######################################## -ADMINUTIL_LIB_VERSION=10 +ADMINUTIL_LIB_VERSION=1.0 ifdef ADMINUTIL_SOURCE_ROOT ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib - ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-1.0 + ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include/adminutil-$(ADMINUTIL_LIB_VERSION) else ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib ADMINUTIL_INCLUDE = $(ADMINUTIL_BUILD_DIR)/include endif ifeq ($(ARCH), WINNT) - ADMINUTIL_LIBNAMES = libadmsslutil_s$(ADMINUTIL_LIB_VERSION) libadminutil$(ADMINUTIL_LIB_VERSION) + ADMINUTIL_LIBNAMES = libadmsslutil_s libadminutil ADMINUTIL_LIBS = $(addsuffix .lib, $(ADMINUTIL_LIBNAMES)) LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_LIBS)) ADMINUTILOBJNAME = $(ADMINUTIL_LIBNAMES) else - ADMINUTIL_LIBNAMES = admsslutil$(ADMINUTIL_LIB_VERSION) adminutil$(ADMINUTIL_LIB_VERSION) - ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF)$(ADMINUTIL_LIB_VERSION), $(addprefix lib, adminutil admsslutil)) + ADMINUTIL_LIBNAMES = admsslutil adminutil + ADMINUTIL_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix lib, adminutil admsslutil)) ADMINUTIL_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMINUTIL_LIBNAMES))) - ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(ADMINUTIL_SOLIB_NAMES)) + ADMINUTIL_SOLIBS = $(addsuffix .$(DLL_SUFFIX).$(MAJOR_VERSION), $(ADMINUTIL_SOLIB_NAMES)) ADMINUTILOBJNAME = $(ADMINUTIL_SOLIBS) LIBADMINUTIL = $(addprefix $(ADMINUTIL_LIBPATH)/, $(ADMINUTIL_SOLIBS)) ADMINUTILLINK = -L$(ADMINUTIL_LIBPATH) $(addprefix -l, $(ADMINUTIL_LIBNAMES)) @@ -886,7 +907,7 @@ endif ifdef CONSOLE_SOURCE_DIR - CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/package + CONSOLE_BASE_DIR = $(CONSOLE_SOURCE_DIR)/built/release/package CONSOLE_JAR_DIR = $(CONSOLE_BASE_DIR)/java else CONSOLE_BASE_DIR = $(CLASS_DEST) Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsdefs.mk 29 Sep 2005 22:11:57 -0000 1.8 +++ nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9 @@ -73,6 +73,7 @@ NSOS_ARCH := $(subst /,_,$(shell uname -s)) +ARCHTYPE= ifeq ($(TMP_ARCH), SunOS) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), i86pc) @@ -80,8 +81,13 @@ else ARCHTYPE= endif -else - ARCHTYPE= +endif + +ifeq ($(TMP_ARCH), HP-UX) + NSOS_TEST1 := $(shell uname -m) + ifeq ($(NSOS_TEST1), ia64) + ARCHTYPE=_ia64 + endif endif ifeq ($(NSOS_ARCH),WINNT) @@ -274,8 +280,10 @@ DO_SEARCH= NODE_FLAG=-DNO_NODELOCK -MAJOR_VERSION:="6" -MINOR_VERSION:="2" +MAJOR_VERSION_NUM:=1 +MINOR_VERSION_NUM:=0 +MAJOR_VERSION:="$(MAJOR_VERSION_NUM)" +MINOR_VERSION:="$(MINOR_VERSION_NUM)" DIRVERDIR=$(COMMON_OBJDIR)/include DIRVER_H=$(DIRVERDIR)/dirver.h Index: nsperl.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsperl.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsperl.mk 10 Nov 2005 01:12:54 -0000 1.5 +++ nsperl.mk 1 Feb 2006 23:03:41 -0000 1.6 @@ -71,6 +71,9 @@ ifeq ($(OSVER),SunOS5.5.1) PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5 endif +ifeq ($(OSVER), HP-UXB.11.23) +PERL5=perl +endif ifeq ($(OSVER), HP-UXB.11.11) PERL5=/u/robobld/nsperl/hpux/nsperl endif From fedora-directory-commits at redhat.com Wed Feb 1 23:04:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:59 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src Makefile, 1.7, 1.8 Message-ID: <200602012305.k11N5TmF019301@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/newinst/src Modified Files: Makefile Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 29 Sep 2005 22:12:00 -0000 1.7 +++ Makefile 1 Feb 2006 23:04:41 -0000 1.8 @@ -32,7 +32,7 @@ include $(BUILD_ROOT)/nsconfig.mk -MODULE_CFLAGS = -DUSE_ADMSERV +MODULE_CFLAGS += -DUSE_ADMSERV OBJDEST=$(ADMSERV_OBJDIR)/install/obj BINDEST=$(ADMSERV_OBJDIR)/install/bin @@ -98,7 +98,7 @@ CURSES=-lHcurses EXTRA_LIBS+= -ld4r else - CURSES=/usr/lib/libcurses.a + CURSES=-lcurses endif endif endif From fedora-directory-commits at redhat.com Wed Feb 1 23:04:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:20 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.7, 1.8 security.c, 1.5, 1.6 Message-ID: <200602012305.k11N5KeS019273@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/cgi-src40 Modified Files: Makefile security.c Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 21 Oct 2005 19:19:11 -0000 1.7 +++ Makefile 1 Feb 2006 23:03:57 -0000 1.8 @@ -382,30 +382,33 @@ $*.c /link /INCREMENTAL:no /SUBSYSTEM:console else +ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) +SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(BINDIR)/security: security.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/security \ $(SRCDIR)/security.c -L$(NSCP_DISTDIR)/lib \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/sec-activate: sec-activate.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-activate \ $(SRCDIR)/sec-activate.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/sec-migrate: sec-migrate.c cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $(BINDIR)/sec-migrate \ $(SRCDIR)/sec-migrate.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/admpw: admpw.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o admpw \ $(SRCDIR)/admpw.c \ $(OBJDIR)/lib/libadmin.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/config: config.c $(GLUEOBJS) cd $(BINDIR); \ @@ -415,7 +418,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/dsconfig: dsconfig.c $(GLUEOBJS) cd $(BINDIR); \ @@ -424,7 +427,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/ugdsconfig: ugdsconfig.c $(GLUEOBJS) cd $(BINDIR); \ @@ -432,13 +435,13 @@ $(SRCDIR)/ugdsconfig.c \ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/mergeConfig: mergeConfig.cpp $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o mergeConfig \ $(SRCDIR)/mergeConfig.cpp \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/monreplication: monreplication.c $(GLUEOBJS) cd $(BINDIR); \ @@ -448,7 +451,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/viewlog: viewlog.c $(GLUEOBJS) cd $(BINDIR); \ @@ -458,7 +461,7 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) $(BINDIR)/viewdata: viewdata.c $(GLUEOBJS) @@ -469,13 +472,13 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/statpingserv: statpingserv.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -I$(SETUPUTIL_INCLUDE) -o statpingserv \ $(SRCDIR)/statpingserv.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/htmladmin: htmladmin.c $(GLUEOBJS) cd $(BINDIR); \ @@ -485,12 +488,12 @@ $(OBJDIR)/lib/libbase.a \ $(OBJDIR)/lib/libsi18n.a \ $(OBJDIR)/lib/libldapu.a \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(SETUPADMINSERVERLINKS) $(BINDIR)/%: %.c $(GLUEOBJS) cd $(BINDIR); \ $(CCC) $(NONSHARED) $(CFLAGS) $(MCC_INCLUDE) -o $* $(SRCDIR)/$*.c \ - $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS) + $(ADMINSERVERLINKS) endif Index: security.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- security.c 22 Aug 2005 23:21:02 -0000 1.5 +++ security.c 1 Feb 2006 23:03:57 -0000 1.6 @@ -597,10 +597,10 @@ { int version; - switch ((int)(crl->crl.version.data)) { + switch ((int)DER_GetInteger(&(crl->crl.version))) { case SEC_CRL_VERSION_1: version = 1; break; case SEC_CRL_VERSION_2: version = 2; break; - default: version = (int)((crl->crl.version.data)+1); break; + default: version = (int)(DER_GetInteger(&(crl->crl.version))+1); break; } fprintf(stdout, "\t%d\n", version); } From fedora-directory-commits at redhat.com Wed Feb 1 23:04:29 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:29 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console/cmdln admconfig, 1.5, 1.6 Message-ID: <200602012305.k11N5jK0019302@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console/cmdln In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/cmdln Modified Files: admconfig Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: admconfig =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- admconfig 28 Oct 2005 22:43:40 -0000 1.5 +++ admconfig 1 Feb 2006 23:04:21 -0000 1.6 @@ -35,7 +35,7 @@ SHLIB_PATH=$SRVROOT/lib/jss:$SRVROOT/lib LIBPATH=$SRVROOT/lib/jss:$SRVROOT/lib JAVAOPTIONS=-Djava.library.path=$LD_LIBRARY_PATH -CLASSPATH=./java/nmclf10.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc10.jar:./java/jars/admserv10.jar +CLASSPATH=./java/fedora-nmclf-1.0.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/fedora-mcc-1.0.jar:./java/jars/fedora-admserv-1.0.jar MAINCLASS=com.netscape.management.admserv.cmdln.CommandLine PLATFORM=`uname` From fedora-directory-commits at redhat.com Wed Feb 1 23:04:35 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:04:35 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console/smartupdate start-console.html, 1.7, 1.8 Message-ID: <200602012305.k11N5jZU019303@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv/console/smartupdate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv/console/smartupdate Modified Files: start-console.html Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: start-console.html =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/start-console.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- start-console.html 18 Aug 2005 19:00:40 -0000 1.7 +++ start-console.html 1 Feb 2006 23:04:27 -0000 1.8 @@ -102,7 +102,7 @@   - Fedora Project Home Page
+ Fedora Home Page
Check for upgrades and information about Fedora server products. From fedora-directory-commits at redhat.com Wed Feb 1 23:03:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 1 Feb 2006 18:03:59 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.35, 1.36 Message-ID: <200602012305.k11N5jpo019304@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006/admserv Modified Files: pkgadmin.mk Log Message: [179394] HP-UX IPF support (adminserver) 0) support HP-UX 11.23 ia64 1) adjusted to the components' path name change (suffix, version number) 2) added [admin] section to setup.inf (in pkgadmin.mk) 3) fixed type mismatch for the cert version 4) adjusted the admin jar names 5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34) 6) added "admin" to the component list: "Components = ..." in setup.inf Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- pkgadmin.mk 18 Jan 2006 18:24:20 -0000 1.35 +++ pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36 @@ -168,7 +168,7 @@ # grab the jar files cd $(ADMIN_JARS) ; \ - cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars + cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars # # Cleanup before making distributable zip @@ -245,6 +245,12 @@ # Copy LIB ICU cd $(ICU_LIBPATH); cp -p $(ICU_SOLIBS) $(ADMIN_DIR)/bin/admin/lib + for file in $(ICU_SOLIBS); do \ + if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \ + mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \ + (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \ + fi ; \ + done # Cert System needs chk files [154431] cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib @@ -261,6 +267,12 @@ # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib + for file in $(ADMINUTIL_SOLIBS); do \ + if [ `expr $$file : ".*\.$(DLL_SUFFIX)\.[0-9]*$$"` -ne 0 ]; then \ + mytmpfile=`echo $$file | sed -e "s/\(.*\)\.$(DLL_SUFFIX)\.[0-9]*$$/\1.$(DLL_SUFFIX)/"`; \ + (cd $(ADMIN_DIR)/bin/admin/lib; rm -rf $$mytmpfile; ln -s $$file $$mytmpfile); \ + fi ; \ + done if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \ $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \ cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \ @@ -379,6 +391,16 @@ cp -p $(SETUPUTIL_BIN)/setup $(PKGTOP) cp -p $(SETUPUTIL_BIN)/setup.inf $(PKGTOP) + -if [ -z "`egrep "\[admin\]" $(SETUPUTIL_BIN)/setup.inf`" ]; then \ + components=`grep "^Components.*=" $(SETUPUTIL_BIN)/setup.inf`; \ + if [ `expr "$$components" : ".*admin"` -eq 0 ]; then \ + cat $(SETUPUTIL_BIN)/setup.inf | sed -e "s/^Components.*=.*/&, admin/" > $(PKGTOP)/setup.inf; \ + fi; \ + echo "" >> $(PKGTOP)/setup.inf; \ + echo "# added in the adminserver package phase" >> $(PKGTOP)/setup.inf; \ + echo "[admin]" >> $(PKGTOP)/setup.inf; \ + echo "ComponentInfoFile = admin/admin.inf" >> $(PKGTOP)/setup.inf; \ + fi cp -p $(ADMSERV_OBJDIR)/LICENSE.txt $(PKGTOP) cp -p $(ADMSERV_OBJDIR)/README.txt $(PKGTOP) cp -p $(SETUPUTIL_BIN)/unzip_wrapper.pl $(PKGTOP) From fedora-directory-commits at redhat.com Wed Feb 8 18:59:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 8 Feb 2006 13:59:29 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptpreop.c, 1.4, 1.5 Message-ID: <200602081859.k18IxTg7014795@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778 Modified Files: ptpreop.c Log Message: Bug(s) fixed: 176302 Bug Description: crash in PTA plugin when bind returned controls Reviewed by: Pete (Thanks!) Fix Description: Fix by Ulf. We are passing the ***LDAPControl when it needs the **LDAPControl. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: ptpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptpreop.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ptpreop.c 19 Apr 2005 22:07:31 -0000 1.4 +++ ptpreop.c 8 Feb 2006 18:59:22 -0000 1.5 @@ -253,7 +253,7 @@ * Send a result to our client. */ if ( resctrls != NULL ) { - (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, &resctrls ); + (void)slapi_pblock_set( pb, SLAPI_RESCONTROLS, resctrls ); } slapi_send_ldap_result( pb, rc, matcheddn, errmsg, 0, urls ); } From fedora-directory-commits at redhat.com Wed Feb 8 21:52:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 8 Feb 2006 16:52:29 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication replutil.c, 1.7, 1.8 Message-ID: <200602082152.k18LqTfq020775@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20758 Modified Files: replutil.c Log Message: Bug(s) fixed: 180515 Bug Description: Chain BIND requests with chain on update + global pw policy Reviewed by: Nathan, Pete (Thanks!) Fix Description: When using global password policy, we need to chain the BIND request back to a master so that it can update the pw policy op attrs in the user's entry and replicate them to all other servers. The call to config_get_pw_is_global_policy() is expensive (acquires a lock) so we delay it as long as possible. The reason we have to use config_get_pw_is_global_policy() is because the entry distribution plugin interface is poor - we have no way to register an init or start function to get the config, and no way to register a statechange callback to be notified of changes to the global password policy. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: replutil.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/replutil.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- replutil.c 16 Jan 2006 19:06:03 -0000 1.7 +++ replutil.c 8 Feb 2006 21:52:22 -0000 1.8 @@ -889,7 +889,6 @@ op_type = slapi_op_get_type(op); if (local_online && ((op_type == SLAPI_OPERATION_SEARCH) || - (op_type == SLAPI_OPERATION_BIND) || (op_type == SLAPI_OPERATION_UNBIND) || (op_type == SLAPI_OPERATION_COMPARE))) { #ifdef DEBUG_CHAIN_ON_UPDATE @@ -930,6 +929,19 @@ return local_backend; } + /* if using global password policy, chain the bind request so that the + master can update and replicate the password policy op attrs */ + if (op_type == SLAPI_OPERATION_BIND) { + extern int config_get_pw_is_global_policy(); + if (!config_get_pw_is_global_policy()) { +#ifdef DEBUG_CHAIN_ON_UPDATE + slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name, "repl_chain_on_update: conn=%d op=%d using " + "local backend for local password policy\n", connid, opid); +#endif + return local_backend; + } + } + /* all other case (update while not directory manager) : * or any normal non replicated client operation while local is disabled (import) : * use the chaining backend From fedora-directory-commits at redhat.com Wed Feb 8 22:13:46 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Feb 2006 17:13:46 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/util DirUtil.java, 1.1.1.1, 1.2 Message-ID: <200602082213.k18MDkZ6022707@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/util Modified Files: DirUtil.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: DirUtil.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/DirUtil.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DirUtil.java 18 Jul 2005 00:34:26 -0000 1.1.1.1 +++ DirUtil.java 8 Feb 2006 22:13:30 -0000 1.2 @@ -141,7 +141,7 @@ try { Class c = Class.forName( SSL_CIPHERS ); Method m = c.getMethod( "getCipherSuite", new Class[0] ); - _cipherSuite = m.invoke( null, null ); + _cipherSuite = m.invoke( null, (Object)null ); } catch (Exception e) { Debug.println("DirUtil.getCipherSuite: Cannot load class, " + e ); From fedora-directory-commits at redhat.com Wed Feb 8 22:13:20 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Feb 2006 17:13:20 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/comm HttpsChannel.java, 1.1.1.1, 1.2 Message-ID: <200602082213.k18MDoDS022710@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/comm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/comm Modified Files: HttpsChannel.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: HttpsChannel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/comm/HttpsChannel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- HttpsChannel.java 18 Jul 2005 00:34:12 -0000 1.1.1.1 +++ HttpsChannel.java 8 Feb 2006 22:13:12 -0000 1.2 @@ -326,9 +326,9 @@ public void setCertList(Vector nicknames) { certList.removeAllItems(); - Enumeration enum = nicknames.elements(); - while (enum.hasMoreElements()) { - certList.addItem(enum.nextElement()); + Enumeration nicks_enum = nicknames.elements(); + while (nicks_enum.hasMoreElements()) { + certList.addItem(nicks_enum.nextElement()); } if (certList.getItemCount() > 0) { certList.setSelectedIndex(0); From fedora-directory-commits at redhat.com Wed Feb 8 22:13:26 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Feb 2006 17:13:26 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/security CertInstallCertPage.java, 1.1.1.1, 1.2 CertRequestWizard.java, 1.2, 1.3 ClientAuthPanel.java, 1.1.1.1, 1.2 EncryptionPanel.java, 1.1.1.1, 1.2 Message-ID: <200602082213.k18MDump022716@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/security In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/security Modified Files: CertInstallCertPage.java CertRequestWizard.java ClientAuthPanel.java EncryptionPanel.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: CertInstallCertPage.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertInstallCertPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- CertInstallCertPage.java 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ CertInstallCertPage.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -282,9 +282,9 @@ ); Debug.println("Restore session data"); - Enumeration enum = pref.getNames(); - while (enum.hasMoreElements()) { - String name = enum.nextElement().toString(); + Enumeration names_enum = pref.getNames(); + while (names_enum.hasMoreElements()) { + String name = names_enum.nextElement().toString(); ic.setProperty(name, pref.getString(name)); } Index: CertRequestWizard.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CertRequestWizard.java 29 Nov 2005 18:37:06 -0000 1.2 +++ CertRequestWizard.java 8 Feb 2006 22:13:18 -0000 1.3 @@ -214,9 +214,9 @@ "cn=CSRSession,"+consoleInfo.getCurrentDN() ); - Enumeration enum = ic.getPropertyNames(); - while (enum.hasMoreElements()) { - String attr = enum.nextElement().toString(); + Enumeration names_enum = ic.getPropertyNames(); + while (names_enum.hasMoreElements()) { + String attr = names_enum.nextElement().toString(); pref.set(attr, ic.getProperty(attr)); } Index: ClientAuthPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/ClientAuthPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ClientAuthPanel.java 18 Jul 2005 00:34:16 -0000 1.1.1.1 +++ ClientAuthPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -113,9 +113,9 @@ * @param enable true to enable all buttons, false to disable and gray out all buttons */ public void setEnabled(boolean enable) { - Enumeration enum = buttonGroup.getElements(); - while (enum.hasMoreElements()) { - ((JRadioButton)(enum.nextElement())).setEnabled(enable); + Enumeration button_enum = buttonGroup.getElements(); + while (button_enum.hasMoreElements()) { + ((JRadioButton)(button_enum.nextElement())).setEnabled(enable); } } Index: EncryptionPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/EncryptionPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- EncryptionPanel.java 18 Jul 2005 00:34:17 -0000 1.1.1.1 +++ EncryptionPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -308,10 +308,10 @@ cert.setActionCommand("EVENT_HANDLE_DISABLED"); cert.removeAllItems(); Hashtable selectedDev = (Hashtable)(_secDevice.get((String)(device.getSelectedItem()))); - Enumeration enum = selectedDev.keys(); + Enumeration device_enum = selectedDev.keys(); DefaultComboBoxModel comboModel = (DefaultComboBoxModel) cert.getModel(); - while (enum.hasMoreElements()) { - String key = (String)(enum.nextElement()); + while (device_enum.hasMoreElements()) { + String key = (String)(device_enum.nextElement()); if (key.startsWith("CERT")) { String certName = (String)selectedDev.get(key); // Multiple certs with the same name can exit (bug 558903) From fedora-directory-commits at redhat.com Wed Feb 8 22:13:44 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Feb 2006 17:13:44 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/topology/customview CustomView.java, 1.1.1.1, 1.2 ViewInfo.java, 1.1.1.1, 1.2 Message-ID: <200602082214.k18MEExA022720@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/customview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/topology/customview Modified Files: CustomView.java ViewInfo.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name. There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: CustomView.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/CustomView.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- CustomView.java 18 Jul 2005 00:34:20 -0000 1.1.1.1 +++ CustomView.java 8 Feb 2006 22:13:24 -0000 1.2 @@ -134,10 +134,10 @@ String name) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - if (enum != null) + Enumeration attr_enum = attr.getStringValues(); + if (attr_enum != null) try { - return (String) enum.nextElement(); + return (String) attr_enum.nextElement(); } catch (Exception e)// if value stored was null, enum fails { Debug.println(0, "CustomView: no configuration data"); @@ -159,9 +159,9 @@ return; } - Enumeration enum = attr.getStringValues(); - while (enum != null && enum.hasMoreElements()) { - String flag = ((String)enum.nextElement()).trim(); + Enumeration attr_enum = attr.getStringValues(); + while (attr_enum != null && attr_enum.hasMoreElements()) { + String flag = ((String)attr_enum.nextElement()).trim(); if (flag.equalsIgnoreCase("showTopContainer")) { _fShowTopContainer = true; } Index: ViewInfo.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/customview/ViewInfo.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ViewInfo.java 18 Jul 2005 00:34:20 -0000 1.1.1.1 +++ ViewInfo.java 8 Feb 2006 22:13:24 -0000 1.2 @@ -87,10 +87,10 @@ String name) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - if (enum != null) + Enumeration attr_enum = attr.getStringValues(); + if (attr_enum != null) try { - return (String) enum.nextElement(); + return (String) attr_enum.nextElement(); } catch (Exception e)// if value stored was null, enum fails { } @@ -110,9 +110,9 @@ String name, String value) { LDAPAttribute attr = ldapEntry.getAttribute(name); if (attr != null) { - Enumeration enum = attr.getStringValues(); - while (enum.hasMoreElements()) { - String v = (String)enum.nextElement(); + Enumeration attr_enum = attr.getStringValues(); + while (attr_enum.hasMoreElements()) { + String v = (String)attr_enum.nextElement(); if (v.equalsIgnoreCase(value)) { return true; } @@ -305,4 +305,4 @@ } return null; } -} \ No newline at end of file +} From fedora-directory-commits at redhat.com Wed Feb 8 23:56:57 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 8 Feb 2006 18:56:57 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/util DirUtil.java, 1.2, 1.3 Message-ID: <200602082356.k18Nuv5h030978@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30959 Modified Files: DirUtil.java Log Message: Checked in a modification the the cast used when calling Method.invoke(). This is needed to maintain Java 1.4 compatibility. Reviewed by Noriko. Index: DirUtil.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/DirUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DirUtil.java 8 Feb 2006 22:13:30 -0000 1.2 +++ DirUtil.java 8 Feb 2006 23:56:49 -0000 1.3 @@ -141,7 +141,7 @@ try { Class c = Class.forName( SSL_CIPHERS ); Method m = c.getMethod( "getCipherSuite", new Class[0] ); - _cipherSuite = m.invoke( null, (Object)null ); + _cipherSuite = m.invoke( null, (Object[])null ); } catch (Exception e) { Debug.println("DirUtil.getCipherSuite: Cannot load class, " + e ); From fedora-directory-commits at redhat.com Thu Feb 9 19:10:18 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 9 Feb 2006 14:10:18 -0500 Subject: [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSExportImport.java, 1.1.1.1, 1.2 Message-ID: <200602091910.k19JAIuO022945@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-serv22906 Modified Files: DSExportImport.java Log Message: Bug(s) fixed: 178478 Bug Description: DSExportImport.java uses non-standard sun.io class Reviewed by: Nathan, Noriko (Thanks!) Fix Description: Use java.io.CharConversionException instead. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: DSExportImport.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSExportImport.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSExportImport.java 18 Jul 2005 00:55:39 -0000 1.1.1.1 +++ DSExportImport.java 9 Feb 2006 19:10:09 -0000 1.2 @@ -452,8 +452,9 @@ } } /* Create error message */ - String msg; - if (e instanceof sun.io.MalformedInputException) { + String msg; + /* see if there was an invalid char in the input e.g. a non-utf8 8 bit char */ + if (e instanceof java.io.CharConversionException) { String[] args = {String.valueOf(_numEntry), e.toString()}; msg = DSUtil._resource.getString("import", "malformedinputerror-label", args); From fedora-directory-commits at redhat.com Thu Feb 9 23:57:33 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 9 Feb 2006 18:57:33 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/util AbstractDialog.java, 1.2, 1.3 Message-ID: <200602092357.k19NvXBS000713@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console/src/com/netscape/management/client/util In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv681/src/com/netscape/management/client/util Modified Files: AbstractDialog.java Log Message: Bug(s) fixed: 175177 Bug Description: The login dialog is hidden behind the splash screen when running startconsole using Java 1.5. Reviewed by: Rich, Pete, Noriko (thanks!) Files: see diffs Branch: HEAD Fix Description: We needed to push the login dialog to the front of the window stack in addition to pushing the splash screen to the back. Ideally, we'd get rid of the splash screen, or combine the login dialog components into the splash screen, but that's much less trivial to do. Platforms tested: RHEL4 (Java 1.4 and 1.5) Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: AbstractDialog.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/AbstractDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractDialog.java 2 Dec 2005 21:30:20 -0000 1.2 +++ AbstractDialog.java 9 Feb 2006 23:57:25 -0000 1.3 @@ -324,6 +324,7 @@ center(); } super.show(); + this.toFront(); } /** From fedora-directory-commits at redhat.com Thu Feb 9 23:57:27 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 9 Feb 2006 18:57:27 -0500 Subject: [Fedora-directory-commits] console/src/com/netscape/management/client/console Console.java, 1.4, 1.5 Message-ID: <200602092357.k19NvwF3000726@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-serv681/src/com/netscape/management/client/console Modified Files: Console.java Log Message: Bug(s) fixed: 175177 Bug Description: The login dialog is hidden behind the splash screen when running startconsole using Java 1.5. Reviewed by: Rich, Pete, Noriko (thanks!) Files: see diffs Branch: HEAD Fix Description: We needed to push the login dialog to the front of the window stack in addition to pushing the splash screen to the back. Ideally, we'd get rid of the splash screen, or combine the login dialog components into the splash screen, but that's much less trivial to do. Platforms tested: RHEL4 (Java 1.4 and 1.5) Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Console.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/Console.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Console.java 2 Dec 2005 21:30:15 -0000 1.4 +++ Console.java 9 Feb 2006 23:57:20 -0000 1.5 @@ -565,6 +565,7 @@ dialog.setInitialLocation(x, y); _splashScreen.setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + _splashScreen.toBack(); dialog.showModal(); if (dialog.isCancel()) System.exit(0); From fedora-directory-commits at redhat.com Fri Feb 10 15:29:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 10 Feb 2006 10:29:01 -0500 Subject: [Fedora-directory-commits] dsbuild - Imported sources Message-ID: <200602101529.k1AFT10s004542@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4520 Log Message: import of fds 1.0.1 + changes dsbuild scripts Status: Vendor Tag: DSBUILD Release Tags: DSBUILD_1_0_1 N dsbuild/gar.mk N dsbuild/color.mk N dsbuild/README N dsbuild/category.mk N dsbuild/gar.lib.mk N dsbuild/objdirname.mk N dsbuild/gar.conf.mk.in N dsbuild/gar.conf.mk N dsbuild/ds.conf.mk N dsbuild/ds/category.mk N dsbuild/ds/setuputil/checksums N dsbuild/ds/setuputil/Makefile N dsbuild/ds/ldapjdk/checksums N dsbuild/ds/ldapjdk/Makefile N dsbuild/ds/dsmlgwjars/checksums N dsbuild/ds/dsmlgwjars/Makefile N dsbuild/ds/crimson/checksums N dsbuild/ds/crimson/Makefile N dsbuild/ds/cyrus-sasl/checksums N dsbuild/ds/cyrus-sasl/Makefile N dsbuild/ds/dsonlinehelp/checksums N dsbuild/ds/dsonlinehelp/Makefile N dsbuild/ds/mod_nss/checksums N dsbuild/ds/mod_nss/Makefile N dsbuild/ds/mod_restartd/checksums N dsbuild/ds/mod_restartd/Makefile N dsbuild/ds/net-snmp/checksums N dsbuild/ds/net-snmp/Makefile N dsbuild/ds/adminserver/checksums N dsbuild/ds/adminserver/Makefile N dsbuild/ds/console/checksums N dsbuild/ds/console/Makefile N dsbuild/ds/onlinehelp/checksums N dsbuild/ds/onlinehelp/Makefile N dsbuild/ds/icu/checksums N dsbuild/ds/icu/Makefile N dsbuild/ds/db/checksums N dsbuild/ds/db/Makefile N dsbuild/ds/db/files/4.2.52.4.diff N dsbuild/ds/db/files/4.2.52.3.diff N dsbuild/ds/db/files/4.2.52.2.diff N dsbuild/ds/db/files/4.2.52.1.diff N dsbuild/ds/mod_admserv/checksums N dsbuild/ds/mod_admserv/Makefile N dsbuild/ds/adminutil/checksums N dsbuild/ds/adminutil/Makefile N dsbuild/ds/ldapserver/checksums N dsbuild/ds/ldapserver/Makefile N dsbuild/ds/directoryconsole/checksums N dsbuild/ds/directoryconsole/Makefile N dsbuild/ds/mozilla/checksums N dsbuild/ds/mozilla/Makefile N dsbuild/meta/Makefile N dsbuild/meta/ds/Makefile No conflicts created by this import From fedora-directory-commits at redhat.com Fri Feb 10 18:33:27 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Fri, 10 Feb 2006 13:33:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/schema 00core.ldif, 1.7, 1.8 Message-ID: <200602101833.k1AIXRUM011098@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/schema In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071 Modified Files: 00core.ldif Log Message: Bug(s) fixed: 180744 Bug Description: If you try to add one of the new password policy attributes to a fine-grained policy, you get an objectclass violation error. Reviewed by: Rich, Noriko (thanks!) Files: ldapserver/ldap/schema/00core.ldif Branch: HEAD Fix Description: This adds new password policy config attributes need to the schema and updates the "passwordPolicy" objectclass needs to allow them. I've also updated our master schema document to keep track of the OIDs. Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: 00core.ldif =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/schema/00core.ldif,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- 00core.ldif 19 Apr 2005 22:07:27 -0000 1.7 +++ 00core.ldif 10 Feb 2006 18:33:20 -0000 1.8 @@ -190,6 +190,15 @@ attributeTypes: ( 2.16.840.1.113730.3.1.997 NAME 'pwdpolicysubentry' DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.998 NAME ( 'passwordGraceUserTime' 'pwdGraceUserTime' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.999 NAME ( 'passwordGraceLimit' 'pwdGraceLoginLimit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2075 NAME ( 'passwordMinDigits' 'pwdMinDigits' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2076 NAME ( 'passwordMinAlphas' 'pwdMinAlphas' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2077 NAME ( 'passwordMinUppers' 'pwdMinUppers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2078 NAME ( 'passwordMinLowers' 'pwdMinLowers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2079 NAME ( 'passwordMinSpecials' 'pwdMinSpecials' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2080 NAME ( 'passwordMin8bit' 'pwdMin8bit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2081 NAME ( 'passwordMaxRepeats' 'pwdMaxRepeats' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2082 NAME ( 'passwordMinCategories' 'pwdMinCategories' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2083 NAME ( 'passwordMinTokenLength' 'pwdMinTokenLength' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.198 NAME 'memberURL' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.199 NAME 'memberCertificateDescription' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' ) attributeTypes: ( 2.16.840.1.113730.3.1.207 NAME 'vlvBase' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape Directory Server' ) @@ -344,7 +353,7 @@ objectClasses: ( 2.16.840.1.113730.3.2.1 NAME 'changeLogEntry' DESC 'LDAP changelog objectclass' SUP top MUST ( targetdn $ changeTime $ changenumber $ changeType ) MAY ( changes $ newrdn $ deleteoldrdn $ newsuperior ) X-ORIGIN 'Changelog Internet Draft' ) objectClasses: ( 2.16.840.1.113730.3.2.6 NAME 'referral' DESC 'LDAP referrals objectclass' SUP top MAY ( ref ) X-ORIGIN 'LDAPv3 referrals Internet Draft' ) objectClasses: ( 2.16.840.1.113730.3.2.12 NAME 'passwordObject' DESC 'Netscape defined password policy objectclass' SUP top MAY ( pwdpolicysubentry $ passwordExpirationTime $ passwordExpWarned $ passwordRetryCount $ retryCountResetTime $ accountUnlockTime $ passwordHistory $ passwordAllowChangeTime $ passwordGraceUserTime ) X-ORIGIN 'Netscape Directory Server' ) -objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit ) X-ORIGIN 'Netscape Directory Server' ) +objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit $ passwordMinDigits $ passwordMinAlphas $ passwordMinUppers $ passwordMinLowers $ passwordMinSpecials $ passwordMin8bit $ passwordMaxRepeats $ passwordMinCategories $ passwordMinTokenLength ) X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.30 NAME 'glue' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.32 NAME 'netscapeMachineData' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' ) objectClasses: ( 2.16.840.1.113730.3.2.38 NAME 'vlvSearch' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ vlvBase $ vlvScope $ vlvFilter ) MAY ( multiLineDescription ) X-ORIGIN 'Netscape Directory Server' ) From fedora-directory-commits at redhat.com Fri Feb 10 23:22:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 10 Feb 2006 18:22:07 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.46,1.47 Message-ID: <200602102322.k1ANM7K7023409@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- Makefile 7 Dec 2005 21:49:52 -0000 1.46 +++ Makefile 10 Feb 2006 23:22:00 -0000 1.47 @@ -359,7 +359,11 @@ # now time to move the necessary jars in place $(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib - $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib + if [ -f $(DSMLGWJARS_BUILD_DIR)/jaf.jar ] ; then \ + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaf.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ + else \ + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \ + fi # if you use the jaxrpc.jar from the axis distribution, you don't need the api file # or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa # if so, I'm not sure where to get the implementation @@ -370,6 +374,7 @@ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib + $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jakarta-commons-codec.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib endif # USE_DSMLGW # PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install From fedora-directory-commits at redhat.com Fri Feb 10 23:21:51 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 10 Feb 2006 18:21:51 -0500 Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.9, 1.10 components.mk, 1.37, 1.38 internal_comp_deps.mk, 1.33, 1.34 Message-ID: <200602102322.k1ANMLPq023414@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver Modified Files: buildpaths.mk components.mk internal_comp_deps.mk Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- buildpaths.mk 31 Oct 2005 15:55:24 -0000 1.9 +++ buildpaths.mk 10 Feb 2006 23:21:43 -0000 1.10 @@ -122,9 +122,13 @@ SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil #SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil -# it's customary and easier to use the pre-built jars +# it's customary and easier to use the pre-built jar +# you can get this from www.jpackage.org as well +# we usually get this from the admin server package which +# gets it from the console package #LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT) # Crimson - crimson.jar - http://xml.apache.org/crimson/ +# you can get this from www.jpackage.org as well #CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver @@ -133,9 +137,16 @@ # these are the files needed to build the java components - xmltools and dsmlgw - # and where to get them +# NOTE: www.jpackage.org has almost all of these, and you can configure yum or apt +# or up2date or whatever your package manager is to pull them, which is nice because it will +# also take care of the dependencies - http://www.jpackage.org/repos.php # Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar # Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi # JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html +# OR +# JAF - activation.jar or jaf.jar - http://www.jpackage.org +# NOTE - classpathx-jaf may also work +# Codec - jakarta-commons-codec.jar - http://jakarta.apache.org/commons/codec/ # JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html # all of these files need to be in the following directory: DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- components.mk 8 Nov 2005 15:58:16 -0000 1.37 +++ components.mk 10 Feb 2006 23:21:43 -0000 1.38 @@ -555,7 +555,7 @@ AXIS_FILES = $(AXIS) AXIS_FILE = $(CLASS_DEST)/$(AXIS) -DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar +DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar,jakarta-commons-codec.jar DSMLJAR_FILE = $(CLASS_DEST) CRIMSON_LICENSE = LICENSE.crimson Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- internal_comp_deps.mk 7 Dec 2005 21:25:50 -0000 1.33 +++ internal_comp_deps.mk 10 Feb 2006 23:21:43 -0000 1.34 @@ -450,7 +450,7 @@ DSMLJAR_RELEASE = $(COMPONENTS_DIR) #DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION) DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars -DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar +DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar $(CLASS_DEST)/jakarta-commons-codec.jar ifndef DSMLJAR_PULL_METHOD DSMLJAR_PULL_METHOD = $(COMPONENT_PULL_METHOD) From fedora-directory-commits at redhat.com Fri Feb 10 23:21:56 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 10 Feb 2006 18:21:56 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw build.xml, 1.7, 1.8 Message-ID: <200602102322.k1ANMRG7023417@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw Modified Files: build.xml Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: build.xml =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 29 Oct 2005 02:21:46 -0000 1.7 +++ build.xml 10 Feb 2006 23:21:49 -0000 1.8 @@ -51,16 +51,20 @@ + + + + @@ -68,6 +72,7 @@ + From fedora-directory-commits at redhat.com Fri Feb 10 23:22:02 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 10 Feb 2006 18:22:02 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway ParseValue.java, 1.4, 1.5 gatewayHandler.java, 1.8, 1.9 Message-ID: <200602102322.k1ANMWOU023421@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway Modified Files: ParseValue.java gatewayHandler.java Log Message: Bug(s) fixed: 178479 Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder Reviewed by: The team (Thanks!) Fix Description: Added jakarta-commons-codec.jar to the DS build and packaging. We will need to add this file to the bundle of dsmlgw jar files on /share/builds/components. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: ParseValue.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ParseValue.java 19 Apr 2005 22:07:19 -0000 1.4 +++ ParseValue.java 10 Feb 2006 23:21:54 -0000 1.5 @@ -36,6 +36,8 @@ * --- END COPYRIGHT BLOCK --- */ package com.netscape.dsml.gateway; +import org.apache.commons.codec.binary.Base64; + /** * * @author elliot @@ -53,9 +55,9 @@ org.w3c.dom.Node type = n.getAttributes().getNamedItem("xsi:type"); if (type != null && type.getNodeValue().equalsIgnoreCase("xsd:base64Binary") ) { // This value is encoded in base64. decode it. - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - ret = bd.decodeBuffer( n.getFirstChild().getNodeValue() ) ; + ret = bd.decode( n.getFirstChild().getNodeValue().getBytes() ) ; } catch (org.w3c.dom.DOMException de) { ret = "".getBytes(); Index: gatewayHandler.java =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gatewayHandler.java 11 May 2005 04:29:55 -0000 1.8 +++ gatewayHandler.java 10 Feb 2006 23:21:54 -0000 1.9 @@ -62,6 +62,7 @@ import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.handlers.BasicHandler; +import org.apache.commons.codec.binary.Base64; public class gatewayHandler extends BasicHandler { private HandlerInfo handlerInfo; @@ -110,9 +111,9 @@ if ( tmp != null && tmp.startsWith("Basic ") ) { int i ; - sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder(); + Base64 bd = new Base64(); try { - tmp = new String( (bd.decodeBuffer(tmp.substring(6) ))); + tmp = new String( (bd.decode(tmp.substring(6).getBytes() ))); } catch (Exception e) { // couldn't decode auth info From fedora-directory-commits at redhat.com Mon Feb 13 22:00:46 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:00:46 -0500 Subject: [Fedora-directory-commits] directoryconsole build.properties, 1.2, 1.3 build.xml, 1.3, 1.4 Message-ID: <200602132200.k1DM0kfZ031790@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761/directoryconsole Modified Files: build.properties build.xml Log Message: The console now builds jar files in the format brand-name-version.jar e.g. fedora-mcc-1.0.jar so change the build scripts to pick up the new jar format. We will have to add build.properties to the branding. Index: build.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.properties 28 Oct 2005 18:01:11 -0000 1.2 +++ build.properties 13 Feb 2006 22:00:39 -0000 1.3 @@ -23,3 +23,4 @@ ldapconsole.root=.. ldapconsole.version=10 ldapconsole.name=ds${ldapconsole.version} +brand=fedora Index: build.xml =================================================================== RCS file: /cvs/dirsec/directoryconsole/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 14 Nov 2005 04:14:11 -0000 1.3 +++ build.xml 13 Feb 2006 22:00:39 -0000 1.4 @@ -79,9 +79,9 @@ - - - + + + From fedora-directory-commits at redhat.com Mon Feb 13 22:10:19 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:10:19 -0500 Subject: [Fedora-directory-commits] adminserver nsconfig.mk,1.21,1.22 Message-ID: <200602132210.k1DMAJfc001363@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv840/adminserver Modified Files: nsconfig.mk Log Message: Use NSS 3.11 and NSPR 4.6.1 - This requires packaging the new freebl3 library on all platforms, and more on Solaris and HPUX. Rename the console jar file back to admserv10.jar for now to easy new fedora ds migration issues. Will rename it back to the new name once the current code is tagged. From fedora-directory-commits at redhat.com Mon Feb 13 22:13:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:13:13 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console build.properties, 1.9, 1.10 Message-ID: <200602132213.k1DMDDww001624@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv/console Modified Files: build.properties Log Message: Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime on all platforms, and more on Solaris and HP-UX. Use admserv10.jar as the console jar file name instead of the new format - will change back once the new code is tagged. Index: build.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.properties 1 Feb 2006 23:04:04 -0000 1.9 +++ build.properties 13 Feb 2006 22:13:06 -0000 1.10 @@ -22,9 +22,10 @@ adminconsole.root=../.. mcc.version=1.0 +mcc.nodot.version=10 admin.core=admserv -admin.console=fedora-${admin.core}-${mcc.version} +admin.console=${admin.core}${mcc.nodot.version} console.root=${adminconsole.root}/../built/release/package/java ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar From fedora-directory-commits at redhat.com Mon Feb 13 22:13:08 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:13:08 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.36, 1.37 Message-ID: <200602132213.k1DMDcE0001637@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv Modified Files: pkgadmin.mk Log Message: Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime on all platforms, and more on Solaris and HP-UX. Use admserv10.jar as the console jar file name instead of the new format - will change back once the new code is tagged. Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36 +++ pkgadmin.mk 13 Feb 2006 22:12:55 -0000 1.37 @@ -168,7 +168,7 @@ # grab the jar files cd $(ADMIN_JARS) ; \ - cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars + cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars # # Cleanup before making distributable zip @@ -252,19 +252,6 @@ fi ; \ done -# Cert System needs chk files [154431] - cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib -# libfreebl_*.chk files only exist on the 32-bit builds. -# They should be packaged only for the 32-bit builds. -ifneq ($(USE_64), 1) -ifeq ($(ARCH), SOLARIS) - cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib -endif -ifeq ($(ARCH), HPUX) - cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib -endif -endif - # Copy LIB ADMIN UTIL cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib for file in $(ADMINUTIL_SOLIBS); do \ From fedora-directory-commits at redhat.com Mon Feb 13 22:25:42 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:25:42 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.47, 1.48 fixSetupInf.pl, 1.7, 1.8 Message-ID: <200602132225.k1DMPgoU001998@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver/ldap/cm Modified Files: Makefile fixSetupInf.pl Log Message: Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime, and more on Solaris and HP-UX. Use setup.inf from admin server, and make sure the admin component is in there. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Makefile 10 Feb 2006 23:22:00 -0000 1.47 +++ Makefile 13 Feb 2006 22:25:33 -0000 1.48 @@ -595,7 +595,6 @@ # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL),1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) - $(PERL) -w $(FIX_SETUP_INF) $(SETUPUTIL_BINPATH)/setup.inf $(INSTDIR)/setup.inf endif # copy in our product .inf files @@ -691,6 +690,13 @@ done ; \ fi +# make sure setup.inf has everything we need +ifeq ($(USE_SETUPUTIL),1) + cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp + $(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER) + rm -f $(INSTDIR)/setup.inf.tmp +endif + # we must remove the nsbase.zip file - we package those files now rm -f $(INSTDIR)/base/nsbase.zip # we also need to remove the Archive directive from the [base] section of the @@ -714,7 +720,7 @@ # build the combined packages tar file; use h flag to follow symlinks ifdef BUILD_SHIP ifndef BUILD_PATCH - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ) endif ifeq ($(DEBUG), optimize) @@ -723,7 +729,7 @@ else echo base/unzipped > $(TMPLIST) echo admin/unzipped >> $(TMPLIST) - cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \ + cd $(INSTDIR); $(TAR) cvfh - setup slapd \ dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz rm -f $(TMPLIST) endif # BUILD_SHIP @@ -913,7 +919,7 @@ # move the tarball back after the copy mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR) # make sure our packages are in the setup.inf file - $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf + $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER) #---------------------------- slapd rules -------------------------------------------------- Index: fixSetupInf.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fixSetupInf.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fixSetupInf.pl 21 Oct 2005 19:21:12 -0000 1.7 +++ fixSetupInf.pl 13 Feb 2006 22:25:33 -0000 1.8 @@ -51,6 +51,8 @@ $input = shift; $output = shift; +$use_adminserver = shift; + die "cannot open input file $input" unless open( FILE, $input ); die "cannot open output file $output" unless open( OUT, ">$output" ); $inGeneralSection = 0; @@ -65,6 +67,10 @@ $_ .= ", slapd"; $addedSlapd = 1; } + if (! /admin/ && $use_adminserver) { + $_ .= ", admin"; + $addedAdmin = 1; + } if (! /perldap/) { $_ .= ", perldap"; $addedPerLDAP = 1; @@ -95,6 +101,11 @@ print OUT "ComponentInfoFile = slapd/slapd.inf\n"; } +if ($addedAdmin) { + print OUT "\n[admin]\n"; + print OUT "ComponentInfoFile = admin/admin.inf\n"; +} + if ($addedPerLDAP) { print OUT "\n[perldap]\n"; print OUT "ComponentInfoFile = perldap/perldap.inf\n"; From fedora-directory-commits at redhat.com Mon Feb 13 22:25:35 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 17:25:35 -0500 Subject: [Fedora-directory-commits] ldapserver component_versions.mk, 1.40, 1.41 components.mk, 1.38, 1.39 Message-ID: <200602132226.k1DMQ5Fp002002@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver Modified Files: component_versions.mk components.mk Log Message: Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime, and more on Solaris and HP-UX. Use setup.inf from admin server, and make sure the admin component is in there. Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- component_versions.mk 31 Oct 2005 15:55:24 -0000 1.40 +++ component_versions.mk 13 Feb 2006 22:25:27 -0000 1.41 @@ -52,12 +52,12 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.4.1 + NSPR_RELDATE = v4.6.1 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_9_3_RTM + SECURITY_RELDATE = NSS_3_11_RTM endif # LIBDB @@ -97,7 +97,7 @@ # ANT ifndef ANT_VERSION - ANT_VERSION = 1.4.1 + ANT_VERSION = 1.6.2 endif ifndef ANT_COMP ANT_COMP = ant @@ -140,7 +140,7 @@ # server core ifndef SVRCORE_RELDATE - SVRCORE_RELDATE = SVRCORE_4_0_RTM + SVRCORE_RELDATE = SVRCORE_4_0_1_RTM endif # admin utility library Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- components.mk 10 Feb 2006 23:21:43 -0000 1.38 +++ components.mk 13 Feb 2006 22:25:27 -0000 1.39 @@ -210,23 +210,30 @@ SECURITY_INCLUDE = -I$(SECURITY_INCDIR) # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign -SECURITY_LIBNAMES = ssl3 nss3 softokn3 +# as of NSS 3.11, no longer need to link with softokn3 +SECURITY_LIBNAMES = ssl3 nss3 # these libs have a corresponding .chk file -SECURITY_NEED_CHK = softokn3 +# freebl is new for NSS 3.11 +SECURITY_NEED_CHK = softokn3 freebl3 -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 +SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3 -# these are only needed on 32 bit Solaris and HP-UX ifneq ($(USE_64), 1) ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 +SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 # these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 -endif +SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 +endif # SOLARIS ifeq ($(ARCH), HPUX) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 +SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3 +# these libs have a corresponding .chk file +SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3 +endif # HPUX +else # USE_64 +ifeq ($(ARCH), SOLARIS) +SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3 # these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 +SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3 endif endif # USE_64 @@ -238,7 +245,7 @@ LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG) LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools ifeq ($(USE_SETUPUTIL), 1) - PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) + PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) # for the setup programs endif ifeq ($(USE_DSGW), 1) LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw @@ -423,7 +430,7 @@ ### ICU package ########################################## -ICU_LIB_VERSION = 24 +ICU_LIB_VERSION = 34 ifdef ICU_SOURCE_ROOT ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin @@ -518,10 +525,10 @@ # during the build process ifdef ADMINUTIL_SOURCE_ROOT ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib - ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include + ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include/adminutil-$(ADMINUTIL_DOT_VER) else ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib - ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include + ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER) endif PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib @@ -529,11 +536,11 @@ LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX)) ifeq ($(ARCH),WINNT) -ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX) -ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX) -LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX) +ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil.$(LIB_SUFFIX) +ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s.$(LIB_SUFFIX) +LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX) else -ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER) +ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil endif ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \ -I$(ADMINUTIL_INCPATH)/libadmsslutil @@ -572,8 +579,8 @@ ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR) # else set in internal_buildpaths.mk endif -# these are the only two subcomponents we use from the adminserver package -ADMINSERVER_SUBCOMPS=admin base +# these are the subcomponents we use from the adminserver package +ADMINSERVER_SUBCOMPS=admin base setup.inf ifdef LDAPCONSOLE_SOURCE_ROOT LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package From fedora-directory-commits at redhat.com Tue Feb 14 04:26:36 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 23:26:36 -0500 Subject: [Fedora-directory-commits] adminserver nsconfig.mk,1.22,1.23 Message-ID: <200602140426.k1E4QauQ015421@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: nsconfig.mk Log Message: Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package. Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nsconfig.mk 13 Feb 2006 22:09:55 -0000 1.22 +++ nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23 @@ -721,30 +721,27 @@ # where secmod.db file is, rather than in the LD_LIBRARY_PATH SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi -# These files are only needed at runtime, not to link with -SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 freebl3 -# these shared libs need the corresponding .chk files at runtime -SECURITY_NEED_CHK = softokn3 freebl3 - -ifneq ($(USE_64), 1) +# freebl for all platforms is new for NSS 3.11 +# there are some platform specific versions as well +FREEBL_LIBS = freebl3 +ifeq ($(USE_64), 1) +ifeq ($(ARCH), SOLARIS) +FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3 +endif +else # USE_64 ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 +FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 endif # SOLARIS ifeq ($(ARCH), HPUX) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3 +FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3 endif # HPUX -else # USE_64 -ifeq ($(ARCH), SOLARIS) -SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_64fpu_3 freebl_64int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3 -endif endif # USE_64 +# These files are only needed at runtime, not to link with +SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS) +# these shared libs need the corresponding .chk files at runtime +SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS) + ifeq ($(ARCH), WINNT) SECURITYDLL_NAME = $(SECURITY_LIBNAMES) SECURITYOBJNAME = $(addsuffix .lib, $(SECURITY_LIBNAMES)) From fedora-directory-commits at redhat.com Tue Feb 14 04:27:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Mon, 13 Feb 2006 23:27:07 -0500 Subject: [Fedora-directory-commits] ldapserver components.mk,1.39,1.40 Message-ID: <200602140427.k1E4R7Bl015445@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15427 Modified Files: components.mk Log Message: Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package. Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- components.mk 13 Feb 2006 22:25:27 -0000 1.39 +++ components.mk 14 Feb 2006 04:26:54 -0000 1.40 @@ -213,30 +213,30 @@ # as of NSS 3.11, no longer need to link with softokn3 SECURITY_LIBNAMES = ssl3 nss3 # these libs have a corresponding .chk file -# freebl is new for NSS 3.11 -SECURITY_NEED_CHK = softokn3 freebl3 +SECURITY_NEED_CHK = softokn3 -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3 +# these are the libs we need at runtime +SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 -ifneq ($(USE_64), 1) +# freebl for all platforms is new for NSS 3.11 +# there are some platform specific versions as well +FREEBL_LIBS = freebl3 +ifeq ($(USE_64), 1) ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 +FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3 +endif +else # USE_64 +ifeq ($(ARCH), SOLARIS) +FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3 endif # SOLARIS ifeq ($(ARCH), HPUX) -SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3 +FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3 endif # HPUX -else # USE_64 -ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3 -endif endif # USE_64 +SECURITY_LIBNAMES.pkg += $(FREEBL_LIBS) +SECURITY_NEED_CHK += $(FREEBL_LIBS) + SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES)) SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS)) From fedora-directory-commits at redhat.com Tue Feb 14 22:30:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:30:13 -0500 Subject: [Fedora-directory-commits] dsbuild/meta/ds Makefile,1.1.1.1,1.2 Message-ID: <200602142230.k1EMUDcR031366@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/meta/ds Modified Files: Makefile Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:30:05 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = ds -GARVERSION = 1 +GARVERSION = 1.0.2 CATEGORIES = meta # assume that if someone defines DEBUG=1 they mean DEBUG=full From fedora-directory-commits at redhat.com Tue Feb 14 22:29:25 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:25 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_nss Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUEr031378@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_nss Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:18 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_nss -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -43,7 +43,7 @@ CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:18 -0000 1.2 @@ -1 +1,2 @@ 68bb2fcd01694538e384454ee4c8ae53 download/mod_nss-1.0.tar.gz +59a6a6b2f17d2bf8f68a36d10ee378ba download/mod_nss-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:29:14 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:14 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUIH031384@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/ldapserver Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:06 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-ds -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule @@ -21,13 +21,13 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \ MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \ + ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ + SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 \ DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \ NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 \ - ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.1 \ + ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.2 \ ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0 ifndef NOJAVA @@ -40,6 +40,9 @@ BUILD_ARGS += BUILD_JAVA_CODE=0 USE_DSMLGW= USE_CONSOLE= USE_JAVATOOLS= endif # NOJAVA +ifeq ($(DEBUG), optimize) +BUILD_ARGS += BUILD_DEBUG=optimize +endif ifndef DEBUG BUILD_ARGS += BUILD_DEBUG=optimize endif Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:06 -0000 1.2 @@ -2,3 +2,4 @@ 5c71c276c01daef37adf39a5337a6908 download/ldapserver-gcc4.patch a3209ba62911a8ea55b7c7f9cef1d965 download/fedora-ds-1.0.tar.gz 4e29cb87a7907fc0d3646036c142774e download/fedora-ds-1.0.1.tar.gz +d43cb74a6700d72fd8ee96062a35d1ce download/fedora-ds-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:28:32 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:28:32 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUXbN031405@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminutil Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:25 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-adminutil -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -12,7 +12,7 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 +BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 ifndef DEBUG BUILD_ARGS += BUILD_DEBUG=optimize Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:25 -0000 1.2 @@ -1 +1,2 @@ 08c514a30604e192a22d7a035a9dfccc download/fedora-adminutil-1.0.tar.gz +ff441f6af22846102592ad101929e02e download/fedora-adminutil-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:28:47 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:28:47 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/directoryconsole Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUkR031381@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/directoryconsole Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:38 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-directoryconsole -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -15,7 +15,7 @@ #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/package +IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/release/package configure-custom: $(MAKECOOKIE) Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:38 -0000 1.2 @@ -1 +1,2 @@ ea552fe1c83fb87b9ad652f0422a77fa download/fedora-directoryconsole-1.0.tar.gz +7a057db966ee7bbe59a98a82d31bc087 download/fedora-directoryconsole-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:28:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:28:53 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/dsmlgwjars Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUxA031379@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/dsmlgwjars In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/dsmlgwjars Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:45 -0000 1.2 @@ -4,7 +4,7 @@ # this is the subdir of the download dir where the jar files are kept - see ds.conf.mk DSMLGWJAR_VERSION = 1.0 # this is the list of jar files -MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar +MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar jakarta-commons-codec.jar # these are the files to be downloaded DISTFILES = $(MYJARS) # do not extract the jar files, just download them Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:45 -0000 1.2 @@ -4,3 +4,4 @@ bbc59424764db89879c7216bd4480ec0 download/saaj.jar bc3a50120bbb72afe43a8d26d1633d0d download/xercesImpl.jar 2e7aed876c51af3ee6a23ed524180d37 download/xml-apis.jar +191aab4f9fd7ef02f6e514c4fd9dbdbb download/jakarta-commons-codec.jar From fedora-directory-commits at redhat.com Tue Feb 14 22:29:31 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:31 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_restartd Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUVHd031397@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_restartd Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:23 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_restartd -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -41,7 +41,7 @@ CONFIGURE_ARGS = --with-apr-config -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:23 -0000 1.2 @@ -1 +1,2 @@ 5d04f72e1b1287fde46213678d8f24de download/mod_restartd-1.0.tar.gz +27121b306c0c777d7187223b4179c601 download/mod_restartd-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:29:36 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:36 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozilla Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUaBZ031413@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mozilla Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:29 -0000 1.2 @@ -3,8 +3,9 @@ CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule -MYPATCH = mozilla-gcc4.patch -DISTFILES = mozilla-components-2.tar.gz $(MYPATCH) +#MYPATCH = mozilla-gcc4.patch +MYPATCH = sysfdtable.patch sysfdtable2.patch +DISTFILES = mozilla-components-1.0.2.tar.gz $(MYPATCH) PATCHFILES = LIBDEPS = @@ -16,7 +17,7 @@ INSTALL_SCRIPTS = custom ifndef DEBUG -OPTFLAG="BUILDOPT=1" +OPTFLAG="BUILD_OPT=1" CONFIGFLAG=--disable-debug --enable-optimize else CONFIGFLAG=--enable-debug --disable-optimize @@ -24,22 +25,25 @@ # this is our "custom" patch target post-patch: +ifdef MYPATCH cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 ) +endif $(MAKECOOKIE) configure-custom: # remove the stupid mozilla- directory rmdir $(WORKSRC) - cd work/mozilla/directory/c-sdk && ./configure --with-nss $(CONFIGFLAG) $(MAKECOOKIE) build-custom: cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG) cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) + cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG) cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG) # perldap uses MakeMaker, so lots of env. vars. cd work/mozilla/directory/perldap && \ - LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && $(MAKE) + LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \ + $(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib $(MAKECOOKIE) Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:29 -0000 1.2 @@ -1,3 +1,6 @@ b93ea453da4e0510130649cf827108b1 download/mozilla-components.tar.gz 39bca53b30595c69fc64a6710dd3129e download/mozilla-components-2.tar.gz a4c0724bc5b319ec7670da4cce93f920 download/mozilla-gcc4.patch +f0d13d53c37adfe5312cf44d5d992042 download/sysfdtable.patch +251df4db04cced3c22713c865289d471 download/sysfdtable2.patch +931bc65330ad6d53aeb951e9d51a6a53 download/mozilla-components-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:30:02 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:30:02 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/onlinehelp Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUWcq031401@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/onlinehelp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/onlinehelp Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/onlinehelp/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:34 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-onlinehelp -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/onlinehelp/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:34 -0000 1.2 @@ -1 +1,2 @@ cc8cece82f0dc4d3ff502129fdd590f6 download/fedora-onlinehelp-1.0.tar.gz +bd3d02c50d88848551dfa24964cfcf92 download/fedora-onlinehelp-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:30:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:30:07 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/setuputil Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUc86031417@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/setuputil Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:30:00 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-setuputil -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:30:00 -0000 1.2 @@ -1 +1,2 @@ 6bc26ba2edee75c3c8d5bf9a21bda7b8 download/fedora-setuputil-1.0.tar.gz +ad98662666e99bd737227ad6cf89abec download/fedora-setuputil-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:28:40 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:28:40 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/console Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUWf031385@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/console Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/console/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:30 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = fedora-console -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -21,7 +21,7 @@ $(MAKECOOKIE) build-custom: - cd $(WORKSRC) && ant $(IMPORTS) + cd $(WORKSRC) && ant $(IMPORTS) package $(MAKECOOKIE) install-custom: Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/console/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:30 -0000 1.2 @@ -1 +1,2 @@ 7514ba3946a23d638e7d0ab60f26255b download/fedora-console-1.0.tar.gz +31b26c651997500690de9dd186bf1e30 download/fedora-console-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:29:20 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:20 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_admserv Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUJA031383@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mod_admserv Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:29:12 -0000 1.2 @@ -1,7 +1,7 @@ include ../../objdirname.mk GARNAME = mod_admserv -GARVERSION = 1.0 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -12,7 +12,7 @@ MOZILLA_DIST = $(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla/dist -ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0/built/adminutil/$(OBJDIR_NAME) +ADMINUTIL = $(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2/built/adminutil/$(OBJDIR_NAME) INSTALL_SCRIPTS = custom @@ -47,7 +47,7 @@ CONFIGURE_ARGS = --with-apr-config --with-nspr=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME) --with-nss-inc=$(MOZILLA_DIST)/public/nss --with-nss-lib=$(MOZILLA_DIST)/$(MOZ_OBJDIR_NAME)/lib --with-ldapsdk-inc=$(MOZILLA_DIST)/public/ldap --with-ldapsdk-lib=$(MOZILLA_DIST)/lib --with-adminutil=$(ADMINUTIL) -ifdef DEBUG +ifeq ($(DEBUG),full) CONFIGURE_ENV = CFLAGS=-g else CONFIGURE_ENV = CFLAGS=-O2 Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:29:12 -0000 1.2 @@ -1 +1,2 @@ a2615e7a400d10e6ec41565748decd3b download/mod_admserv-1.0.tar.gz +51e4a305687b48820bc8e02a28eb8fb7 download/mod_admserv-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 14 22:29:08 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:29:08 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/icu Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUcFw031421@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/icu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/icu Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:51 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = icu -GARVERSION = 2.4 +GARVERSION = 3.4 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tgz PATCHFILES = Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:51 -0000 1.2 @@ -1 +1,2 @@ 77d56e4dca9ec0fd635151ce1dc72137 download/icu-2.4.tgz +b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz From fedora-directory-commits at redhat.com Tue Feb 14 22:28:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 14 Feb 2006 17:28:27 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2 Message-ID: <200602142230.k1EMUUhD031387@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminserver Modified Files: Makefile checksums Log Message: upgrade to 1.0.2 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ Makefile 14 Feb 2006 22:28:18 -0000 1.2 @@ -1,5 +1,5 @@ GARNAME = fedora-adminserver -GARVERSION = 1.0.1 +GARVERSION = 1.0.2 CATEGORIES = ds DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PATCHFILES = @@ -14,14 +14,14 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ - ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \ - ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \ - SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \ - ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0 \ - MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0/.libs \ - MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0/.libs \ - MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0/.libs \ - MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0 + ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ + ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ + SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ + ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.2 \ + MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \ + MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \ + MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \ + MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2 ifndef NOJAVA BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ checksums 14 Feb 2006 22:28:18 -0000 1.2 @@ -1,2 +1,3 @@ b61ebbdff8d4a911ed54f94108476e37 download/fedora-adminserver-1.0.tar.gz e2e2557b9548bb3d2f54803b5fcf9103 download/fedora-adminserver-1.0.1.tar.gz +f3c89782dd1642bbc9939f07a3fd22d2 download/fedora-adminserver-1.0.2.tar.gz From fedora-directory-commits at redhat.com Wed Feb 15 00:26:28 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 14 Feb 2006 19:26:28 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd libglobs.c, 1.7, 1.8 Message-ID: <200602150026.k1F0QSMd003193@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3170 Modified Files: libglobs.c Log Message: Bug(s) fixed: 181032 Bug Description: Most of our integer based config parameters do not do a good job validating input. For example, alphabetic characters will be accepted as a value if "0" is a valid setting for a given parameter since atoi returns "0" on error. We also don't properly check for range errors for many parameters. Reviewed by: Rich, Pete, and Noriko (Thanks!) Files: ldapserver/ldap/servers/slapd/libglobs.c Branch: HEAD Fix Description: This adds better input validation for a number of integer based config settings. I replaced our usage of atoi() with strtol() so we can recognize conversion errors. I also added more descriptive error strings where they were missing. I revised the fix due to feedback from Noriko. She recommended that we check for ERANGE areas for all calls to strtol insead of only checking when LONG_MAX is a valid setting for a config parameter. Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none Index: libglobs.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libglobs.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libglobs.c 25 Jan 2006 16:51:39 -0000 1.7 +++ libglobs.c 15 Feb 2006 00:26:19 -0000 1.8 @@ -950,7 +950,8 @@ int config_set_port( const char *attrname, char *port, char *errorbuf, int apply ) { - int nPort; + long nPort; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); int retVal = LDAP_SUCCESS; @@ -958,17 +959,20 @@ return LDAP_OPERATIONS_ERROR; } - nPort = atoi( port ); + errno = 0; + nPort = strtol(port, &endp, 10); - if ( nPort == 0 ) { - LDAPDebug( LDAP_DEBUG_ANY, - "Information: Non-Secure Port Disabled, server only contactable via secure port\n", 0, 0, 0 ); - } - else if (nPort > LDAP_PORT_MAX || nPort < 0 ) { + if ( *endp != '\0' || errno == ERANGE || nPort > LDAP_PORT_MAX || nPort < 0 ) { retVal = LDAP_OPERATIONS_ERROR; PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: %d is invalid, ports must range from 1 to %d", - attrname, nPort, LDAP_PORT_MAX ); + "%s: \"%s\" is invalid, ports must range from 0 to %d", + attrname, port, LDAP_PORT_MAX ); + return retVal; + } + + if ( nPort == 0 ) { + LDAPDebug( LDAP_DEBUG_ANY, + "Information: Non-Secure Port Disabled, server only contactable via secure port\n", 0, 0, 0 ); } if ( apply ) { @@ -984,19 +988,23 @@ int config_set_secureport( const char *attrname, char *port, char *errorbuf, int apply ) { - int nPort = atoi ( port ); + long nPort; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); int retVal = LDAP_SUCCESS; if ( config_value_is_null( attrname, port, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + nPort = strtol(port, &endp, 10); - if (nPort > LDAP_PORT_MAX || nPort <= 0 ) { + if (*endp != '\0' || errno == ERANGE || nPort > LDAP_PORT_MAX || nPort <= 0 ) { retVal = LDAP_OPERATIONS_ERROR; PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: %d is invalid, ports must range from 1 to %d", - attrname, nPort, LDAP_PORT_MAX ); + "%s: \"%s\" is invalid, ports must range from 1 to %d", + attrname, port, LDAP_PORT_MAX ); } if (apply) { @@ -1159,23 +1167,27 @@ int config_set_sizelimit( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; + long sizelimit; + char *endp = NULL; Slapi_Backend *be; char *cookie; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); - int sizelimit = atoi ( value ); - if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - if ( sizelimit < -1 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: %d is too small", - attrname, sizelimit ); + errno = 0; + sizelimit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || sizelimit < -1 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: \"%s\" is invalid, sizelimit must range from -1 to %ld", + attrname, value, LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } - + if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -1347,15 +1359,20 @@ int config_set_pw_minlength( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minLength = 0; + int retVal = LDAP_SUCCESS; + long minLength = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minLength = atoi(value); - if ( minLength < 2 || minLength > 512 ) { + errno = 0; + minLength = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minLength < 2 || minLength > 512 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum length \"%s\" is invalid. " "The minimum length must range from 2 to 512.", @@ -1377,15 +1394,20 @@ int config_set_pw_mindigits( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minDigits = 0; + int retVal = LDAP_SUCCESS; + long minDigits = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minDigits = atoi(value); - if ( minDigits < 0 || minDigits > 64 ) { + errno = 0; + minDigits = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minDigits < 0 || minDigits > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of digits \"%s\" is invalid. " "The minimum number of digits must range from 0 to 64.", @@ -1407,15 +1429,20 @@ int config_set_pw_minalphas( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minAlphas = 0; + int retVal = LDAP_SUCCESS; + long minAlphas = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minAlphas = atoi(value); - if ( minAlphas < 0 || minAlphas > 64 ) { + errno = 0; + minAlphas = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minAlphas < 0 || minAlphas > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of alphas \"%s\" is invalid. " "The minimum number of alphas must range from 0 to 64.", @@ -1437,15 +1464,20 @@ int config_set_pw_minuppers( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minUppers = 0; + int retVal = LDAP_SUCCESS; + long minUppers = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minUppers = atoi(value); - if ( minUppers < 0 || minUppers > 64 ) { + errno = 0; + minUppers = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minUppers < 0 || minUppers > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of uppercase characters \"%s\" is invalid. " "The minimum number of uppercase characters must range from 0 to 64.", @@ -1467,15 +1499,20 @@ int config_set_pw_minlowers( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minLowers = 0; + int retVal = LDAP_SUCCESS; + long minLowers = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minLowers = atoi(value); - if ( minLowers < 0 || minLowers > 64 ) { + errno = 0; + minLowers = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minLowers < 0 || minLowers > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of lowercase characters \"%s\" is invalid. " "The minimum number of lowercase characters must range from 0 to 64.", @@ -1497,15 +1534,20 @@ int config_set_pw_minspecials( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minSpecials = 0; + int retVal = LDAP_SUCCESS; + long minSpecials = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minSpecials = atoi(value); - if ( minSpecials < 0 || minSpecials > 64 ) { + errno = 0; + minSpecials = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minSpecials < 0 || minSpecials > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of special characters \"%s\" is invalid. " "The minimum number of special characters must range from 0 to 64.", @@ -1527,15 +1569,20 @@ int config_set_pw_min8bit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, min8bit = 0; + int retVal = LDAP_SUCCESS; + long min8bit = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - min8bit = atoi(value); - if ( min8bit < 0 || min8bit > 64 ) { + errno = 0; + min8bit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || min8bit < 0 || min8bit > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of 8-bit characters \"%s\" is invalid. " "The minimum number of 8-bit characters must range from 0 to 64.", @@ -1557,15 +1604,20 @@ int config_set_pw_maxrepeats( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxRepeats = 0; + int retVal = LDAP_SUCCESS; + long maxRepeats = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxRepeats = atoi(value); - if ( maxRepeats < 0 || maxRepeats > 64 ) { + errno = 0; + maxRepeats = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || maxRepeats < 0 || maxRepeats > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password maximum number of repeated characters \"%s\" is invalid. " "The maximum number of repeated characters must range from 0 to 64.", @@ -1587,15 +1639,20 @@ int config_set_pw_mincategories( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minCategories = 0; + int retVal = LDAP_SUCCESS; + long minCategories = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minCategories = atoi(value); - if ( minCategories < 1 || minCategories > 5 ) { + errno = 0; + minCategories = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minCategories < 1 || minCategories > 5 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum number of categories \"%s\" is invalid. " "The minimum number of categories must range from 1 to 5.", @@ -1617,15 +1674,20 @@ int config_set_pw_mintokenlength( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, minTokenLength = 0; + int retVal = LDAP_SUCCESS; + long minTokenLength = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - minTokenLength = atoi(value); - if ( minTokenLength < 1 || minTokenLength > 64 ) { + errno = 0; + minTokenLength = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || minTokenLength < 1 || minTokenLength > 64 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password minimum token length \"%s\" is invalid. " "The minimum token length must range from 1 to 64.", @@ -1647,15 +1709,20 @@ int config_set_pw_maxfailure( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxFailure = 0; + int retVal = LDAP_SUCCESS; + long maxFailure = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxFailure = atoi(value); - if ( maxFailure <= 0 || maxFailure > 32767 ) { + errno = 0; + maxFailure = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || maxFailure <= 0 || maxFailure > 32767 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password maximum retry \"%s\" is invalid. " "Password maximum failure must range from 1 to 32767", @@ -1679,15 +1746,20 @@ int config_set_pw_inhistory( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, history = 0; + int retVal = LDAP_SUCCESS; + long history = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - history = atoi(value); - if ( history < 2 || history > 24 ) { + errno = 0; + history = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || history < 2 || history > 24 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password history length \"%s\" is invalid. " "The password history must range from 2 to 24", @@ -1712,16 +1784,19 @@ config_set_pw_lockduration( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long duration = 0; /* in minutes */ + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - duration = strtol (value, NULL, 0); + duration = strtol(value, &endp, 10); - if ( duration <= 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + if ( *endp != '\0' || errno == ERANGE || duration <= 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password lockout duration \"%s\" seconds is invalid. ", value ); @@ -1741,15 +1816,19 @@ config_set_pw_resetfailurecount( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long duration = 0; /* in minutes */ + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - duration = strtol (value, NULL, 0); - if ( duration < 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + duration = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || duration < 0 || duration > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "password reset count duration \"%s\" seconds is invalid. ", value ); @@ -1824,18 +1903,22 @@ int config_set_pw_gracelimit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, gracelimit = 0; + int retVal = LDAP_SUCCESS; + long gracelimit = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - - gracelimit = atoi(value); - if ( gracelimit < 0 ) { + errno = 0; + gracelimit = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || gracelimit < 0 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password grace limit \"%s\" is invalid.", - value ); + "password grace limit \"%s\" is invalid, password grace limit must range from 0 to %ld", + value , LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2296,17 +2379,21 @@ int config_set_threadnumber( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, threadnum = 0; + int retVal = LDAP_SUCCESS; + long threadnum = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - threadnum = atoi ( value ); + errno = 0; + threadnum = strtol(value, &endp, 10); - if ( threadnum < 1 || threadnum > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum thread number must range from 1 to 65535", attrname, threadnum ); + if ( *endp != '\0' || errno == ERANGE || threadnum < 1 || threadnum > 65535 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum thread number must range from 1 to 65535", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } @@ -2321,17 +2408,21 @@ int config_set_maxthreadsperconn( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, maxthreadnum = 0; + int retVal = LDAP_SUCCESS; + long maxthreadnum = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - maxthreadnum = atoi ( value ); + errno = 0; + maxthreadnum = strtol(value, &endp, 10); - if ( maxthreadnum < 1 || maxthreadnum > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum thread number per connection must range from 1 to 65535", attrname, maxthreadnum ); + if ( *endp != '\0' || errno == ERANGE || maxthreadnum < 1 || maxthreadnum > 65535 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum thread number per connection must range from 1 to 65535", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } @@ -2348,29 +2439,34 @@ #include int config_set_maxdescriptors( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; int maxVal = 65535; struct rlimit rlp; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { - maxVal = (int)rlp.rlim_max; + maxVal = (int)rlp.rlim_max; } - - if ( nValue < 1 || nValue > maxVal ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, maximum file descriptors must range from 1 to %d (the current process limit)", - attrname, nValue, maxVal ); - if ( nValue < 1 ) { - retVal = LDAP_OPERATIONS_ERROR; - } else { - nValue = maxVal; - retVal = LDAP_UNWILLING_TO_PERFORM; - } + + errno = 0; + nValue = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", maximum file descriptors must range from 1 to %d (the current process limit)", + attrname, value, maxVal ); + if ( nValue > maxVal ) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } if (apply) { @@ -2385,8 +2481,10 @@ int config_set_conntablesize( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; int maxVal = 65535; + char *endp = NULL; #ifndef _WIN32 struct rlimit rlp; #endif @@ -2396,27 +2494,31 @@ return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); +#ifndef _WIN32 + if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { + maxVal = (int)rlp.rlim_max; + } +#endif + + errno = 0; + nValue = strtol(value, &endp, 0); #ifdef _WIN32 - if ( nValue < 1 || nValue > 0xfffffe ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, connection table size must range from 1 to 0xfffffe", attrname, nValue ); + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > 0xfffffe ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", connection table size must range from 1 to 0xfffffe", attrname, value ); retVal = LDAP_OPERATIONS_ERROR; } #elif !defined(AIX) - if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { - maxVal = (int)rlp.rlim_max; - } - if ( nValue < 1 || nValue > maxVal ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, connection table size must range from 1 to %d (the current process maxdescriptors limit)", - attrname, nValue, maxVal ); - if ( nValue < 1 ) { - retVal = LDAP_OPERATIONS_ERROR; - } else { - nValue = maxVal; - retVal = LDAP_UNWILLING_TO_PERFORM; - } + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", connection table size must range from 1 to %d" + " (the current process maxdescriptors limit)", attrname, value, maxVal ); + if ( nValue > maxVal) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } #endif @@ -2431,18 +2533,38 @@ int config_set_reservedescriptors( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + int maxVal = 65535; + long nValue = 0; + char *endp = NULL; +#ifndef _WIN32 + struct rlimit rlp; +#endif + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); +#ifndef _WIN32 + if ( 0 == getrlimit( RLIMIT_NOFILE, &rlp ) ) { + maxVal = (int)rlp.rlim_max; + } +#endif + + errno = 0; + nValue = strtol(value, &endp, 10); - if ( nValue < 1 || nValue > 65535 ) { - PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value %d, reserved file descriptors must range from 1 to 65535", attrname, nValue ); - retVal = LDAP_OPERATIONS_ERROR; + if ( *endp != '\0' || errno == ERANGE || nValue < 1 || nValue > maxVal ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", reserved file descriptors must range from 1 to %d" + " (the current process maxdescriptors limit)", attrname, value, maxVal ); + if ( nValue > maxVal) { + nValue = maxVal; + retVal = LDAP_UNWILLING_TO_PERFORM; + } else { + retVal = LDAP_OPERATIONS_ERROR; + } } if (apply) { @@ -2458,14 +2580,25 @@ int config_set_ioblocktimeout( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nValue < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", I/O block timeout must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } #if defined(IRIX) /* on IRIX poll can only handle timeouts up to @@ -2489,14 +2622,25 @@ int config_set_idletimeout( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); + + if (*endp != '\0' || errno == ERANGE || nValue < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: invalid value \"%s\", idle timeout must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -2511,19 +2655,25 @@ int config_set_groupevalnestlevel( const char *attrname, char * value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nValue = 0; + int retVal = LDAP_SUCCESS; + long nValue = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 0 )) { return LDAP_OPERATIONS_ERROR; } - nValue = atoi ( value ); + errno = 0; + nValue = strtol(value, &endp, 10); - if ( nValue < 1 ) { + if ( *endp != '\0' || errno == ERANGE || nValue < 0 || nValue > 5 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: invalid value %d, must be a positive number", - attrname, nValue ); + "%s: invalid value \"%s\", group eval nest level must range from 0 to 5", + attrname, value ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; } if (apply) { CFG_LOCK_WRITE(slapdFrontendConfig); @@ -2571,7 +2721,9 @@ int config_set_timelimit( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, nVal = 0; + int retVal = LDAP_SUCCESS; + long nVal = 0; + char *endp = NULL; slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); Slapi_Backend *be = NULL; char *cookie; @@ -2582,10 +2734,15 @@ return LDAP_OPERATIONS_ERROR; } - nVal = atoi(value); - if ( nVal < 0 ) { + errno = 0; + nVal = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || nVal < 0 ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "%s: invalid value %d", attrname, nVal ); + "%s: invalid value \"%s\", time limit must range from 0 to %ld", + attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; } if ( apply ) { @@ -2699,22 +2856,27 @@ } return retVal; } + int config_set_pw_maxage( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long age; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* age in seconds */ - age = strtol(value, NULL, 0 ); - if ( age <= 0 || age > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { + age = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || age <= 0 || age > (MAX_ALLOWED_TIME_IN_SECS - current_time()) ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password maximum age \"%s\" seconds is invalid. ", - value ); + "%s: password maximum age \"%s\" seconds is invalid. ", + attrname, value ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2736,6 +2898,7 @@ return LDAP_OPERATIONS_ERROR; } + errno = 0; /* age in seconds */ age = strtol(value, &endPtr, 0 ); /* endPtr should never be NULL, but we check just in case; if the @@ -2750,10 +2913,11 @@ */ if ( (age < 0) || (age > (MAX_ALLOWED_TIME_IN_SECS - current_time())) || - (endPtr == NULL) || (endPtr == value) || !isdigit(*(endPtr-1)) ) { + (endPtr == NULL) || (endPtr == value) || !isdigit(*(endPtr-1)) || + errno == ERANGE ) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password minimum age \"%s\" seconds is invalid. ", - value ); + "%s: password minimum age \"%s\" seconds is invalid. ", + attrname, value ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2768,19 +2932,23 @@ config_set_pw_warning( const char *attrname, char *value, char *errorbuf, int apply ) { int retVal = LDAP_SUCCESS; long sec; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + errno = 0; /* in seconds */ - sec = strtol(value, NULL, 0); - if (sec < 0) { + sec = strtol(value, &endp, 10); + + if (*endp != '\0' || errno == ERANGE || sec < 0) { PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, - "password warning age \"%s\" seconds is invalid, password warning " - "age must be >= 0 seconds", - value ); + "%s: password warning age \"%s\" seconds is invalid, password warning " + "age must range from 0 to %ld seconds", + attrname, value, LONG_MAX ); retVal = LDAP_OPERATIONS_ERROR; return retVal; } @@ -2795,16 +2963,28 @@ int config_set_errorlog_level( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, level = 0; + int retVal = LDAP_SUCCESS; + long level = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + level = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || level < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: error log level \"%s\" is invalid," + " error log level must range from 0 to %ld", attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if ( apply ) { CFG_LOCK_WRITE(slapdFrontendConfig); - level = atoi ( value ); level |= LDAP_DEBUG_ANY; #ifdef _WIN32 @@ -2821,16 +3001,28 @@ int config_set_accesslog_level( const char *attrname, char *value, char *errorbuf, int apply ) { - int retVal = LDAP_SUCCESS, level = 0; + int retVal = LDAP_SUCCESS; + long level = 0; + char *endp = NULL; + slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig(); if ( config_value_is_null( attrname, value, errorbuf, 1 )) { return LDAP_OPERATIONS_ERROR; } + + errno = 0; + level = strtol(value, &endp, 10); + + if ( *endp != '\0' || errno == ERANGE || level < 0 ) { + PR_snprintf ( errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "%s: access log level \"%s\" is invalid," + " access log level must range from 0 to %ld", attrname, value, LONG_MAX ); + retVal = LDAP_OPERATIONS_ERROR; + return retVal; + } if ( apply ) { CFG_LOCK_WRITE(slapdFrontendConfig); - level = atoi ( value ); g_set_accesslog_level ( level ); slapdFrontendConfig->accessloglevel = level; CFG_UNLOCK_WRITE(slapdFrontendConfig); From fedora-directory-commits at redhat.com Wed Feb 15 21:22:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 16:22:53 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd passwd_extop.c, 1.6, 1.7 Message-ID: <200602152122.k1FLMrGt024737@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24719 Modified Files: passwd_extop.c Log Message: Bug(s) fixed: 181587 Bug Description: Password Modify LDAPv3 extended operation erroneously forces the client to supply old password Reviewed by: Pete & Nathan (Thanks!) Fix Description: If the BIND operation was successful, the CONN_DN field is always set to the proper DN. This is even the case during a SASL or client cert DN if the authentication was successful AND the given identity could be mapped to a real user in the directory. Also, the authmethod will be something other than NULL or none. So, if the old password was not given, that is ok if there is a non-anonymous bind DN and a real authmethod. The rest of the operation passes through the usual access control. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: passwd_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- passwd_extop.c 19 Apr 2005 22:07:36 -0000 1.6 +++ passwd_extop.c 15 Feb 2006 21:22:46 -0000 1.7 @@ -201,6 +201,7 @@ { char *oid = NULL; char *bindDN = NULL; + char *authmethod = NULL; char *dn = NULL; char *oldPasswd = NULL; char *newPasswd = NULL; @@ -297,6 +298,7 @@ { if ( ber_scanf( ber, "a", &dn) == LBER_ERROR ) { + slapi_ch_free_string(&dn); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at userID parse.\n"; @@ -313,6 +315,7 @@ { if ( ber_scanf( ber, "a", &oldPasswd ) == LBER_ERROR ) { + slapi_ch_free_string(&oldPasswd); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at oldPasswd parse.\n"; @@ -320,10 +323,6 @@ goto free_and_return; } tag = ber_peek_tag( ber, &len); - } else { - errMesg = "Current passwd must be supplied by the user.\n"; - rc = LDAP_PARAM_ERROR; - goto free_and_return; } /* identify newPasswd field by tags */ @@ -331,6 +330,7 @@ { if ( ber_scanf( ber, "a", &newPasswd ) == LBER_ERROR ) { + slapi_ch_free_string(&newPasswd); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed :{\n", 0, 0, 0 ); errMesg = "ber_scanf failed at newPasswd parse.\n"; @@ -348,12 +348,27 @@ dn, oldPasswd, newPasswd); */ - if (oldPasswd == NULL || *oldPasswd == '\0') { - /* Refuse to handle this operation because current password is not provided */ - errMesg = "Current passwd must be supplied by the user.\n"; - rc = LDAP_PARAM_ERROR; + /* Get Bind DN */ + slapi_pblock_get( pb, SLAPI_CONN_DN, &bindDN ); + + /* If the connection is bound anonymously, we must refuse to process this operation. */ + if (bindDN == NULL || *bindDN == '\0') { + /* Refuse the operation because they're bound anonymously */ + errMesg = "Anonymous Binds are not allowed.\n"; + rc = LDAP_INSUFFICIENT_ACCESS; goto free_and_return; } + + if (oldPasswd == NULL || *oldPasswd == '\0') { + /* If user is authenticated, they already gave their password during + the bind operation (or used sasl or client cert auth) */ + slapi_pblock_get(pb, SLAPI_CONN_AUTHMETHOD, &authmethod); + if (!authmethod || !strcmp(authmethod, SLAPD_AUTH_NONE)) { + errMesg = "User must be authenticated to the directory server.\n"; + rc = LDAP_INSUFFICIENT_ACCESS; + goto free_and_return; + } + } /* We don't implement password generation, so if the request implies * that they asked us to do that, we must refuse to process it */ @@ -364,22 +379,12 @@ goto free_and_return; } - /* Get Bind DN */ - slapi_pblock_get( pb, SLAPI_CONN_DN, &bindDN ); - - /* If the connection is bound anonymously, we must refuse to process this operation. */ - if (bindDN == NULL || *bindDN == '\0') { - /* Refuse the operation because they're bound anonymously */ - errMesg = "Anonymous Binds are not allowed.\n"; - rc = LDAP_INSUFFICIENT_ACCESS; - goto free_and_return; - } /* Determine the target DN for this operation */ /* Did they give us a DN ? */ if (dn == NULL || *dn == '\0') { /* Get the DN from the bind identity on this connection */ - dn = bindDN; + dn = slapi_ch_strdup(bindDN); LDAPDebug( LDAP_DEBUG_ANY, "Missing userIdentity in request, using the bind DN instead.\n", 0, 0, 0 ); @@ -433,13 +438,15 @@ * They gave us a password (old), check it against the target entry * Is the old password valid ? */ - ret = passwd_check_pwd(targetEntry, oldPasswd); - if (ret) { - /* No, then we fail this operation */ - errMesg = "Invalid oldPasswd value.\n"; - rc = ret; - goto free_and_return; - } + if (oldPasswd && *oldPasswd) { + ret = passwd_check_pwd(targetEntry, oldPasswd); + if (ret) { + /* No, then we fail this operation */ + errMesg = "Invalid oldPasswd value.\n"; + rc = ret; + goto free_and_return; + } + } /* Now we're ready to make actual password change */ @@ -455,7 +462,17 @@ /* Free anything that we allocated above */ free_and_return: - + + slapi_ch_free_string(&oldPasswd); + slapi_ch_free_string(&newPasswd); + /* Either this is the same pointer that we allocated and set above, + or whoever used it should have freed it and allocated a new + value that we need to free here */ + slapi_pblock_get( pb, SLAPI_ORIGINAL_TARGET, &dn ); + slapi_ch_free_string(&dn); + slapi_pblock_set( pb, SLAPI_ORIGINAL_TARGET, NULL ); + slapi_ch_free_string(&authmethod); + if ( targetEntry != NULL ){ slapi_entry_free (targetEntry); } @@ -465,9 +482,8 @@ ber = NULL; } - slapi_log_error( SLAPI_LOG_PLUGIN, "passwd_modify_extop", - errMesg ); + errMesg ? errMesg : "success" ); send_ldap_result( pb, rc, NULL, errMesg, 0, NULL ); From fedora-directory-commits at redhat.com Wed Feb 15 21:32:51 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:51 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.4.2.2, 1.4.2.3 testdatainterop.c, 1.4.2.2, 1.4.2.3 testentry.c, 1.4.2.2, 1.4.2.3 testextendedop.c, 1.4.2.2, 1.4.2.3 testgetip.c, 1.4.2.2, 1.4.2.3 testpostop.c, 1.4.2.2, 1.4.2.3 testpreop.c, 1.4.2.3, 1.4.2.4 testsaslbind.c, 1.6.2.2, 1.6.2.3 Message-ID: <200602152132.k1FLWp7Y024998@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/servers/slapd/test-plugins Modified Files: Tag: Directory71RtmBranch testbind.c testdatainterop.c testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testbind.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testbind.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -69,7 +69,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "7.1 SP2", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testdatainterop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testdatainterop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP1", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "7.1 SP2", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testentry.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testentry.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -90,7 +90,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "7.1 SP2", "sample entry modification plugin" }; /* Entry store plug-in function */ Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testextendedop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testextendedop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "7.1 SP2", "sample extended operation plugin" }; Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testgetip.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testgetip.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "7.1 SP2", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- testpostop.c 31 Aug 2005 21:41:24 -0000 1.4.2.2 +++ testpostop.c 15 Feb 2006 21:32:43 -0000 1.4.2.3 @@ -93,7 +93,7 @@ static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "7.1 SP2", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -r1.4.2.3 -r1.4.2.4 --- testpreop.c 31 Aug 2005 21:41:24 -0000 1.4.2.3 +++ testpreop.c 15 Feb 2006 21:32:43 -0000 1.4.2.4 @@ -79,7 +79,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "7.1 SP2", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- testsaslbind.c 31 Aug 2005 21:41:24 -0000 1.6.2.2 +++ testsaslbind.c 15 Feb 2006 21:32:43 -0000 1.6.2.3 @@ -80,7 +80,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP1", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "7.1 SP2", "sample SASL bind pre-operation plugin" }; From fedora-directory-commits at redhat.com Wed Feb 15 21:32:23 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:23 -0500 Subject: [Fedora-directory-commits] ldapserver component_versions.mk, 1.35.2.2, 1.35.2.3 components.mk, 1.30, 1.30.2.1 internal_comp_deps.mk, 1.24, 1.24.2.1 ldapserver.spec.tmpl, 1.10.2.7, 1.10.2.8 nsdefs.mk, 1.11.2.2, 1.11.2.3 Message-ID: <200602152132.k1FLWrU2025007@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857 Modified Files: Tag: Directory71RtmBranch component_versions.mk components.mk internal_comp_deps.mk ldapserver.spec.tmpl nsdefs.mk Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.35.2.2 retrieving revision 1.35.2.3 diff -u -r1.35.2.2 -r1.35.2.3 --- component_versions.mk 22 Oct 2005 00:07:40 -0000 1.35.2.2 +++ component_versions.mk 15 Feb 2006 21:32:16 -0000 1.35.2.3 @@ -81,7 +81,7 @@ # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.16 + LDAP_RELDATE = v5.17 endif ifndef LDAPCOMP_DIR LDAPCOMP_DIR=ldapsdk50 Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -r1.30 -r1.30.2.1 --- components.mk 16 May 2005 21:58:00 -0000 1.30 +++ components.mk 15 Feb 2006 21:32:16 -0000 1.30.2.1 @@ -296,13 +296,15 @@ else LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib LDAPSDK_INCDIR = $(LDAP_ROOT)/include - LDAPSDK_BINPATH = $(LDAP_ROOT)/tools + LDAPSDK_BINPATH = $(LDAP_ROOT)/bin endif LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR) # package the command line programs -LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX)) -BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS) +LDAPSDK_BINNAMES = ldapcmp ldapcompare ldapdelete ldapmodify ldapsearch +LDAPSDK_TOOLS = $(addsuffix $(EXE_SUFFIX),$(LDAPSDK_BINNAMES)) +LDAPSDK_TOOLS_FULLPATH = $(addprefix $(LDAPSDK_BINPATH)/, $(LDAPSDK_TOOLS)) +BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS_FULLPATH) # package the include files - needed for the plugin API LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h) PACKAGE_SRC_DEST += $(subst $(SPACE),$(SPACE)plugins/slapd/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES)) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -u -r1.24 -r1.24.2.1 --- internal_comp_deps.mk 18 May 2005 13:38:57 -0000 1.24 +++ internal_comp_deps.mk 15 Feb 2006 21:32:16 -0000 1.24.2.1 @@ -236,7 +236,7 @@ mkdir -p $(LDAP_LIBPATH) $(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \ -objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \ - -files include,$(LDAPSDK_PULL_LIBS),tools + -files include,$(LDAPSDK_PULL_LIBS),bin endif - at if [ ! -f $@ ] ; \ then echo "Error: could not get component LDAPSDK file $@" ; \ Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.10.2.7 retrieving revision 1.10.2.8 diff -u -r1.10.2.7 -r1.10.2.8 --- ldapserver.spec.tmpl 14 Oct 2005 17:32:46 -0000 1.10.2.7 +++ ldapserver.spec.tmpl 15 Feb 2006 21:32:16 -0000 1.10.2.8 @@ -45,7 +45,7 @@ Summary: @COMPANY-PRODUCT-NAME@ Name: @LCASE-COMPANY-NAME-NOSP at -ds Version: @GEN-VERSION@ -Release: 3. at PLATFORM@ +Release: 4. at PLATFORM@ License: GPL plus extensions Group: System Environment/Daemons URL: @COMPANY-URL@ Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -r1.11.2.2 -r1.11.2.3 --- nsdefs.mk 10 Sep 2005 00:41:45 -0000 1.11.2.2 +++ nsdefs.mk 15 Feb 2006 21:32:16 -0000 1.11.2.3 @@ -265,8 +265,8 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=7.1 SP1 -NOSP_DIR_VERSION:=7.1SP1 +DIR_VERSION:=7.1 SP2 +NOSP_DIR_VERSION:=7.1SP2 DIR_NORM_VERSION:=7.1 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must From fedora-directory-commits at redhat.com Wed Feb 15 21:32:29 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:29 -0500 Subject: [Fedora-directory-commits] ldapserver/include version.h, 1.6.2.1, 1.6.2.2 Message-ID: <200602152132.k1FLWx8T025012@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/include Modified Files: Tag: Directory71RtmBranch version.h Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- version.h 31 Aug 2005 21:40:48 -0000 1.6.2.1 +++ version.h 15 Feb 2006 21:32:21 -0000 1.6.2.2 @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "7.1 SP1" +#define DIRECTORY_VERSION_DEF "7.1 SP2" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1 SP2" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING From fedora-directory-commits at redhat.com Wed Feb 15 21:32:40 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:40 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst setup.patch, 1.1.2.6, 1.1.2.7 slapd-patch.inf, 1.1.2.2, 1.1.2.3 Message-ID: <200602152133.k1FLXA8l025027@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm/newinst Modified Files: Tag: Directory71RtmBranch setup.patch slapd-patch.inf Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file setup.patch: Index: setup.patch =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- setup.patch 17 Nov 2005 23:29:42 -0000 1.1.2.6 +++ setup.patch 15 Feb 2006 21:32:32 -0000 1.1.2.7 @@ -73,8 +73,12 @@ echo "" echo "To accept the default shown in brackets, press the Enter key." echo "" -printf "Install location [/opt/fedora/servers]: " +defaultserverroot=/opt/fedora-ds +printf "Install location [$defaultserverroot]: " read serverroot +if [ "$serverroot" = "" ]; then + serverroot=$defaultserverroot +fi if [ ! -d $serverroot ]; then echo "" @@ -243,10 +247,10 @@ echo "ConfigDirectoryAdminID= $adminid" >> $inffile echo "AdminDomain= $admindomain" >> $inffile echo "ConfigDirectoryAdminPwd= $siepasswd" >> $inffile -echo "Components= slapd-71sp1" >> $inffile +echo "Components= slapd-71sp2" >> $inffile echo "" >> $inffile -echo "[slapd-71sp1]" >> $inffile -echo "Components= slapd-71sp1" >> $inffile +echo "[slapd-71sp2]" >> $inffile +echo "Components= slapd-71sp2" >> $inffile clear Index: slapd-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd-patch.inf,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- slapd-patch.inf 16 Sep 2005 20:01:26 -0000 1.1.2.2 +++ slapd-patch.inf 15 Feb 2006 21:32:32 -0000 1.1.2.3 @@ -38,17 +38,17 @@ # [General] Name= %%%SERVER_NAME%%% -Components=slapd-71sp1 +Components=slapd-71sp2 -[slapd-71sp1] +[slapd-71sp2] Name= %%%SERVER_NAME%%% InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%% Description= %%%SERVER_NAME%%% -NickName= slapd-71sp1 +NickName= slapd-71sp2 Version= %%%SERVER_VERSION%%% BuildNumber= %%%SERVER_BUILD_NUM%%% -Archive= nsslapd-71sp1.zip -SourcePath=slapd-71sp1 +Archive= nsslapd-71sp2.zip +SourcePath=slapd-71sp2 PreInstall= ns-config -r PostInstall= bin/slapd/admin/bin/ns-update PreUninstall= bin/slapd/admin/bin/uninstall From fedora-directory-commits at redhat.com Wed Feb 15 21:32:34 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:34 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.12, 1.30.2.13 fedora-patch.inf, 1.1.2.6, 1.1.2.7 genRpmPatch.pl, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.6, 1.1.2.7 Message-ID: <200602152133.k1FLX5bY025020@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm Modified Files: Tag: Directory71RtmBranch Makefile fedora-patch.inf genRpmPatch.pl redhat-patch.inf Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.12 retrieving revision 1.30.2.13 diff -u -r1.30.2.12 -r1.30.2.13 --- Makefile 22 Oct 2005 07:00:03 -0000 1.30.2.12 +++ Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13 @@ -106,9 +106,9 @@ endif ifdef USE_64 -VERSION=-ver 7.1SP1-64bit +VERSION=-ver 7.1SP2-64bit else -VERSION=-ver 7.1SP1 +VERSION=-ver 7.1SP2 endif ifeq ($(ARCH), HPUX) @@ -191,9 +191,6 @@ SHARETOP = $(COMPONENTS_DIR)/ldapsdk BUILD_DATE = $(shell date +%Y%m%d) SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR) -#ADM_VERSDIR = admserv40 -#ADM_RELDATE = untested/19980119 -#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32) IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME) # these are files and directories in the import adminsrv directory which we don't # make a local copy of, we just import directly into the tar file or create a @@ -235,7 +232,7 @@ ifdef BUILD_PATCH PATCHINSTDIR = $(ABS_INSTDIR)-SP -SLAPDSP = slapd-71sp1 +SLAPDSP = slapd-71sp2 endif INST_TARGET_RESKIT=$(INSTDIR)/reskit @@ -271,7 +268,7 @@ ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=7.1SP1 + RPM_VERSION=7.1SP2 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files @@ -655,21 +652,6 @@ endif endif -ifdef BUILD_PATCH -# take care of files in components (e.g., a file in nsadmin.zip) - - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ - zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ - afile=`echo $$pair | awk -F: '{print $$2}'` ; \ - cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ - done -ifdef BUILD_RPM -# create a patch - $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v - mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original - ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) -endif -endif - # create the slapd-client.zip file, which only has the ds jar file for the console and # the ldap client utility programs rm -f $(INSTDIR)/slapd/slapd-client.zip @@ -730,6 +712,26 @@ $(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \ fi +ifdef BUILD_PATCH +# copying a file from the component area + - at for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \ + zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \ + sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ + dfile=`echo $$pair | awk -F: '{print $$3}'` ; \ + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \ + mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \ + echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ + $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ + done + +ifdef BUILD_RPM +# create a patch + $(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v + mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original + ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) +endif #BUILD_RPM +endif #BUILD_PATCH + # we must remove the nsbase.zip file - we package those files now rm -f $(INSTDIR)/base/nsbase.zip # we also need to remove the Archive directive from the [base] section of the @@ -831,6 +833,7 @@ # create a zip file based upon the $(PATCHINF) file cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'` cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` # put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP) - at for file in $(PACKAGE_SETUP_LIBS_32) ; \ @@ -842,6 +845,7 @@ cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2 echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2 Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6 +++ fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 @@ -36,17 +36,17 @@ # All rights reserved. # END COPYRIGHT BLOCK # -# Info file to generate DS7.1 SP1 patch +# Info file to generate DS7.1 SP2 patch # base: containing the base package -- DS7.1 # file: bug#: # compfile: bug#: : # %DISTDIR% points /dist/ # -base: /share/dev4/fedora-ds/fds71/ships/20050526.1 +base: ... file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.* @@ -60,5 +60,26 @@ file: 169388,169954,170071,170350: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt +file: M324525,M324529: shared/lib/libldap50.so +file: M324525,M324529: shared/lib/libprldap50.so +file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: bin/slapd/lib/libldap50.so +file: M324525,M324529: bin/slapd/lib/libprldap50.so +file: M324525,M324529: bin/slapd/lib/libssldap50.so +file: M324525,M324529: clients/lib/libldap50.so +file: M324525,M324529: clients/lib/libprldap50.so +file: M324525,M324529: clients/lib/libssldap50.so +file: M324525,M324529: shared/bin/ldapcmp +file: M324525,M324529: shared/bin/ldapcompare +file: M324525,M324529: shared/bin/ldapdelete +file: M324525,M324529: shared/bin/ldapmodify +file: M324525,M324529: shared/bin/ldapsearch + +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so +copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help Index: genRpmPatch.pl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3 +++ genRpmPatch.pl 15 Feb 2006 21:32:27 -0000 1.1.2.4 @@ -129,16 +129,11 @@ $pos = rindex($l, ":", $pos); $pos++; $file = substr($l, $pos); - $file =~ s/[ ]//g; - push(@newfiles, ($file)); - } elsif ($l =~ /^compfile: /) { - $pos = rindex($l, ":", $pos); - $pos++; - $file = substr($l, $pos); - $file =~ s/[ ]//g; + $file =~ s/[ ]//g; push(@newfiles, ($file)); } } +close(INFFILE); if (1 == $verbose) { print "Base: $basedir\n"; print "New Files:\n"; Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6 +++ redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 @@ -36,17 +36,17 @@ # All rights reserved. # END COPYRIGHT BLOCK # -# Info file to generate DS7.1 SP1 patch +# Info file to generate DS7.1 SP2 patch # base: containing the base package -- DS7.1 # file: bug#: # compfile: bug#: : # %DISTDIR% points /dist/ # -base: /share/dev4/ds/ds71/ships/20050524.1 +base: /share/builds/products/server/directry/7.1 file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* file: 151678: bin/slapd/admin/bin/ds_newinst file: 151678: bin/slapd/admin/bin/ds_create file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.* @@ -60,5 +60,26 @@ file: 169388,169954,170071,170350: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt +file: M324525,M324529: shared/lib/libldap50.so +file: M324525,M324529: shared/lib/libprldap50.so +file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: shared/bin/ldapcmp +file: M324525,M324529: shared/bin/ldapcompare +file: M324525,M324529: shared/bin/ldapdelete +file: M324525,M324529: shared/bin/ldapmodify +file: M324525,M324529: shared/bin/ldapsearch +file: M324525,M324529: bin/slapd/lib/libldap50.so +file: M324525,M324529: bin/slapd/lib/libprldap50.so +file: M324525,M324529: bin/slapd/lib/libssldap50.so +file: M324525,M324529: clients/lib/libldap50.so +file: M324525,M324529: clients/lib/libprldap50.so +file: M324525,M324529: clients/lib/libssldap50.so + +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help From fedora-directory-commits at redhat.com Wed Feb 15 21:32:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 16:32:45 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/docs README.txt, 1.2.2.2, 1.2.2.3 Message-ID: <200602152133.k1FLXGog025031@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/docs Modified Files: Tag: Directory71RtmBranch README.txt Log Message: [181582] Directory Server 7.1 SP2 packaging Changes: 1) SP1 -> SP2 2) LDAPCSDK v5.16 -> v5.17 3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm -> redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm 4) modified makefile/script to support copying a component file Index: README.txt =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- README.txt 12 Sep 2005 18:13:40 -0000 1.2.2.2 +++ README.txt 15 Feb 2006 21:32:38 -0000 1.2.2.3 @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 7.1 SP1 + Fedora Directory Server 7.1 SP2 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the From fedora-directory-commits at redhat.com Wed Feb 15 22:50:23 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:50:23 -0500 Subject: [Fedora-directory-commits] adminutil buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8 Message-ID: <200602152250.k1FMoNpr027572@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27551/adminutil Modified Files: buildpaths.mk internal_comp_deps.mk nsconfig.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- buildpaths.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1 +++ buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2 @@ -57,10 +57,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- internal_comp_deps.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1 +++ internal_comp_deps.mk 15 Feb 2006 22:50:15 -0000 1.2 @@ -146,7 +146,7 @@ # LDAP does not have PTH version, so here is the hack which treat non PTH # version as PTH version ifeq ($(USE_PTHREADS), 1) - LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1) + LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME) else LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsconfig.mk 28 Jan 2006 02:29:52 -0000 1.7 +++ nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8 @@ -39,8 +39,12 @@ NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + # if it's x86_64, just leave it - otherwise, convert iX86 to just x86 + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -56,12 +60,11 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 - endif - ifeq ($(USE_64), 1) - NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG) - NSOS_TEST1 := $(NSOS_TEST2) + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + # if it's x86_64, just leave it - otherwise, convert iX86 to just x86 + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -84,6 +87,9 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif +# add _64 tag on all platforms except linux/rhel + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -469,17 +475,13 @@ NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) endif else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ endif # platforms without full rtl debugging versions of libraries i.e. not NT NSCP_DIST := $(ABS_ROOT_PARENT)/dist From fedora-directory-commits at redhat.com Wed Feb 15 22:51:08 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:51:08 -0500 Subject: [Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6 Message-ID: <200602152251.k1FMp8Lu027601@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578/setuputil Modified Files: buildpaths.mk nsconfig.mk nsdefs.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- buildpaths.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ buildpaths.mk 15 Feb 2006 22:51:00 -0000 1.2 @@ -58,10 +58,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsconfig.mk 1 Feb 2006 22:46:18 -0000 1.6 +++ nsconfig.mk 15 Feb 2006 22:51:00 -0000 1.7 @@ -47,37 +47,21 @@ endif ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - ifeq (x86, $(findstring x86, $(NSOS_TEST1))) - NSOS_TMP := $(NSOS_TEST1) - else - NSOS_TMP := x86 - endif - else - NSOS_TMP := $(NSOS_TEST1) - endif ifeq ($(USE_LIBC),1) LIBC_VERSION = _libc else LIBC_VERSION = _glibc endif PTHREAD_TAG = _PTH - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)$(LIBC_VERSION)$(PTHREAD_TAG) NSCONFIG_NOTAG = $(NSCONFIG) - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ else ifeq ($(NSOS_ARCH),RHEL) - NSOS_TMP = $(NSOS_TEST1) - ifeq (86,$(findstring 86,$(NSOS_TMP))) - ifeq (x86, $(findstring x86, $(NSOS_TEST1))) - NSOS_TMP := $(NSOS_TEST1) - else - NSOS_TMP := x86 - endif - endif PTHREAD_TAG = - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) + NSOBJDIR_NAME = $(NSCONFIG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ else ifeq ($(NSOS_TEST1),i86pc) NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) @@ -95,8 +79,8 @@ NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJD endif endif + NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ endif - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ endif MAKE=gmake $(BUILDOPT) USE_PTHREADS=$(USE_PTHREADS) SECURITY=$(SECURITY) MOZILLA_SOURCE_ROOT_EXT=$(MOZILLA_SOURCE_ROOT_EXT) @@ -509,18 +493,12 @@ NSOBJDIR_NAME = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ NSOBJDIR_NAME_32 = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) endif NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) endif # platforms without full rtl debugging versions of libraries i.e. not NT NSCP_DIST := $(ABS_ROOT_PARENT)/dist Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nsdefs.mk 28 Jan 2006 02:33:14 -0000 1.5 +++ nsdefs.mk 15 Feb 2006 22:51:00 -0000 1.6 @@ -182,13 +182,15 @@ NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') endif endif + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE) +else + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) endif ifdef BUILD_INTL INTL_DEF=-intl endif -NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG) PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST) From fedora-directory-commits at redhat.com Wed Feb 15 22:53:10 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:53:10 -0500 Subject: [Fedora-directory-commits] adminserver buildpaths.mk, 1.5, 1.6 nsconfig.mk, 1.23, 1.24 nsdefs.mk, 1.9, 1.10 Message-ID: <200602152253.k1FMrBUh027637@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/adminserver Modified Files: buildpaths.mk nsconfig.mk nsdefs.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5 +++ buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6 @@ -53,10 +53,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23 +++ nsconfig.mk 15 Feb 2006 22:53:03 -0000 1.24 @@ -47,9 +47,13 @@ NSOS_TEST1 := $(shell uname -m) -ifeq (86, $(findstring 86, $(NSOS_TEST1))) - CPU_ARCH := x86 -else +ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86, $(findstring 86, $(NSOS_TEST1))) + CPU_ARCH := x86 + else + CPU_ARCH := $(NSOS_TEST1) + endif +else CPU_ARCH := $(NSOS_TEST1) endif Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9 +++ nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10 @@ -180,6 +180,9 @@ GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//')) endif endif + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE) +else + NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG) endif ifdef BUILD_INTL From fedora-directory-commits at redhat.com Wed Feb 15 22:54:15 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:54:15 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_replica.c, 1.11, 1.12 Message-ID: <200602152254.k1FMsFli027735@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/servers/plugins/replication Modified Files: repl5_replica.c Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: repl5_replica.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_replica.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- repl5_replica.c 19 Apr 2005 22:07:32 -0000 1.11 +++ repl5_replica.c 15 Feb 2006 22:54:07 -0000 1.12 @@ -108,9 +108,9 @@ static char * _replica_get_config_dn (const Slapi_DN *root); static char * _replica_type_as_string (const Replica *r); /* DBDB, I think this is probably bogus : */ -int replica_create_ruv_tombstone(Replica *r); -void assign_csn_callback(const CSN *csn, void *data); -void abort_csn_callback(const CSN *csn, void *data); +static int replica_create_ruv_tombstone(Replica *r); +static void assign_csn_callback(const CSN *csn, void *data); +static void abort_csn_callback(const CSN *csn, void *data); static void eq_cb_reap_tombstones(time_t when, void *arg); static CSN *_replica_get_purge_csn_nolock (const Replica *r); static void replica_get_referrals_nolock (const Replica *r, char ***referrals); From fedora-directory-commits at redhat.com Wed Feb 15 22:53:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:53:53 -0500 Subject: [Fedora-directory-commits] ldapserver buildpaths.mk, 1.10, 1.11 nsarch, 1.6, 1.7 nsconfig.mk, 1.17, 1.18 Message-ID: <200602152254.k1FMsNP6027743@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver Modified Files: buildpaths.mk nsarch nsconfig.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- buildpaths.mk 10 Feb 2006 23:21:43 -0000 1.10 +++ buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11 @@ -71,10 +71,10 @@ # subdir of mozilla/dist, and their naming convention is different than # ours - we need to map ours to theirs ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) endif Index: nsarch =================================================================== RCS file: /cvs/dirsec/ldapserver/nsarch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nsarch 19 Apr 2005 22:06:42 -0000 1.6 +++ nsarch 15 Feb 2006 22:53:45 -0000 1.7 @@ -607,6 +607,16 @@ fi ns_printf exit 0 + elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_x86_64"; then + #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 + GNU_NAME="${UNAME_MACHINE}-unknown-linux" + NS_NAME="${UNAME_SYSTEM}" + NS_RELEASE="${UNAME_RELEASE}" + if echo "$NS_RELEASE" | grep >/dev/null 2>&1 "2.0."; then + NS_RELEASE="2.0" + fi + ns_printf + exit 0 elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0 GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout" Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- nsconfig.mk 16 Nov 2005 03:31:05 -0000 1.17 +++ nsconfig.mk 15 Feb 2006 22:53:45 -0000 1.18 @@ -256,8 +256,10 @@ NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -273,8 +275,10 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -297,6 +301,8 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -337,13 +343,9 @@ NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ endif else - NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1 = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEeh = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAMEaCC = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME)) + NSOBJDIR_NAME1 = $(NSOBJDIR_NAME) endif @@ -667,8 +669,8 @@ else ifeq ($(ARCH), Linux) OSVERSION := $(basename $(shell uname -r)) -CC=/usr/bin/gcc -fwritable-strings -CXX=/usr/bin/g++ -fwritable-strings +CC=/usr/bin/gcc +CXX=/usr/bin/g++ CCC=$(CXX) LD=$(CXX) ARCH_DEBUG=-g From fedora-directory-commits at redhat.com Wed Feb 15 22:53:58 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:53:58 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap Makefile, 1.11, 1.12 nsldap.mk, 1.10, 1.11 Message-ID: <200602152254.k1FMsS3h027747@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap Modified Files: Makefile nsldap.mk Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 22 Sep 2005 16:48:11 -0000 1.11 +++ Makefile 15 Feb 2006 22:53:51 -0000 1.12 @@ -62,16 +62,7 @@ cd systools; $(MAKE) $(MFLAGS) all # new unix installer ifeq ($(USE_SETUPUTIL), 1) - # passing $(OBJDIR) as ORIGINAL_OBJDIR since USE_64 info is cleaned up - # and lost in cm/newinst - cd cm/newinst; $(MAKE) $(MFLAGS) ORIGINAL_OBJDIR=$(ABS_OBJDIR) all -ifeq ($(USE_64),1) - # In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts - # get copied into the 32-bit output directory by the makefile above. However, we later want to package them and expect - # to see them in the 64-bit output directory. So, here we copy them over. - $(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR) - $(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR) -endif # USE_64 + cd cm/newinst; $(MAKE) $(MFLAGS) all endif # USE_SETUPUTIL else # not WINNT ifeq ($(USE_SETUPUTIL), 1) Index: nsldap.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/nsldap.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nsldap.mk 3 Oct 2005 19:53:46 -0000 1.10 +++ nsldap.mk 15 Feb 2006 22:53:51 -0000 1.11 @@ -1490,7 +1490,7 @@ # # compiler to use, e.g. CC=cc or CC=gcc -CC=/usr/bin/gcc -fwritable-strings +CC=/usr/bin/gcc # give full path to hostname since it may not be in user's path HOSTNAME=/bin/hostname From fedora-directory-commits at redhat.com Wed Feb 15 22:54:04 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:54:04 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.48,1.49 Message-ID: <200602152254.k1FMsYHw027750@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm Modified Files: Makefile Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Makefile 13 Feb 2006 22:25:33 -0000 1.48 +++ Makefile 15 Feb 2006 22:53:56 -0000 1.49 @@ -254,11 +254,15 @@ ZIP_FLAGS=-r -T -n .gif endif +ifeq ($(ARCH), Linux) +MAKEARCH=$(ARCH) +else ifeq ($(USE_64), 1) MAKEARCH=$(ARCH)64 else MAKEARCH=$(ARCH) endif +endif PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS)) @@ -598,7 +602,7 @@ endif # copy in our product .inf files - $(INSTALL) -m 755 $(OBJDIR_32)/*.inf $(INSTDIR)/slapd + $(INSTALL) -m 755 $(OBJDIR)/*.inf $(INSTDIR)/slapd # strip the executables in the optimized build ifeq ($(DEBUG), optimize) @@ -668,10 +672,10 @@ # do one last check for aix. aix zip doesn't like -r -T $(ZIP) -T $(INSTDIR)/slapd/ns$(DIR).zip # install the ns-config file into the slapd package directory - $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd + $(INSTALL) -m 755 $(RELDIR)/bin/slapd/admin/bin/ns-config $(INSTDIR)/slapd # if we are packaging our own version of the components, we need them during setup too - - at for file in $(PACKAGE_SETUP_LIBS_32) ; \ + - at for file in $(PACKAGE_SETUP_LIBS) ; \ do if [ -f $$file ] ; \ then $(INSTALL) -m 755 $$file $(INSTDIR)/slapd ; \ fi ; \ From fedora-directory-commits at redhat.com Wed Feb 15 22:54:09 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:54:09 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst Makefile, 1.8, 1.9 Message-ID: <200602152254.k1FMseiC027753@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver/ldap/cm/newinst Modified Files: Makefile Log Message: The correct naming convention for RHEL is RHEL4_x86_64_gcc3_OPT.OBJ The makefiles were assuming that if the string 86 was found in uname -m it should use x86 for the arch. However, it should only do this if uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the NS64TAG just before the _OPT (or _DBG) since it's already in the arch. Other platforms continue to use the other naming convention. The default naming convention for the mozilla components is Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's instructions about source builds, but that would cause many changes to be made to our makefiles, so I just changed the way we calculate the mozilla OBJDIR name from the regular OBJDIR name. These changes are pretty much the same for adminutil, setuputil, adminserver, and ldapserver. For ldapserver, I had to change nsarch (adminserver changed nsarch in a different way). I also got rid of the 32 bit specific setup stuff. I assume this was due to 32 bit NES admin server, so we can get rid of this for the future, because we will have all native 64 bit apps. I also went ahead and rolled in the gcc4 changes since they are safe for gcc3 as well. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 22 Sep 2005 16:48:16 -0000 1.8 +++ Makefile 15 Feb 2006 22:54:02 -0000 1.9 @@ -41,12 +41,6 @@ .SUFFIXES: .cc -# We do this to force a 32-bit build of this stuff, even in a 64-bit build -# (because we want to avoid various complexities inherenet in having a 64-bit -# installer rubbing shoulders with other 32-bit stuff at install time). -COMPONENT_DEPS := 1 -override USE_64= - BUILD_ROOT = ../../.. LDAP_SRC = ../.. @@ -96,7 +90,7 @@ BINS=$(addprefix $(BINDEST)/, $(PROGS)) endif INFO= $(OBJDIR)/$(DIR) -PATCHINFO= $(ORIGINAL_OBJDIR)/$(DIR) +PATCHINFO= $(ABS_OBJDIR)/$(DIR) # Source for staged installation utilities INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src From fedora-directory-commits at redhat.com Wed Feb 15 22:55:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:55:53 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.2,1.3 Message-ID: <200602152255.k1FMtrdn027791@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild/ds/ldapserver Modified Files: Makefile Log Message: Add support for x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:29:06 -0000 1.2 +++ Makefile 15 Feb 2006 22:55:46 -0000 1.3 @@ -5,7 +5,7 @@ CATEGORIES = ds # have the regular download rule download the patch rather than listing it in PATCHFILES # this is so we can override the default patch rule -MYPATCH = ldapserver-gcc4.patch +#MYPATCH = ldapserver-gcc4.patch DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH) PATCHFILES = @@ -49,7 +49,9 @@ # this is our "custom" patch target post-patch: +ifdef MYPATCH cat $(addprefix download/,$(MYPATCH)) | ( cd work/$(GARNAME)-$(GARVERSION) ; patch -p1 ) +endif $(MAKECOOKIE) configure-custom: From fedora-directory-commits at redhat.com Wed Feb 15 22:55:48 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 15 Feb 2006 17:55:48 -0500 Subject: [Fedora-directory-commits] dsbuild objdirname.mk,1.1.1.1,1.2 Message-ID: <200602152256.k1FMuIYx027794@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27759/dsbuild Modified Files: objdirname.mk Log Message: Add support for x86_64 Index: objdirname.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- objdirname.mk 10 Feb 2006 15:28:53 -0000 1.1.1.1 +++ objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2 @@ -76,10 +76,16 @@ PRETTY_ARCH := Linux endif +ifeq ($(USE_64), 1) + NS64TAG=_64 +endif + NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_ARCH),Linux) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif ifeq ($(USE_LIBC),1) @@ -95,8 +101,10 @@ NSCONFIG_NOTAG = $(NSCONFIG) else ifeq ($(NSOS_ARCH),RHEL) - ifeq (86,$(findstring 86,$(NSOS_TEST1))) - NSOS_TEST1 = x86 + ifneq (x86_64, $(NSOS_TEST1)) + ifeq (86,$(findstring 86,$(NSOS_TEST1))) + NSOS_TEST1 = x86 + endif endif NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) @@ -119,6 +127,8 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) endif endif + NSCONFIG += $(NS64TAG) + NSCONFIG_NOTAG += $(NS64TAG) endif endif @@ -132,17 +142,17 @@ OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ else - OBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ - OBJDIR_NAME_32 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ - OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ + OBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ + OBJDIR_NAME_32 = $(subst $(NS64TAG),,$(OBJDIR_NAME)) + OBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ endif # Mozilla uses a slightly different naming convention ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) else ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) else MOZ_OBJDIR_NAME = $(OBJDIR_NAME) endif From fedora-directory-commits at redhat.com Wed Feb 15 23:01:03 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 15 Feb 2006 18:01:03 -0500 Subject: [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel DSEntrySet.java, 1.1.1.1, 1.2 PasswordPolicyPanel.java, 1.1.1.1, 1.2 Message-ID: <200602152301.k1FN13XI029392@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837/panel Modified Files: DSEntrySet.java PasswordPolicyPanel.java Log Message: Bug(s) fixed: 181570 Bug Description: The UI for the new password syntax enhancements needs to be created. Reviewed by: Rich, Noriko (thanks!) Files: see diffs Branch: HEAD (directoryconsole) Fix Description: This adds input fields for the new password syntax config parameters. The new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of diffs fixes an issue where the default values when setting up a per-user or per-subtree password policy were all showing up as 0. This was due to DSEntrySet overwriting the default component values with a null string if the passwordPolicy LDAP entry did not exist. Flag Day: no Doc impact: no QA impact: Console testplan will need to be updated. New Tests integrated into TET: none Index: DSEntrySet.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DSEntrySet.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- DSEntrySet.java 18 Jul 2005 00:55:55 -0000 1.1.1.1 +++ DSEntrySet.java 15 Feb 2006 23:00:55 -0000 1.2 @@ -152,73 +152,75 @@ // collect all attribute names for this entry into an array String[] attrNames = getAttributeNames(dn); Debug.println(9, "DSEntrySet.getAttributes(): attempting to read entry " + - dn + " from the server attrNames = " + attrNames); - try { - entry = ldc.read(dn, attrNames); - } catch (LDAPException lde) { - if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT && - _allowNoEntry ) { - entry = null; - } else { - throw lde; - } - } - if ( entry == null && !_allowNoEntry ) { - Debug.println( "DSEntrySet.getAttribytes: failed to read " + - dn ); - return false; - } else { -// Debug.println( "DSEntrySet.getAttributes(): entry = " + entry ); - } + dn + " from the server attrNames = " + attrNames); + try { + entry = ldc.read(dn, attrNames); + } catch (LDAPException lde) { + if ( lde.getLDAPResultCode() == lde.NO_SUCH_OBJECT && _allowNoEntry ) { + entry = null; + } else { + throw lde; + } + } + + if ( entry == null && !_allowNoEntry ) { + Debug.println( "DSEntrySet.getAttribytes: failed to read " + dn ); + return false; + } else { + // Debug.println( "DSEntrySet.getAttributes(): entry = " + entry ); + } + + Debug.println("DSEntrySet.getAttributes(): read entry from DS:" + entry); + Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" + attrNames); - Debug.println("DSEntrySet.getAttributes(): read entry from DS:" + - entry); - Debug.println("DSEntrySet.getAttributes(): attributes for this entry:" + - attrNames); // now we have the entry; get the LDAPAttributes - boolean haveAllAttrs = true; // flag if any attribues were missing + boolean haveAllAttrs = true; // flag if any attribues were missing for (int ii = 0; ii < attrNames.length; ++ii) { String attrName = attrNames[ii]; LDAPAttribute lda = null; - if (entry != null) { - lda = entry.getAttribute(attrName); - } + if (entry != null) { + lda = entry.getAttribute(attrName); + } + if (lda == null && entry != null) { - Debug.println( "DSEntrySet.getAttributes(): failed to get " + - "attribute " + attrName + " in " + entry.getDN()); - haveAllAttrs = false; // missing at least one attr value - } + Debug.println( "DSEntrySet.getAttributes(): failed to get " + + "attribute " + attrName + " in " + entry.getDN()); + haveAllAttrs = false; // missing at least one attr value + } - // loop through all of the DSEntrys which - // correspond to this attribute name and do the - // remoteToLocal for each one - Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName); - for (int jj = 0; v != null && jj < v.size(); ++jj) { - IDSEntry dse = (IDSEntry)v.elementAt(jj); - if (lda != null) { - dse.remoteToLocal(lda.getStringValues()); - } else { - dse.remoteToLocal(""); // dummy empty value - } -// Debug.println("DSEntrySet.show(): set DSE" + -// " for attribute" + attrName + -// " to value=" + lda); -// Debug.println("DSEntrySet.show(): new val=" + -// dse); - dse.show(); - } - } - if (!haveAllAttrs) { - Debug.println("DSEntrySet.show(): some of the attributes of " + - entry.getDN() + " could not be read. Either they " + - "are not present in the entry or there is an ACI " + - "which prevents that attribute from being read. " + - "Try authenticating as a user with more access"); - if (_validate) - return false; - } - } - return true; + // loop through all of the DSEntrys which + // correspond to this attribute name and do the + // remoteToLocal for each one that was found + Vector v = (Vector)_attrNametoDSAVectorMap.get(attrName); + for (int jj = 0; v != null && jj < v.size(); ++jj) { + IDSEntry dse = (IDSEntry)v.elementAt(jj); + if (lda != null) { + Debug.println("DSEntrySet.getAttributes(): " + attrName + + " was found, setting value from entry"); + dse.remoteToLocal(lda.getStringValues()); + } + + // Debug.println("DSEntrySet.show(): set DSE" + + // " for attribute" + attrName + + // " to value=" + lda); + // Debug.println("DSEntrySet.show(): new val=" + dse); + + dse.show(); + } + } + + if (!haveAllAttrs) { + Debug.println("DSEntrySet.show(): some of the attributes of " + + entry.getDN() + " could not be read. Either they " + + "are not present in the entry or there is an ACI " + + "which prevents that attribute from being read. " + + "Try authenticating as a user with more access"); + if (_validate) + return false; + } + } + + return true; } /** Index: PasswordPolicyPanel.java =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/PasswordPolicyPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- PasswordPolicyPanel.java 18 Jul 2005 00:56:02 -0000 1.1.1.1 +++ PasswordPolicyPanel.java 15 Feb 2006 23:00:55 -0000 1.2 @@ -28,6 +28,7 @@ import com.netscape.admin.dirserv.*; import com.netscape.management.client.*; import com.netscape.management.client.util.*; +import com.netscape.management.nmclf.*; import netscape.ldap.*; import netscape.ldap.util.*; @@ -90,8 +91,7 @@ createChangeArea((Container)_myPanel); createExpirationArea((Container)_myPanel); createSyntaxArea((Container)_myPanel); - createMinLengthArea((Container)_myPanel); - createStorageArea((Container)_myPanel); + createStorageArea((Container)_myPanel); addBottomGlue (); _isInitialized = true; @@ -254,46 +254,231 @@ protected void createSyntaxArea( Container myContainer ) { _cbCheckSyntax = makeJCheckBox(_section, "check", false); - DSEntrySet entries = getDSEntrySet(); - DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax ); - entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se ); - setComponentTable(_cbCheckSyntax, se); - GridBagConstraints gbc = getGBC(); - gbc.gridwidth = gbc.REMAINDER; - gbc.anchor = gbc.WEST; - gbc.fill = gbc.NONE; - gbc.weightx = 1.0; - myContainer.add(_cbCheckSyntax, gbc); - } - - protected void createMinLengthArea( Container myContainer ) { _minLengthLabel = makeJLabel(_section, "minlength"); _tfMinLengthValue = makeNumericalJTextField(_section, "minlength"); - _minLengthLabel.setLabelFor(_tfMinLengthValue); + _minLengthLabel.setLabelFor(_tfMinLengthValue); + + _minDigitsLabel = makeJLabel(_section, "mindigits"); + + _tfMinDigitsValue = makeNumericalJTextField(_section, "mindigits"); + _minDigitsLabel.setLabelFor(_tfMinDigitsValue); + + _minAlphasLabel = makeJLabel(_section, "minalphas"); + + _tfMinAlphasValue = makeNumericalJTextField(_section, "minalphas"); + _minAlphasLabel.setLabelFor(_tfMinAlphasValue); + + _minUppersLabel = makeJLabel(_section, "minuppers"); + + _tfMinUppersValue = makeNumericalJTextField(_section, "minuppers"); + _minUppersLabel.setLabelFor(_tfMinUppersValue); + + _minLowersLabel = makeJLabel(_section, "minlowers"); + + _tfMinLowersValue = makeNumericalJTextField(_section, "minlowers"); + _minLowersLabel.setLabelFor(_tfMinLowersValue); + + _minSpecialsLabel = makeJLabel(_section, "minspecials"); + + _tfMinSpecialsValue = makeNumericalJTextField(_section, "minspecials"); + _minSpecialsLabel.setLabelFor(_tfMinSpecialsValue); + + _min8bitLabel = makeJLabel(_section, "min8bit"); + + _tfMin8bitValue = makeNumericalJTextField(_section, "min8bit"); + _min8bitLabel.setLabelFor(_tfMin8bitValue); + + _maxRepeatsLabel = makeJLabel(_section, "maxrepeats"); + _tfMaxRepeatsValue = makeNumericalJTextField(_section, "maxrepeats"); + _maxRepeatsLabel.setLabelFor(_tfMaxRepeatsValue); + + _minCategoriesLabel = makeJLabel(_section, "mincategories"); + + _tfMinCategoriesValue = makeNumericalJTextField(_section, "mincategories"); + _minCategoriesLabel.setLabelFor(_tfMinCategoriesValue); + + _minTokenLengthLabel = makeJLabel(_section, "mintokenlength"); + + _tfMinTokenLengthValue = makeNumericalJTextField(_section, "mintokenlength"); + _minTokenLengthLabel.setLabelFor(_tfMinTokenLengthValue); + + // tie components to config attributes DSEntrySet entries = getDSEntrySet(); - DSEntryInteger minDSEntry = new DSEntryInteger("", _tfMinLengthValue, - _minLengthLabel,MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1); - entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minDSEntry); - setComponentTable(_tfMinLengthValue, minDSEntry); + + DSEntryBoolean se = new DSEntryBoolean( "off", _cbCheckSyntax ); + entries.add( _policyspecdn, SYNTAX_ATTR_NAME, se ); + setComponentTable(_cbCheckSyntax, se); + + DSEntryInteger minLengthDSEntry = new DSEntryInteger(MINLENGTH_DEFAULT_VAL, + _tfMinLengthValue, _minLengthLabel, MINLENGTH_MIN_VAL, MINLENGTH_MAX_VAL, 1); + entries.add(_policyspecdn, MINLENGTH_ATTR_NAME, minLengthDSEntry); + setComponentTable(_tfMinLengthValue, minLengthDSEntry); + + DSEntryInteger minDigitsDSEntry = new DSEntryInteger(MINDIGITS_DEFAULT_VAL, + _tfMinDigitsValue, _minDigitsLabel, MINDIGITS_MIN_VAL, MINDIGITS_MAX_VAL, 1); + entries.add(_policyspecdn, MINDIGITS_ATTR_NAME, minDigitsDSEntry); + setComponentTable(_tfMinDigitsValue, minDigitsDSEntry); + + DSEntryInteger minAlphasDSEntry = new DSEntryInteger(MINALPHAS_DEFAULT_VAL, + _tfMinAlphasValue, _minAlphasLabel, MINALPHAS_MIN_VAL, MINALPHAS_MAX_VAL, 1); + entries.add(_policyspecdn, MINALPHAS_ATTR_NAME, minAlphasDSEntry); + setComponentTable(_tfMinAlphasValue, minAlphasDSEntry); + + DSEntryInteger minUppersDSEntry = new DSEntryInteger(MINUPPERS_DEFAULT_VAL, + _tfMinUppersValue, _minUppersLabel, MINUPPERS_MIN_VAL, MINUPPERS_MAX_VAL, 1); + entries.add(_policyspecdn, MINUPPERS_ATTR_NAME, minUppersDSEntry); + setComponentTable(_tfMinUppersValue, minUppersDSEntry); + + DSEntryInteger minLowersDSEntry = new DSEntryInteger(MINLOWERS_DEFAULT_VAL, + _tfMinLowersValue, _minLowersLabel, MINLOWERS_MIN_VAL, MINLOWERS_MAX_VAL, 1); + entries.add(_policyspecdn, MINLOWERS_ATTR_NAME, minLowersDSEntry); + setComponentTable(_tfMinLowersValue, minLowersDSEntry); + + DSEntryInteger minSpecialsDSEntry = new DSEntryInteger(MINSPECIALS_DEFAULT_VAL, + _tfMinSpecialsValue, _minSpecialsLabel, MINSPECIALS_MIN_VAL, MINSPECIALS_MAX_VAL, 1); + entries.add(_policyspecdn, MINSPECIALS_ATTR_NAME, minSpecialsDSEntry); + setComponentTable(_tfMinSpecialsValue, minSpecialsDSEntry); + + DSEntryInteger min8bitDSEntry = new DSEntryInteger(MIN8BIT_DEFAULT_VAL, + _tfMin8bitValue, _min8bitLabel,MIN8BIT_MIN_VAL, MIN8BIT_MAX_VAL, 1); + entries.add(_policyspecdn, MIN8BIT_ATTR_NAME, min8bitDSEntry); + setComponentTable(_tfMin8bitValue, min8bitDSEntry); + + DSEntryInteger maxRepeatsDSEntry = new DSEntryInteger(MAXREPEATS_DEFAULT_VAL, + _tfMaxRepeatsValue, _maxRepeatsLabel,MAXREPEATS_MIN_VAL, MAXREPEATS_MAX_VAL, 1); + entries.add(_policyspecdn, MAXREPEATS_ATTR_NAME, maxRepeatsDSEntry); + setComponentTable(_tfMaxRepeatsValue, maxRepeatsDSEntry); + + DSEntryInteger minCategoriesDSEntry = new DSEntryInteger(MINCATEGORIES_DEFAULT_VAL, + _tfMinCategoriesValue, _minCategoriesLabel,MINCATEGORIES_MIN_VAL, MINCATEGORIES_MAX_VAL, 1); + entries.add(_policyspecdn, MINCATEGORIES_ATTR_NAME, minCategoriesDSEntry); + setComponentTable(_tfMinCategoriesValue, minCategoriesDSEntry); + + DSEntryInteger minTokenLengthDSEntry = new DSEntryInteger(MINTOKENLENGTH_DEFAULT_VAL, + _tfMinTokenLengthValue, _minTokenLengthLabel,MINTOKENLENGTH_MIN_VAL, MINTOKENLENGTH_MAX_VAL, 1); + entries.add(_policyspecdn, MINTOKENLENGTH_ATTR_NAME, minTokenLengthDSEntry); + setComponentTable(_tfMinTokenLengthValue, minTokenLengthDSEntry); // create containers and layouts - JPanel panel = - new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - GridBagConstraints gbc = getGBC(); - gbc.gridwidth = gbc.REMAINDER; - gbc.anchor = gbc.WEST; - gbc.fill = gbc.HORIZONTAL; + JPanel syntaxPanel = new GroupPanel( _resource.getString(_section, "syntax-title")); + syntaxPanel.setLayout(new GridBagLayout()); + GridBagConstraints gbc = getGBC(); + gbc.gridwidth = gbc.REMAINDER; + gbc.anchor = GridBagConstraints.WEST; + gbc.fill = GridBagConstraints.HORIZONTAL; gbc.weightx = 1.0; - myContainer.add(panel, gbc); - panel.add(_minLengthLabel); - int space = UIFactory.getComponentSpace(); - panel.add(Box.createHorizontalStrut(space)); - panel.add(_tfMinLengthValue); + myContainer.add(syntaxPanel, gbc); + + GridBagUtil.constrain(syntaxPanel, _cbCheckSyntax, 0, 0, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, SuiConstants.COMPONENT_SPACE, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minLengthLabel, 0, 1, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinLengthValue, 1, 1, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minDigitsLabel, 0, 2, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinDigitsValue, 1, 2, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minAlphasLabel, 0, 3, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinAlphasValue, 1, 3, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minUppersLabel, 0, 4, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinUppersValue, 1, 4, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minLowersLabel, 0, 5, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinLowersValue, 1, 5, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minSpecialsLabel, 0, 6, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinSpecialsValue, 1, 6, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _min8bitLabel, 0, 7, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMin8bitValue, 1, 7, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _maxRepeatsLabel, 0, 8, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMaxRepeatsValue, 1, 8, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minCategoriesLabel, 0, 9, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinCategoriesValue, 1, 9, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); + + GridBagUtil.constrain(syntaxPanel, _minTokenLengthLabel, 0, 10, + 1, 1, 0.0, 0.0, + GridBagConstraints.EAST, GridBagConstraints.NONE, + 0, 0, 0, SuiConstants.COMPONENT_SPACE); + + GridBagUtil.constrain(syntaxPanel, _tfMinTokenLengthValue, 1, 10, + 1, 1, 1.0, 0.0, + GridBagConstraints.WEST, GridBagConstraints.NONE, + 0, 0, SuiConstants.COMPONENT_SPACE, 0); } + protected void createExpirationArea( Container myContainer) { ButtonGroup expirationButtonGroup = new ButtonGroup(); @@ -610,7 +795,7 @@ * @param e event */ public void actionPerformed(ActionEvent e) { - if (e.getSource().equals(_cbCheckSyntax)) { + if (e.getSource().equals(_cbCheckSyntax)) { enableSyntax(); } else if (e.getSource().equals(_cbKeepHistory)) { enableHistory(); @@ -709,6 +894,42 @@ _minLengthLabel.repaint(); _tfMinLengthValue.setEnabled( enable ); _tfMinLengthValue.repaint(); + _minDigitsLabel.setEnabled( enable ); + _minDigitsLabel.repaint(); + _tfMinDigitsValue.setEnabled( enable ); + _tfMinDigitsValue.repaint(); + _minAlphasLabel.setEnabled( enable ); + _minAlphasLabel.repaint(); + _tfMinAlphasValue.setEnabled( enable ); + _tfMinAlphasValue.repaint(); + _minUppersLabel.setEnabled( enable ); + _minUppersLabel.repaint(); + _tfMinUppersValue.setEnabled( enable ); + _tfMinUppersValue.repaint(); + _minLowersLabel.setEnabled( enable ); + _minLowersLabel.repaint(); + _tfMinLowersValue.setEnabled( enable ); + _tfMinLowersValue.repaint(); + _minSpecialsLabel.setEnabled( enable ); + _minSpecialsLabel.repaint(); + _tfMinSpecialsValue.setEnabled( enable ); + _tfMinSpecialsValue.repaint(); + _min8bitLabel.setEnabled( enable ); + _min8bitLabel.repaint(); + _tfMin8bitValue.setEnabled( enable ); + _tfMin8bitValue.repaint(); + _maxRepeatsLabel.setEnabled( enable ); + _maxRepeatsLabel.repaint(); + _tfMaxRepeatsValue.setEnabled( enable ); + _tfMaxRepeatsValue.repaint(); + _minCategoriesLabel.setEnabled( enable ); + _minCategoriesLabel.repaint(); + _tfMinCategoriesValue.setEnabled( enable ); + _tfMinCategoriesValue.repaint(); + _minTokenLengthLabel.setEnabled( enable ); + _minTokenLengthLabel.repaint(); + _tfMinTokenLengthValue.setEnabled( enable ); + _tfMinTokenLengthValue.repaint(); } private void enableChange (){ @@ -910,6 +1131,24 @@ private JLabel _minLengthLabel; private JTextField _tfMinLengthValue; + private JLabel _minDigitsLabel; + private JTextField _tfMinDigitsValue; + private JLabel _minAlphasLabel; + private JTextField _tfMinAlphasValue; + private JLabel _minUppersLabel; + private JTextField _tfMinUppersValue; + private JLabel _minLowersLabel; + private JTextField _tfMinLowersValue; + private JLabel _minSpecialsLabel; + private JTextField _tfMinSpecialsValue; + private JLabel _min8bitLabel; + private JTextField _tfMin8bitValue; + private JLabel _maxRepeatsLabel; + private JTextField _tfMaxRepeatsValue; + private JLabel _minCategoriesLabel; + private JTextField _tfMinCategoriesValue; + private JLabel _minTokenLengthLabel; + private JTextField _tfMinTokenLengthValue; private JRadioButton _rbNever; private JRadioButton _rbExpiresIn; @@ -995,10 +1234,64 @@ "passwordCheckSyntax"; private static final String MINLENGTH_DN = "cn=config"; - private static final String MINLENGTH_ATTR_NAME = - "passwordMinLength"; + private static final String MINLENGTH_ATTR_NAME = "passwordMinLength"; private static final int MINLENGTH_MIN_VAL = 2; private static final int MINLENGTH_MAX_VAL = 512; + private static final String MINLENGTH_DEFAULT_VAL = "8"; + + private static final String MINDIGITS_DN = "cn=config"; + private static final String MINDIGITS_ATTR_NAME = "passwordMinDigits"; + private static final int MINDIGITS_MIN_VAL = 0; + private static final int MINDIGITS_MAX_VAL = 64; + private static final String MINDIGITS_DEFAULT_VAL = "0"; + + private static final String MINALPHAS_DN = "cn=config"; + private static final String MINALPHAS_ATTR_NAME = "passwordMinAlphas"; + private static final int MINALPHAS_MIN_VAL = 0; + private static final int MINALPHAS_MAX_VAL = 64; + private static final String MINALPHAS_DEFAULT_VAL = "0"; + + private static final String MINUPPERS_DN = "cn=config"; + private static final String MINUPPERS_ATTR_NAME = "passwordMinUppers"; + private static final int MINUPPERS_MIN_VAL = 0; + private static final int MINUPPERS_MAX_VAL = 64; + private static final String MINUPPERS_DEFAULT_VAL = "0"; + + private static final String MINLOWERS_DN = "cn=config"; + private static final String MINLOWERS_ATTR_NAME = "passwordMinLowers"; + private static final int MINLOWERS_MIN_VAL = 0; + private static final int MINLOWERS_MAX_VAL = 64; + private static final String MINLOWERS_DEFAULT_VAL = "0"; + + private static final String MINSPECIALS_DN = "cn=config"; + private static final String MINSPECIALS_ATTR_NAME = "passwordMinSpecials"; + private static final int MINSPECIALS_MIN_VAL = 0; + private static final int MINSPECIALS_MAX_VAL = 64; + private static final String MINSPECIALS_DEFAULT_VAL = "0"; + + private static final String MIN8BIT_DN = "cn=config"; + private static final String MIN8BIT_ATTR_NAME = "passwordMin8bit"; + private static final int MIN8BIT_MIN_VAL = 0; + private static final int MIN8BIT_MAX_VAL = 64; + private static final String MIN8BIT_DEFAULT_VAL = "0"; + + private static final String MAXREPEATS_DN = "cn=config"; + private static final String MAXREPEATS_ATTR_NAME = "passwordMaxRepeats"; + private static final int MAXREPEATS_MIN_VAL = 0; + private static final int MAXREPEATS_MAX_VAL = 64; + private static final String MAXREPEATS_DEFAULT_VAL = "0"; + + private static final String MINCATEGORIES_DN = "cn=config"; + private static final String MINCATEGORIES_ATTR_NAME = "passwordMinCategories"; + private static final int MINCATEGORIES_MIN_VAL = 1; + private static final int MINCATEGORIES_MAX_VAL = 5; + private static final String MINCATEGORIES_DEFAULT_VAL = "3"; + + private static final String MINTOKENLENGTH_DN = "cn=config"; + private static final String MINTOKENLENGTH_ATTR_NAME = "passwordMinTokenLength"; + private static final int MINTOKENLENGTH_MIN_VAL = 1; + private static final int MINTOKENLENGTH_MAX_VAL = 64; + private static final String MINTOKENLENGTH_DEFAULT_VAL = "3"; private static final String EXPIRES_DN = "cn=config"; private static final String EXPIRES_ATTR_NAME = "passwordExp"; From fedora-directory-commits at redhat.com Wed Feb 15 23:00:57 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 15 Feb 2006 18:00:57 -0500 Subject: [Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv dirserv.properties, 1.2, 1.3 Message-ID: <200602152301.k1FN1SN9029651@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27837 Modified Files: dirserv.properties Log Message: Bug(s) fixed: 181570 Bug Description: The UI for the new password syntax enhancements needs to be created. Reviewed by: Rich, Noriko (thanks!) Files: see diffs Branch: HEAD (directoryconsole) Fix Description: This adds input fields for the new password syntax config parameters. The new fields are added uder the "Configuration->Data->Passwords" tab. This revised set of diffs fixes an issue where the default values when setting up a per-user or per-subtree password policy were all showing up as 0. This was due to DSEntrySet overwriting the default component values with a null string if the passwordPolicy LDAP entry did not exist. Flag Day: no Doc impact: no QA impact: Console testplan will need to be updated. New Tests integrated into TET: none Index: dirserv.properties =================================================================== RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dirserv.properties 28 Oct 2005 18:01:34 -0000 1.2 +++ dirserv.properties 15 Feb 2006 23:00:50 -0000 1.3 @@ -1586,7 +1586,6 @@ passwordpolicy-check-default=false passwordpolicy-minlength-label=Password minimum length passwordpolicy-minlength-ttip=When syntax checking is on, reject passwords with fewer than this many characters -passwordpolicy-minlength-default=6 passwordpolicy-minlength-columns=4 passwordpolicy-expiration-title=Password Expiration passwordpolicy-neverexpire-label=Password never expires @@ -1606,6 +1605,35 @@ passwordpolicy-sendwarning2-label=day(s) before password expires passwordpolicy-sendwarning2-ttip=Notify users this many days before their password expires +passwordpolicy-syntax-title=Password Syntax +passwordpolicy-mindigits-label=Minimum required digit characters +passwordpolicy-mindigits-ttip=Reject passwords with fewer than this many digit characters (0-9) +passwordpolicy-mindigits-columns=4 +passwordpolicy-minalphas-label=Minimum required alpha characters +passwordpolicy-minalphas-ttip=Reject passwords with fewer than this many alpha characters (uppercase and lowercase 7-bit ASCII) +passwordpolicy-minalphas-columns=4 +passwordpolicy-minuppers-label=Minimum required uppercase characters +passwordpolicy-minuppers-ttip=Reject passwords with fewer than this many uppercase characters (7-bit ASCII) +passwordpolicy-minuppers-columns=4 +passwordpolicy-minlowers-label=Minimum required lowercase characters +passwordpolicy-minlowers-ttip=Reject passwords with fewer than this many lowercase characters (7-bit ASCII) +passwordpolicy-minlowers-columns=4 +passwordpolicy-minspecials-label=Minimum required special characters +passwordpolicy-minspecials-ttip=Reject passwords with fewer than this many special characters (non-alphanumeric 7-bit ASCII) +passwordpolicy-minspecials-columns=4 +passwordpolicy-min8bit-label=Minimum required 8-bit characters +passwordpolicy-min8bit-ttip=Reject passwords with fewer than this many 8-bit or multi-byte characters +passwordpolicy-min8bit-columns=4 +passwordpolicy-maxrepeats-label=Maximum number of repeated characters +passwordpolicy-maxrepeats-ttip=The maximum number of times the same character can sequentially appear in a password +passwordpolicy-maxrepeats-columns=4 +passwordpolicy-mincategories-label=Minimum required character categories +passwordpolicy-mincategories-ttip=The minimum number of character categories that a password must contain (categories are upper, lower, digit, special, and 8-bit) +passwordpolicy-mincategories-columns=4 +passwordpolicy-mintokenlength-label=Minimum token length +passwordpolicy-mintokenlength-ttip=The smallest attribute value used when checking if the password contains account information +passwordpolicy-mintokenlength-columns=4 + passwordpolicy-gracelogin-label=Allow up to passwordpolicy-gracelogin-ttip=Allow this many login attempts after password has expired passwordpolicy-gracelogin-default=3 From fedora-directory-commits at redhat.com Thu Feb 16 01:28:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 15 Feb 2006 20:28:20 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw Makefile, 1.6, 1.6.2.1 Message-ID: <200602160128.k1G1SKd5001732@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1709 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: [181582] Directory Server 7.1 SP2 packaging See Comment #4 Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Makefile,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- Makefile 19 Apr 2005 22:07:01 -0000 1.6 +++ Makefile 16 Feb 2006 01:28:12 -0000 1.6.2.1 @@ -151,7 +151,7 @@ $(LDAPLINK) $(ADMINUTIL_LINK) \ $(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \ $(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \ - $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY) + $(THREADSLIB) $(SECURITYLINK) $(NSPRLINK) $(LDAP_LIBLITEKEY) endif NSECLIBS_DEP=$(SECGLUEOBJS) From fedora-directory-commits at redhat.com Thu Feb 16 17:40:00 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 12:40:00 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c, 1.9, 1.10 Message-ID: <200602161740.k1GHe0n6007583@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/servers/slapd Modified Files: util.c Log Message: Bug(s) fixed: 181776 Bug Description: 64bit issues with normalize_path(), make_dn(), and add_aci_v() Reviewed by: Nathan and Noriko (Thanks!) Fix Description: 1) use sizeof(char *) as the elemsize to pass to slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass as the last argument to the varargs functions. Platforms tested: RHEL4 64 Flag Day: no Doc impact: no Index: util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- util.c 12 Jan 2006 00:28:57 -0000 1.9 +++ util.c 16 Feb 2006 17:39:53 -0000 1.10 @@ -408,8 +408,8 @@ char *dname = slapi_ch_strdup(path); char *dnamep = dname; char *bnamep = NULL; - char **dirs = (char **)slapi_ch_calloc(strlen(path), 1); - char **rdirs = (char **)slapi_ch_calloc(strlen(path), 1); + char **dirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *)); + char **rdirs = (char **)slapi_ch_calloc(strlen(path), sizeof(char *)); char **dp = dirs; char **rdp; do { From fedora-directory-commits at redhat.com Thu Feb 16 17:39:55 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 12:39:55 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src cfg_sspt.c, 1.7, 1.8 Message-ID: <200602161740.k1GHePTA007601@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/ldapserver/ldap/admin/src Modified Files: cfg_sspt.c Log Message: Bug(s) fixed: 181776 Bug Description: 64bit issues with normalize_path(), make_dn(), and add_aci_v() Reviewed by: Nathan and Noriko (Thanks!) Fix Description: 1) use sizeof(char *) as the elemsize to pass to slapi_ch_calloc(). 2) create a variable const char *NULLSTR = 0 to pass as the last argument to the varargs functions. Platforms tested: RHEL4 64 Flag Day: no Doc impact: no Index: cfg_sspt.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/cfg_sspt.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- cfg_sspt.c 19 Apr 2005 22:06:55 -0000 1.7 +++ cfg_sspt.c 16 Feb 2006 17:39:47 -0000 1.8 @@ -54,6 +54,8 @@ #define TEST_CONFIG /* for testing cn=config40 dummy entry instead of real one */ +char* const NULLSTR = 0; + char* const class_top = "top"; char* const class_organization = "organization"; char* const class_organizationalUnit = "organizationalunit"; @@ -754,7 +756,7 @@ if (!base) entrydn = strdup(unit); else - entrydn = make_dn("%s=%s, %s", name_ou, unit, base, 0); + entrydn = make_dn("%s=%s, %s", name_ou, unit, base, NULLSTR); if (!entry_exists(ld, entrydn)) { @@ -1062,7 +1064,7 @@ return -1; } - entrydn = make_dn("%s=%s", name_cn, value_config40, 0); + entrydn = make_dn("%s=%s", name_cn, value_config40, NULLSTR); if (!entry_exists(ld, entrydn)) { LDAPMod* attrs[3]; @@ -1130,7 +1132,7 @@ return -1; } - entrydn = make_dn("%s=%s, %s", name_cn, group, base, 0); + entrydn = make_dn("%s=%s, %s", name_cn, group, base, NULLSTR); if (!entry_exists(ld, entrydn)) { @@ -1379,7 +1381,7 @@ { /* initial ACIs for o=NetscapeRoot */ - int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, 0); + int ret = add_aci_v (connection, value_config40DN, ACI_self_allow, NULLSTR); return ret; } @@ -1418,7 +1420,7 @@ /* parent dn of admin uid entry */ if (query->netscaperoot) { parentDN = make_dn("%s, %s, %s", name_administratorsRDN, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); } if (query->config_admin_uid) { @@ -1428,12 +1430,12 @@ configAdminDN = strdup(query->config_admin_uid); } else if (parentDN) { /* create a DN for admid */ - configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, 0); + configAdminDN = make_dn(DN_formatUID, query->config_admin_uid, parentDN, NULLSTR); } else { /* create one from scratch */ configAdminDN = make_dn("%s=%s, %s, %s, %s", name_uid, query->config_admin_uid, name_administratorsRDN, name_topologyRDN, - name_netscaperootDN, 0); + name_netscaperootDN, NULLSTR); } } @@ -1444,7 +1446,7 @@ { if (configAdminDN && !is_root_user(configAdminDN, query)) { add_aci_v(connection, query->suffix, ACI_user_allow_2, - "all", configAdminDN, 0); + "all", configAdminDN, NULLSTR); } status = create_group(connection, query->suffix, name_localDAGroup); @@ -1465,13 +1467,13 @@ adminGroupDN = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); } if (query->suffix) { localDAGroupDN = make_dn("cn=%s, %s", name_localDAGroup, - query->suffix, 0); + query->suffix, NULLSTR); } else { @@ -1483,20 +1485,20 @@ add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_config_admin_group_allow, entryAndAccessList[ii].access, - adminGroupDN, 0); + adminGroupDN, NULLSTR); } if (configAdminDN && !is_root_user(configAdminDN, query)) { add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_user_allow_2, entryAndAccessList[ii].access, - configAdminDN, 0); + configAdminDN, NULLSTR); } if (localDAGroupDN) { add_aci_v(connection, entryAndAccessList[ii].entryDN, ACI_local_DA_allow, entryAndAccessList[ii].access, - localDAGroupDN, 0); + localDAGroupDN, NULLSTR); } } } @@ -1512,22 +1514,22 @@ ACI_config_admin_group_allow_all, value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = add_aci_v(connection, query->netscaperoot, ACI_anonymous_allow_with_filter, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = add_aci_v(connection, query->netscaperoot, ACI_group_expansion, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); /* create "topologyOU, netscaperoot" entry and set ACIs */ if (!status) { char *dn = make_dn("%s, %s", name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); status = create_organizational_unit(connection, NULL, dn, value_topologyDESC, 0, 0, 0); @@ -1542,7 +1544,7 @@ if (!status) { char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); status = create_organizational_unit (connection, NULL, dn, value_groupsDesc, 0, 0, 0); free(dn); @@ -1552,7 +1554,7 @@ if (!status) { char *dn = make_dn("%s, %s, %s", name_administratorsRDN, - name_topologyRDN, query->netscaperoot, 0); + name_topologyRDN, query->netscaperoot, NULLSTR); status = create_organizational_unit (connection, NULL, dn, value_administratorsDESC, 0, 0, 0); @@ -1564,7 +1566,7 @@ { char *dn = make_dn("%s=%s, %s, %s", name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); status = create_group (connection, dn, value_configAdminGroupCN); free(dn); } @@ -1575,7 +1577,7 @@ /* group to add the uid to */ char *groupdn = make_dn("%s, %s=%s, %s, %s", value_configAdminGroupRDN, name_ou, value_groupsOU, name_topologyRDN, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); create_ssadmin_user(connection, parentDN, query->ssAdmID, query->ssAdmPW1); @@ -1585,7 +1587,7 @@ } admin_domainDN = make_dn("%s=%s, %s", name_ou, query->admin_domain, - query->netscaperoot, 0); + query->netscaperoot, NULLSTR); if (!status) status = create_organizational_unit (connection, 0, From fedora-directory-commits at redhat.com Thu Feb 16 21:33:55 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:33:55 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.2,1.3 Message-ID: <200602162134.k1GLYPfN020540@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminserver Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:28:18 -0000 1.2 +++ Makefile 16 Feb 2006 21:33:47 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-adminserver GARVERSION = 1.0.2 CATEGORIES = ds @@ -14,6 +16,7 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ + MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ @@ -27,7 +30,7 @@ BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work endif # NOJAVA -ifndef DEBUG +ifneq ($(DEBUG), full) BUILD_ARGS += BUILD_DEBUG=optimize endif From fedora-directory-commits at redhat.com Thu Feb 16 21:34:22 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:34:22 -0500 Subject: [Fedora-directory-commits] dsbuild/meta/ds Makefile,1.2,1.3 Message-ID: <200602162134.k1GLYMni020537@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/meta/ds Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:30:05 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:15 -0000 1.3 @@ -7,6 +7,11 @@ override DEBUG=full endif +ARCH=$(shell uname -m) +ifeq ($(ARCH), x86_64) + USE_64=1 +endif + LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd ifndef NOJAVA From fedora-directory-commits at redhat.com Thu Feb 16 21:34:00 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:34:00 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil Makefile,1.2,1.3 Message-ID: <200602162134.k1GLYUIr020556@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminutil Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:28:25 -0000 1.2 +++ Makefile 16 Feb 2006 21:33:53 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-adminutil GARVERSION = 1.0.2 CATEGORIES = ds @@ -12,12 +14,12 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 +BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) -ifndef DEBUG -BUILD_ARGS += BUILD_DEBUG=optimize -else +ifeq ($(DEBUG), full) BUILD_ARGS += DEBUG=full +else +BUILD_ARGS += BUILD_DEBUG=optimize endif configure-custom: From fedora-directory-commits at redhat.com Thu Feb 16 21:34:06 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:34:06 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.3,1.4 Message-ID: <200602162134.k1GLYaE6020568@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/ldapserver Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 15 Feb 2006 22:55:46 -0000 1.3 +++ Makefile 16 Feb 2006 21:33:58 -0000 1.4 @@ -21,6 +21,7 @@ INSTALL_SCRIPTS = custom BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \ MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \ + MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \ From fedora-directory-commits at redhat.com Thu Feb 16 21:34:11 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:34:11 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.2,1.3 Message-ID: <200602162134.k1GLYfA0020572@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/mozilla Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:29:29 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:04 -0000 1.3 @@ -18,11 +18,19 @@ ifndef DEBUG OPTFLAG="BUILD_OPT=1" -CONFIGFLAG=--disable-debug --enable-optimize +CONFIGURE_OPTS=--disable-debug --enable-optimize +OBJDIR=OPT.OBJ else -CONFIGFLAG=--enable-debug --disable-optimize +CONFIGURE_OPTS=--enable-debug --disable-optimize +OBJDIR=DBG.OBJ endif +ifeq ($(USE_64), 1) +CONFIGURE_OPTS += --enable-64bit +endif + +NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR) + # this is our "custom" patch target post-patch: ifdef MYPATCH @@ -36,13 +44,35 @@ $(MAKECOOKIE) build-custom: - cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG) - cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) - cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG) +# first, build coreconf + $(MAKE) -C work/mozilla/security/coreconf OBJDIR_NAME=$(OBJDIR) + +# next, configure and make nspr + mkdir -p work/mozilla/dist/$(OBJDIR) + mkdir -p work/mozilla/nsprpub/$(OBJDIR) + cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \ + --with-dist-prefix='$(NSPR_PREFIX)' \ + --with-dist-includedir='$(NSPR_PREFIX)/include' + + $(MAKE) -C work/mozilla/nsprpub/$(OBJDIR) + +# next, make dbm + $(MAKE) -C work/mozilla/security/dbm OBJDIR_NAME=$(OBJDIR) export libs + +# next, make nss + $(MAKE) -C work/mozilla/security/nss $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) all +# $(MAKE) -C work/mozilla/security/nss nss_build_all $(OPTFLAG) + +# next, make svrcore + cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) + +# next, configure and make the ldap c sdk + cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGURE_OPTS) cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG) + # perldap uses MakeMaker, so lots of env. vars. cd work/mozilla/directory/perldap && \ - LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \ + LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=../../dist/$(OBJDIR) perl Makefile.PL && \ $(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib $(MAKECOOKIE) From fedora-directory-commits at redhat.com Thu Feb 16 21:34:17 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:34:17 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/setuputil Makefile,1.2,1.3 Message-ID: <200602162134.k1GLYlA9020576@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/setuputil Modified Files: Makefile Log Message: use given name for moz objdir naming Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 14 Feb 2006 22:30:00 -0000 1.2 +++ Makefile 16 Feb 2006 21:34:09 -0000 1.3 @@ -1,3 +1,5 @@ +include ../../objdirname.mk + GARNAME = fedora-setuputil GARVERSION = 1.0.2 CATEGORIES = ds @@ -12,12 +14,12 @@ BUILD_SCRIPTS = $(WORKSRC)/Makefile #INSTALL_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = custom -BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla +BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) -ifndef DEBUG -BUILD_ARGS += BUILD_DEBUG=optimize -else +ifeq ($(DEBUG), full) BUILD_ARGS += DEBUG=full +else +BUILD_ARGS += BUILD_DEBUG=optimize endif configure-custom: From fedora-directory-commits at redhat.com Thu Feb 16 21:33:49 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 16:33:49 -0500 Subject: [Fedora-directory-commits] dsbuild objdirname.mk,1.2,1.3 Message-ID: <200602162134.k1GLYng8020579@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild Modified Files: objdirname.mk Log Message: use given name for moz objdir naming Index: objdirname.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2 +++ objdirname.mk 16 Feb 2006 21:33:42 -0000 1.3 @@ -134,8 +134,10 @@ ifeq ($(DEBUG), full) NSOBJDIR_TAG=_DBG + MOZ_OBJDIR_NAME=DBG.OBJ else NSOBJDIR_TAG=_OPT + MOZ_OBJDIR_NAME=OPT.OBJ endif ifeq ($(NSOS_ARCH),WINNT) @@ -148,14 +150,20 @@ endif # Mozilla uses a slightly different naming convention -ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) -else -ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) -else - MOZ_OBJDIR_NAME = $(OBJDIR_NAME) -endif +ifndef MOZ_OBJDIR_NAME + ifneq (,$(findstring RHEL3,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(OBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(OBJDIR_NAME) + endif + endif + endif endif # figure out which imports file to use - for console builds From fedora-directory-commits at redhat.com Thu Feb 16 22:22:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 16 Feb 2006 17:22:29 -0500 Subject: [Fedora-directory-commits] adminserver nsdefs.mk,1.10,1.11 Message-ID: <200602162222.k1GMMTFP023377@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23359 Modified Files: nsdefs.mk Log Message: NSPLATFORM_DIR is set differently for linux than for other platforms Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10 +++ nsdefs.mk 16 Feb 2006 22:22:22 -0000 1.11 @@ -189,7 +189,6 @@ INTL_DEF=-intl endif -NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG) PLATFORM_DEST=$(NSOBJDIR_NAME) PLATFORM_OBJDIR=$(BUILD_ROOT)/built/$(PLATFORM_DEST) PLATFORM_PACKAGE_DIR=$(BUILD_ROOT)/built/package/$(PLATFORM_DEST) From fedora-directory-commits at redhat.com Thu Feb 16 23:58:01 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 16 Feb 2006 18:58:01 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.3, 1.4 Message-ID: <200602162358.k1GNw1QT027872@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer/unix/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27855 Modified Files: Makefile Log Message: Added a space to an addprefix call that was randomly failing on FC4 x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 28 Jan 2006 02:33:25 -0000 1.3 +++ Makefile 16 Feb 2006 23:57:54 -0000 1.4 @@ -36,7 +36,7 @@ STAGE=$(OBJDIR)/$(DIR) -OBJS=$(addprefix $(OBJDEST)/,ux-util.o ux-curse.o dialog.o ux-wrapper.o) +OBJS=$(addprefix $(OBJDEST)/, ux-util.o ux-curse.o dialog.o ux-wrapper.o) INCS=ux-util.h dialog.h LIBS=$(LIBDEST)/libinstall.a From fedora-directory-commits at redhat.com Fri Feb 17 01:16:30 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 16 Feb 2006 20:16:30 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.13, 1.30.2.14 Message-ID: <200602170116.k1H1GUHV002086@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2069 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: Fix for the Solaris and HP-UX patch packaging Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.13 retrieving revision 1.30.2.14 diff -u -r1.30.2.13 -r1.30.2.14 --- Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13 +++ Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14 @@ -713,7 +713,14 @@ fi ifdef BUILD_PATCH -# copying a file from the component area +# take care of files in components (e.g., a file in nsadmin.zip) + - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ + zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ + afile=`echo $$pair | awk -F: '{print $$2}'` ; \ + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ + done + +# copying files from the component area - at for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \ zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ From fedora-directory-commits at redhat.com Fri Feb 17 03:36:16 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 16 Feb 2006 22:36:16 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.8, 1.9 Message-ID: <200602170336.k1H3aGp9007404@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/ldapserver/ldap/admin/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387 Modified Files: Makefile Log Message: Fix build-time issue of lib_dsadmin.so for x86_64 support Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile 3 Oct 2005 19:53:47 -0000 1.8 +++ Makefile 17 Feb 2006 03:36:08 -0000 1.9 @@ -98,13 +98,6 @@ EXTRA_LIBS += -lc endif -ifneq ($(BUILD_DEBUG), optimize) -ifeq ($(ARCH), Linux) -LINK_DLL += -Wl,--no-allow-shlib-undefined -EXTRA_LIBS += -lc -lpthread -ldl /lib/ld-linux.so.2 -endif -endif - all: $(LIBS) $(LDAP_ADMDLL_RELDLLS) $(LIBS): $(OBJDEST) $(LDAP_ADMDLLDIR) $(LDAP_ADMLIBDIR) $(OBJS) $(EXTRA_LIBS_DEP) From fedora-directory-commits at redhat.com Fri Feb 17 15:00:00 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 10:00:00 -0500 Subject: [Fedora-directory-commits] adminutil buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.8, 1.9 Message-ID: <200602171500.k1HF00IA000653@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv629 Modified Files: buildpaths.mk nsconfig.mk Log Message: 1) Fix moz objdir name for generic linux x86_64 2) Allow moz objdir name to be passed in 3) append _64 tag to objdir name directly rather than via += Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2 +++ buildpaths.mk 17 Feb 2006 14:59:52 -0000 1.3 @@ -52,18 +52,25 @@ else MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla endif + ifdef MOZILLA_SOURCE_ROOT - # some of the mozilla components are put in a platform/buildtype specific - # subdir of mozilla/dist, and their naming convention is different than - # ours - we need to map ours to theirs - ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) - else - ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) - else - MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) - endif + ifndef MOZ_OBJDIR_NAME + # some of the mozilla components are put in a platform/buildtype specific + # subdir of mozilla/dist, and their naming convention is different than + # ours - we need to map ours to theirs + ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) + endif + endif + endif endif endif Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8 +++ nsconfig.mk 17 Feb 2006 14:59:52 -0000 1.9 @@ -69,27 +69,25 @@ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION) NSCONFIG_NOTAG = $(NSCONFIG) else +# add _64 tag on all platforms except linux/rhel ifeq ($(NSOS_ARCH),HP-UX) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), ia64) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif else ifeq ($(NSOS_TEST1),i86pc) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif endif -# add _64 tag on all platforms except linux/rhel - NSCONFIG += $(NS64TAG) - NSCONFIG_NOTAG += $(NS64TAG) endif endif From fedora-directory-commits at redhat.com Fri Feb 17 15:03:58 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 10:03:58 -0500 Subject: [Fedora-directory-commits] setuputil buildpaths.mk,1.2,1.3 Message-ID: <200602171503.k1HF3wEh002481@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2461 Modified Files: buildpaths.mk Log Message: 1) Fix moz objdir name for generic linux x86_64 2) Allow moz objdir name to be passed in Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- buildpaths.mk 15 Feb 2006 22:51:00 -0000 1.2 +++ buildpaths.mk 17 Feb 2006 15:03:36 -0000 1.3 @@ -54,17 +54,23 @@ MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla endif ifdef MOZILLA_SOURCE_ROOT - # some of the mozilla components are put in a platform/buildtype specific - # subdir of mozilla/dist, and their naming convention is different than - # ours - we need to map ours to theirs - ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) - else - ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) - else - MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) - endif + ifndef MOZ_OBJDIR_NAME + # some of the mozilla components are put in a platform/buildtype specific + # subdir of mozilla/dist, and their naming convention is different than + # ours - we need to map ours to theirs + ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) + endif + endif + endif endif endif From fedora-directory-commits at redhat.com Fri Feb 17 15:05:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 10:05:13 -0500 Subject: [Fedora-directory-commits] adminserver buildpaths.mk,1.6,1.7 Message-ID: <200602171505.k1HF5Dq5002510@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2493 Modified Files: buildpaths.mk Log Message: 1) Fix moz objdir name for generic linux x86_64 2) Allow moz objdir name to be passed in Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6 +++ buildpaths.mk 17 Feb 2006 15:04:54 -0000 1.7 @@ -49,17 +49,23 @@ MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla ifdef MOZILLA_SOURCE_ROOT - # some of the mozilla components are put in a platform/buildtype specific - # subdir of mozilla/dist, and their naming convention is different than - # ours - we need to map ours to theirs - ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) - else - ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) - else - MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) - endif + ifndef MOZ_OBJDIR_NAME + # some of the mozilla components are put in a platform/buildtype specific + # subdir of mozilla/dist, and their naming convention is different than + # ours - we need to map ours to theirs + ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) + endif + endif + endif endif endif From fedora-directory-commits at redhat.com Fri Feb 17 15:05:57 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 10:05:57 -0500 Subject: [Fedora-directory-commits] ldapserver buildpaths.mk,1.11,1.12 Message-ID: <200602171505.k1HF5v8X002541@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2521 Modified Files: buildpaths.mk Log Message: 1) Fix moz objdir name for generic linux x86_64 2) Allow moz objdir name to be passed in Index: buildpaths.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11 +++ buildpaths.mk 17 Feb 2006 15:05:32 -0000 1.12 @@ -67,17 +67,23 @@ MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla ifdef MOZILLA_SOURCE_ROOT - # some of the mozilla components are put in a platform/buildtype specific - # subdir of mozilla/dist, and their naming convention is different than - # ours - we need to map ours to theirs - ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) - else - ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) - MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) - else - MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) - endif + ifndef MOZ_OBJDIR_NAME + # some of the mozilla components are put in a platform/buildtype specific + # subdir of mozilla/dist, and their naming convention is different than + # ours - we need to map ours to theirs + ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME))) + else + ifneq (,$(findstring Linux,$(NSOBJDIR_NAME))) + MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME)) + else + MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME) + endif + endif + endif endif endif From fedora-directory-commits at redhat.com Fri Feb 17 16:57:26 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 11:57:26 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.49,1.50 Message-ID: <200602171657.k1HGvQIv006029@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6012 Modified Files: Makefile Log Message: Reviewed by Nathan (Thanks!) NSS 3.11 introduces a new library (libfreebl3.so) that is loaded as part of NSS initialization. With Fedora DS 1.0, we moved NSS initialization to occur after the setuid from root to the runtime uid so that the files created during NSS init would have the correct ownership. However, the bin/slapd/server directory is set to 0700 meaning no execute permission for the runtime uid. The OS requires this directory to be 711 to allow the slapd process to load in the shared libraries needed by NSS. We use 711 to disallow reading in this directory because if slapd crashes shortly after startup, a core file may go in this directory which may contain secret information. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Makefile 15 Feb 2006 22:53:56 -0000 1.49 +++ Makefile 17 Feb 2006 16:57:19 -0000 1.50 @@ -581,9 +581,12 @@ endif # BUILD_RPM find $(RELDIR) -exec chmod go-w {} \; -# $(RELDIR)/bin/slapd/server may host a core file. -# For security reason, it's readable only by the owner - chmod 700 $(RELDIR)/bin/slapd/server +# $(RELDIR)/bin/slapd/server may host a core file if the server crashes +# shortly after startup (otherwise, cores go in slapd-instance/logs) +# For security reasons, it's readable only by the owner +# but it needs to be executable (11) so that it can +# load in shared libs from slapd/lib after the setuid + chmod 711 $(RELDIR)/bin/slapd/server $(INSTDIR)/slapd: $(MKDIR) -p $@ From fedora-directory-commits at redhat.com Fri Feb 17 17:02:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 17 Feb 2006 12:02:27 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.14, 1.15 Message-ID: <200602171702.k1HH2RjQ007879@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7860 Modified Files: Makefile Log Message: Don't attempt to package 32 bit NSS apps/libs with the 64 bit package on rhel/linux - assume everything is native 64 bit. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile 21 Oct 2005 19:21:10 -0000 1.14 +++ Makefile 17 Feb 2006 17:02:05 -0000 1.15 @@ -235,8 +235,20 @@ TEMPLATE_SCRIPTS_SRC = $(wildcard scripts/template-*) TEMPLATE_SCRIPTS_DEST = $(subst scripts/,$(SCRIPTSDIR)/,$(TEMPLATE_SCRIPTS_SRC)) +# We only need to do this if we have to ship 32 bit binaries in our 64 bit packages +# Right now, on rhel/linux, we ship all native 64 bit apps so we don't have to do +# this. We still may need to do this on solaris/hpux, but hopefully not for very +# much longer ifeq ($(USE_64), 1) - FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64 + ifeq ($(ARCH), RHEL) + FIX_SECMOD_DEP = + else + ifeq ($(ARCH), Linux) + FIX_SECMOD_DEP = + else + FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64 + endif + endif endif # gmake 3.74 will remove "intermediate" files if generated via a pattern match rule From fedora-directory-commits at redhat.com Fri Feb 17 17:26:09 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 17 Feb 2006 12:26:09 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.14, 1.30.2.15 Message-ID: <200602171726.k1HHQ9PM008193@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8175 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: The first character should have been tab for the command line. (fix for the previous fix) Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.14 retrieving revision 1.30.2.15 diff -u -r1.30.2.14 -r1.30.2.15 --- Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14 +++ Makefile 17 Feb 2006 17:26:01 -0000 1.30.2.15 @@ -714,11 +714,11 @@ ifdef BUILD_PATCH # take care of files in components (e.g., a file in nsadmin.zip) - - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ - zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ - afile=`echo $$pair | awk -F: '{print $$2}'` ; \ - cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ - done + - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \ + zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ + afile=`echo $$pair | awk -F: '{print $$2}'` ; \ + cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \ + done # copying files from the component area - at for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \ From fedora-directory-commits at redhat.com Mon Feb 20 18:14:58 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 20 Feb 2006 13:14:58 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm import-threads.c, 1.8, 1.8.2.1 import.c, 1.5, 1.5.2.1 import.h, 1.4, 1.4.2.1 Message-ID: <200602201814.k1KIEwZg023473@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23432/back-ldbm Modified Files: Tag: Directory71RtmBranch import-threads.c import.c import.h Log Message: [175063] entry with escaped characters fails to import and index Index: import-threads.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- import-threads.c 28 Apr 2005 17:31:54 -0000 1.8 +++ import-threads.c 20 Feb 2006 18:14:50 -0000 1.8.2.1 @@ -986,6 +986,7 @@ int ret = 0; struct attrinfo *parentid_ai; Slapi_PBlock *pb = slapi_pblock_new(); + int shift = 0; PR_ASSERT(info != NULL); PR_ASSERT(inst != NULL); @@ -1027,10 +1028,11 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 0); + fi = import_fifo_fetch(job, id, 0, shift); if (! fi) { - import_log_notice(job, "ERROR: foreman fifo error"); - goto error; + import_log_notice(job, "WARNING: entry id %d is missing"); + shift++; + continue; } /* first, fill in any operational attributes */ @@ -1268,7 +1270,7 @@ info->state = RUNNING; /* Read that entry from the cache */ - fi = import_fifo_fetch(job, id, 1); + fi = import_fifo_fetch(job, id, 1, 0); ep = fi ? fi->entry : NULL; if (!ep) { /* skipping an entry that turned out to be bad */ Index: import.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- import.c 19 Apr 2005 22:07:38 -0000 1.5 +++ import.c 20 Feb 2006 18:14:50 -0000 1.5.2.1 @@ -91,7 +91,7 @@ return 0; } -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker) +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift) { int idx = id % job->fifo.size; FifoItem *fi; @@ -102,7 +102,7 @@ return NULL; } if (fi->entry) { - if (id != fi->entry->ep_id) + if (id != fi->entry->ep_id - shift) fi = NULL; else if (worker) { if (fi->bad) return NULL; Index: import.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- import.h 19 Apr 2005 22:07:38 -0000 1.4 +++ import.h 20 Feb 2006 18:14:50 -0000 1.4.2.1 @@ -201,7 +201,7 @@ /* import.c */ -FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker); +FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift); void import_free_job(ImportJob *job); void import_log_notice(ImportJob *job, char *format, ...); void import_abort_all(ImportJob *job, int wait_for_them); From fedora-directory-commits at redhat.com Mon Feb 20 18:14:52 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 20 Feb 2006 13:14:52 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd dn.c, 1.6, 1.6.2.1 Message-ID: <200602201815.k1KIFMCw023478@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23432 Modified Files: Tag: Directory71RtmBranch dn.c Log Message: [175063] entry with escaped characters fails to import and index Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- dn.c 19 Apr 2005 22:07:36 -0000 1.6 +++ dn.c 20 Feb 2006 18:14:43 -0000 1.6.2.1 @@ -188,8 +188,7 @@ case INVALUE: if ( gotesc ) { if ( SEPARATOR( *s ) ) { - if ( value_separator ) value_separator = dn; - else value_separator = d; + value_separator = d; } else if ( ! NEEDSESCAPE( *s ) ) { --d; /* eliminate the \ */ } From fedora-directory-commits at redhat.com Mon Feb 20 19:36:32 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 20 Feb 2006 14:36:32 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.12, 1.13 windows_protocol_util.c, 1.23, 1.24 Message-ID: <200602201936.k1KJaWa3026400@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-serv26379 Modified Files: windows_connection.c windows_protocol_util.c Log Message: Bug(s) fixed: 181827 Bug Description: If you delete an attribute from an entry on AD, the attribute doesn't get deleted on the DS side. The replication code doesn't even notice that the entry changed. Reviewed by: Rich, Noriko, Pete (thanks!) Files: see diffs Branch: HEAD, Directory71Branch Fix Description: The dirsync search control passes back deleted attributes with no values. If you try to add a Slapi_Attr with no values to a Slapi_Entry, it doesn't get added. This fix stuffs the deleted attributes into the deleted attributes list in the Slapi_Entry and checks for them when creating the modification operations to be performed on the local entry. Flag Day: no Doc impact: no QA impact: A regression test needs to be added New Tests integrated into TET: none Index: windows_connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- windows_connection.c 27 Oct 2005 19:09:07 -0000 1.12 +++ windows_connection.c 20 Feb 2006 19:36:24 -0000 1.13 @@ -557,7 +557,19 @@ { type_to_use = a; } - slapi_entry_add_values( e, type_to_use, aVal); + + /* If the list of attribute values is null, we need to delete this attribute + * from the local entry. + */ + if (aVal == NULL) { + /* Windows will send us an attribute with no values if it was deleted + * on the AD side. Add this attribute to the deleted attributes list */ + Slapi_Attr *attr = slapi_attr_new(); + slapi_attr_init(attr, type_to_use); + entry_add_deleted_attribute_wsi(e, attr); + } else { + slapi_entry_add_values( e, type_to_use, aVal); + } ldap_memfree(a); ldap_value_free_len(aVal); Index: windows_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- windows_protocol_util.c 22 Nov 2005 03:40:08 -0000 1.23 +++ windows_protocol_util.c 20 Feb 2006 19:36:24 -0000 1.24 @@ -2496,6 +2496,7 @@ { int retval = 0; Slapi_Attr *attr = NULL; + Slapi_Attr *del_attr = NULL; int is_user = 0; int is_group = 0; int rc = 0; @@ -2638,17 +2639,48 @@ *do_modify = 1; } } + if (vs) { slapi_valueset_free(vs); vs = NULL; } - if (local_type) - { - slapi_ch_free((void**)&local_type); - local_type = NULL; - } + + slapi_ch_free_string(&local_type); } + + /* Check if any attributes were deleted from the remote entry */ + entry_first_deleted_attribute(remote_entry, &del_attr); + while (del_attr != NULL) { + Slapi_Attr *local_attr = NULL; + char *type = NULL; + char *local_type = NULL; + int mapdn = 0; + + /* Map remote type to local type */ + slapi_attr_get_type(del_attr, &type); + if ( is_straight_mapped_attr(type,is_user,is_nt4) ) { + local_type = slapi_ch_strdup(type); + } else { + windows_map_attr_name(type , to_windows, is_user, 0 /* not create */, &local_type, &mapdn); + } + + /* Check if this attr exists in the local entry */ + if (local_type) { + slapi_entry_attr_find(local_entry, local_type, &local_attr); + if (local_attr) { + slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, + "windows_generate_update_mods: deleting %s attribute from local entry\n", local_type); + /* Delete this attr from the local entry */ + slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL); + *do_modify = 1; + } + } + + entry_next_deleted_attribute(remote_entry, &del_attr); + slapi_ch_free_string(&local_type); + } + if (slapi_is_loglevel_set(SLAPI_LOG_REPL) && *do_modify) { slapi_mods_dump(smods,"windows sync"); @@ -2669,14 +2701,18 @@ /* Now perform the modify if we need to */ if (0 == retval && do_modify) { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "windows_update_remote_entry: modifying entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "windows_update_remote_entry: modifying entry %s\n", escape_string(dn, dnbuf)); retval = windows_conn_send_modify(prp->conn, slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)),slapi_mods_get_ldapmods_byref(&smods), NULL,NULL); } else { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "no mods generated for remote entry: %s\n", escape_string(dn, dnbuf)); } slapi_mods_done(&smods); return retval; @@ -2701,8 +2737,10 @@ pb = slapi_pblock_new(); if (pb) { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "modifying entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry))); + "modifying entry: %s\n", escape_string(dn, dnbuf)); slapi_modify_internal_set_pb (pb, slapi_entry_get_ndn(local_entry), slapi_mods_get_ldapmods_byref(&smods), NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0); slapi_modify_internal_pb (pb); @@ -2710,7 +2748,7 @@ if (rc) { slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, - "windows_update_local_entry: failed to modify entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry))); + "windows_update_local_entry: failed to modify entry %s\n", escape_string(dn, dnbuf)); } slapi_pblock_destroy(pb); } else @@ -2721,8 +2759,10 @@ } else { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "no mods generated for local entry: %s\n", escape_string(dn, dnbuf)); } slapi_mods_done(&smods); return retval; @@ -2959,6 +2999,22 @@ windows_get_remote_entry(prp,slapi_entry_get_sdn_const(e),&remote_entry); if (remote_entry) { + /* We need to check for any deleted attrs from the dirsync entry + * and pass them into the newly fetched remote entry. */ + Slapi_Attr *attr = NULL; + Slapi_Attr *rem_attr = NULL; + entry_first_deleted_attribute(e, &attr); + while (attr != NULL) { + /* We need to dup the attr and add it to the remote entry. + * rem_attr is now owned by remote_entry, so don't free it */ + rem_attr = slapi_attr_dup(attr); + if (rem_attr) { + entry_add_deleted_attribute_wsi(remote_entry, rem_attr); + rem_attr = NULL; + } + entry_next_deleted_attribute(e, &attr); + } + rc = windows_update_local_entry(prp, remote_entry, local_entry); slapi_entry_free(remote_entry); remote_entry = NULL; From fedora-directory-commits at redhat.com Mon Feb 20 19:50:37 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Mon, 20 Feb 2006 14:50:37 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication windows_connection.c, 1.8.2.4, 1.8.2.5 windows_protocol_util.c, 1.20.2.2, 1.20.2.3 Message-ID: <200602201950.k1KJobHl026661@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-serv26642 Modified Files: Tag: Directory71RtmBranch windows_connection.c windows_protocol_util.c Log Message: Bug(s) fixed: 181827 Bug Description: If you delete an attribute from an entry on AD, the attribute doesn't get deleted on the DS side. The replication code doesn't even notice that the entry changed. Reviewed by: Rich, Noriko, Pete (thanks!) Files: see diffs Branch: HEAD, Directory71Branch Fix Description: The dirsync search control passes back deleted attributes with no values. If you try to add a Slapi_Attr with no values to a Slapi_Entry, it doesn't get added. This fix stuffs the deleted attributes into the deleted attributes list in the Slapi_Entry and checks for them when creating the modification operations to be performed on the local entry. Flag Day: no Doc impact: no QA impact: A regression test needs to be added New Tests integrated into TET: none Index: windows_connection.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_connection.c,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -u -r1.8.2.4 -r1.8.2.5 --- windows_connection.c 27 Oct 2005 19:11:14 -0000 1.8.2.4 +++ windows_connection.c 20 Feb 2006 19:50:29 -0000 1.8.2.5 @@ -557,7 +557,19 @@ { type_to_use = a; } - slapi_entry_add_values( e, type_to_use, aVal); + + /* If the list of attribute values is null, we need to delete this attribute + * from the local entry. + */ + if (aVal == NULL) { + /* Windows will send us an attribute with no values if it was deleted + * on the AD side. Add this attribute to the deleted attributes list */ + Slapi_Attr *attr = slapi_attr_new(); + slapi_attr_init(attr, type_to_use); + entry_add_deleted_attribute_wsi(e, attr); + } else { + slapi_entry_add_values( e, type_to_use, aVal); + } ldap_memfree(a); ldap_value_free_len(aVal); Index: windows_protocol_util.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/windows_protocol_util.c,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -r1.20.2.2 -r1.20.2.3 --- windows_protocol_util.c 20 Oct 2005 17:25:22 -0000 1.20.2.2 +++ windows_protocol_util.c 20 Feb 2006 19:50:29 -0000 1.20.2.3 @@ -2494,6 +2494,7 @@ { int retval = 0; Slapi_Attr *attr = NULL; + Slapi_Attr *del_attr = NULL; int is_user = 0; int is_group = 0; int rc = 0; @@ -2636,17 +2637,48 @@ *do_modify = 1; } } + if (vs) { slapi_valueset_free(vs); vs = NULL; } - if (local_type) - { - slapi_ch_free((void**)&local_type); - local_type = NULL; - } + + slapi_ch_free_string(&local_type); } + + /* Check if any attributes were deleted from the remote entry */ + entry_first_deleted_attribute(remote_entry, &del_attr); + while (del_attr != NULL) { + Slapi_Attr *local_attr = NULL; + char *type = NULL; + char *local_type = NULL; + int mapdn = 0; + + /* Map remote type to local type */ + slapi_attr_get_type(del_attr, &type); + if ( is_straight_mapped_attr(type,is_user,is_nt4) ) { + local_type = slapi_ch_strdup(type); + } else { + windows_map_attr_name(type , to_windows, is_user, 0 /* not create */, &local_type, &mapdn); + } + + /* Check if this attr exists in the local entry */ + if (local_type) { + slapi_entry_attr_find(local_entry, local_type, &local_attr); + if (local_attr) { + slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, + "windows_generate_update_mods: deleting %s attribute from local entry\n", local_type); + /* Delete this attr from the local entry */ + slapi_mods_add_mod_values(smods, LDAP_MOD_DELETE, local_type, NULL); + *do_modify = 1; + } + } + + entry_next_deleted_attribute(remote_entry, &del_attr); + slapi_ch_free_string(&local_type); + } + if (slapi_is_loglevel_set(SLAPI_LOG_REPL) && *do_modify) { slapi_mods_dump(smods,"windows sync"); @@ -2667,14 +2699,18 @@ /* Now perform the modify if we need to */ if (0 == retval && do_modify) { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "windows_update_remote_entry: modifying entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "windows_update_remote_entry: modifying entry %s\n", escape_string(dn, dnbuf)); retval = windows_conn_send_modify(prp->conn, slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)),slapi_mods_get_ldapmods_byref(&smods), NULL,NULL); } else { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "no mods generated for remote entry: %s\n", escape_string(dn, dnbuf)); } slapi_mods_done(&smods); return retval; @@ -2699,8 +2735,10 @@ pb = slapi_pblock_new(); if (pb) { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "modifying entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry))); + "modifying entry: %s\n", escape_string(dn, dnbuf)); slapi_modify_internal_set_pb (pb, slapi_entry_get_ndn(local_entry), slapi_mods_get_ldapmods_byref(&smods), NULL, NULL, repl_get_plugin_identity (PLUGIN_MULTIMASTER_REPLICATION), 0); slapi_modify_internal_pb (pb); @@ -2708,7 +2746,7 @@ if (rc) { slapi_log_error(SLAPI_LOG_FATAL, windows_repl_plugin_name, - "windows_update_local_entry: failed to modify entry %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry))); + "windows_update_local_entry: failed to modify entry %s\n", escape_string(dn, dnbuf)); } slapi_pblock_destroy(pb); } else @@ -2719,8 +2757,10 @@ } else { + char dnbuf[BUFSIZ]; + char *dn = slapi_sdn_get_dn(slapi_entry_get_sdn_const(local_entry)); slapi_log_error(SLAPI_LOG_REPL, windows_repl_plugin_name, - "no mods generated for entry: %s\n", slapi_sdn_get_dn(slapi_entry_get_sdn_const(remote_entry))); + "no mods generated for local entry: %s\n", escape_string(dn, dnbuf)); } slapi_mods_done(&smods); return retval; @@ -2957,6 +2997,22 @@ windows_get_remote_entry(prp,slapi_entry_get_sdn_const(e),&remote_entry); if (remote_entry) { + /* We need to check for any deleted attrs from the dirsync entry + * and pass them into the newly fetched remote entry. */ + Slapi_Attr *attr = NULL; + Slapi_Attr *rem_attr = NULL; + entry_first_deleted_attribute(e, &attr); + while (attr != NULL) { + /* We need to dup the attr and add it to the remote entry. + * rem_attr is now owned by remote_entry, so don't free it */ + rem_attr = slapi_attr_dup(attr); + if (rem_attr) { + entry_add_deleted_attribute_wsi(remote_entry, rem_attr); + rem_attr = NULL; + } + entry_next_deleted_attribute(e, &attr); + } + rc = windows_update_local_entry(prp, remote_entry, local_entry); slapi_entry_free(remote_entry); remote_entry = NULL; From fedora-directory-commits at redhat.com Tue Feb 21 19:30:17 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Tue, 21 Feb 2006 14:30:17 -0500 Subject: [Fedora-directory-commits] console imports.FC2, 1.2, 1.3 imports.FC3, 1.2, 1.3 imports.HP-UX11i, 1.2, 1.3 imports.Solaris9, 1.2, 1.3 Message-ID: <200602211930.k1LJUHSu017312@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17289 Modified Files: imports.FC2 imports.FC3 imports.HP-UX11i imports.Solaris9 Log Message: Updated nss version and added x86_64 imports file Index: imports.FC2 =================================================================== RCS file: /cvs/dirsec/console/imports.FC2,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imports.FC2 29 Nov 2005 18:36:50 -0000 1.2 +++ imports.FC2 21 Feb 2006 19:30:09 -0000 1.3 @@ -32,7 +32,7 @@ jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL3_x86_gcc3_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/RHEL3_x86_gcc3_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library Index: imports.FC3 =================================================================== RCS file: /cvs/dirsec/console/imports.FC3,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imports.FC3 29 Nov 2005 18:36:50 -0000 1.2 +++ imports.FC3 21 Feb 2006 19:30:09 -0000 1.3 @@ -32,7 +32,7 @@ jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL4_x86_gcc3_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/RHEL4_x86_gcc3_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library Index: imports.HP-UX11i =================================================================== RCS file: /cvs/dirsec/console/imports.HP-UX11i,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imports.HP-UX11i 29 Nov 2005 18:36:50 -0000 1.2 +++ imports.HP-UX11i 21 Feb 2006 19:30:09 -0000 1.3 @@ -32,7 +32,7 @@ jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/HP-UXB.11.11_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/HP-UXB.11.11_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library Index: imports.Solaris9 =================================================================== RCS file: /cvs/dirsec/console/imports.Solaris9,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- imports.Solaris9 29 Nov 2005 18:36:50 -0000 1.2 +++ imports.Solaris9 21 Feb 2006 19:30:09 -0000 1.3 @@ -32,7 +32,7 @@ jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/SunOS5.9_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/SunOS5.9_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library From fedora-directory-commits at redhat.com Tue Feb 21 20:46:11 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 21 Feb 2006 15:46:11 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.7, 1.1.2.8 redhat-patch.inf, 1.1.2.7, 1.1.2.8 Message-ID: <200602212046.k1LKkB1A019881@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19855 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: added 175063,179135,179137,175897,179810,181827 Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 +++ fedora-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8 @@ -45,11 +45,11 @@ base: ... file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: 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: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810: 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.* @@ -57,29 +57,29 @@ file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi file: 167761: java/jars/ds71.jar -file: 169388,169954,170071,170350: lib/replication-plugin.* +file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.so file: M324525,M324529: shared/lib/libprldap50.so file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: shared/bin/ldapcmp +file: M324525,M324529: shared/bin/ldapcompare +file: M324525,M324529: shared/bin/ldapdelete +file: M324525,M324529: shared/bin/ldapmodify +file: M324525,M324529: shared/bin/ldapsearch file: M324525,M324529: bin/slapd/lib/libldap50.so file: M324525,M324529: bin/slapd/lib/libprldap50.so file: M324525,M324529: bin/slapd/lib/libssldap50.so file: M324525,M324529: clients/lib/libldap50.so file: M324525,M324529: clients/lib/libprldap50.so file: M324525,M324529: clients/lib/libssldap50.so -file: M324525,M324529: shared/bin/ldapcmp -file: M324525,M324529: shared/bin/ldapcompare -file: M324525,M324529: shared/bin/ldapdelete -file: M324525,M324529: shared/bin/ldapmodify -file: M324525,M324529: shared/bin/ldapsearch -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so -copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7 +++ redhat-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8 @@ -45,11 +45,11 @@ base: /share/builds/products/server/directry/7.1 file: 147585: plugins/slapd/slapi/examples/testpreop.c -file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd -file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.* +file: 164834,165641,166229,173687,175063: bin/slapd/server/ns-slapd +file: 155276,164834,164843,165641,166229,173687,175063,179135,179137: 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: 155276,164843,165641,165827,165862,166012,175063,175897,179135,179137,179810: 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.* @@ -57,7 +57,7 @@ file: 167478,160589: setup/setup file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi file: 167761: java/jars/ds71.jar -file: 169388,169954,170071,170350: lib/replication-plugin.* +file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt file: M324525,M324529: shared/lib/libldap50.so From fedora-directory-commits at redhat.com Tue Feb 21 21:38:13 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 21 Feb 2006 16:38:13 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm fedora-patch.inf, 1.1.2.8, 1.1.2.9 redhat-patch.inf, 1.1.2.8, 1.1.2.9 Message-ID: <200602212138.k1LLcDGc022061@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22038 Modified Files: Tag: Directory71RtmBranch fedora-patch.inf redhat-patch.inf Log Message: replaced library extensions ".so" with ".*" (fix for HP-UX patch packaging) Index: fedora-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- fedora-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8 +++ fedora-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9 @@ -60,26 +60,26 @@ file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt -file: M324525,M324529: shared/lib/libldap50.so -file: M324525,M324529: shared/lib/libprldap50.so -file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: shared/lib/libldap50.* +file: M324525,M324529: shared/lib/libprldap50.* +file: M324525,M324529: shared/lib/libssldap50.* file: M324525,M324529: shared/bin/ldapcmp file: M324525,M324529: shared/bin/ldapcompare file: M324525,M324529: shared/bin/ldapdelete file: M324525,M324529: shared/bin/ldapmodify file: M324525,M324529: shared/bin/ldapsearch -file: M324525,M324529: bin/slapd/lib/libldap50.so -file: M324525,M324529: bin/slapd/lib/libprldap50.so -file: M324525,M324529: bin/slapd/lib/libssldap50.so -file: M324525,M324529: clients/lib/libldap50.so -file: M324525,M324529: clients/lib/libprldap50.so -file: M324525,M324529: clients/lib/libssldap50.so +file: M324525,M324529: bin/slapd/lib/libldap50.* +file: M324525,M324529: bin/slapd/lib/libprldap50.* +file: M324525,M324529: bin/slapd/lib/libssldap50.* +file: M324525,M324529: clients/lib/libldap50.* +file: M324525,M324529: clients/lib/libprldap50.* +file: M324525,M324529: clients/lib/libssldap50.* -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.* compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help Index: redhat-patch.inf =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- redhat-patch.inf 21 Feb 2006 20:45:48 -0000 1.1.2.8 +++ redhat-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9 @@ -60,26 +60,26 @@ file: 169388,169954,170071,170350,181827,179135,179137: lib/replication-plugin.* file: xxxxxx: bin/slapd/README.txt file: xxxxxx: README.txt -file: M324525,M324529: shared/lib/libldap50.so -file: M324525,M324529: shared/lib/libprldap50.so -file: M324525,M324529: shared/lib/libssldap50.so +file: M324525,M324529: shared/lib/libldap50.* +file: M324525,M324529: shared/lib/libprldap50.* +file: M324525,M324529: shared/lib/libssldap50.* file: M324525,M324529: shared/bin/ldapcmp file: M324525,M324529: shared/bin/ldapcompare file: M324525,M324529: shared/bin/ldapdelete file: M324525,M324529: shared/bin/ldapmodify file: M324525,M324529: shared/bin/ldapsearch -file: M324525,M324529: bin/slapd/lib/libldap50.so -file: M324525,M324529: bin/slapd/lib/libprldap50.so -file: M324525,M324529: bin/slapd/lib/libssldap50.so -file: M324525,M324529: clients/lib/libldap50.so -file: M324525,M324529: clients/lib/libprldap50.so -file: M324525,M324529: clients/lib/libssldap50.so +file: M324525,M324529: bin/slapd/lib/libldap50.* +file: M324525,M324529: bin/slapd/lib/libprldap50.* +file: M324525,M324529: bin/slapd/lib/libssldap50.* +file: M324525,M324529: clients/lib/libldap50.* +file: M324525,M324529: clients/lib/libprldap50.* +file: M324525,M324529: clients/lib/libssldap50.* -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so -copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.* +copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.* compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help From fedora-directory-commits at redhat.com Wed Feb 22 02:25:36 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 21 Feb 2006 21:25:36 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.37, 1.38 Message-ID: <200602220225.k1M2PaYD000635@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv618 Modified Files: pkgadmin.mk Log Message: Added httpd-2.2.conf.tmpl - Apache 2.2 uses different modules than 2.0 for auth/authz Admin server post install will figure out which one to use based on httpd -v Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- pkgadmin.mk 13 Feb 2006 22:12:55 -0000 1.37 +++ pkgadmin.mk 22 Feb 2006 02:25:27 -0000 1.38 @@ -280,6 +280,7 @@ cp $(BUILD_ROOT)/lib/ldaputil/certmap.conf $(ADMIN_DIR)/shared/config cp -p $(BUILD_ROOT)/admserv/cfgstuff/httpd.conf $(ADMIN_DIR)/shared/config/template/httpd.conf.tmpl + cp -p $(BUILD_ROOT)/admserv/cfgstuff/httpd-2.2.conf $(ADMIN_DIR)/shared/config/template/httpd-2.2.conf.tmpl cp -p $(BUILD_ROOT)/admserv/cfgstuff/admserv.conf $(ADMIN_DIR)/shared/config/template/admserv.conf.tmpl cp -p $(BUILD_ROOT)/admserv/cfgstuff/console.conf $(ADMIN_DIR)/shared/config/template/console.conf.tmpl cp -p $(BUILD_ROOT)/admserv/cfgstuff/nss.conf $(ADMIN_DIR)/shared/config/template/nss.conf.tmpl From fedora-directory-commits at redhat.com Wed Feb 22 02:28:59 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 21 Feb 2006 21:28:59 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.18, 1.19 Message-ID: <200602220228.k1M2SxbR000667@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv648 Modified Files: ux-update.cc Log Message: Apache 2.2 uses different modules for auth/authz than 2.0. This change allows admin server post install to figure out what version of Apache is being used (via httpd -v) and select the appropriate httpd.conf template file based on that version. Index: ux-update.cc =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ux-update.cc 12 Dec 2005 18:34:14 -0000 1.18 +++ ux-update.cc 22 Feb 2006 02:28:51 -0000 1.19 @@ -241,7 +241,6 @@ findApacheRoot(const char *dir) { char path[1024]; - char errMsg[SML_BUF]; struct stat st; char *v; @@ -264,6 +263,53 @@ return v; } +static char *get_version(char * file) { + char cmd[1024]; + char buf[1024]; + FILE *fp; + const char *versstr = "Server version: Apache/"; + + sprintf(cmd, "%s -v", file); + fp = popen(cmd, "r"); + + if (fp != NULL) { + char *x, *t; + while ((fgets(buf, sizeof(buf), fp)) > 0) { + x = (char *)strstr(buf, versstr); + if (x) { + t = x + strlen(versstr); + if (x = strchr(buf, '\n')) { + *x = '\0'; + } + pclose(fp); + return (char *)(strdup(t)); + } + } + } + pclose(fp); + return NULL; +} + +static NSString +findApacheVersion(const char *dir) +{ + char path[1024]; + struct stat st; + char *v; + + snprintf(path, sizeof(path), "%s/httpd.worker", dir); + if (stat(path, &st) != 0) { + snprintf(path, sizeof(path), "%s/httpd", dir); + if (stat(path, &st) != 0) { + return NULL; + } + } + + v = get_version(path); + + return v; +} + void configTasks(const Ldap *ldap, const char *sroot, const char *sieDN) { @@ -527,6 +573,7 @@ char apacheRoot[BIG_BUF]; char apacheDir[BIG_BUF]; char apacheBin[BIG_BUF]; + char apacheVersion[BIG_BUF]; struct stat st; NSString hostip = InstUtil::getHostIpAddress(hn); char serverAddress[SML_BUF]; @@ -535,6 +582,7 @@ int port; const char *s; char *ss; + NSString tmp; chdir(sroot); @@ -577,6 +625,12 @@ } } + apacheVersion[0] = '\0'; + tmp = findApacheVersion(apacheDir); + if ((const char*)tmp) { + strcpy(apacheVersion, (const char *)tmp); + } + s = installInfo->get(SS_USER_ID); if (NULL == s) { fatal_error("InstallInfo: Server User \"SuiteSpotUserID\" is missing.", "", ""); @@ -1209,8 +1263,12 @@ restartarray[1] = (char *)sroot; restartarray[2] = NULL; + if (0 == strncmp(apacheVersion, "2.2", 3)) { + snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd-2.2.conf.tmpl", sroot); + } else { + snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd.conf.tmpl", sroot); + } snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/httpd.conf", sroot); - snprintf(src, sizeof(tstr), "%s/shared/config/template/httpd.conf.tmpl", sroot); replaceTokensInFile(src, tstr, httparray); chmod(tstr, S_IRUSR | S_IWUSR); logUninstallInfo(sroot, "admin", "admin", tstr); From fedora-directory-commits at redhat.com Wed Feb 22 03:09:03 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 21 Feb 2006 22:09:03 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.15, 1.30.2.16 Message-ID: <200602220309.k1M393Xg002626@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2607 Modified Files: Tag: Directory71RtmBranch Makefile Log Message: When copyfile is a library, the extension was not treated correctly. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.30.2.15 retrieving revision 1.30.2.16 diff -u -r1.30.2.15 -r1.30.2.16 --- Makefile 17 Feb 2006 17:26:01 -0000 1.30.2.15 +++ Makefile 22 Feb 2006 03:08:49 -0000 1.30.2.16 @@ -726,7 +726,7 @@ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \ dfile=`echo $$pair | awk -F: '{print $$3}'` ; \ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \ - mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \ + mkdir -p `dirname $$dfile`; cp $$sfile `dirname $$dfile` ; \ echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \ done From fedora-directory-commits at redhat.com Wed Feb 22 16:03:07 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 22 Feb 2006 11:03:07 -0500 Subject: [Fedora-directory-commits] console imports.FC3_x86_64,NONE,1.1 Message-ID: <200602221603.k1MG3767002966@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2946 Added Files: imports.FC3_x86_64 Log Message: Added x86_64 imports file --- NEW FILE imports.FC3_x86_64 --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation version # 2.1 of the License. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK # # Defines component import locations for FC3 x86_64 # Mozilla LDAP JDK ldapjdk.location=http://directory.fedora.redhat.com/built/components/ldapjdk/v4.17 ldapjdk.import=ldapjdk.jar # Mozilla JSS Library jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/RHEL4_x86_64_gcc3_OPT.OBJ jss.lib.import=mdbinary.jar # Mozilla JSS Jar jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM jss.jar.import=xpclass.jar # Mozilla NSS Library nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_11_RTM/RHEL4_x86_64_gcc3_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/RHEL4_x86_64_gcc3_OPT.OBJ nspr.import=mdbinary.jar From fedora-directory-commits at redhat.com Wed Feb 22 18:15:34 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 22 Feb 2006 13:15:34 -0500 Subject: [Fedora-directory-commits] dsbuild objdirname.mk,1.3,1.4 Message-ID: <200602221815.k1MIFY2j008881@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8857 Modified Files: objdirname.mk Log Message: Added support for 64-bit Console build on Linux Index: objdirname.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- objdirname.mk 16 Feb 2006 21:33:42 -0000 1.3 +++ objdirname.mk 22 Feb 2006 18:15:24 -0000 1.4 @@ -168,10 +168,18 @@ # figure out which imports file to use - for console builds ifeq (RHEL4,$(findstring RHEL4,$(OBJDIR_NAME))) -IMPORTS.FILE=imports.FC3 + ifeq ($(USE_64), 1) + IMPORTS.FILE=imports.FC3_x86_64 + else + IMPORTS.FILE=imports.FC3 + endif endif ifeq (Linux2.6,$(findstring Linux2.6,$(OBJDIR_NAME))) -IMPORTS.FILE=imports.FC3 + ifeq ($(USE_64), 1) + IMPORTS.FILE=imports.FC3_x86_64 + else + IMPORTS.FILE=imports.FC3 + endif endif ifeq (RHEL3,$(findstring RHEL3,$(OBJDIR_NAME))) IMPORTS.FILE=imports.FC2 From fedora-directory-commits at redhat.com Wed Feb 22 21:45:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 22 Feb 2006 16:45:45 -0500 Subject: [Fedora-directory-commits] adminutil/lib/libadmsslutil Makefile, 1.3, 1.4 Message-ID: <200602222145.k1MLjjEk016288@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadmsslutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16214/lib/libadmsslutil Modified Files: Makefile Log Message: [179394] HP-UX PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM ICU_VERSDIR=libicu_3_4 (from /share/builds/sbsintegration/libicu/libicu_3_4) Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadmsslutil/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 28 Jan 2006 02:30:03 -0000 1.3 +++ Makefile 22 Feb 2006 21:45:37 -0000 1.4 @@ -58,8 +58,6 @@ ADM_EXPORT_FILE=$(OBJLIBDIR)/$(SO_NAME)$(DLL_PRESUF).exp endif -DEPLIBS += $(ADMSDKLINK) $(ICULINK) $(LDAPLINK) $(SVRCORELINK) $(SECURITYLINK) $(NSPRLINK) $(EXTRA_LIBS) - # # Don't build sslpset.c since the open-source SVRCORE doesn't have everything it needs # From fedora-directory-commits at redhat.com Wed Feb 22 21:45:26 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 22 Feb 2006 16:45:26 -0500 Subject: [Fedora-directory-commits] adminutil component_versions.mk, 1.2, 1.3 components.mk, 1.2, 1.3 internal_comp_deps.mk, 1.2, 1.3 Message-ID: <200602222145.k1MLjvsS016293@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16214 Modified Files: component_versions.mk components.mk internal_comp_deps.mk Log Message: [179394] HP-UX PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM ICU_VERSDIR=libicu_3_4 (from /share/builds/sbsintegration/libicu/libicu_3_4) Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/adminutil/component_versions.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- component_versions.mk 28 Jan 2006 02:29:52 -0000 1.2 +++ component_versions.mk 22 Feb 2006 21:45:17 -0000 1.3 @@ -34,12 +34,12 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.4.1 + NSPR_RELDATE = v4.6 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_9_3_RTM + SECURITY_RELDATE = NSS_3_11_RTM endif # LDAP SDK @@ -63,6 +63,6 @@ ICU_VERSDIR=libicu_3_4 endif ifndef ICU_RELDATE - ICU_RELDATE=20040820 + ICU_RELDATE= endif Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminutil/components.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- components.mk 28 Jan 2006 02:29:52 -0000 1.2 +++ components.mk 22 Feb 2006 21:45:17 -0000 1.3 @@ -73,15 +73,6 @@ NSPR_INCLUDE = -I$(NSPR_INCDIR) NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES))) -LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG) -LIBS_TO_PKG_SHARED += $(NSPR_LIBS_TO_PKG) # needed for cmd line tools -ifeq ($(USE_SETUPSDK), 1) - PACKAGE_SETUP_LIBS += $(NSPR_LIBS_TO_PKG) -endif -ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(NSPR_LIBS_TO_PKG) # for dsgw -endif - ifeq ($(ARCH), WINNT) NSPRDLL_NAME = $(addprefix lib, $(NSPR_LIBNAMES)) NSPROBJNAME = $(addsuffix .lib, $(NSPRDLL_NAME)) @@ -109,38 +100,6 @@ # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign SECURITY_LIBNAMES = ssl3 nss3 softokn3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK = softokn3 - -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 - -# these are only needed on 32 bit Solaris and HP-UX -ifneq ($(USE_64), 1) -ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 -endif -ifeq ($(ARCH), HPUX) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 -# these libs have a corresponding .chk file -SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 -endif -endif # USE_64 - -SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES)) -SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS)) - -SECURITY_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_LIBNAMES.pkg))) -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) - PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) -endif -ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw -endif ifeq ($(ARCH), WINNT) SECURITYOBJNAME = $(addsuffix .$(LIB_SUFFIX), $(SECURITY_LIBNAMES)) @@ -152,12 +111,6 @@ SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES)) endif -# we need to package the root cert file in the alias directory -PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) alias - -# need to package the sec tools in shared/bin -BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH) - ### SECURITY END ############################# #################################################### @@ -175,13 +128,8 @@ endif LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR) -# package the command line programs -LDAPSDK_TOOLS = $(wildcard $(LDAPSDK_BINPATH)/ldap*$(EXE_SUFFIX)) -BINS_TO_PKG_SHARED += $(LDAPSDK_TOOLS) # package the include files - needed for the plugin API LDAPSDK_INCLUDE_FILES = $(wildcard $(LDAPSDK_INCDIR)/*.h) -PACKAGE_SRC_DEST += $(subst $(SPACE),$(SPACE)plugins/slapd/slapi/include$(SPACE),$(LDAPSDK_INCLUDE_FILES)) -PACKAGE_SRC_DEST += plugins/slapd/slapi/include ifeq ($(ARCH), WINNT) LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF) @@ -191,14 +139,6 @@ LDAP_NOSSL_LINK = /LIBPATH:$(LDAPSDK_LIBPATH) nsldap32v$(LDAP_SUF).$(LIB_SUFFIX) LIBLDAPDLL_NAMES = $(addsuffix .dll, $(addprefix $(LDAP_LIBPATH)/, $(LDAPDLL_NAME))) - 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) - PACKAGE_SETUP_LIBS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME))) - endif - ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(LDAPSDK_LIBPATH)/,$(LDAPDLL_NAME))) - endif else # not WINNT LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ifndef LDAP_NO_LIBLCACHE @@ -212,14 +152,6 @@ LDAPLINK = -L$(LDAPSDK_LIBPATH) $(addprefix -l,$(LDAP_SOLIB_NAMES)) LDAP_NOSSL_LINK = -L$(LDAPSDK_LIBPATH) -lldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) - LIBS_TO_PKG += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) - LIBS_TO_PKG_SHARED += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) - ifeq ($(USE_SETUPSDK), 1) - PACKAGE_SETUP_LIBS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) - endif - ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(addprefix $(LDAPSDK_LIBPATH)/,$(LDAP_SOLIBS)) - endif endif LDAP_LIBPATH = $(LDAPSDK_LIBPATH) @@ -248,19 +180,9 @@ ICU_LIBNAMES = icuin$(ICU_LIB_SUF) icuuc$(ICU_LIB_SUF) icudata ICU_DLLNAMES = icuin$(ICU_LIB_VERSION)$(ICU_LIB_SUF) icuuc$(ICU_LIB_VERSION)$(ICU_LIB_SUF) icudt$(ICU_LIB_VERSION)l ICULINK = /LIBPATH:$(ICU_LIBPATH) $(addsuffix .$(LIB_SUFFIX),$(ICU_LIBNAMES)) - LIBS_TO_PKG += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES))) - LIBS_TO_PKG_SHARED += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES))) - ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_BINPATH)/,$(ICU_DLLNAMES))) - endif else ICU_LIBNAMES = icui18n icuuc icudata ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES)) - LIBS_TO_PKG += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES))))) - LIBS_TO_PKG_SHARED += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES))))) - ifeq ($(USE_DSGW), 1) - LIBS_TO_PKG_CLIENTS += $(addsuffix .$(ICU_LIB_VERSION),$(addsuffix .$(DLL_SUFFIX),$(addprefix $(ICU_LIBPATH)/,$(addprefix lib,$(ICU_LIBNAMES))))) - endif #LIBS_TO_PKG = $(addsuffix $(addprefix lib,$(ICU_LIBNAMES)) endif @@ -271,9 +193,6 @@ ICU_GENRB = sh ./genrb_wrapper.sh $(ICU_BUILD_DIR) endif - -BINS_TO_PKG_SHARED += $(ICU_BINPATH)/uconv$(EXE_SUFFIX) - ########################################################### ifeq ($(INTERNAL_BUILD), 1) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- internal_comp_deps.mk 15 Feb 2006 22:50:15 -0000 1.2 +++ internal_comp_deps.mk 22 Feb 2006 21:45:17 -0000 1.3 @@ -55,47 +55,11 @@ else SECURITY_DEP = $(SECURITY_LIBPATH)/libssl3.$(DLL_SUFFIX) endif -# if building 64 bit version, also need the 32 bit version of nssckbi.so -# rename it as nssckbi32.so -ifeq ($(USE_64), 1) -# assumes there is a 32 bit version - SHARED32_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/shared32 - NSS32_IMPORT = $(subst $(NS64TAG),,$(SECURITY_IMPORT)) - NSS32_BINNAMES = modutil - NSS32_LIBNAMES = $(SECURITY_LIBNAMES.pkg) - NSS32_NEED_CHK = $(SECURITY_NEED_CHK) - ifeq ($(ARCH), SOLARIS) - NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3 -# these libs have a corresponding .chk file - NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 - endif - ifeq ($(ARCH), HPUX) - NSS32_LIBNAMES += freebl_hybrid_3 freebl_pure32_3 -# these libs have a corresponding .chk file - NSS32_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 - endif - NSSCKBI_FILE = $(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) - NSSCKBI32_FILE = $(LIB_PREFIX)nssckbi32.$(DLL_SUFFIX) - NSS32_PULLFILES = bin/modutil lib/$(NSSCKBI_FILE) $(addprefix lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSS32_LIBNAMES))) $(addprefix lib/$(LIB_PREFIX),$(addsuffix .chk,$(NSS32_NEED_CHK))) - - NSPR32_IMPORT = $(subst $(NS64TAG),,$(NSPR_IMPORT)) - NSPR32_LIBNAMES = $(NSPR_LIBNAMES) - NSPR32_PULLFILES = lib/$(LIB_PREFIX)$(subst $(SPACE),$(COMMA)lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(NSPR_LIBNAMES))) - -# we need to package the root cert file in the alias directory - PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE) alias -# all other files go under shared32/bin or /lib - PACKAGE_SRC_DEST += $(SHARED32_BUILD_DIR)/bin/modutil shared32/bin - -# do not need redundant copy of nssckbi - NSS32_NSPR32_SRC_LIBS = $(filter-out $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*)) - PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS)) -endif # USE_64 ifdef VSFTPD_HACK -SECURITY_FILES=lib,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS)) +SECURITY_FILES=lib else -SECURITY_FILES=lib,include,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS)) +SECURITY_FILES=lib,include endif ifndef SECURITY_PULL_METHOD @@ -114,20 +78,6 @@ -objdir $(SECURITY_BUILD_DIR) -componentdir $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE) \ -files include endif -# if building 64 bit version, also need the 32 bit version of nssckbi.so -# rename it as nssckbi32.so -# also need the 32 bit modutil, other NSS shared libraries and NSPR shared libraries -ifeq ($(USE_64), 1) - mkdir -p $(SHARED32_BUILD_DIR)/bin - mkdir -p $(SHARED32_BUILD_DIR)/lib - $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \ - -objdir $(SHARED32_BUILD_DIR) -componentdir $(NSPR32_IMPORT) \ - -files $(NSPR32_PULLFILES) - $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \ - -objdir $(SHARED32_BUILD_DIR) -componentdir $(NSS32_IMPORT) \ - -files $(subst $(SPACE),$(COMMA),$(NSS32_PULLFILES)) - mv $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE) -endif # USE_64 endif # COMPONENT_DEPS - at if [ ! -f $@ ] ; \ then echo "Error: could not get component NSS file $@" ; \ @@ -175,7 +125,8 @@ endif # LDAPSDK_SOURCE_ROOT ifndef ICU_SOURCE_ROOT -ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) +#ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) +ICU_RELEASE = $(INT_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h ifndef ICU_PULL_METHOD ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD) From fedora-directory-commits at redhat.com Wed Feb 22 21:45:34 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 22 Feb 2006 16:45:34 -0500 Subject: [Fedora-directory-commits] adminutil/include version.h,1.5,1.6 Message-ID: <200602222146.k1MLk49p016296@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16214/include Modified Files: version.h Log Message: [179394] HP-UX PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM ICU_VERSDIR=libicu_3_4 (from /share/builds/sbsintegration/libicu/libicu_3_4) Index: version.h =================================================================== RCS file: /cvs/dirsec/adminutil/include/version.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- version.h 15 Dec 2005 21:06:48 -0000 1.5 +++ version.h 22 Feb 2006 21:45:24 -0000 1.6 @@ -44,4 +44,4 @@ #define VI_COMPANYNAME "Red Hat, Inc." #define VI_COPYRIGHT "Copyright (C) 2005 Red Hat, Inc." -#define ADMSDK_BUILDNUM "2005.349.2055" +#define ADMSDK_BUILDNUM "2006.053.2050" From fedora-directory-commits at redhat.com Wed Feb 22 21:45:39 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 22 Feb 2006 16:45:39 -0500 Subject: [Fedora-directory-commits] adminutil/lib/libadminutil Makefile, 1.6, 1.7 Message-ID: <200602222146.k1MLk999016300@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil/lib/libadminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16214/lib/libadminutil Modified Files: Makefile Log Message: [179394] HP-UX PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM ICU_VERSDIR=libicu_3_4 (from /share/builds/sbsintegration/libicu/libicu_3_4) Index: Makefile =================================================================== RCS file: /cvs/dirsec/adminutil/lib/libadminutil/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 28 Jan 2006 02:29:58 -0000 1.6 +++ Makefile 22 Feb 2006 21:45:32 -0000 1.7 @@ -58,8 +58,6 @@ LDAPLINK=-L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES)) $(addprefix -l, $(LDAP_SSLLIB_NAMES)) endif -DEPLIBS += $(NSPRLINK) $(LDAP_NOSSL_LINK) $(ICULINK) $(EXTRA_LIBS) - ifeq ($(ARCH), SOLARIS) ifeq ($(NS_USE_NATIVE), 1) ifeq ($(USE_64), 1) From fedora-directory-commits at redhat.com Thu Feb 23 00:01:20 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Wed, 22 Feb 2006 19:01:20 -0500 Subject: [Fedora-directory-commits] adminutil pkgadminutil.mk,1.6,1.7 Message-ID: <200602230001.k1N01K1b022662@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21147 Modified Files: pkgadminutil.mk Log Message: [179394] HP-UX IPF/PA-RISC support replaced --exclude option with -X for broader tar. Index: pkgadminutil.mk =================================================================== RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pkgadminutil.mk 28 Jan 2006 02:29:52 -0000 1.6 +++ pkgadminutil.mk 23 Feb 2006 00:01:12 -0000 1.7 @@ -28,6 +28,7 @@ include $(BUILD_ROOT)/nsconfig.mk MKDIR=mkdir -p +TMPLIST := $(shell echo /tmp/build.$$$$) # Destination directories for package PKGDIR_NAME=$(FULL_RTL_OBJDIR) @@ -99,9 +100,18 @@ cd $(ABS_PKGINSTDIR); tar -cvf - * | gzip -c > adminutil.tar.gz # create a source tar ball (ABS_INSTDIR is always new and clean) ifneq ($(ARCH), WINNT) - cd $(ABS_INSTDIR); ln -s $(ABS_ROOT) $(RPM_FILE_BASE); \ - tar cfh - --exclude \*/built --exclude \*/CVS $(RPM_FILE_BASE) --exclude \*/branding --exclude \*/RHEL* --exclude \*/SunOS* --exclude \*/HP* --exclude \*/Linux* | gzip > $(RPM_FILE_BASE).tar.gz; \ + cd $(ABS_INSTDIR); \ + if [ -h $(RPM_FILE_BASE) ] ; then rm -rf $(RPM_FILE_BASE) ; fi ; \ + ln -s $(ABS_ROOT) $(RPM_FILE_BASE); \ + echo $(RPM_FILE_BASE)/built > $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "CVS" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "HP-UX*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "SunOS*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "RHEL*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "Linux*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + tar cfh - -X $(TMPLIST) $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz; \ rm -rf $(RPM_FILE_BASE) + rm -rf $(TMPLIST) endif pkgRPM: From fedora-directory-commits at redhat.com Thu Feb 23 00:43:23 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Wed, 22 Feb 2006 19:43:23 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.4, 1.5 Message-ID: <200602230043.k1N0hNAb023215@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer/unix/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23197 Modified Files: Makefile Log Message: Fixed intermittent build failure on fast machines caused by an incorrect automatic variable Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 16 Feb 2006 23:57:54 -0000 1.4 +++ Makefile 23 Feb 2006 00:43:13 -0000 1.5 @@ -89,7 +89,7 @@ mkdir -p $(DISTINC) $(LIBS): $(OBJS) - $(AR) $? + $(AR) $^ $(RANLIB) $@ $(CURSES) $(STAGE): $(DISTINC) From fedora-directory-commits at redhat.com Thu Feb 23 01:13:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:13:01 -0500 Subject: [Fedora-directory-commits] adminserver/include/nt regparms.h, 1.8, 1.9 Message-ID: <200602230113.k1N1D1wM025196@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/include/nt In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/include/nt Modified Files: regparms.h Log Message: Change admin server version to 1.0.2 Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure mod_admserv is loaded after mod_nss Index: regparms.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/nt/regparms.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regparms.h 7 Dec 2005 21:42:40 -0000 1.8 +++ regparms.h 23 Feb 2006 01:12:51 -0000 1.9 @@ -46,19 +46,19 @@ /* Admin IDs */ #define ADM_ID_PRODUCT "admin" #define ADM_NAME_SHORT "Administration" -#define ADM_VERSION "1.0.1" -#define ADM_NAME_VERSION "Administration 1.0.1" +#define ADM_VERSION "1.0.2" +#define ADM_NAME_VERSION "Administration 1.0.2" #define ADM_NAME_SERVER "Administration Server" #define ADM_NAME_FULL "Fedora Administration Server" -#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0.1" -#define ADM_NAME_SERVICE "Fedora Administration 1.0.1" +#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0.2" +#define ADM_NAME_SERVICE "Fedora Administration 1.0.2" #define ADM_EXE "ns-admin.exe" #define ADM_EXE_START "admin.exe" #define ADM_ID_SERVICE "admin10" -#define ADM_KEY_ROOT "Administration\\1.0.1" +#define ADM_KEY_ROOT "Administration\\1.0.2" #define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server" #define ADM_DIR_ROOT "admin" -#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0.1" +#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0.2" /* original definitions */ // Upper-level registry parameters From fedora-directory-commits at redhat.com Thu Feb 23 01:12:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:12:13 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.38, 1.39 Message-ID: <200602230113.k1N1DE5N025202@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/admserv Modified Files: pkgadmin.mk Log Message: Change admin server version to 1.0.2 Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure mod_admserv is loaded after mod_nss Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- pkgadmin.mk 22 Feb 2006 02:25:27 -0000 1.38 +++ pkgadmin.mk 23 Feb 2006 01:12:03 -0000 1.39 @@ -292,8 +292,8 @@ cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver10to101.patch $(ADMIN_DIR)/setup # The patch file that fixes the start-admin ldap problem on Fedora Core 2 cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup -# The patch file that fixes the console ld libpath problem - cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup +# The patch file that fixes module load order + cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-httpd-moduleorder.patch $(ADMIN_DIR)/setup cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients From fedora-directory-commits at redhat.com Thu Feb 23 01:12:47 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:12:47 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/console/src/com/netscape/management/admserv admserv.properties, 1.5, 1.6 Message-ID: <200602230113.k1N1DHV3025205@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/admserv/console/src/com/netscape/management/admserv Modified Files: admserv.properties Log Message: Change admin server version to 1.0.2 Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure mod_admserv is loaded after mod_nss Index: admserv.properties =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/console/src/com/netscape/management/admserv/admserv.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- admserv.properties 7 Dec 2005 21:42:35 -0000 1.5 +++ admserv.properties 23 Feb 2006 01:12:18 -0000 1.6 @@ -22,7 +22,7 @@ # Admin Server Component Localization file admin-title=Administration Server -admin-version=Version 1.0.1 +admin-version=Version 1.0.2 admin-smallIcon=com/netscape/management/admserv/images/AdminServer.gif admin-largeIcon=com/netscape/management/admserv/images/AdminServerL.gif From fedora-directory-commits at redhat.com Thu Feb 23 01:12:53 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:12:53 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/newinst/insadm insadm.c, 1.6, 1.7 Message-ID: <200602230113.k1N1DOTd025210@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/insadm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/admserv/newinst/insadm Modified Files: insadm.c Log Message: Change admin server version to 1.0.2 Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure mod_admserv is loaded after mod_nss Index: insadm.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/insadm/insadm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- insadm.c 28 Oct 2005 22:44:12 -0000 1.6 +++ insadm.c 23 Feb 2006 01:12:45 -0000 1.7 @@ -965,10 +965,10 @@ else if (strcmp(f, "jss3.jar") == 0) { return 1; } - else if (strstr(f, "mcc10") == f) { + else if (strstr(f, "fedora-mcc-1.0") == f) { return 1; } - else if (strstr(f, "nmclf10") == f) { + else if (strstr(f, "fedora-nmclf-1.0") == f) { return 1; } return 0; @@ -1082,7 +1082,7 @@ FindClose(hFile); } - if (cd.nReplaceVersion == 10) /* The current version; + if (cd.nReplaceVersion == 1.0) /* The current version; target of brandAdminServer */ { LoadString(mi.m_hModule, IDS_README, szTemp, sizeof(szTemp)); @@ -1510,7 +1510,7 @@ // Create the program manager group icons // - if (cd.nReplaceVersion == 10) /* The current version; + if (cd.nReplaceVersion == 1.0) /* The current version; target of brandAdminServer */ { //delete 1.0 readme (current) From fedora-directory-commits at redhat.com Thu Feb 23 01:12:20 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:12:20 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-httpd-moduleorder.patch, NONE, 1.1 httpd-2.2.conf, NONE, 1.1 admserv.conf, 1.12, 1.13 Message-ID: <200602230112.k1N1CK4L025154@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/admserv/cfgstuff Modified Files: admserv.conf Added Files: adminserver-httpd-moduleorder.patch httpd-2.2.conf Log Message: Change admin server version to 1.0.2 Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure mod_admserv is loaded after mod_nss adminserver-httpd-moduleorder.patch: --- NEW FILE adminserver-httpd-moduleorder.patch --- --- admin-serv/config/httpd.conf 7 Dec 2005 20:46:06 -0000 1.7 +++ admin-serv/config/httpd.conf 18 Jan 2006 16:58:37 -0000 1.8 @@ -143,18 +143,18 @@ LoadModule alias_module %%%module_dir%%%/modules/mod_alias.so LoadModule rewrite_module %%%module_dir%%%/modules/mod_rewrite.so LoadModule cache_module %%%module_dir%%%/modules/mod_cache.so LoadModule disk_cache_module %%%module_dir%%%/modules/mod_disk_cache.so LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so LoadModule restartd_module %%%sroot%%%/bin/admin/lib/libmodrestartd.so -LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so LoadModule nss_module %%%sroot%%%/bin/admin/lib/libmodnss.so +LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so ### Section 2: 'Main' server configuration # # The directives in this section set up the values used by the 'main' # server, which responds to any requests that aren't handled by a # definition. These values also provide defaults for # any containers you may define later in the file. # --- NEW FILE httpd-2.2.conf --- # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK # # Based upon the NCSA server configuration files originally by Rob McCool. # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. # See for detailed information about # the directives. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. # # The configuration directives are grouped into three basic sections: # 1. Directives that control the operation of the Apache server process as a # whole (the 'global environment'). # 2. Directives that define the parameters of the 'main' or 'default' server, # which responds to requests that aren't handled by a virtual host. # These directives also provide default values for the settings # of all virtual hosts. # 3. Settings for virtual hosts, which allow Web requests to be sent to # different IP addresses or hostnames and have them handled by the # same Apache server process. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/foo.log" # with ServerRoot set to "/path/redhat/apache" will be interpreted by the # server as "/path/redhat/apache/logs/foo.log". # ### Section 1: Global Environment # # The directives in this section affect the overall operation of Apache, # such as the number of concurrent requests it can handle or where it # can find its configuration files. # # # ServerRoot: The top of the directory tree under which the server's # configuration, error, and log files are kept. # # NOTE! If you intend to place this on an NFS (or otherwise network) # mounted filesystem then please read the LockFile documentation (available # at ); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. # #ServerRoot This is passed in via the start-admin command line # # PidFile: The file in which the server should record its process # identification number when it starts. # PidFile logs/pid # # Timeout: The number of seconds before receives and sends time out. # Timeout 300 # # KeepAlive: Whether or not to allow persistent connections (more than # one request per connection). Set to "Off" to deactivate. # KeepAlive Off # # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. # We recommend you leave this number high, for maximum performance. # MaxKeepAliveRequests 100 # # KeepAliveTimeout: Number of seconds to wait for the next request from the # same client on the same connection. # KeepAliveTimeout 15 # The console bombs on the x.y.z version format, so omit the .z ServerTokens Minor # start one server in multi threaded mode StartServers 1 # mtm ServerLimit 1 MaxClients 64 MinSpareThreads 32 MaxSpareThreads 64 ThreadsPerChild 64 # # Dynamic Shared Object (DSO) Support # # To be able to use the functionality of a module which was built as a DSO you # have to place corresponding `LoadModule' lines at this location so the # directives contained in it are actually available _before_ they are used. # Statically compiled modules (those listed by `httpd -l') do not need # to be loaded here. # # Example: # LoadModule foo_module modules/mod_foo.so LoadModule authz_host_module %%%module_dir%%%/modules/mod_authz_host.so LoadModule auth_basic_module %%%module_dir%%%/modules/mod_auth_basic.so LoadModule authn_file_module %%%module_dir%%%/modules/mod_authn_file.so LoadModule log_config_module %%%module_dir%%%/modules/mod_log_config.so LoadModule env_module %%%module_dir%%%/modules/mod_env.so LoadModule mime_magic_module %%%module_dir%%%/modules/mod_mime_magic.so LoadModule expires_module %%%module_dir%%%/modules/mod_expires.so LoadModule deflate_module %%%module_dir%%%/modules/mod_deflate.so LoadModule headers_module %%%module_dir%%%/modules/mod_headers.so LoadModule unique_id_module %%%module_dir%%%/modules/mod_unique_id.so LoadModule setenvif_module %%%module_dir%%%/modules/mod_setenvif.so LoadModule mime_module %%%module_dir%%%/modules/mod_mime.so LoadModule vhost_alias_module %%%module_dir%%%/modules/mod_vhost_alias.so LoadModule negotiation_module %%%module_dir%%%/modules/mod_negotiation.so LoadModule dir_module %%%module_dir%%%/modules/mod_dir.so LoadModule actions_module %%%module_dir%%%/modules/mod_actions.so LoadModule alias_module %%%module_dir%%%/modules/mod_alias.so LoadModule rewrite_module %%%module_dir%%%/modules/mod_rewrite.so LoadModule cache_module %%%module_dir%%%/modules/mod_cache.so LoadModule disk_cache_module %%%module_dir%%%/modules/mod_disk_cache.so LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so LoadModule restartd_module %%%sroot%%%/bin/admin/lib/libmodrestartd.so LoadModule nss_module %%%sroot%%%/bin/admin/lib/libmodnss.so LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so ### Section 2: 'Main' server configuration # # The directives in this section set up the values used by the 'main' # server, which responds to any requests that aren't handled by a # definition. These values also provide defaults for # any containers you may define later in the file. # # All of these directives may appear inside containers, # in which case these default settings will be overridden for the # virtual host being defined. # # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin at your-domain.com # #ServerAdmin you at example.com # # ServerName gives the name and port that the server uses to identify itself. # This can often be determined automatically, but we recommend you specify # it explicitly to prevent problems during startup. # # If this is not set to valid DNS name for your host, server-generated # redirections will not work. See also the UseCanonicalName directive. # # If your host doesn't have a registered DNS name, enter its IP address here. # You will have to access it by its address anyway, and this will make # redirections work in a sensible way. # #ServerName www.example.com:80 # # UseCanonicalName: Determines how Apache constructs self-referencing # URLs and the SERVER_NAME and SERVER_PORT variables. # When set "Off", Apache will use the Hostname and Port supplied # by the client. When set "On", Apache will use the value of the # ServerName directive. # UseCanonicalName Off # # DocumentRoot: The directory out of which you will serve your # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # DocumentRoot %%%sroot%%% # # Each directory to which Apache has access can be configured with respect # to which services and features are allowed and/or disabled in that # directory (and its subdirectories). # # First, we configure the "default" to be a very restrictive set of # features. # Options FollowSymLinks AllowOverride None # # Note that from this point forward you must specifically allow # particular features to be enabled - so if something's not working as # you might expect, make sure that you have specifically enabled it # below. # # # This should be changed to whatever you set DocumentRoot to. # # # Possible values for the Options directive are "None", "All", # or any combination of: # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews # # Note that "MultiViews" must be named *explicitly* --- "Options All" # doesn't give it to you. # # The Options directive is both complicated and important. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#options # for more information. # Options Indexes FollowSymLinks # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: # Options FileInfo AuthConfig Limit # AllowOverride None # # Controls who can get stuff from this server. # By default, no one may access anything # Access must be explicitly granted in admserv.conf Order deny,allow Deny from all # # DirectoryIndex: sets the file that Apache will serve if a directory # is requested. # # The index.html.var file (a type-map) is used to deliver content- # negotiated documents. The MultiViews Option can be used for the # same purpose, but it is much slower. # DirectoryIndex index.html index.html.var # # AccessFileName: The name of the file to look for in each directory # for additional configuration directives. See also the AllowOverride # directive. # AccessFileName .htaccess # # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # Order allow,deny Deny from all # # TypesConfig describes where the mime.types file (or equivalent) is # to be found. # TypesConfig /etc/mime.types # # DefaultType is the default MIME type the server will use for a document # if it cannot otherwise determine one, such as from filename extensions. # If your server contains mostly text or HTML documents, "text/plain" is # a good value. If most of your content is binary, such as applications # or images, you may want to use "application/octet-stream" instead to # keep browsers from trying to display binary files as though they are # text. # DefaultType text/plain # # The mod_mime_magic module allows the server to use various hints from the # contents of the file itself to determine its type. The MIMEMagicFile # directive tells the module where the hint definitions are located. # MIMEMagicFile %%%module_dir%%%/conf/magic # # HostnameLookups: Log the names of clients or just their IP addresses # e.g., www.apache.org (on) or 204.62.129.132 (off). # The default is off because it'd be overall better for the net if people # had to knowingly turn this feature on, since enabling it means that # each client request will result in AT LEAST one lookup request to the # nameserver. # HostnameLookups Off # # EnableMMAP: Control whether memory-mapping is used to deliver # files (assuming that the underlying OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. On some systems, turning it off (regardless of # filesystem) can improve performance; for details, please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap # #EnableMMAP off # # EnableSendfile: Control whether the sendfile kernel support is # used to deliver files (assuming that the OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. Please see # http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile # #EnableSendfile off # # LogLevel: Control the number of messages logged to the error_log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. # LogLevel warn # # The following directives define some format nicknames for use with # a CustomLog directive (see below). # LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent # You need to enable mod_logio.c to use %I and %O #LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio # # Optionally add a line containing the server version and virtual host # name to server-generated pages (internal error documents, FTP directory # listings, mod_status and mod_info output etc., but not CGI generated # documents or custom error documents). # Set to "EMail" to also include a mailto: link to the ServerAdmin. # Set to one of: On | Off | EMail # ServerSignature On # # Aliases: Add here as many aliases as you need (with no limit). The format is # Alias fakename realname # # Note that if you include a trailing / on fakename then the server will # require it to be present in the URL. So "/icons" isn't aliased in this # example, only "/icons/". If the fakename is slash-terminated, then the # realname must also be slash terminated, and if the fakename omits the # trailing slash, the realname must also omit it. # # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # # # This should be changed to the ServerRoot/manual/. The alias provides # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the realname directory are treated as applications and # run by the server when requested rather than as documents sent to the client. # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # # # Additional to mod_cgid.c settings, mod_cgid has Scriptsock # for setting UNIX socket for communicating with cgid. # #Scriptsock logs/cgisock # # Redirect allows you to tell clients about documents which used to exist in # your server's namespace, but do not anymore. This allows you to tell the # clients where to look for the relocated document. # Example: # Redirect permanent /foo http://www.example.com/bar # # DefaultLanguage and AddLanguage allows you to specify the language of # a document. You can then use content negotiation to give a browser a # file in a language the user can understand. # # Specify a default language. This means that all data # going out without a specific language tag (see below) will # be marked with this one. You probably do NOT want to set # this unless you are sure it is correct for all cases. # # * It is generally better to not mark a page as # * being a certain language than marking it with the wrong # * language! # # DefaultLanguage nl # # Note 1: The suffix does not have to be the same as the language # keyword --- those with documents in Polish (whose net-standard # language code is pl) may wish to use "AddLanguage pl .po" to # avoid the ambiguity with the common suffix for perl scripts. # # Note 2: The example entries below illustrate that in some cases # the two character 'Language' abbreviation is not identical to # the two character 'Country' code for its country, # E.g. 'Danmark/dk' versus 'Danish/da'. # # Note 3: In the case of 'ltz' we violate the RFC by using a three char # specifier. There is 'work in progress' to fix this and get # the reference data for rfc1766 cleaned up. # # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) # English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) # Norwegian (no) - Polish (pl) - Portugese (pt) # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) # Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) # AddLanguage ca .ca AddLanguage cs .cz .cs AddLanguage da .dk AddLanguage de .de AddLanguage el .el AddLanguage en .en AddLanguage eo .eo AddLanguage es .es AddLanguage et .et AddLanguage fr .fr AddLanguage he .he AddLanguage hr .hr AddLanguage it .it AddLanguage ja .ja AddLanguage ko .ko AddLanguage ltz .ltz AddLanguage nl .nl AddLanguage nn .nn AddLanguage no .no AddLanguage pl .po AddLanguage pt .pt AddLanguage pt-BR .pt-br AddLanguage ru .ru AddLanguage sv .sv AddLanguage zh-CN .zh-cn AddLanguage zh-TW .zh-tw # # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. # # Just list the languages in decreasing order of preference. We have # more or less alphabetized them here. You probably want to change this. # LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW # # ForceLanguagePriority allows you to serve a result page rather than # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) # [in case no accepted languages matched the available variants] # ForceLanguagePriority Prefer Fallback # # Commonly used filename extensions to character sets. You probably # want to avoid clashes with the language extensions, unless you # are good at carefully testing your setup after each change. # See http://www.iana.org/assignments/character-sets for the # official list of charset names and their respective RFCs. # AddCharset ISO-8859-1 .iso8859-1 .latin1 AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen AddCharset ISO-8859-3 .iso8859-3 .latin3 AddCharset ISO-8859-4 .iso8859-4 .latin4 AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk AddCharset ISO-2022-JP .iso2022-jp .jis AddCharset ISO-2022-KR .iso2022-kr .kis AddCharset ISO-2022-CN .iso2022-cn .cis AddCharset Big5 .Big5 .big5 # For russian, more than one charset is used (depends on client, mostly): AddCharset WINDOWS-1251 .cp-1251 .win-1251 AddCharset CP866 .cp866 AddCharset KOI8-r .koi8-r .koi8-ru AddCharset KOI8-ru .koi8-uk .ua AddCharset ISO-10646-UCS-2 .ucs2 AddCharset ISO-10646-UCS-4 .ucs4 AddCharset UTF-8 .utf8 # The set below does not map to a specific (iso) standard # but works on a fairly wide range of browsers. Note that # capitalization actually matters (it should not, but it # does for some browsers). # # See http://www.iana.org/assignments/character-sets # for a list of sorts. But browsers support few. # AddCharset GB2312 .gb2312 .gb AddCharset utf-7 .utf7 AddCharset utf-8 .utf8 AddCharset big5 .big5 .b5 AddCharset EUC-TW .euc-tw AddCharset EUC-JP .euc-jp AddCharset EUC-KR .euc-kr AddCharset shift_jis .sjis # # AddType allows you to add to or override the MIME configuration # file mime.types for specific file types. # #AddType application/x-tar .tgz # # AddEncoding allows you to have certain browsers uncompress # information on the fly. Note: Not all browsers support this. # Despite the name similarity, the following Add* directives have nothing # to do with the FancyIndexing customization directives above. # #AddEncoding x-compress .Z #AddEncoding x-gzip .gz .tgz # # If the AddEncoding directives above are commented-out, then you # probably should define those extensions to indicate media types: # AddType application/x-compress .Z AddType application/x-gzip .gz .tgz # # AddHandler allows you to map certain file extensions to "handlers": # actions unrelated to filetype. These can be either built into the server # or added with the Action directive (see below) # # To use CGI scripts outside of ScriptAliased directories: # (You will also need to add "ExecCGI" to the "Options" directive.) # #AddHandler cgi-script .cgi # # For files that include their own HTTP headers: # #AddHandler send-as-is asis # # For server-parsed imagemap files: # #AddHandler imap-file map # # For type maps (negotiated resources): # (This is enabled by default to allow the Apache "It Worked" page # to be distributed in multiple languages.) # AddHandler type-map var # # Filters allow you to process content before it is sent to the client. # # To parse .shtml files for server-side includes (SSI): # (You will also need to add "Includes" to the "Options" directive.) # #AddType text/html .shtml #AddOutputFilter INCLUDES .shtml # # Action lets you define media types that will execute a script whenever # a matching file is called. This eliminates the need for repeated URL # pathnames for oft-used CGI file processors. # Format: Action media/type /cgi-script/location # Format: Action handler-name /cgi-script/location # # # Customizable error responses come in three flavors: # 1) plain text 2) local redirects 3) external redirects # # Some examples: #ErrorDocument 500 "The server made a boo boo." #ErrorDocument 404 /missing.html #ErrorDocument 404 "/cgi-bin/missing_handler.pl" #ErrorDocument 402 http://www.example.com/subscription_info.html # # # Putting this all together, we can internationalize error responses. # # We use Alias to redirect any /error/HTTP_.html.var response to # our collection of by-error message multi-language collections. We use # includes to substitute the appropriate text. # # You can modify the messages' appearance without changing any of the # default HTTP_.html.var files by adding the line: # # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the # /path/to/error/include/ files and copying them to /your/include/path/, # even on a per-VirtualHost basis. The default include files will display # your Apache version number and your ServerAdmin email address regardless # of the setting of ServerSignature. # # The internationalized error documents require mod_alias, mod_include # and mod_negotiation. To activate them, uncomment the following 30 lines. # Alias /error/ "/path/redhat/apache/error/" # # # AllowOverride None # Options IncludesNoExec # AddOutputFilter Includes html # AddHandler type-map var # Order allow,deny # Allow from all # LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr # ForceLanguagePriority Prefer Fallback # # # ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var # ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var # ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var # ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var # ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var # ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var # ErrorDocument 410 /error/HTTP_GONE.html.var # ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var # ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var # ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var # ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var # ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var # ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var # ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var # ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var # ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var # ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var # # The following directives modify normal HTTP response behavior to # handle known problems with browser implementations. # BrowserMatch "Mozilla/2" nokeepalive BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 BrowserMatch "RealPlayer 4\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 # # The following directive disables redirects on non-GET requests for # a directory that does not include the trailing slash. This fixes a # problem with Microsoft WebFolders which does not appropriately handle # redirects for folders with DAV methods. # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. # BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully BrowserMatch "^WebDrive" redirect-carefully BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully BrowserMatch "^gnome-vfs" redirect-carefully # # Allow server status reports generated by mod_status, # with the URL of http://servername/server-status # Change the ".example.com" to match your domain to enable. # # # SetHandler server-status # Order deny,allow # Deny from all # Allow from .example.com # # # Allow remote server configuration reports, with the URL of # http://servername/server-info (requires that mod_info.c be loaded). # Change the ".example.com" to match your domain to enable. # # # SetHandler server-info # Order deny,allow # Deny from all # Allow from .example.com # ### Section 3: Virtual Hosts # # VirtualHost: If you want to maintain multiple domains/hostnames on your # machine you can setup VirtualHost containers for them. Most configurations # use only name-based virtual hosts so the server doesn't need to worry about # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at # # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host # configuration. # # Use name-based virtual hosting. # #NameVirtualHost *:80 # # VirtualHost example: # Almost any Apache directive may go into a VirtualHost container. # The first VirtualHost section is used for requests without a known # server name. # # # ServerAdmin webmaster at dummy-host.example.com # DocumentRoot /www/docs/dummy-host.example.com # ServerName dummy-host.example.com # ErrorLog logs/dummy-host.example.com-error_log # CustomLog logs/dummy-host.example.com-access_log common # Include config/admserv.conf Include config/nss.conf Include config/console.conf Index: admserv.conf =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- admserv.conf 7 Dec 2005 20:46:06 -0000 1.12 +++ admserv.conf 23 Feb 2006 01:12:11 -0000 1.13 @@ -25,7 +25,7 @@ SetEnv ADMSERV_ROOT %%%sroot%%%/admin-serv/config/ ADMCacheLifeTime 600 -ADMServerVersionString "Fedora-Administrator/1.0.1" +ADMServerVersionString "Fedora-Administrator/1.0.2" ScriptAlias /clients/orgchart/bin/ "%%%sroot%%%/clients/orgchart/bin/" ScriptAlias /clients/dsgw/bin/ "%%%sroot%%%/clients/dsgw/bin/" From fedora-directory-commits at redhat.com Thu Feb 23 01:20:25 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:20:25 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.7, 1.8 testdatainterop.c, 1.7, 1.8 testentry.c, 1.7, 1.8 testextendedop.c, 1.7, 1.8 testgetip.c, 1.7, 1.8 testpostop.c, 1.7, 1.8 testpreop.c, 1.8, 1.9 testsaslbind.c, 1.9, 1.10 Message-ID: <200602230120.k1N1KPij025357@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/servers/slapd/test-plugins Modified Files: testbind.c testdatainterop.c testentry.c testextendedop.c testgetip.c testpostop.c testpreop.c testsaslbind.c Log Message: Change version to 1.0.2 RPM post install adds a new patch to fix the httpd module load order, removes the console patch Tell the user to run setup/setup after upgrade installation. Index: testbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testbind.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testbind.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -69,7 +69,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.1", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.2", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testdatainterop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testdatainterop.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testdatainterop.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.1", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.2", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; Index: testentry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testentry.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testentry.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -90,7 +90,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.1", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.2", "sample entry modification plugin" }; /* Entry store plug-in function */ Index: testextendedop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testextendedop.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testextendedop.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.1", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.2", "sample extended operation plugin" }; Index: testgetip.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testgetip.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testgetip.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.1", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.2", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); Index: testpostop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- testpostop.c 7 Dec 2005 21:50:09 -0000 1.7 +++ testpostop.c 23 Feb 2006 01:20:17 -0000 1.8 @@ -93,7 +93,7 @@ static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.1", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.2", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); Index: testpreop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- testpreop.c 7 Dec 2005 21:50:09 -0000 1.8 +++ testpreop.c 23 Feb 2006 01:20:17 -0000 1.9 @@ -79,7 +79,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.1", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.2", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ Index: testsaslbind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- testsaslbind.c 7 Dec 2005 21:50:09 -0000 1.9 +++ testsaslbind.c 23 Feb 2006 01:20:17 -0000 1.10 @@ -80,7 +80,7 @@ #include #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.1", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.2", "sample SASL bind pre-operation plugin" }; From fedora-directory-commits at redhat.com Thu Feb 23 01:20:03 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:20:03 -0500 Subject: [Fedora-directory-commits] ldapserver Makefile, 1.29, 1.30 ldapserver.spec.tmpl, 1.22, 1.23 nsdefs.mk, 1.16, 1.17 Message-ID: <200602230120.k1N1KXn7025364@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver Modified Files: Makefile ldapserver.spec.tmpl nsdefs.mk Log Message: Change version to 1.0.2 RPM post install adds a new patch to fix the httpd module load order, removes the console patch Tell the user to run setup/setup after upgrade installation. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile 7 Dec 2005 21:25:50 -0000 1.29 +++ Makefile 23 Feb 2006 01:19:55 -0000 1.30 @@ -353,7 +353,7 @@ -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \ -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \ -e 's/@GEN-VERSION@/1.0/g' \ - -e 's/@NOSP-VERSION@/1.0.1/g' \ + -e 's/@NOSP-VERSION@/1.0.2/g' \ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \ ldapserver.spec.tmpl > $@ mv $@ $(OBJDIR) Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ldapserver.spec.tmpl 8 Dec 2005 04:14:27 -0000 1.22 +++ ldapserver.spec.tmpl 23 Feb 2006 01:19:55 -0000 1.23 @@ -122,18 +122,18 @@ if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi -# patch file to fix startconsole ld libpath -if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch -fi if [ "$1" -gt 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch fi # patch file to fix start-admin on Fedora Core 2 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + fi +# patch file to fix module load order + if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf @@ -152,11 +152,12 @@ chown $usergroup $RPM_INSTALL_PREFIX/alias fi fi - echo "Install finished. Please restart your directory servers first," - echo "then the admin server. Do not run setup." -else - echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." + for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*` + do + cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif $instance/config/schema + done fi +echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." %preun # only run uninstall if this is the last version of the package @@ -169,6 +170,11 @@ fi %changelog +* Wed Feb 22 2006 Rich Megginson - 1.0.2-1 +- Remove startconsole patch; add patch to fix admin server httpd +- module load order; you must now run setup after an upgrade; copy +- in the new 00core.ldif schema file to the server instances + * Tue Dec 6 2005 Rich Megginson - 1.0.1-1 - Use nosp version instead of gen version to get patch version numbers - Patch the admin server in the post install section Index: nsdefs.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- nsdefs.mk 7 Dec 2005 21:25:50 -0000 1.16 +++ nsdefs.mk 23 Feb 2006 01:19:55 -0000 1.17 @@ -227,8 +227,8 @@ OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=1.0.1 -NOSP_DIR_VERSION:=1.0.1 +DIR_VERSION:=1.0.2 +NOSP_DIR_VERSION:=1.0.2 DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must From fedora-directory-commits at redhat.com Thu Feb 23 01:20:08 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:20:08 -0500 Subject: [Fedora-directory-commits] ldapserver/include version.h,1.8,1.9 Message-ID: <200602230120.k1N1Kc2O025367@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/include Modified Files: version.h Log Message: Change version to 1.0.2 RPM post install adds a new patch to fix the httpd module load order, removes the console patch Tell the user to run setup/setup after upgrade installation. Index: version.h =================================================================== RCS file: /cvs/dirsec/ldapserver/include/version.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- version.h 7 Dec 2005 21:49:47 -0000 1.8 +++ version.h 23 Feb 2006 01:20:01 -0000 1.9 @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "1.0.1" +#define DIRECTORY_VERSION_DEF "1.0.2" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.2" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING From fedora-directory-commits at redhat.com Thu Feb 23 01:20:14 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:20:14 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.50,1.51 Message-ID: <200602230120.k1N1KiCi025370@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/cm Modified Files: Makefile Log Message: Change version to 1.0.2 RPM post install adds a new patch to fix the httpd module load order, removes the console patch Tell the user to run setup/setup after upgrade installation. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- Makefile 17 Feb 2006 16:57:19 -0000 1.50 +++ Makefile 23 Feb 2006 01:20:06 -0000 1.51 @@ -108,9 +108,9 @@ endif ifdef USE_64 -VERSION=-ver 1.0.1-64bit +VERSION=-ver 1.0.2-64bit else -VERSION=-ver 1.0.1 +VERSION=-ver 1.0.2 endif ifeq ($(ARCH), HPUX) @@ -270,7 +270,7 @@ ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=1.0.1 + RPM_VERSION=1.0.2 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files From fedora-directory-commits at redhat.com Thu Feb 23 01:20:19 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:20:19 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/docs README.txt,1.3,1.4 Message-ID: <200602230120.k1N1Knxi025373@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/docs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/docs Modified Files: README.txt Log Message: Change version to 1.0.2 RPM post install adds a new patch to fix the httpd module load order, removes the console patch Tell the user to run setup/setup after upgrade installation. Index: README.txt =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.txt 29 Oct 2005 02:26:29 -0000 1.3 +++ README.txt 23 Feb 2006 01:20:12 -0000 1.4 @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 1.0 + Fedora Directory Server 1.0.2 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the From fedora-directory-commits at redhat.com Thu Feb 23 01:50:37 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 20:50:37 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-httpd-moduleorder.patch, 1.1, 1.2 Message-ID: <200602230150.k1N1ob8V025506@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25486 Modified Files: adminserver-httpd-moduleorder.patch Log Message: replace %%% tokens with the real default paths, otherwise patch won't work adminserver-httpd-moduleorder.patch: Index: adminserver-httpd-moduleorder.patch =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-httpd-moduleorder.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- adminserver-httpd-moduleorder.patch 23 Feb 2006 01:12:11 -0000 1.1 +++ adminserver-httpd-moduleorder.patch 23 Feb 2006 01:50:30 -0000 1.2 @@ -1,17 +1,17 @@ --- admin-serv/config/httpd.conf 7 Dec 2005 20:46:06 -0000 1.7 +++ admin-serv/config/httpd.conf 18 Jan 2006 16:58:37 -0000 1.8 @@ -143,18 +143,18 @@ - LoadModule alias_module %%%module_dir%%%/modules/mod_alias.so - LoadModule rewrite_module %%%module_dir%%%/modules/mod_rewrite.so - LoadModule cache_module %%%module_dir%%%/modules/mod_cache.so - LoadModule disk_cache_module %%%module_dir%%%/modules/mod_disk_cache.so - LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so - LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so - LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so - LoadModule restartd_module %%%sroot%%%/bin/admin/lib/libmodrestartd.so --LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so - LoadModule nss_module %%%sroot%%%/bin/admin/lib/libmodnss.so -+LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so + LoadModule alias_module /etc/httpd/modules/mod_alias.so + LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so + LoadModule cache_module /etc/httpd/modules/mod_cache.so + LoadModule disk_cache_module /etc/httpd/modules/mod_disk_cache.so + LoadModule file_cache_module /etc/httpd/modules/mod_file_cache.so + LoadModule mem_cache_module /etc/httpd/modules/mod_mem_cache.so + LoadModule cgi_module /etc/httpd/modules/mod_cgi.so + LoadModule restartd_module /opt/fedora-ds/bin/admin/lib/libmodrestartd.so +-LoadModule admserv_module /opt/fedora-ds/bin/admin/lib/libmodadmserv.so + LoadModule nss_module /opt/fedora-ds/bin/admin/lib/libmodnss.so ++LoadModule admserv_module /opt/fedora-ds/bin/admin/lib/libmodadmserv.so ### Section 2: 'Main' server configuration # From fedora-directory-commits at redhat.com Thu Feb 23 04:04:22 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 23:04:22 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.2, 1.3 Message-ID: <200602230404.k1N44Mdu032250@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32216 Modified Files: console-ld-libpath.patch Log Message: Still need the console ld lib path patch for startconsole console-ld-libpath.patch: Index: console-ld-libpath.patch =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- console-ld-libpath.patch 8 Dec 2005 02:37:52 -0000 1.2 +++ console-ld-libpath.patch 23 Feb 2006 04:04:14 -0000 1.3 @@ -1,41 +1,22 @@ ---- startconsole 26 Oct 2005 23:16:14 -0000 1.4 -+++ startconsole 7 Dec 2005 23:50:54 -0000 -@@ -26,17 +26,17 @@ - then - echo "$0: Your JAVA_HOME environment variable is not set. Please set it appropriately." - exit 1 - fi +--- startconsole.orig 2006-02-22 20:45:12.000000000 -0700 ++++ startconsole 2006-02-22 20:46:03.000000000 -0700 +@@ -21,12 +21,19 @@ - # - # Make sure java exists and is executable - # --if [ ! -f java -a ! -x java ] -+if [ ! -f $JAVA_HOME/bin/java -a ! -x $JAVA_HOME/bin/java ] + JAVA=`which java` + if [ -z "$JAVA" -o ! -x "$JAVA" ] then - echo "$0: The java program is not in your path, or is not executable." + echo "$0: The java program is not in your path, or is not executable."; exit 1 fi - # - # See if libjava and libjvm exist, and set the lib path. These are linked to by JSS. - # -@@ -53,16 +53,19 @@ - LD_LIBRARY_PATH="$LIBJAVA_DIR" - SHLIB_PATH="$LIBJAVA_DIR" - DYLD_PATH="$LIBJAVA_DIR" - else - LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - fi -+ LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH} -+ SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH} -+ DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH} - export LD_LIBRARY_PATH - export SHLIB_PATH - export DYLD_PATH - fi - ++LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH} ++SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH} ++DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH} ++export LD_LIBRARY_PATH ++export SHLIB_PATH ++export DYLD_PATH ++ # # Launch the Console # + java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $* From fedora-directory-commits at redhat.com Thu Feb 23 04:05:36 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 23:05:36 -0500 Subject: [Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.39, 1.40 Message-ID: <200602230405.k1N45aWI032285@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32259 Modified Files: pkgadmin.mk Log Message: still need the console ld libpath patch for startconsole Index: pkgadmin.mk =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- pkgadmin.mk 23 Feb 2006 01:12:03 -0000 1.39 +++ pkgadmin.mk 23 Feb 2006 04:05:13 -0000 1.40 @@ -294,6 +294,8 @@ cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup # The patch file that fixes module load order cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-httpd-moduleorder.patch $(ADMIN_DIR)/setup +# The patch file that fixes console ld libpath + cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients From fedora-directory-commits at redhat.com Thu Feb 23 04:06:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Wed, 22 Feb 2006 23:06:27 -0500 Subject: [Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.23, 1.24 Message-ID: <200602230406.k1N46R2v032308@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32291 Modified Files: ldapserver.spec.tmpl Log Message: Still need the console ld libpath patch for startconsole Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ldapserver.spec.tmpl 23 Feb 2006 01:19:55 -0000 1.23 +++ ldapserver.spec.tmpl 23 Feb 2006 04:06:17 -0000 1.24 @@ -122,18 +122,22 @@ if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi +# patch file to fix console ld libpath +if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch > /dev/null 2>&1 +fi if [ "$1" -gt 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then - patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch > /dev/null 2>&1 fi # patch file to fix start-admin on Fedora Core 2 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then - patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch > /dev/null 2>&1 fi # patch file to fix module load order if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then - patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1 fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf @@ -156,6 +160,7 @@ do cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif $instance/config/schema done + echo "Upgrade complete. Please restart slapd then admin." fi echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." @@ -171,9 +176,9 @@ %changelog * Wed Feb 22 2006 Rich Megginson - 1.0.2-1 -- Remove startconsole patch; add patch to fix admin server httpd -- module load order; you must now run setup after an upgrade; copy -- in the new 00core.ldif schema file to the server instances +- Add patch to fix admin server httpd module load order; you +- must now run setup after an upgrade; copy in the new 00core.ldif +- schema file to the server instances * Tue Dec 6 2005 Rich Megginson - 1.0.1-1 - Use nosp version instead of gen version to get patch version numbers From fedora-directory-commits at redhat.com Thu Feb 23 17:57:10 2006 From: fedora-directory-commits at redhat.com (Nathan Kinder (nkinder)) Date: Thu, 23 Feb 2006 12:57:10 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix product.cc, 1.3, 1.4 Message-ID: <200602231757.k1NHvAZl029389@cvs-int.fedora.redhat.com> Author: nkinder Update of /cvs/dirsec/setuputil/installer/unix In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29367 Modified Files: product.cc Log Message: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182611 Bug(s) fixed: 182611 Bug Description: When running setup of 64-bit Directory Server on my FC4 x86_64 machine, setup complains that there is not enough available diskspace when I actually have 90+ GB available on the installation partition. Reviewed by: Files: see diffs Branch: HEAD (setuputil) Fix Description: We were using fscanf to read in the total unzipped size of our zip archives incorrectly. It was scanning for a normal int, but storing it in a long. The compiler was not automatically converting types correctly which would cause the required space to be a huge number. The proper thing to do is to have fscanf read in a long. Flag Day: no Doc impact: no QA impact: Should be covered by manual and nightly testing New Tests integrated into TET: none https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=125120 Index: product.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/product.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- product.cc 12 Jan 2006 17:26:46 -0000 1.3 +++ product.cc 23 Feb 2006 17:57:02 -0000 1.4 @@ -27,6 +27,25 @@ ** ** HISTORY: ** $Log$ +** Revision 1.4 2006/02/23 17:57:02 nkinder +** https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182611 +** Bug(s) fixed: 182611 +** Bug Description: When running setup of 64-bit Directory Server on my FC4 x86_64 machine, +** setup complains that there is not enough available diskspace when I actually have 90+ GB +** available on the installation partition. +** Reviewed by: +** Files: see diffs +** Branch: HEAD (setuputil) +** Fix Description: We were using fscanf to read in the total unzipped size of our zip archives +** incorrectly. It was scanning for a normal int, but storing it in a long. The compiler was +** not automatically converting types correctly which would cause the required space to be +** a huge number. The proper thing to do is to have fscanf read in a long. +** Flag Day: no +** Doc impact: no +** QA impact: Should be covered by manual and nightly testing +** New Tests integrated into TET: none +** https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=125120 +** ** Revision 1.3 2006/01/12 17:26:46 nkinder ** 174749 - Uninstall should not follow symlinks ** @@ -1160,7 +1179,7 @@ if (fp = fopen(tmpfilename.data(), "r")) { long size; - if (EOF != fscanf(fp, "%d", &size)) + if (EOF != fscanf(fp, "%ld", &size)) { long newSize = getArchiveSize() + (size / 1024 + 1); setArchiveSize(newSize); @@ -1228,7 +1247,7 @@ if (fp = fopen(tmpfilename.data(), "r")) { long size; - if (EOF != fscanf(fp, "%d", &size)) + if (EOF != fscanf(fp, "%ld", &size)) { long newSize = getArchiveSize() + (size / 1024 + 1); setArchiveSize(newSize); From fedora-directory-commits at redhat.com Thu Feb 23 19:30:49 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 14:30:49 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm/newinst sec_tools_wrapper, NONE, 1.1 Makefile, 1.9, 1.10 ns-update, 1.10, 1.11 setup, 1.14, 1.15 Message-ID: <200602231930.k1NJUnQi002285@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm/newinst In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver/ldap/cm/newinst Modified Files: Makefile ns-update setup Added Files: sec_tools_wrapper Log Message: Bug(s) fixed: 182613 Bug Description: Upgrade wipes out sectool wrappers Reviewed by: Pete and Nathan (Thanks!) Fix Description: It's better if we just package those wrappers instead of creating them on the fly. The new file sec_tools_wrappers is a simple shell script that assumes it's being run out of a parent/bin directory which contains a program called $0-bin, and the shared libs it needs are in parent/lib. This shell script is copied to shared/bin/certutil, shared/bin/modutil, etc. I had to create another makefile packaging macro to handle the case where you want to package a file under a different name than the original. Also 1) Add Red Hat and Fedora DS to upgradeServer 2) adminutil property directory is now adminutil-properties instead of property 3) General clean up of some upgrade install things Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no --- NEW FILE sec_tools_wrapper --- #!/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) 2006 Red Hat, Inc. # All rights reserved. # END COPYRIGHT BLOCK # # This file is the wrapper around the security tools. It just sets the # runtime library lookup path and invokes the actual binary with the given # arguments. This file is copied to the actual name of the command e.g. # we get the binary certutil program from the NSS package. When we package # it, we rename it to certutil-bin e.g. cp $(NSS)/certutil shared/bin/certutil-bin # This file is copied to certutil e.g. cp sec_tools_wrapper shared/bin/certutil # figure out where the libdir is based on the location of this shell script savedir=`pwd` bindir=`dirname $0` if test -n "$bindir" ; then cd $bindir/../lib else # could be running as e.g. ./certutil or certutil if current dir is in PATH cd ../lib fi # assume the libdir is ../lib from the bindir e.g. sroot/shared/bin and sroot/shared/lib libdir=`pwd` cd $savedir # cover our bases on ld libpaths SHLIB_PATH=$libdir LIBPATH=$libdir LD_LIBRARY_PATH=$libdir DYLD_PATH=$libdir export SHLIB_PATH LIBPATH LD_LIBRARY_PATH DYLD_PATH $0-bin ${1+"$@"} Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile 15 Feb 2006 22:54:02 -0000 1.9 +++ Makefile 23 Feb 2006 19:30:41 -0000 1.10 @@ -95,10 +95,13 @@ # Source for staged installation utilities INCDIR=$(SETUPUTIL_INCLUDE) -I$(LDAP_SRC)/admin/include -I$(LDAP_SRC)/admin/lib -I$(LDAP_SRC)/admin/src +# we wrap the security tools with a shell script wrapper for their ld libpath +PACKAGE_SEC_T0OLS = $(addprefix $(RELDIR)/shared/bin/,$(SECURITY_TOOLS)) + # ADM_VERSDIR = admserv40 # ADM_RELDATE = 19980112 -all: $(OBJDEST) $(BINDEST) $(SETUPUTIL_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 $(PACKAGE_SEC_T0OLS) # removed ns-keygen from build - it was only used for Dir Lite # $(BINDEST)/ns-keygen ifeq ($(ARCH), BSDI) @@ -170,6 +173,11 @@ -o $(BINDEST)/ns-config $(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) $(OBJS1) $(OBJS2) $(SETUPUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK) \ $(EXTRA_LIBS) $(CURSES) +$(RELDIR)/shared/bin/%: sec_tools_wrapper $(RELDIR)/shared/bin + -@$(RM) $@ + $(CP) $< $@ + chmod +x $@ + ifeq ($(ARCH), WINNT) $(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) "bin/admin/ns-admin,bin/admin/ns-admin.so" Index: ns-update =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/ns-update,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ns-update 7 Dec 2005 21:29:14 -0000 1.10 +++ ns-update 23 Feb 2006 19:30:41 -0000 1.11 @@ -60,48 +60,6 @@ cd $cwd } -wrap_security_tools() -{ - cwd=`pwd` - SECURITY_BINNAMES="certutil derdump modutil pk12util pp ssltap shlibsign" - arch=`uname` - if [ $arch = HP-UX ]; then - env_ld_library_path=SHLIB_PATH - elif [ $arch = AIX ]; then - env_ld_library_path=LIBPATH - else - env_ld_library_path=LD_LIBRARY_PATH - fi - cd $sroot/shared/bin - for file in $SECURITY_BINNAMES - do - if [ -f $file -a ! -f $file-bin ]; then - mv $file $file-bin - echo "#!/bin/sh" > $file - echo $env_ld_library_path=$sroot/shared/lib >> $file - echo "export $env_ld_library_path" >> $file - echo "$sroot/shared/bin/$file-bin " '${1+"$@"}' >> $file - chmod 755 $file - fi - done - - if [ -d $sroot/shared32/bin ] ; then - cd $sroot/shared32/bin - for file in modutil - do - if [ -f $file -a ! -f $file-bin ]; then - mv $file $file-bin - echo "#!/bin/sh" > $file - echo $env_ld_library_path=$sroot/shared32/lib >> $file - echo "export $env_ld_library_path" >> $file - echo "$sroot/shared32/bin/$file-bin " '${1+"$@"}' >> $file - chmod 755 $file - fi - done - fi - cd $cwd -} - # if the -r flag is present, this means we're doing a # reinstall or an upgrade, so restart the servers for arg in $* ; do @@ -161,8 +119,6 @@ $PERL $sroot/bin/slapd/admin/bin/upgradeServer $sroot fi -wrap_security_tools $sroot - cd `dirname $0` # we need to make sure the alias directory is owned by the server user/group @@ -196,10 +152,6 @@ ./ds_create $* $extraflags rc=$? -if [ -f fix_secmod_db_64 ]; then - ./fix_secmod_db_64 $sroot/alias $sroot/shared32/bin -fi - # chown the cookie directory - bug 175098 if [ "$ssuser" ] ; then if [ "$ssgrp" ] ; then Index: setup =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- setup 17 Nov 2005 17:38:25 -0000 1.14 +++ setup 23 Feb 2006 19:30:41 -0000 1.15 @@ -289,8 +289,12 @@ if [ -d $sroot/admin-serv/config ]; then adminSSLOff $sroot/admin-serv/config/adm.conf security: assecure.txt adminSSLOff $sroot/admin-serv/config/local.conf configuration.nsServerSecurity: assecure.txt - adminSSLOff $sroot/admin-serv/config/magnus.conf Security assecure.txt - adminXmlSSLOff $sroot/admin-serv/config/server.xml security assecure.txt + if [ -f $sroot/admin-serv/config/magnus.conf ] ; then + adminSSLOff $sroot/admin-serv/config/magnus.conf Security assecure.txt + fi + if [ -f $sroot/admin-serv/config/server.xml ] ; then + adminXmlSSLOff $sroot/admin-serv/config/server.xml security assecure.txt + fi if [ $isadminsslon -ne 0 ]; then $sroot/start-admin From fedora-directory-commits at redhat.com Thu Feb 23 19:30:37 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 14:30:37 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src upgradeServer, 1.7, 1.8 Message-ID: <200602231931.k1NJV8vq002295@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/admin/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver/ldap/admin/src Modified Files: upgradeServer Log Message: Bug(s) fixed: 182613 Bug Description: Upgrade wipes out sectool wrappers Reviewed by: Pete and Nathan (Thanks!) Fix Description: It's better if we just package those wrappers instead of creating them on the fly. The new file sec_tools_wrappers is a simple shell script that assumes it's being run out of a parent/bin directory which contains a program called $0-bin, and the shared libs it needs are in parent/lib. This shell script is copied to shared/bin/certutil, shared/bin/modutil, etc. I had to create another makefile packaging macro to handle the case where you want to package a file under a different name than the original. Also 1) Add Red Hat and Fedora DS to upgradeServer 2) adminutil property directory is now adminutil-properties instead of property 3) General clean up of some upgrade install things Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: upgradeServer =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upgradeServer 21 Oct 2005 19:21:10 -0000 1.7 +++ upgradeServer 23 Feb 2006 19:30:30 -0000 1.8 @@ -326,7 +326,29 @@ sleep(1); # allow some data to accumulate in the pipe # print "Output from $prog -v:\n"; while () { - if (/^Netscape-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) { + if (/^Red Hat-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) { + $version = $1; + $minor = $2; + if ($4) { + $subminor = $3; + $buildNumber = $4; + } else { + $buildNumber = $3; + } + last; + } + elsif (/^Fedora-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) { + $version = $1; + $minor = $2; + if ($4) { + $subminor = $3; + $buildNumber = $4; + } else { + $buildNumber = $3; + } + last; + } + elsif (/^Netscape-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) { $version = $1; $minor = $2; if ($4) { @@ -414,7 +436,6 @@ "$sroot/bin/slapd/admin/scripts/template-migrate5to7", "$sroot/bin/slapd/admin/scripts/template-migrate6to7", "$sroot/bin/slapd/admin/scripts/template-migrateInstance7", - "$sroot/bin/slapd/admin/scripts/template-migrateTo4", "$sroot/bin/slapd/admin/scripts/template-migrateTo7", "$sroot/bin/slapd/admin/scripts/template-repl-monitor-cgi.pl", ); From fedora-directory-commits at redhat.com Thu Feb 23 19:30:32 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 14:30:32 -0500 Subject: [Fedora-directory-commits] ldapserver components.mk, 1.40, 1.41 ldapserver.spec.tmpl, 1.24, 1.25 Message-ID: <200602231931.k1NJV3iU002292@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver Modified Files: components.mk ldapserver.spec.tmpl Log Message: Bug(s) fixed: 182613 Bug Description: Upgrade wipes out sectool wrappers Reviewed by: Pete and Nathan (Thanks!) Fix Description: It's better if we just package those wrappers instead of creating them on the fly. The new file sec_tools_wrappers is a simple shell script that assumes it's being run out of a parent/bin directory which contains a program called $0-bin, and the shared libs it needs are in parent/lib. This shell script is copied to shared/bin/certutil, shared/bin/modutil, etc. I had to create another makefile packaging macro to handle the case where you want to package a file under a different name than the original. Also 1) Add Red Hat and Fedora DS to upgradeServer 2) adminutil property directory is now adminutil-properties instead of property 3) General clean up of some upgrade install things Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- components.mk 14 Feb 2006 04:26:54 -0000 1.40 +++ components.mk 23 Feb 2006 19:30:23 -0000 1.41 @@ -112,6 +112,14 @@ # separate the src from the dest with a single space PACKAGE_SRC_DEST = +# this macro contains a list of pairs of source and dest files, not directories +# the source is where to find the item in the build tree, and the dest is +# the place in the release to put the item, relative to the server root e.g. +# nls locale files are in libnls31/locale, but for packaging they need to +# go into lib/nls, not just lib; the destination should be a file name; +# separate the src from the dest with a single space +PACKAGE_SRC_DESTFILE = + # these defs are useful for doing pattern search/replace COMMA := , NULLSTRING := @@ -264,8 +272,10 @@ # we need to package the root cert file in the alias directory PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) alias -# need to package the sec tools in shared/bin -BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH) +# the security tools are wrapped with shell scripts so that the correct ld libpath can be set +# so, when we package them, we rename them with a -bin extension e.g. certutil -> shared/bin/certutil-bin +# the actual certutil will be an executable shell script that points to certutil-bin +PACKAGE_SRC_DESTFILE += $(foreach prog,$(SECURITY_TOOLS),$(SECURITY_BINPATH)/$(prog)$(SPACE)shared/bin/$(prog)-bin) ### SECURITY END ############################# @@ -531,7 +541,7 @@ ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER) endif -PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib +PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/adminutil-properties bin/slapd/lib LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX)) LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX)) Index: ldapserver.spec.tmpl =================================================================== RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ldapserver.spec.tmpl 23 Feb 2006 04:06:17 -0000 1.24 +++ ldapserver.spec.tmpl 23 Feb 2006 19:30:23 -0000 1.25 @@ -156,13 +156,10 @@ chown $usergroup $RPM_INSTALL_PREFIX/alias fi fi - for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*` - do - cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif $instance/config/schema - done - echo "Upgrade complete. Please restart slapd then admin." + echo "Upgrade finished. Please run $RPM_INSTALL_PREFIX/setup/setup to complete the upgrade." +else + echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to complete installation and set up the servers." fi -echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." %preun # only run uninstall if this is the last version of the package From fedora-directory-commits at redhat.com Thu Feb 23 19:30:43 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 14:30:43 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.51,1.52 Message-ID: <200602231931.k1NJVDLK002298@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/cm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver/ldap/cm Modified Files: Makefile Log Message: Bug(s) fixed: 182613 Bug Description: Upgrade wipes out sectool wrappers Reviewed by: Pete and Nathan (Thanks!) Fix Description: It's better if we just package those wrappers instead of creating them on the fly. The new file sec_tools_wrappers is a simple shell script that assumes it's being run out of a parent/bin directory which contains a program called $0-bin, and the shared libs it needs are in parent/lib. This shell script is copied to shared/bin/certutil, shared/bin/modutil, etc. I had to create another makefile packaging macro to handle the case where you want to package a file under a different name than the original. Also 1) Add Red Hat and Fedora DS to upgradeServer 2) adminutil property directory is now adminutil-properties instead of property 3) General clean up of some upgrade install things Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- Makefile 23 Feb 2006 01:20:06 -0000 1.51 +++ Makefile 23 Feb 2006 19:30:35 -0000 1.52 @@ -346,6 +346,20 @@ fi ; \ done +# PACKAGE_SRC_DESTFILE is defined in components.mk - these are component files and directories to install +# with the other component files that we don't necessarily pick up from the admin server build +# these can go in any directory - this differs from PACKAGE_SRC_DEST above in that in this case, the +# destination is a _file_, not a directory, and src must be a filename, not a directory + for destfile in $(PACKAGE_SRC_DESTFILE) ; \ + do if [ "$$src" ] ; \ + then destdir=`dirname $$destfile` ; \ + if [ ! -d $(RELDIR)/$$destdir ] ; then mkdir -p $(RELDIR)/$$destdir ; fi ; \ + $(CP) $$src $(RELDIR)/$$destfile ; \ + src= ; \ + else src=$$destfile ; \ + fi ; \ + done + # install the DSMLGW into the client directory # the following DSML files must be packaged separately: # web-app_2_3.dtd, activation.jar, saaj.jar - due to Sun license From fedora-directory-commits at redhat.com Thu Feb 23 20:45:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:45:29 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm sort.c, 1.5, 1.6 Message-ID: <200602232045.k1NKjTAH004918@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4860/ldapserver/ldap/servers/slapd/back-ldbm Modified Files: sort.c Log Message: Bug(s) fixed: 179135 Bug Description: memory leaks using ber_scanf when handling bad BER packets Reviewed by: All (Thanks!) Files: https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=123783 Branch: HEAD Fix Description: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135#c0 I basically did a search through our code for all calls to ber_scanf, ber_get_stringa, and ber_get_stringal and made sure we properly free any arguments that may have been allocated. There was a bug in the ldapsdk https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135 that causes us to free uninitialized memory when trying to clean up the result of ber_get_stringal (or ber_scanf with 'V'). I had to initialize some variables to NULL so that we could properly clean them up, and added some additional clean ups that were missing. Also, in repl_extop.c, we were calling free on an array that we should have been calling ch_array_free on. Yet another lesson in the evils of slapi_ch_free and disabling compiler type checks in general. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: sort.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/sort.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sort.c 19 Apr 2005 22:07:38 -0000 1.5 +++ sort.c 23 Feb 2006 20:45:22 -0000 1.6 @@ -384,6 +384,7 @@ return_value = ber_scanf(ber,"a",&rtype); if (LBER_ERROR == return_value) { + slapi_ch_free_string(&rtype); rc = LDAP_PROTOCOL_ERROR; goto err; } From fedora-directory-commits at redhat.com Thu Feb 23 20:45:19 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:45:19 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/plugins/replication repl5_total.c, 1.5, 1.6 repl_controls.c, 1.5, 1.6 repl_extop.c, 1.7, 1.8 Message-ID: <200602232045.k1NKjoAO004923@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4860/ldapserver/ldap/servers/plugins/replication Modified Files: repl5_total.c repl_controls.c repl_extop.c Log Message: Bug(s) fixed: 179135 Bug Description: memory leaks using ber_scanf when handling bad BER packets Reviewed by: All (Thanks!) Files: https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=123783 Branch: HEAD Fix Description: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135#c0 I basically did a search through our code for all calls to ber_scanf, ber_get_stringa, and ber_get_stringal and made sure we properly free any arguments that may have been allocated. There was a bug in the ldapsdk https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135 that causes us to free uninitialized memory when trying to clean up the result of ber_get_stringal (or ber_scanf with 'V'). I had to initialize some variables to NULL so that we could properly clean them up, and added some additional clean ups that were missing. Also, in repl_extop.c, we were calling free on an array that we should have been calling ch_array_free on. Yet another lesson in the evils of slapi_ch_free and disabling compiler type checks in general. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: repl5_total.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_total.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl5_total.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl5_total.c 23 Feb 2006 20:45:09 -0000 1.6 @@ -585,7 +585,7 @@ char *lasti; unsigned long len; unsigned long tag; - char *str; + char *str = NULL; int rc; Slapi_Value *value; @@ -685,6 +685,9 @@ if (value) slapi_value_free (&value); + slapi_ch_free_string(&attrtype); + slapi_ch_free_string(&str); + return -1; } Index: repl_controls.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_controls.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- repl_controls.c 19 Apr 2005 22:07:32 -0000 1.5 +++ repl_controls.c 23 Feb 2006 20:45:10 -0000 1.6 @@ -349,15 +349,15 @@ emtag != LBER_ERROR && emtag != LBER_END_OF_SEQORSET; emtag = ber_next_element( ember, &emlen, emlast )) { - struct berval **embvals; - if ( ber_scanf( ember, "{i{a[V]}}", &op, &type, &embvals ) == LBER_ERROR ) + struct berval **embvals = NULL; + type = NULL; + if ( ber_scanf( ember, "{i{a[V]}}", &op, &type, &embvals ) != LBER_ERROR ) { - continue; + slapi_mods_add_modbvps( smods, op, type, embvals); /* GGOODREPL I suspect this will cause two sets of lastmods attr values to end up in the entry. We need to remove the old ones. */ } - slapi_mods_add_modbvps( smods, op, type, embvals); free( type ); ber_bvecfree( embvals ); } Index: repl_extop.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl_extop.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- repl_extop.c 19 Apr 2005 22:07:32 -0000 1.7 +++ repl_extop.c 23 Feb 2006 20:45:10 -0000 1.8 @@ -384,7 +384,8 @@ /* slapi_ch_free accepts NULL pointer */ slapi_ch_free ((void**)protocol_oid); slapi_ch_free ((void**)repl_root); - slapi_ch_free ((void **)extra_referrals); + slapi_ch_array_free (*extra_referrals); + *extra_referrals = NULL; slapi_ch_free ((void**)csnstr); if (*supplier_ruv) From fedora-directory-commits at redhat.com Thu Feb 23 20:45:24 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:45:24 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd add.c, 1.5, 1.6 ava.c, 1.4, 1.5 bind.c, 1.6, 1.7 compare.c, 1.4, 1.5 delete.c, 1.4, 1.5 filter.c, 1.5, 1.6 modify.c, 1.8, 1.9 modrdn.c, 1.4, 1.5 Message-ID: <200602232045.k1NKjsuR004928@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4860/ldapserver/ldap/servers/slapd Modified Files: add.c ava.c bind.c compare.c delete.c filter.c modify.c modrdn.c Log Message: Bug(s) fixed: 179135 Bug Description: memory leaks using ber_scanf when handling bad BER packets Reviewed by: All (Thanks!) Files: https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=123783 Branch: HEAD Fix Description: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135#c0 I basically did a search through our code for all calls to ber_scanf, ber_get_stringa, and ber_get_stringal and made sure we properly free any arguments that may have been allocated. There was a bug in the ldapsdk https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=179135 that causes us to free uninitialized memory when trying to clean up the result of ber_get_stringal (or ber_scanf with 'V'). I had to initialize some variables to NULL so that we could properly clean them up, and added some additional clean ups that were missing. Also, in repl_extop.c, we were calling free on an array that we should have been calling ch_array_free on. Yet another lesson in the evils of slapi_ch_free and disabling compiler type checks in general. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: add.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/add.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- add.c 19 Apr 2005 22:07:36 -0000 1.5 +++ add.c 23 Feb 2006 20:45:16 -0000 1.6 @@ -102,8 +102,9 @@ */ /* get the name */ { - char *dn; + char *dn = NULL; if ( ber_scanf( ber, "{a", &dn ) == LBER_ERROR ) { + slapi_ch_free_string(&dn); LDAPDebug( LDAP_DEBUG_ANY, "ber_scanf failed (op=Add; params=DN)\n", 0, 0, 0 ); op_shared_log_error_access (pb, "ADD", "???", "decoding error"); @@ -121,11 +122,13 @@ tag != LBER_DEFAULT && tag != LBER_END_OF_SEQORSET; tag = ber_next_element( ber, &len, last ) ) { char *type = NULL, *normtype = NULL; - struct berval **vals; + struct berval **vals = NULL; if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) { op_shared_log_error_access (pb, "ADD", slapi_sdn_get_dn (slapi_entry_get_sdn_const(e)), "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, "decoding error", 0, NULL ); + slapi_ch_free_string(&type); + ber_bvecfree( vals ); goto free_and_return; } @@ -134,7 +137,7 @@ op_shared_log_error_access (pb, "ADD", slapi_sdn_get_dn (slapi_entry_get_sdn_const(e)), "null value"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, NULL, 0, NULL ); - free( type ); + slapi_ch_free_string(&type); goto free_and_return; } @@ -144,7 +147,7 @@ PR_snprintf (ebuf, BUFSIZ, "invalid type '%s'", type); op_shared_log_error_access (pb, "ADD", slapi_sdn_get_dn (slapi_entry_get_sdn_const(e)), ebuf); send_ldap_result( pb, rc, NULL, ebuf, 0, NULL ); - free( type ); + slapi_ch_free_string(&type); slapi_ch_free( (void**)&normtype ); ber_bvecfree( vals ); goto free_and_return; Index: ava.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ava.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ava.c 19 Apr 2005 22:07:36 -0000 1.4 +++ ava.c 23 Feb 2006 20:45:16 -0000 1.5 @@ -53,10 +53,12 @@ struct ava *ava ) { - char *type; + char *type = NULL; if ( ber_scanf( ber, "{ao}", &type, &ava->ava_value ) == LBER_ERROR ) { + slapi_ch_free_string(&type); + ava_done(ava); LDAPDebug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 ); return( LDAP_PROTOCOL_ERROR ); } Index: bind.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bind.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bind.c 19 Apr 2005 22:07:36 -0000 1.6 +++ bind.c 23 Feb 2006 20:45:16 -0000 1.7 @@ -111,7 +111,7 @@ long ber_version = -1; int auth_response_requested = 0; int pw_response_requested = 0; - char *dn, *saslmech = NULL; + char *dn = NULL, *saslmech = NULL; struct berval cred = {0}; Slapi_Backend *be = NULL; unsigned long rc; @@ -154,6 +154,7 @@ log_bind_access (pb, "???", method, version, saslmech, "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, "decoding error", 0, NULL ); + slapi_ch_free_string(&dn); return; } Index: compare.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/compare.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- compare.c 19 Apr 2005 22:07:36 -0000 1.4 +++ compare.c 23 Feb 2006 20:45:16 -0000 1.5 @@ -60,13 +60,13 @@ do_compare( Slapi_PBlock *pb ) { BerElement *ber = pb->pb_op->o_ber; - char *dn; - struct ava ava; + char *dn = NULL; + struct ava ava = {0}; Slapi_Backend *be = NULL; int err; char ebuf[ BUFSIZ ]; Slapi_DN sdn; - Slapi_Entry *referral; + Slapi_Entry *referral = NULL; char errorbuf[BUFSIZ]; LDAPDebug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 ); @@ -74,6 +74,9 @@ /* count the compare request */ PR_AtomicIncrement(g_get_global_snmp_vars()->ops_tbl.dsCompareOps); + /* have to init this here so we can "done" it below if we short circuit */ + slapi_sdn_init(&sdn); + /* * Parse the compare request. It looks like this: * @@ -86,7 +89,6 @@ * } */ - if ( ber_scanf( ber, "{a{ao}}", &dn, &ava.ava_type, &ava.ava_value ) == LBER_ERROR ) { LDAPDebug( LDAP_DEBUG_ANY, @@ -94,7 +96,7 @@ 0, 0, 0 ); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, NULL, 0, NULL ); - return; + goto free_and_return; } /* * in LDAPv3 there can be optional control extensions on @@ -106,6 +108,7 @@ goto free_and_return; } slapi_sdn_init_dn_passin(&sdn,dn); + dn = NULL; /* do not free - sdn owns it now */ /* target spec is used to decide which plugins are applicable for the operation */ operation_set_target_spec (pb->pb_op, &sdn); @@ -181,5 +184,6 @@ if (be) slapi_be_Unlock(be); slapi_sdn_done(&sdn); + slapi_ch_free_string(&dn); ava_done( &ava ); } Index: delete.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/delete.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- delete.c 19 Apr 2005 22:07:36 -0000 1.4 +++ delete.c 23 Feb 2006 20:45:16 -0000 1.5 @@ -66,7 +66,7 @@ { Slapi_Operation *operation; BerElement *ber; - char *dn; + char *dn = NULL; int err; LDAPDebug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 ); @@ -89,7 +89,7 @@ op_shared_log_error_access (pb, "DEL", "???", "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, NULL, 0, NULL ); - return; + goto free_and_return; } /* Index: filter.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/filter.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- filter.c 19 Apr 2005 22:07:36 -0000 1.5 +++ filter.c 23 Feb 2006 20:45:16 -0000 1.6 @@ -175,7 +175,7 @@ unsigned long len; int err; struct slapi_filter *f; - char *ftmp, *type; + char *ftmp, *type = NULL; LDAPDebug( LDAP_DEBUG_FILTER, "=> get_filter_internal\n", 0, 0, 0 ); @@ -293,6 +293,7 @@ case LDAP_FILTER_PRESENT: LDAPDebug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 ); if ( ber_scanf( ber, "a", &type ) == LBER_ERROR ) { + slapi_ch_free_string(&type); err = LDAP_PROTOCOL_ERROR; } else { err = LDAP_SUCCESS; @@ -440,12 +441,13 @@ ) { unsigned long tag, len, rc; - char *val, *last, *type; + char *val, *last, *type = NULL; char ebuf[BUFSIZ]; LDAPDebug( LDAP_DEBUG_FILTER, "=> get_substring_filter\n", 0, 0, 0 ); if ( ber_scanf( ber, "{a", &type ) == LBER_ERROR ) { + slapi_ch_free_string(&type); return( LDAP_PROTOCOL_ERROR ); } f->f_sub_type = slapi_attr_syntax_normalize( type ); @@ -460,8 +462,10 @@ tag != LBER_ERROR && tag != LBER_END_OF_SEQORSET; tag = ber_next_element( ber, &len, last ) ) { + val = NULL; rc = ber_scanf( ber, "a", &val ); if ( rc == LBER_ERROR ) { + slapi_ch_free_string(&val); return( LDAP_PROTOCOL_ERROR ); } if ( val == NULL || *val == '\0' ) { @@ -573,8 +577,9 @@ } } { - char* type; + char* type = NULL; if (ber_scanf( ber, "a", &type ) == LBER_ERROR) { + slapi_ch_free_string (&type); rc = LDAP_PROTOCOL_ERROR; } else { mrf->mrf_type = slapi_attr_syntax_normalize(type); Index: modify.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modify.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modify.c 25 Jan 2006 16:51:39 -0000 1.8 +++ modify.c 23 Feb 2006 20:45:16 -0000 1.9 @@ -114,7 +114,7 @@ { Slapi_Operation *operation; BerElement *ber; - char *last, *type; + char *last, *type = NULL; unsigned long tag, len; LDAPMod *mod; LDAPMod **mods; @@ -124,7 +124,7 @@ int ignored_some_mods = 0; int has_password_mod = 0; /* number of password mods */ char *old_pw = NULL; /* remember the old password */ - char *dn; + char *dn = NULL; LDAPDebug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 ); @@ -161,6 +161,7 @@ op_shared_log_error_access (pb, "MOD", "???", "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, NULL, 0, NULL ); + slapi_ch_free_string(&dn); return; } } @@ -186,7 +187,9 @@ op_shared_log_error_access (pb, "MOD", dn, "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, "decoding error", 0, NULL ); + ber_bvecfree(mod->mod_bvalues); slapi_ch_free((void **)&mod); + slapi_ch_free_string(&type); goto free_and_return; } mod->mod_op = long_mod_op; Index: modrdn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modrdn.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modrdn.c 19 Apr 2005 22:07:36 -0000 1.4 +++ modrdn.c 23 Feb 2006 20:45:16 -0000 1.5 @@ -66,10 +66,10 @@ { Slapi_Operation *operation; BerElement *ber; - char *dn, *newsuperior = NULL; + char *dn = NULL, *newsuperior = NULL; char *newrdn = NULL; - int err, deloldrdn; - unsigned long len; + int err = 0, deloldrdn = 0; + unsigned long len = 0; LDAPDebug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 ); @@ -99,7 +99,7 @@ send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, "unable to decode DN, newRDN, or deleteOldRDN parameters", 0, NULL ); - return; + goto free_and_return; } if ( ber_peek_tag( ber, &len ) == LDAP_TAG_NEWSUPERIOR ) { From fedora-directory-commits at redhat.com Thu Feb 23 20:48:12 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:48:12 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm dn2entry.c, 1.4, 1.5 Message-ID: <200602232048.k1NKmCZi004972@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939/ldapserver/ldap/servers/slapd/back-ldbm Modified Files: dn2entry.c Log Message: Bug(s) fixed: 179137 Bug Description: recursion causes OOM with bad DN in dn2ancestor Reviewed by: All (Thanks!) Fix Description: The fix looks scary, but I thought it would be best to get rid of recursion entirely (ugh - recursion in a multi threaded server - this isn't lisp . . .). Along with eliminating recursion, I created a new function called slapi_dn_find_parent that just returns a pointer to the beginning of the parent of the given dn, rather than returning a copy (as in slapi_dn_parent), to eliminate malloc/free in cases where it is unnecessary such as iterating through the parents in an DN. The new function is basically just the guts of slapi_dn_parent with one twist, specifically to address the bug in question - it skips through consecutive runs of DN separator characters. We should probably have a function like const char *slapi_dn_is_valid(const char *) that returns NULL if the given DN is valid or returns a pointer to the first invalid character if not. We could probably save a lot of time in processing bad or malicious client requests. Anyway, back to dn2ancestor. The given ancestordn must contain the _unnormalized_ parent DN, since some clients get irritated when they get back an DN in a different form than given. However, we need to have a normalized DN to pass to dn2entry, and we cannot use a single Slapi_DN that has both a dn and a ndn that are passed in byval (unless we add a new API or skip the API altogether), so the variable ancestorndn holds the normalized DN. Using the original pointer to the given sdn also allows us to avoid malloc/free entirely. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: We need a test case that calls moddn and modify operations with really bad DNs, consisting of nothing but thousands of ',', '+', and '=' chars. Index: dn2entry.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/dn2entry.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dn2entry.c 19 Apr 2005 22:07:38 -0000 1.4 +++ dn2entry.c 23 Feb 2006 20:48:05 -0000 1.5 @@ -109,58 +109,12 @@ } /* - * dn2entry_or_ancestor - look up dn in the cache/indexes and return the - * corresponding entry. If the entry is not found, this function returns NULL - * and sets ancestordn to the DN of highest entry in the tree matched. - * - * ancestordn should be initialized before calling this function. - * - * When the caller is finished with the entry returned, it should return it - * to the cache: - * e = dn2entry_or_ancestor( ... ); - * if ( NULL != e ) { - * cache_return( &inst->inst_cache, &e ); - * } - */ -struct backentry * -dn2entry_or_ancestor( - Slapi_Backend *be, - const Slapi_DN *sdn, - Slapi_DN *ancestordn, - back_txn *txn, - int *err -) -{ - struct backentry *e; - - LDAPDebug( LDAP_DEBUG_TRACE, "=> dn2entry_or_ancestor \"%s\"\n", slapi_sdn_get_dn(sdn), 0, 0 ); - - /* - * Fetch the entry asked for. - */ - - e= dn2entry(be,sdn,txn,err); - - if(e==NULL) - { - /* - * could not find the entry named. crawl back up the dn and - * stop at the first ancestor that does exist, or when we get - * to the suffix. - */ - e= dn2ancestor(be,sdn,ancestordn,txn,err); - } - - LDAPDebug( LDAP_DEBUG_TRACE, "<= dn2entry_or_ancestor %p\n", e, 0, 0 ); - return( e ); -} - -/* * Use the DN to fetch the parent of the entry. * If the parent entry doesn't exist, keep working * up the DN until we hit "" or an backend suffix. * - * ancestordn should be initialized before calling this function. + * ancestordn should be initialized before calling this function, and + * should be empty * * Returns NULL for no entry found. * @@ -184,18 +138,64 @@ LDAPDebug( LDAP_DEBUG_TRACE, "=> dn2ancestor \"%s\"\n", slapi_sdn_get_dn(sdn), 0, 0 ); - /* stop when we get to "", or a backend suffix point */ - slapi_sdn_done(ancestordn); /* free any previous contents */ - slapi_sdn_get_backend_parent(sdn,ancestordn,be); - if ( !slapi_sdn_isempty(ancestordn) ) - { - Slapi_DN *newsdn = slapi_sdn_dup(ancestordn); - e = dn2entry_or_ancestor( be, newsdn, ancestordn, txn, err ); - slapi_sdn_free(&newsdn); - } - - LDAPDebug( LDAP_DEBUG_TRACE, "<= dn2ancestor %p\n", e, 0, 0 ); - return( e ); + /* first, check to see if the given sdn is empty or a root suffix of the + given backend - if so, it has no parent */ + if (!slapi_sdn_isempty(sdn) && !slapi_be_issuffix( be, sdn )) { + Slapi_DN ancestorndn; + const char *ptr; + + /* assign ancestordn to the parent of the given dn - ancestordn will contain + the "raw" unnormalized DN from the caller, so we can give back the DN + in the same format as we received it */ + ptr = slapi_dn_find_parent(slapi_sdn_get_dn(sdn)); + /* assign the ancestordn dn pointer to the parent of dn from sdn - sdn "owns" + the memory, but ancestordn points to it */ + slapi_sdn_set_dn_byref(ancestordn, ptr); /* free any previous contents */ + /* now, do the same for the normalized version */ + /* ancestorndn holds the normalized version for iteration purposes and + because dn2entry needs the normalized dn */ + ptr = slapi_dn_find_parent(slapi_sdn_get_ndn(sdn)); + slapi_sdn_init_ndn_byref(&ancestorndn, ptr); + + /* + At this point you may be wondering why I need both ancestorndn and + ancestordn. Because, with the slapi_sdn interface, you cannot set both + the dn and ndn byref at the same time. Whenever you call set_dn or set_ndn, + it calls slapi_sdn_done which wipes out the previous contents. I suppose I + could have added another API to allow you to pass them both in. Also, using + slapi_sdn_get_ndn(ancestordn) every time would result in making a copy then + normalizing the copy every time - not efficient. + So, why not just use a char* for the ancestorndn? Because dn2entry requires + a Slapi_DN with the normalized dn. + */ + + /* stop when we get to "", or a backend suffix point */ + while (!e && !slapi_sdn_isempty(&ancestorndn) && !slapi_be_issuffix( be, &ancestorndn )) { + /* find the entry - it uses the ndn, so no further conversion is necessary */ + e= dn2entry(be,&ancestorndn,txn,err); + if (!e) { + /* not found, so set ancestordn to its parent and try again */ + ptr = slapi_dn_find_parent(slapi_sdn_get_ndn(&ancestorndn)); + /* keep in mind that ptr points to the raw ndn pointer inside + ancestorndn which is still the ndn string "owned" by sdn, the + original dn we started with - we are careful not to touch + or change it */ + slapi_sdn_set_ndn_byref(&ancestorndn, ptr); /* wipe out the previous contents */ + /* now do the same for the unnormalized one */ + ptr = slapi_dn_find_parent(slapi_sdn_get_dn(ancestordn)); + slapi_sdn_set_dn_byref(ancestordn, ptr); /* wipe out the previous contents */ + } + } + + slapi_sdn_done(&ancestorndn); + } + + /* post conditions: + e is the entry of the ancestor of sdn OR e is the suffix entry + OR e is NULL + ancestordn contains the unnormalized DN of e or is empty */ + LDAPDebug( LDAP_DEBUG_TRACE, "<= dn2ancestor %p\n", e, 0, 0 ); + return( e ); } /* From fedora-directory-commits at redhat.com Thu Feb 23 20:48:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:48:07 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd dn.c, 1.7, 1.8 slapi-plugin.h, 1.8, 1.9 Message-ID: <200602232048.k1NKmbpY004976@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4939/ldapserver/ldap/servers/slapd Modified Files: dn.c slapi-plugin.h Log Message: Bug(s) fixed: 179137 Bug Description: recursion causes OOM with bad DN in dn2ancestor Reviewed by: All (Thanks!) Fix Description: The fix looks scary, but I thought it would be best to get rid of recursion entirely (ugh - recursion in a multi threaded server - this isn't lisp . . .). Along with eliminating recursion, I created a new function called slapi_dn_find_parent that just returns a pointer to the beginning of the parent of the given dn, rather than returning a copy (as in slapi_dn_parent), to eliminate malloc/free in cases where it is unnecessary such as iterating through the parents in an DN. The new function is basically just the guts of slapi_dn_parent with one twist, specifically to address the bug in question - it skips through consecutive runs of DN separator characters. We should probably have a function like const char *slapi_dn_is_valid(const char *) that returns NULL if the given DN is valid or returns a pointer to the first invalid character if not. We could probably save a lot of time in processing bad or malicious client requests. Anyway, back to dn2ancestor. The given ancestordn must contain the _unnormalized_ parent DN, since some clients get irritated when they get back an DN in a different form than given. However, we need to have a normalized DN to pass to dn2entry, and we cannot use a single Slapi_DN that has both a dn and a ndn that are passed in byval (unless we add a new API or skip the API altogether), so the variable ancestorndn holds the normalized DN. Using the original pointer to the given sdn also allows us to avoid malloc/free entirely. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: We need a test case that calls moddn and modify operations with really bad DNs, consisting of nothing but thousands of ',', '+', and '=' chars. Index: dn.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dn.c 8 Dec 2005 00:59:14 -0000 1.7 +++ dn.c 23 Feb 2006 20:47:59 -0000 1.8 @@ -593,8 +593,26 @@ return r; } -char* -slapi_dn_parent( const char *dn ) +/* + * This function is used for speed. Instead of returning a newly allocated + * dn string that contains the parent, this function just returns a pointer + * to the address _within_ the given string where the parent dn of the + * given dn starts e.g. if you call this with "dc=example,dc=com", the + * function will return "dc=com" - that is, the char* returned will be the + * address of the 'd' after the ',' in "dc=example,dc=com". This function + * also checks for bogus things like consecutive ocurrances of unquoted + * separators e.g. DNs like cn=foo,,,,,,,,,,,cn=bar,,,,,,, + * This function is useful for "interating" over a DN returning the ancestors + * of the given dn e.g. + * + * const char *dn = somedn; + * while (dn = slapi_dn_find_parent(dn)) { + * see if parent exists + * etc. + * } + */ +const char* +slapi_dn_find_parent( const char *dn ) { const char *s; int inquote; @@ -621,14 +639,34 @@ } else { if ( *s == '"' ) inquote = 1; - else if ( DNSEPARATOR( *s ) ) - return( slapi_ch_strdup( s + 1 ) ); + else { + if ( DNSEPARATOR( *s ) ) { + while ( *s && DNSEPARATOR( *s ) ) { + ++s; + } + if (*s) { + return( s ); + } + } + } } } return( NULL ); } +char* +slapi_dn_parent( const char *dn ) +{ + const char *s = slapi_dn_find_parent(dn); + + if ( s == NULL || *s == '\0' ) { + return( NULL ); + } + + return( slapi_ch_strdup( s ) ); +} + /* * slapi_dn_issuffix - tells whether suffix is a suffix of dn. both dn * and suffix must be normalized. Index: slapi-plugin.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- slapi-plugin.h 19 Apr 2005 22:07:37 -0000 1.8 +++ slapi-plugin.h 23 Feb 2006 20:47:59 -0000 1.9 @@ -362,6 +362,7 @@ char *slapi_dn_ignore_case( char *dn ); char *slapi_dn_normalize_case( char *dn ); char *slapi_dn_beparent( Slapi_PBlock *pb, const char *dn ); +const char *slapi_dn_find_parent( const char *dn ); char *slapi_dn_parent( const char *dn ); int slapi_dn_issuffix( const char *dn, const char *suffix ); int slapi_dn_isparent( const char *parentdn, const char *childdn ); From fedora-directory-commits at redhat.com Thu Feb 23 20:56:00 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Thu, 23 Feb 2006 15:56:00 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd attr.c, 1.6, 1.7 Message-ID: <200602232056.k1NKu0uw005008@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4989/ldapserver/ldap/servers/slapd Modified Files: attr.c Log Message: Bug: 179810 Description: crash: modify/delete when attr name doesn't match database Reviewed by: All (Thanks!) Fix description: Use case insensitive comparison for attribute names. Index: attr.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/attr.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- attr.c 25 Aug 2005 00:58:27 -0000 1.6 +++ attr.c 23 Feb 2006 20:55:53 -0000 1.7 @@ -112,7 +112,7 @@ switch ( opt ) { case SLAPI_TYPE_CMP_EXACT: /* compare base name + options as given */ - rc = strcmp( a1, a2 ); + rc = strcasecmp( a1, a2 ); break; case SLAPI_TYPE_CMP_BASE: /* ignore options on both names - compare base names only */ From fedora-directory-commits at redhat.com Thu Feb 23 21:47:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 23 Feb 2006 16:47:59 -0500 Subject: [Fedora-directory-commits] setuputil/installer Makefile,1.4,1.5 Message-ID: <200602232147.k1NLlxdi007556@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil/installer In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489/installer Modified Files: Makefile Log Message: [179394] HP-UX IPF/PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM added _ia64 tag to NSCONFIG replaced --exclude option with more common -X for tar. Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 20 Dec 2005 00:06:45 -0000 1.4 +++ Makefile 23 Feb 2006 21:47:51 -0000 1.5 @@ -38,6 +38,8 @@ include $(BUILD_ROOT)/nsconfig.mk endif +TMPLIST := $(shell echo /tmp/build.$$$$) + PKGDIR_NAME=$(PLATFORM_DEST) PKGTOP=$(ABS_ROOT)/built/package/$(PKGDIR_NAME) ifdef BUILD_INTL @@ -171,8 +173,15 @@ ifneq ($(ARCH), WINNT) # create a source tar ball (ABS_INSTDIR is always new and clean) cd $(ABS_INSTDIR); ln -s $(ABS_ROOT) $(RPM_FILE_BASE); \ - tar cfh - --exclude \*/built --exclude \*/CVS $(RPM_FILE_BASE) --exclude \*/branding --exclude \*/RHEL* --exclude \*/SunOS* --exclude \*/HP* --exclude \*/Linux** | gzip > $(RPM_FILE_BASE).tar.gz; \ + echo $(RPM_FILE_BASE)/built > $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "CVS" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "HP-UX*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "SunOS*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "RHEL*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + find $(RPM_FILE_BASE)/* -name "Linux*" -a -type d -print | egrep -v built >> $(TMPLIST) ; \ + tar cfh - -X $(TMPLIST) $(RPM_FILE_BASE) | gzip > $(RPM_FILE_BASE).tar.gz; \ $(RM) $(RPM_FILE_BASE) + -$(RM) -rf $(TMPLIST) endif pkgRPM: pkgSBC From fedora-directory-commits at redhat.com Thu Feb 23 21:47:53 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 23 Feb 2006 16:47:53 -0500 Subject: [Fedora-directory-commits] setuputil component_versions.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8 Message-ID: <200602232148.k1NLmNUa007565@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7489 Modified Files: component_versions.mk nsconfig.mk Log Message: [179394] HP-UX IPF/PA-RISC support NSPR_RELDATE = v4.6 SECURITY_RELDATE = NSS_3_11_RTM added _ia64 tag to NSCONFIG replaced --exclude option with more common -X for tar. Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/setuputil/component_versions.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- component_versions.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ component_versions.mk 23 Feb 2006 21:47:45 -0000 1.2 @@ -34,12 +34,12 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.4.1 + NSPR_RELDATE = v4.6 endif # SECURITY (NSS) LIBRARY ifndef SECURITY_RELDATE - SECURITY_RELDATE = NSS_3_9_3_RTM + SECURITY_RELDATE = NSS_3_11_RTM endif # DBM Library Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nsconfig.mk 15 Feb 2006 22:51:00 -0000 1.7 +++ nsconfig.mk 23 Feb 2006 21:47:45 -0000 1.8 @@ -68,8 +68,13 @@ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) endif ifeq ($(NSOS_ARCH),HP-UX) + ifeq ($(NSOS_TEST1), ia64) NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + else + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + endif else NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) From fedora-directory-commits at redhat.com Thu Feb 23 22:50:30 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Thu, 23 Feb 2006 17:50:30 -0500 Subject: [Fedora-directory-commits] setuputil component_versions.mk, 1.2, 1.3 components.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2 Message-ID: <200602232250.k1NMoUDx009962@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9935 Modified Files: component_versions.mk components.mk internal_comp_deps.mk Log Message: [179394] HP-UX IPF/PA-RISC support upgraded internal LDAP C SDK to v5.17 Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/setuputil/component_versions.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- component_versions.mk 23 Feb 2006 21:47:45 -0000 1.2 +++ component_versions.mk 23 Feb 2006 22:50:21 -0000 1.3 @@ -49,7 +49,7 @@ # LDAP SDK ifndef LDAP_RELDATE - LDAP_RELDATE = v5.16 + LDAP_RELDATE = v5.17 endif ifndef LDAPCOMP_DIR LDAPCOMP_DIR=ldapsdk50 Index: components.mk =================================================================== RCS file: /cvs/dirsec/setuputil/components.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- components.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ components.mk 23 Feb 2006 22:50:21 -0000 1.2 @@ -215,7 +215,7 @@ else LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib LDAPSDK_INCDIR = $(LDAP_ROOT)/include - LDAPSDK_BINPATH = $(LDAP_ROOT)/tools + LDAPSDK_BINPATH = $(LDAP_ROOT)/bin endif LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/setuputil/internal_comp_deps.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- internal_comp_deps.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1 +++ internal_comp_deps.mk 23 Feb 2006 22:50:21 -0000 1.2 @@ -57,7 +57,7 @@ mkdir -p $(LDAP_LIBPATH) $(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \ -objdir $(LDAP_ROOT) -componentdir $(LDAP_RELEASE) \ - -files include,$(LDAPSDK_PULL_LIBS),tools + -files include,$(LDAPSDK_PULL_LIBS),bin endif - at if [ ! -f $@ ] ; \ then echo "Error: could not get component LDAPSDK file $@" ; \ From fedora-directory-commits at redhat.com Fri Feb 24 16:19:31 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 11:19:31 -0500 Subject: [Fedora-directory-commits] mod_admserv mod_admserv.c,1.19,1.20 Message-ID: <200602241619.k1OGJVLM019920@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19903 Modified Files: mod_admserv.c Log Message: Bug(s) fixed: 182556 Bug Description: Cannot assign multiple domains to nsAdminAccessHosts Reviewed by: Nathan (Thanks!) Fix Description: The adminserver console uses a pattern like (pat1|pat2|...|patN) to encode the host and IP address access allowed lists. apr_fnmatch is not smart enough to grok this pattern, so we have to have mod_admserv pre-digest it. The strdup is because strtok modifies it's argument. apr_strdup allocates memory out of a per request pool, and automatically frees it at the end of the request, so we don't have to free it here. Platforms tested: Fedora Core 4 Flag Day: no Doc impact: no Index: mod_admserv.c =================================================================== RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_admserv.c 18 Jan 2006 02:26:25 -0000 1.19 +++ mod_admserv.c 24 Feb 2006 16:19:23 -0000 1.20 @@ -1822,8 +1822,29 @@ return 1; } -/* Check if the caller hostname or ip address is disallowed */ +/* pattern is (pat1|pat2|...|patN) where patN is a simple apr_fnmatch pattern + if we get a match, just return immediately with success, otherwise, loop + through all the patterns and return a failure code if no match +*/ +static apr_status_t +admserv_match_list(char *patterns, const char *string, int flags) +{ + apr_status_t rc = APR_SUCCESS; + char *last = NULL; + char *pattern = apr_strtok(patterns, "()|", &last); + + while (pattern) { + rc = apr_fnmatch(pattern, string, flags); + if (rc == APR_SUCCESS) { + return rc; + } + pattern = apr_strtok(NULL, "()|", &last); + } + return rc; +} + +/* Check if the caller hostname or ip address is disallowed */ static int admserv_host_ip_check(request_rec *r) { @@ -1845,7 +1866,7 @@ const char *maxdns = ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_HOST, NULL); if (maxdns) { - apr_status_t rc = apr_fnmatch(accessHosts, maxdns, matchflags); + apr_status_t rc = admserv_match_list(apr_pstrdup(r->pool, accessHosts), maxdns, matchflags); if (rc != APR_SUCCESS) { } else { return DECLINED; @@ -1858,13 +1879,15 @@ char buf[PR_NETDB_BUF_SIZE]; PRHostEnt hEntry; if (PR_SUCCESS == PR_GetHostByAddr(&addr, buf, sizeof(buf), &hEntry)) { - if (APR_SUCCESS != apr_fnmatch(accessHosts, hEntry.h_name, matchflags)) { + if (APR_SUCCESS != admserv_match_list(apr_pstrdup(r->pool, accessHosts), + hEntry.h_name, matchflags)) { char ** x; ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, "admserv_host_ip_check: host [%s] did not match pattern [%s] -" "will scan aliases", hEntry.h_name, accessHosts); for (x = hEntry.h_aliases; x && *x; x++) { - if (APR_SUCCESS != apr_fnmatch(accessHosts, *x, matchflags)) { + if (APR_SUCCESS != admserv_match_list(apr_pstrdup(r->pool, accessHosts), + *x, matchflags)) { ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, "admserv_host_ip_check: host alias [%s] did not match pattern [%s]", *x, accessHosts); @@ -1889,7 +1912,7 @@ if (accessAddresses && *accessAddresses) { int matchflags = APR_FNM_PERIOD; - apr_status_t rc = apr_fnmatch(accessAddresses, clientIP, matchflags); + apr_status_t rc = admserv_match_list(apr_pstrdup(r->pool, accessAddresses), clientIP, matchflags); if (rc == APR_SUCCESS) { } else { return DECLINED; From fedora-directory-commits at redhat.com Fri Feb 24 16:53:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 11:53:29 -0500 Subject: [Fedora-directory-commits] dsbuild/meta/ds Makefile,1.3,1.4 Message-ID: <200602241653.k1OGrTWK020397@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20380 Modified Files: Makefile Log Message: added dochecksums target which will regenerate the checksums files for all dependencies Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 16 Feb 2006 21:34:15 -0000 1.3 +++ Makefile 24 Feb 2006 16:53:21 -0000 1.4 @@ -39,3 +39,8 @@ install-%/Makefile: @mkdir -p $(COOKIEDIR)/install-$* $(MAKECOOKIE) + +dochecksums: + @for i in $(LIBDEPS) $(BUILDDEPS); do \ + $(MAKE) -s -C $(GARDIR)/$$i makesum;\ + done From fedora-directory-commits at redhat.com Fri Feb 24 17:23:23 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:23 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver checksums, 1.2, 1.3 Message-ID: <200602241724.k1OHOO3B022850@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/adminserver Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:28:18 -0000 1.2 +++ checksums 24 Feb 2006 17:23:16 -0000 1.3 @@ -1,3 +1 @@ -b61ebbdff8d4a911ed54f94108476e37 download/fedora-adminserver-1.0.tar.gz -e2e2557b9548bb3d2f54803b5fcf9103 download/fedora-adminserver-1.0.1.tar.gz -f3c89782dd1642bbc9939f07a3fd22d2 download/fedora-adminserver-1.0.2.tar.gz +00d8de5cb839225349f73b8335d6cfdb download/fedora-adminserver-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:24:24 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:24:24 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/setuputil checksums,1.2,1.3 Message-ID: <200602241724.k1OHOOsr022856@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/setuputil Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:30:00 -0000 1.2 +++ checksums 24 Feb 2006 17:24:16 -0000 1.3 @@ -1,2 +1 @@ -6bc26ba2edee75c3c8d5bf9a21bda7b8 download/fedora-setuputil-1.0.tar.gz -ad98662666e99bd737227ad6cf89abec download/fedora-setuputil-1.0.2.tar.gz +79b84559973cfbcefc5e9fa04b85417a download/fedora-setuputil-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:56 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:56 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_admserv checksums, 1.2, 1.3 Message-ID: <200602241724.k1OHORIE022859@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/mod_admserv Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_admserv/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:12 -0000 1.2 +++ checksums 24 Feb 2006 17:23:49 -0000 1.3 @@ -1,2 +1 @@ -a2615e7a400d10e6ec41565748decd3b download/mod_admserv-1.0.tar.gz -51e4a305687b48820bc8e02a28eb8fb7 download/mod_admserv-1.0.2.tar.gz +55b569f178f1dbbe1ca5a5eec6f05470 download/mod_admserv-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:24:02 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:24:02 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_nss checksums,1.2,1.3 Message-ID: <200602241724.k1OHOWSB022865@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/mod_nss Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_nss/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:18 -0000 1.2 +++ checksums 24 Feb 2006 17:23:54 -0000 1.3 @@ -1,2 +1 @@ -68bb2fcd01694538e384454ee4c8ae53 download/mod_nss-1.0.tar.gz -59a6a6b2f17d2bf8f68a36d10ee378ba download/mod_nss-1.0.2.tar.gz +49296213d611dc3710c705cba293fc4b download/mod_nss-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:29 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:29 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.2,1.3 Message-ID: <200602241724.k1OHOTNB022862@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/adminutil Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:28:25 -0000 1.2 +++ checksums 24 Feb 2006 17:23:21 -0000 1.3 @@ -1,2 +1 @@ -08c514a30604e192a22d7a035a9dfccc download/fedora-adminutil-1.0.tar.gz -ff441f6af22846102592ad101929e02e download/fedora-adminutil-1.0.2.tar.gz +2d191d3954cb527c4a94613b8e828d72 download/fedora-adminutil-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:24:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:24:07 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_restartd checksums, 1.2, 1.3 Message-ID: <200602241724.k1OHOcd8022871@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/mod_restartd Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:23 -0000 1.2 +++ checksums 24 Feb 2006 17:24:00 -0000 1.3 @@ -1,2 +1 @@ -5d04f72e1b1287fde46213678d8f24de download/mod_restartd-1.0.tar.gz -27121b306c0c777d7187223b4179c601 download/mod_restartd-1.0.2.tar.gz +056b1f79b7b611a627b0a72ba0be5b40 download/mod_restartd-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:34 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:34 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/console checksums,1.2,1.3 Message-ID: <200602241724.k1OHOZJp022868@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/console Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/console/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:28:30 -0000 1.2 +++ checksums 24 Feb 2006 17:23:27 -0000 1.3 @@ -1,2 +1 @@ -7514ba3946a23d638e7d0ab60f26255b download/fedora-console-1.0.tar.gz -31b26c651997500690de9dd186bf1e30 download/fedora-console-1.0.2.tar.gz +cc2ccdf7a0f0a1ce78326251105a12f9 download/fedora-console-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:40 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:40 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/directoryconsole checksums, 1.2, 1.3 Message-ID: <200602241724.k1OHOeFc022874@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/directoryconsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/directoryconsole Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:28:38 -0000 1.2 +++ checksums 24 Feb 2006 17:23:32 -0000 1.3 @@ -1,2 +1 @@ -ea552fe1c83fb87b9ad652f0422a77fa download/fedora-directoryconsole-1.0.tar.gz -7a057db966ee7bbe59a98a82d31bc087 download/fedora-directoryconsole-1.0.2.tar.gz +7d4229a06ad466c67ae5c7877ec09599 download/fedora-directoryconsole-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:24:13 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:24:13 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozilla checksums,1.2,1.3 Message-ID: <200602241724.k1OHOhtg022879@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/mozilla Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:29 -0000 1.2 +++ checksums 24 Feb 2006 17:24:05 -0000 1.3 @@ -1,6 +1,3 @@ -b93ea453da4e0510130649cf827108b1 download/mozilla-components.tar.gz -39bca53b30595c69fc64a6710dd3129e download/mozilla-components-2.tar.gz -a4c0724bc5b319ec7670da4cce93f920 download/mozilla-gcc4.patch +6e46eafaca84bb8121c96071e1546d04 download/mozilla-components-1.0.2.tar.gz f0d13d53c37adfe5312cf44d5d992042 download/sysfdtable.patch 251df4db04cced3c22713c865289d471 download/sysfdtable2.patch -931bc65330ad6d53aeb951e9d51a6a53 download/mozilla-components-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:45 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:45 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/icu checksums,1.2,1.3 Message-ID: <200602241724.k1OHOkY5022882@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/icu In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/icu Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:28:51 -0000 1.2 +++ checksums 24 Feb 2006 17:23:38 -0000 1.3 @@ -1,2 +1 @@ -77d56e4dca9ec0fd635151ce1dc72137 download/icu-2.4.tgz b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz From fedora-directory-commits at redhat.com Fri Feb 24 17:24:18 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:24:18 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/onlinehelp checksums,1.2,1.3 Message-ID: <200602241724.k1OHOn40022886@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/onlinehelp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/onlinehelp Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/onlinehelp/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:34 -0000 1.2 +++ checksums 24 Feb 2006 17:24:11 -0000 1.3 @@ -1,2 +1 @@ -cc8cece82f0dc4d3ff502129fdd590f6 download/fedora-onlinehelp-1.0.tar.gz -bd3d02c50d88848551dfa24964cfcf92 download/fedora-onlinehelp-1.0.2.tar.gz +190e82719b4231d22d91a62734f7d91e download/fedora-onlinehelp-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:23:51 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:23:51 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver checksums,1.2,1.3 Message-ID: <200602241724.k1OHOpcl022889@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22671/dsbuild/ds/ldapserver Modified Files: checksums Log Message: new checksums for 1.0.2 release Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checksums 14 Feb 2006 22:29:06 -0000 1.2 +++ checksums 24 Feb 2006 17:23:43 -0000 1.3 @@ -1,5 +1 @@ -a7f4aacf6c381213ac0dc7806d528834 download/fedora-ds-7.1.tar.gz -5c71c276c01daef37adf39a5337a6908 download/ldapserver-gcc4.patch -a3209ba62911a8ea55b7c7f9cef1d965 download/fedora-ds-1.0.tar.gz -4e29cb87a7907fc0d3646036c142774e download/fedora-ds-1.0.1.tar.gz -d43cb74a6700d72fd8ee96062a35d1ce download/fedora-ds-1.0.2.tar.gz +0beafbdc65c44400bc29517898e03885 download/fedora-ds-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 17:38:07 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:38:07 -0500 Subject: [Fedora-directory-commits] dsbuild/meta/ds Makefile,1.4,1.5 Message-ID: <200602241738.k1OHc9av023044@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/meta/ds In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/dsbuild/meta/ds Modified Files: Makefile Log Message: fix mozilla debug build; make USE_64=1 the default on x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 24 Feb 2006 16:53:21 -0000 1.4 +++ Makefile 24 Feb 2006 17:37:59 -0000 1.5 @@ -9,7 +9,7 @@ ARCH=$(shell uname -m) ifeq ($(ARCH), x86_64) - USE_64=1 + export USE_64=1 endif LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd From fedora-directory-commits at redhat.com Fri Feb 24 17:38:01 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 12:38:01 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.3,1.4 Message-ID: <200602241738.k1OHcVAI023057@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mozilla In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/dsbuild/ds/mozilla Modified Files: Makefile Log Message: fix mozilla debug build; make USE_64=1 the default on x86_64 Index: Makefile =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 16 Feb 2006 21:34:04 -0000 1.3 +++ Makefile 24 Feb 2006 17:37:53 -0000 1.4 @@ -16,13 +16,13 @@ BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom -ifndef DEBUG +ifeq ($(DEBUG), full) +CONFIGURE_OPTS=--disable-optimize +OBJDIR=DBG.OBJ +else OPTFLAG="BUILD_OPT=1" CONFIGURE_OPTS=--disable-debug --enable-optimize OBJDIR=OPT.OBJ -else -CONFIGURE_OPTS=--enable-debug --disable-optimize -OBJDIR=DBG.OBJ endif ifeq ($(USE_64), 1) @@ -50,7 +50,8 @@ # next, configure and make nspr mkdir -p work/mozilla/dist/$(OBJDIR) mkdir -p work/mozilla/nsprpub/$(OBJDIR) - cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \ + cd work/mozilla/nsprpub/$(OBJDIR) && \ + sh ../configure $(CONFIGURE_OPTS) \ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' From fedora-directory-commits at redhat.com Fri Feb 24 17:55:15 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 24 Feb 2006 12:55:15 -0500 Subject: [Fedora-directory-commits] mod_admserv aclocal.m4, 1.7, 1.8 Makefile.am, 1.11, 1.12 Makefile.in, 1.15, 1.16 configure.in, 1.13, 1.14 configure, 1.16, 1.17 Message-ID: <200602241755.k1OHtFUX023148@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23116 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in configure Log Message: [179394] HP-UX IPF/PA-RISC support 1) to adjust to adminutil's change, link with libicu, directly. Thus, configure requires "--with-icu=" 2) updated hppa*64* with hppa2.* in aclocal.m4 to support 64 bit PA_RISC. CAUTION: this file could be automatically updated by "aclocal" command using libtool.m4, which contains the expression: "hppa*64*". But 64 bit PA_RISC generates, this string "build_cpu='hppa2.0w'", which does not match "hppa*64*". So, if aclocal.m4 is updated, hppa*64* needs to be replaced. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_admserv/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aclocal.m4 31 Jan 2006 22:23:22 -0000 1.7 +++ aclocal.m4 24 Feb 2006 17:55:07 -0000 1.8 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -191,8 +191,6 @@ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -238,48 +236,6 @@ ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -352,7 +308,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -621,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then $2=yes fi fi @@ -655,11 +609,6 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi else $2=yes fi @@ -718,38 +667,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -1015,9 +937,7 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1085,8 +1005,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1253,7 +1173,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[[45]]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1311,7 +1231,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac [...1858 lines suppressed...] -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -6736,16 +6614,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -6799,15 +6688,26 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 2 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -6832,16 +6732,28 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. -# serial 4 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 3 # AM_SANITY_CHECK # --------------- @@ -6884,14 +6796,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -6914,13 +6837,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 1 -# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.am 31 Jan 2006 22:23:22 -0000 1.11 +++ Makefile.am 24 Feb 2006 17:55:07 -0000 1.12 @@ -8,7 +8,7 @@ ## Set the includes and libraries needed INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 EXTRA_CPPFLAGS=@extra_cppflags@ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 31 Jan 2006 22:23:22 -0000 1.15 +++ Makefile.in 24 Feb 2006 17:55:07 -0000 1.16 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -121,7 +121,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -177,6 +177,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +icu_lib = @icu_lib@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ Index: configure.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure.in 31 Jan 2006 22:23:22 -0000 1.13 +++ configure.in 24 Feb 2006 17:55:07 -0000 1.14 @@ -273,6 +273,44 @@ AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.]) fi +###################################3 +AC_CHECKING(for LIBICU) + +# check for --with-icu +AC_MSG_CHECKING(for --with-icu) +AC_ARG_WITH(icu, [ --with-icu=PATH Icu directory], +[ + if test -d "$withval"/lib + then + AC_MSG_RESULT([using $withval]) + ICUDIR=$withval + icu_lib="-L$ICUDIR/lib" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + +# if ADMINUTIL is not found yet, try pkg-config + +# last resort +if test -z "$adminutil_lib"; then + AC_MSG_CHECKING(for icu with pkg-config) + AC_PATH_PROG(PKG_CONFIG, pkg-config) + if test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists icu; then + icu_lib=`$PKG_CONFIG --libs-only-L icu` + else + AC_MSG_ERROR([ADMINUTIL not found, specify with --with-icu.]) + fi + fi +fi + +if test -z "$adminutil_lib"; then + AC_MSG_ERROR([ADMINUTIL not found, specify with --with-icu.]) +fi +###################################3 AC_CHECKING(for NSS) # check for --with-nss @@ -352,6 +390,7 @@ AC_SUBST(adminutil_inc) AC_SUBST(adminutil_lib) AC_SUBST(adminutil_ver) +AC_SUBST(icu_lib) AC_SUBST(nss_inc) AC_SUBST(nss_lib) AC_SUBST(extra_cppflags) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.16 -r 1.17 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- configure 31 Jan 2006 22:23:22 -0000 1.16 +++ configure 24 Feb 2006 17:55:07 -0000 1.17 @@ -278,7 +278,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -462,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1049,6 +1049,7 @@ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory --with-adminutil=PATH Adminutil directory + --with-icu=PATH Icu 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 @@ -3201,7 +3202,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3226,10 +3227,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3370,15 +3371,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3465,7 +3457,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -3488,13 +3480,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3515,7 +3507,7 @@ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa*64*) + hppa2.*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -3538,6 +3530,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -3560,10 +3561,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -3656,7 +3659,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3659 "configure"' > conftest.$ac_ext + echo '#line 3662 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4905,12 +4908,7 @@ fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5140,8 +5138,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi - ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' @@ -5235,7 +5231,7 @@ # Provide some information about the compiler. -echo "$as_me:5238:" \ +echo "$as_me:5234:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5425,38 +5421,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 [...3011 lines suppressed...] -#line 18571 "configure" +#line 18121 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18786,12 +18336,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -18868,7 +18412,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -19116,35 +18660,11 @@ compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -19261,12 +18781,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -19343,7 +18857,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? @@ -20622,6 +20136,98 @@ { (exit 1); exit 1; }; } fi +###################################3 +{ echo "$as_me:$LINENO: checking for LIBICU..." >&5 +echo "$as_me: checking for LIBICU..." >&6;} + +# check for --with-icu +echo "$as_me:$LINENO: checking for --with-icu" >&5 +echo $ECHO_N "checking for --with-icu... $ECHO_C" >&6 + +# Check whether --with-icu or --without-icu was given. +if test "${with_icu+set}" = set; then + withval="$with_icu" + + if test -d "$withval"/lib + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + ICUDIR=$withval + icu_lib="-L$ICUDIR/lib" + 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 ADMINUTIL is not found yet, try pkg-config + +# last resort +if test -z "$adminutil_lib"; then + echo "$as_me:$LINENO: checking for icu with pkg-config" >&5 +echo $ECHO_N "checking for icu with pkg-config... $ECHO_C" >&6 + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists icu; then + icu_lib=`$PKG_CONFIG --libs-only-L icu` + else + { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-icu." >&5 +echo "$as_me: error: ADMINUTIL not found, specify with --with-icu." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi + +if test -z "$adminutil_lib"; then + { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-icu." >&5 +echo "$as_me: error: ADMINUTIL not found, specify with --with-icu." >&2;} + { (exit 1); exit 1; }; } +fi +###################################3 { echo "$as_me:$LINENO: checking for NSS..." >&5 echo "$as_me: checking for NSS..." >&6;} @@ -20777,6 +20383,7 @@ + # Write config.status and the Makefile ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -21527,6 +21134,7 @@ s, at adminutil_inc@,$adminutil_inc,;t t s, at adminutil_lib@,$adminutil_lib,;t t s, at adminutil_ver@,$adminutil_ver,;t t +s, at icu_lib@,$icu_lib,;t t s, at nss_inc@,$nss_inc,;t t s, at nss_lib@,$nss_lib,;t t s, at extra_cppflags@,$extra_cppflags,;t t From fedora-directory-commits at redhat.com Fri Feb 24 18:25:52 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 13:25:52 -0500 Subject: [Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.5, 1.6 Message-ID: <200602241825.k1OIPq02025285@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/setuputil/installer/unix/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25268 Modified Files: Makefile Log Message: ranlib does not take extra arguments - omit CURSES Index: Makefile =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 23 Feb 2006 00:43:13 -0000 1.5 +++ Makefile 24 Feb 2006 18:25:44 -0000 1.6 @@ -90,7 +90,7 @@ $(LIBS): $(OBJS) $(AR) $^ - $(RANLIB) $@ $(CURSES) + $(RANLIB) $@ $(STAGE): $(DISTINC) cp $(INCS) $(DISTINC) From fedora-directory-commits at redhat.com Fri Feb 24 18:41:42 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 13:41:42 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/setuputil checksums,1.3,1.4 Message-ID: <200602241841.k1OIfg1q025360@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/setuputil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25343 Modified Files: checksums Log Message: new version of setuputil Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/setuputil/checksums,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checksums 24 Feb 2006 17:24:16 -0000 1.3 +++ checksums 24 Feb 2006 18:41:35 -0000 1.4 @@ -1 +1 @@ -79b84559973cfbcefc5e9fa04b85417a download/fedora-setuputil-1.0.2.tar.gz +26b73777c5f9847630060572db98d493 download/fedora-setuputil-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 19:16:46 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 14:16:46 -0500 Subject: [Fedora-directory-commits] mod_restartd aclocal.m4, 1.6, 1.7 Makefile.in, 1.7, 1.8 configure, 1.6, 1.7 Message-ID: <200602241916.k1OJGkJZ027696@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27645 Modified Files: aclocal.m4 Makefile.in configure Log Message: Allow configure to run on RHEL3 I had to manually edit aclocal.m4 to change the required versions of autoconf and automake to match those on RHEL3. Then I re-ran automake and autoconf to regenerate Makefile.in and configure. Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_restartd/aclocal.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- aclocal.m4 31 Jan 2006 22:38:56 -0000 1.6 +++ aclocal.m4 24 Feb 2006 19:16:38 -0000 1.7 @@ -6188,7 +6188,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6526,7 +6526,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.57])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_restartd/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 31 Jan 2006 22:38:56 -0000 1.7 +++ Makefile.in 24 Feb 2006 19:16:38 -0000 1.8 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,142 +13,84 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -SOURCES = $(libmodrestartd_la_SOURCES) +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libmodrestartd_la_LIBADD = -am_libmodrestartd_la_OBJECTS = mod_restartd at ap_ver_suf@.lo -libmodrestartd_la_OBJECTS = $(am_libmodrestartd_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -SOURCES = $(libmodrestartd_la_SOURCES) -DIST_SOURCES = $(libmodrestartd_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APR_CONFIG = @APR_CONFIG@ APXS = @APXS@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ +RC = @RC@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -160,99 +102,90 @@ apache_inc = @apache_inc@ apache_prefix = @apache_prefix@ apr_inc = @apr_inc@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ extra_cppflags = @extra_cppflags@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ lib_LTLIBRARIES = libmodrestartd.la # the version suffix is -2.2 for Apache 2.2 - it is empty for 2.0 libmodrestartd_la_SOURCES = mod_restartd at ap_ver_suf@.c + INCLUDES = @apr_inc@ -I at apache_inc@ + EXTRA_CPPFLAGS = @extra_cppflags@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + +libmodrestartd_la_LDFLAGS = +libmodrestartd_la_LIBADD = +am_libmodrestartd_la_OBJECTS = mod_restartd at ap_ver_suf@.lo +libmodrestartd_la_OBJECTS = $(am_libmodrestartd_la_OBJECTS) + +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles + at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_restartd at ap_ver_suf@.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libmodrestartd_la_SOURCES) +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ + Makefile.in NEWS aclocal.m4 config.guess config.sub configure \ + configure.in depcomp install-sh ltmain.sh missing mkinstalldirs +SOURCES = $(libmodrestartd_la_SOURCES) + all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) + +$(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +libLTLIBRARIES_INSTALL = $(INSTALL) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ + test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -260,33 +193,34 @@ $(LINK) -rpath $(libdir) $(libmodrestartd_la_LDFLAGS) $(libmodrestartd_la_OBJECTS) $(libmodrestartd_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_restartd at ap_ver_suf@.Plo at am__quote@ +distclean-depend: + -rm -rf ./$(DEPDIR) + .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` .c.lo: - at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo @@ -298,6 +232,11 @@ -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -306,7 +245,6 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique -tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -318,24 +256,8 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: @@ -344,23 +266,29 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = . +distdir = $(PACKAGE)-$(VERSION) + +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + +GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -381,54 +309,26 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac + $(am__remove_distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + mkdir $(distdir)/=build + mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -436,49 +336,32 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ + && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ + if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) + installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done + $(mkinstalldirs) $(DESTDIR)$(libdir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -490,7 +373,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -498,7 +381,7 @@ clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -510,17 +393,13 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -537,9 +416,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) - -rm -f Makefile + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -547,30 +424,20 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool dist dist-all dist-gzip \ + distcheck distclean distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES install-libLTLIBRARIES: libmodrestartd.la View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_restartd/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure 31 Jan 2006 22:38:57 -0000 1.6 +++ configure 24 Feb 2006 19:16:38 -0000 1.7 @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.57. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -19,10 +20,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,17 +218,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -821,7 +820,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -861,10 +860,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -976,9 +975,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1093,45 +1092,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1142,7 +1108,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1156,7 +1122,8 @@ if $ac_init_version; then cat <<\_ACEOF -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1168,7 +1135,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1245,19 +1212,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) [...3304 lines suppressed...] -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` case $INSTALL in @@ -21172,7 +20588,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -21181,24 +20597,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -21240,41 +20656,16 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. if test "$ac_dir" != .; then @@ -21300,45 +20691,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -21356,10 +20714,10 @@ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -21389,10 +20747,10 @@ test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -21408,10 +20766,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } From fedora-directory-commits at redhat.com Fri Feb 24 20:16:40 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 24 Feb 2006 15:16:40 -0500 Subject: [Fedora-directory-commits] mod_nss aclocal.m4, 1.7, 1.8 Makefile.am, 1.8, 1.9 Makefile.in, 1.15, 1.16 configure.in, 1.8, 1.9 configure, 1.12, 1.13 nss_engine_log.c, 1.2, 1.3 Message-ID: <200602242016.k1OKGeFn030227@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30182 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in configure nss_engine_log.c Log Message: [179394] HP-UX IPF/PA-RISC support updated hppa*64* with hppa2.* in aclocal.m4 to support 64 bit PA_RISC. CAUTION: this file could be automatically updated by "aclocal" command using libtool.m4, which contains the expression: "hppa*64*". But 64 bit PA_RISC generates, this string "build_cpu='hppa2.0w'", which does not match "hppa*64*". So, if aclocal.m4 is updated, hppa*64* needs to be replaced. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_nss/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aclocal.m4 31 Jan 2006 22:27:09 -0000 1.7 +++ aclocal.m4 24 Feb 2006 20:16:23 -0000 1.8 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.2 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -123,7 +123,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' +Xsed='sed -e s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -191,8 +191,6 @@ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -_LT_CC_BASENAME([$compiler]) - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -238,48 +236,6 @@ ])# _LT_AC_SYS_COMPILER -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* -])# _LT_LINKER_BOILERPLATE - - # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -352,7 +308,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -621,10 +577,8 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + # So say no if there are warnings + if test ! -s conftest.err; then $2=yes fi fi @@ -655,11 +609,6 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi else $2=yes fi @@ -718,38 +667,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && lt_cv_sys_max_cmd_len=$new_result && @@ -1015,9 +937,7 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.err; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1085,8 +1005,8 @@ [AC_MSG_CHECKING([how to hardcode library paths into programs]) _LT_AC_TAGVAR(hardcode_action, $1)= if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then # We can hardcode non-existant directories. if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && @@ -1253,7 +1173,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[[45]]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1311,7 +1231,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac [...1858 lines suppressed...] -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 4 +# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 3 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -6736,16 +6614,27 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_MKDIR_P # --------------- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# + +# Copyright (C) 2003, 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories # created by `make install' are always world readable, even if the # installer happens to have an overly restrictive umask (e.g. 077). @@ -6799,15 +6688,26 @@ fi AC_SUBST([mkdir_p])]) -# Helper functions for option handling. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -# serial 3 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 2 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -6832,16 +6732,28 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to make sure that the build environment is sane. +# + +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. -# serial 4 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 3 # AM_SANITY_CHECK # --------------- @@ -6884,14 +6796,25 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - # AM_PROG_INSTALL_STRIP -# --------------------- + +# Copyright (C) 2001, 2003 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -6914,13 +6837,25 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Copyright (C) 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# 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. + +# serial 1 -# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_nss/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.in 31 Jan 2006 22:27:09 -0000 1.15 +++ Makefile.in 24 Feb 2006 20:16:24 -0000 1.16 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_nss/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure 31 Jan 2006 22:27:09 -0000 1.12 +++ configure 24 Feb 2006 20:16:24 -0000 1.13 @@ -278,7 +278,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -3198,7 +3198,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f $lt_ac_sed && break cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -3223,10 +3223,10 @@ fi done done +SED=$lt_cv_path_SED fi -SED=$lt_cv_path_SED echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -3367,15 +3367,6 @@ *) reload_flag=" $reload_flag" ;; esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3462,7 +3453,7 @@ lt_cv_deplibs_check_method=pass_all ;; -bsdi[45]*) +bsdi4*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so @@ -3485,13 +3476,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3512,7 +3503,7 @@ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa*64*) + hppa2.*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -3535,6 +3526,15 @@ # This must be Linux ELF. linux*) + case $host_cpu in + alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + # this will be overridden with pass_all, but let us keep it just in case + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` lt_cv_deplibs_check_method=pass_all ;; @@ -3557,10 +3557,12 @@ ;; openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' fi ;; @@ -3653,7 +3655,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3656 "configure"' > conftest.$ac_ext + echo '#line 3658 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4902,12 +4904,7 @@ fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5137,8 +5134,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -fi - ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' @@ -5232,7 +5227,7 @@ # Provide some information about the compiler. -echo "$as_me:5235:" \ +echo "$as_me:5230:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5422,38 +5417,11 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for *BSD - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - *) + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && new_result=`expr "X$teststring" : ".*" 2>&1` && [...2879 lines suppressed...] - *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. - # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + *) # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_GCJ=yes ;; @@ -17331,7 +16882,7 @@ shlibpath_var=LIBRARY_PATH ;; -bsdi[45]*) +bsdi4*) version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -17389,7 +16940,7 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -17447,9 +16998,7 @@ dynamic_linker='GNU ld.so' ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. +freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -17468,7 +17017,7 @@ freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.01* | freebsdelf3.01*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -17511,7 +17060,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -17596,7 +17145,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17599 "configure"' > conftest.$ac_ext + echo '#line 17148 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17615,7 +17164,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi @@ -17678,7 +17227,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -17800,8 +17349,8 @@ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then # We can hardcode non-existant directories. if test "$hardcode_direct_GCJ" != no && @@ -18467,7 +18016,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm conftest* - - # Allow CC to be a program name with arguments. lt_save_CC="$CC" CC=${RC-"windres"} compiler=$CC compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - lt_cv_prog_compiler_c_o_RC=yes # The else clause should only fire when bootstrapping the @@ -19258,12 +18777,6 @@ # The host system. host_alias=$host_alias host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -19340,7 +18853,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? +# Must we lock files when doing compilation ? need_locks=$lt_need_locks # Do we need the lib prefix for modules? Index: nss_engine_log.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_log.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nss_engine_log.c 31 May 2005 14:32:42 -0000 1.2 +++ nss_engine_log.c 24 Feb 2006 20:16:24 -0000 1.3 @@ -24,9 +24,9 @@ #define NSPR_ERROR_BASE PR_NSPR_ERROR_BASE #define NSPR_MAX_ERROR (PR_MAX_ERROR - 1) -#define LIBSEC_ERROR_BASE -8192 +#define LIBSEC_ERROR_BASE (-8192) #define LIBSEC_MAX_ERROR (LIBSEC_ERROR_BASE + 144) -#define LIBSSL_ERROR_BASE -12288 +#define LIBSSL_ERROR_BASE (-12288) #define LIBSSL_MAX_ERROR (LIBSSL_ERROR_BASE + 102) typedef struct l_error_t { From fedora-directory-commits at redhat.com Fri Feb 24 22:11:20 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 17:11:20 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/mod_restartd checksums, 1.3, 1.4 Message-ID: <200602242211.k1OMBKtE002282@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265 Modified Files: checksums Log Message: updated checksum Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/mod_restartd/checksums,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checksums 24 Feb 2006 17:24:00 -0000 1.3 +++ checksums 24 Feb 2006 22:11:05 -0000 1.4 @@ -1 +1 @@ -056b1f79b7b611a627b0a72ba0be5b40 download/mod_restartd-1.0.2.tar.gz +99a20955eb26ab5ecb41fbae37a50932 download/mod_restartd-1.0.2.tar.gz From fedora-directory-commits at redhat.com Fri Feb 24 22:19:39 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 24 Feb 2006 17:19:39 -0500 Subject: [Fedora-directory-commits] mod_restartd aclocal.m4, 1.7, 1.8 Makefile.am, 1.7, 1.8 Makefile.in, 1.8, 1.9 configure.in, 1.5, 1.6 Message-ID: <200602242219.k1OMJdgp002387@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in Log Message: [179394] HP-UX IPF/PA-RISC support updated hppa*64* with hppa2.* in aclocal.m4 to support 64 bit PA_RISC. CAUTION: this file could be automatically updated by "aclocal" command using libtool.m4, which contains the expression: "hppa*64*". But 64 bit PA_RISC generates, this string "build_cpu='hppa2.0w'", which does not match "hppa*64*". So, if aclocal.m4 needs to be updated, hppa*64* needs to be replaced. Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_restartd/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aclocal.m4 24 Feb 2006 19:16:38 -0000 1.7 +++ aclocal.m4 24 Feb 2006 22:19:31 -0000 1.8 @@ -1433,7 +1433,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -2261,7 +2261,7 @@ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa*64*) + hppa2.*) [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -3094,7 +3094,7 @@ hpux10*|hpux11*) if test $with_gnu_ld = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: @@ -3110,7 +3110,7 @@ esac fi case "$host_cpu" in - hppa*64*) + hppa2.*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -3136,7 +3136,7 @@ ;; aCC*) case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; *) @@ -3157,7 +3157,7 @@ if test "$GXX" = yes; then if test $with_gnu_ld = no; then case "$host_cpu" in - ia64*|hppa*64*) + ia64*|hppa2.*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; *) @@ -4722,7 +4722,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) ;; *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' @@ -4791,7 +4791,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -4996,7 +4996,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -5043,7 +5043,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -5705,7 +5705,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -5714,7 +5714,7 @@ esac else case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -5724,7 +5724,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: From fedora-directory-commits at redhat.com Fri Feb 24 22:21:12 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Fri, 24 Feb 2006 17:21:12 -0500 Subject: [Fedora-directory-commits] mod_restartd configure,1.7,1.8 Message-ID: <200602242221.k1OMLCMU002412@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2395 Modified Files: configure Log Message: [179394] HP-UX IPF/PA-RISC support updated hppa*64* with hppa2.* in aclocal.m4 to support 64 bit PA_RISC. CAUTION: this file could be automatically updated by "aclocal" command using libtool.m4, which contains the expression: "hppa*64*". But 64 bit PA_RISC generates, this string "build_cpu='hppa2.0w'", which does not match "hppa*64*". So, if aclocal.m4 needs to be updated, hppa*64* needs to be replaced. Index: configure =================================================================== RCS file: /cvs/dirsec/mod_restartd/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure 24 Feb 2006 19:16:38 -0000 1.7 +++ configure 24 Feb 2006 22:21:04 -0000 1.8 @@ -3408,7 +3408,7 @@ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa*64*) + hppa2.*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -6224,7 +6224,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -6271,7 +6271,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -7111,7 +7111,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -7120,7 +7120,7 @@ esac else case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -7130,7 +7130,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: @@ -7740,7 +7740,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -10028,7 +10028,7 @@ hpux10*|hpux11*) if test $with_gnu_ld = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_CXX='+b $libdir' hardcode_libdir_separator_CXX=: @@ -10044,7 +10044,7 @@ esac fi case "$host_cpu" in - hppa*64*) + hppa2.*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no ;; @@ -10070,7 +10070,7 @@ ;; aCC*) case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; *) @@ -10091,7 +10091,7 @@ if test "$GXX" = yes; then if test $with_gnu_ld = no; then case "$host_cpu" in - ia64*|hppa*64*) + ia64*|hppa2.*) archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' ;; *) @@ -10690,7 +10690,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) ;; *) lt_prog_compiler_pic_CXX='-fPIC' @@ -10759,7 +10759,7 @@ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -11428,7 +11428,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -13107,7 +13107,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -13154,7 +13154,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -13972,7 +13972,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -13981,7 +13981,7 @@ esac else case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -13991,7 +13991,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_F77='+b $libdir' hardcode_libdir_separator_F77=: @@ -14601,7 +14601,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -15547,7 +15547,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -15594,7 +15594,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) # +Z the default ;; *) @@ -16434,7 +16434,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -16443,7 +16443,7 @@ esac else case "$host_cpu" in - hppa*64*|ia64*) + hppa2.*|ia64*) archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -16453,7 +16453,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa*64*) + hppa2.*) hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' hardcode_libdir_separator_GCJ=: @@ -17063,7 +17063,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) + hppa2.*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" From fedora-directory-commits at redhat.com Fri Feb 24 22:49:27 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 17:49:27 -0500 Subject: [Fedora-directory-commits] adminserver nsconfig.mk,1.24,1.25 Message-ID: <200602242249.k1OMnR7c002683@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2666 Modified Files: nsconfig.mk Log Message: Have to add back softokn3 to the link line - adminutil, setuputil, and ldapsdk didn't remove them as dependencies, so the linker forces it to be present at link time. Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nsconfig.mk 15 Feb 2006 22:53:03 -0000 1.24 +++ nsconfig.mk 24 Feb 2006 22:49:20 -0000 1.25 @@ -718,8 +718,7 @@ SECURITY_INCLUDE = $(SECURITY_BUILD_DIR)/include endif -# with NSS 3.11, only need smime, ssl and nss to link - all others at runtime only -SECURITY_LIBNAMES = smime3 ssl3 nss3 +SECURITY_LIBNAMES = smime3 ssl3 nss3 softokn3 # For NSS3, nssckbi shared library must be put in the same directory # where secmod.db file is, rather than in the LD_LIBRARY_PATH @@ -742,7 +741,7 @@ endif # USE_64 # These files are only needed at runtime, not to link with -SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS) +SECURITY_EXTRA_RUNTIME_LIBNAMES = $(FREEBL_LIBS) # these shared libs need the corresponding .chk files at runtime SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS) From fedora-directory-commits at redhat.com Fri Feb 24 22:52:18 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 17:52:18 -0500 Subject: [Fedora-directory-commits] ldapserver components.mk,1.41,1.42 Message-ID: <200602242252.k1OMqISf002752@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2735 Modified Files: components.mk Log Message: Have to add back softokn3 to the link libs - dependent libs are linked directly against it and expect it to be present at link time. Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- components.mk 23 Feb 2006 19:30:23 -0000 1.41 +++ components.mk 24 Feb 2006 22:52:10 -0000 1.42 @@ -218,13 +218,12 @@ SECURITY_INCLUDE = -I$(SECURITY_INCDIR) # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign -# as of NSS 3.11, no longer need to link with softokn3 -SECURITY_LIBNAMES = ssl3 nss3 +SECURITY_LIBNAMES = ssl3 nss3 softokn3 # these libs have a corresponding .chk file SECURITY_NEED_CHK = softokn3 # these are the libs we need at runtime -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 +SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 # freebl for all platforms is new for NSS 3.11 # there are some platform specific versions as well From fedora-directory-commits at redhat.com Sat Feb 25 00:33:18 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 19:33:18 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver checksums,1.3,1.4 Message-ID: <200602250033.k1P0XIk6007200@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7166/ldapserver Modified Files: checksums Log Message: updated checksums Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checksums 24 Feb 2006 17:23:43 -0000 1.3 +++ checksums 25 Feb 2006 00:32:56 -0000 1.4 @@ -1 +1 @@ -0beafbdc65c44400bc29517898e03885 download/fedora-ds-1.0.2.tar.gz +94cdea9e28ee7c2fd843ce0c9f1e544e download/fedora-ds-1.0.2.tar.gz From fedora-directory-commits at redhat.com Sat Feb 25 00:32:58 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 19:32:58 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver checksums, 1.3, 1.4 Message-ID: <200602250033.k1P0XdpT007203@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7166/adminserver Modified Files: checksums Log Message: updated checksums Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- checksums 24 Feb 2006 17:23:16 -0000 1.3 +++ checksums 25 Feb 2006 00:32:31 -0000 1.4 @@ -1 +1 @@ -00d8de5cb839225349f73b8335d6cfdb download/fedora-adminserver-1.0.2.tar.gz +e4c863d213d39f031d80f7e515a6d496 download/fedora-adminserver-1.0.2.tar.gz From fedora-directory-commits at redhat.com Sat Feb 25 03:17:22 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 22:17:22 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/clients/dsgw Makefile, 1.6, 1.7 Message-ID: <200602250317.k1P3HMn0013312@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13289 Modified Files: Makefile Log Message: Some DSGW programs must not be linked with SSL, including the LDAP ssl library. On RHEL3, this causes a linker error, but appears to be fine on other platforms. So, just use the LDAP_NOSSL_LINK macro for those programs, and use the LDAPLINK macro for the other programs. Index: Makefile =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 19 Apr 2005 22:07:01 -0000 1.6 +++ Makefile 25 Feb 2006 03:17:14 -0000 1.7 @@ -148,7 +148,7 @@ LIBS_DEP = $(LIBLDAPU_DEP) $(LDAP_LIBLDBM_DEP) $(LDAP_LIBLDIF_DEP) LIBS_DEP += $(LDAPSDK_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP) NSECLIBS = $(DISTLIBFLAG) $(SSLLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) \ - $(LDAPLINK) $(ADMINUTIL_LINK) \ + $(LDAP_NOSSL_LINK) $(ADMINUTIL_LINK) \ $(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \ $(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \ $(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY) From fedora-directory-commits at redhat.com Sat Feb 25 03:27:46 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Fri, 24 Feb 2006 22:27:46 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/ldapserver checksums,1.4,1.5 Message-ID: <200602250327.k1P3RkIc013374@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13357 Modified Files: checksums Log Message: updated checksum Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- checksums 25 Feb 2006 00:32:56 -0000 1.4 +++ checksums 25 Feb 2006 03:27:39 -0000 1.5 @@ -1 +1 @@ -94cdea9e28ee7c2fd843ce0c9f1e544e download/fedora-ds-1.0.2.tar.gz +3ccdf3f3613bd8cb547a9b088fe3d3d9 download/fedora-ds-1.0.2.tar.gz From fedora-directory-commits at redhat.com Sun Feb 26 00:25:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:25:45 -0500 Subject: [Fedora-directory-commits] mod_restartd aclocal.m4, 1.8, 1.9 Makefile.am, 1.8, 1.9 Makefile.in, 1.9, 1.10 configure.in, 1.6, 1.7 Message-ID: <200602260025.k1Q0Pjct023724@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23697 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_restartd/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aclocal.m4 24 Feb 2006 22:19:31 -0000 1.8 +++ aclocal.m4 26 Feb 2006 00:25:34 -0000 1.9 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,3809 +11,3275 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 47 AC_PROG_LIBTOOL +# Do all the work for Automake. -*- Autoconf -*- +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) +# 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. -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# 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. +# serial 8 -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl +AC_PREREQ([2.52]) -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [_AM_DEPENDENCIES(CXX)], [...12485 lines suppressed...] +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# Check how to create a tarball. -*- Autoconf -*- +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) -# serial 2 +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && break + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +SED=$lt_cv_path_SED +]) +AC_MSG_RESULT([$SED]) +]) Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_restartd/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.in 24 Feb 2006 22:19:32 -0000 1.9 +++ Makefile.in 26 Feb 2006 00:25:34 -0000 1.10 @@ -74,7 +74,6 @@ CC = @CC@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CYGPATH_W = @CYGPATH_W@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ @@ -92,10 +91,7 @@ STRIP = @STRIP@ VERSION = @VERSION@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ ap_ver_suf = @ap_ver_suf@ apache_bin = @apache_bin@ apache_conf = @apache_conf@ @@ -104,7 +100,6 @@ apr_inc = @apr_inc@ extra_cppflags = @extra_cppflags@ install_sh = @install_sh@ -mkdir_p = @mkdir_p@ lib_LTLIBRARIES = libmodrestartd.la # the version suffix is -2.2 for Apache 2.2 - it is empty for 2.0 From fedora-directory-commits at redhat.com Sun Feb 26 00:28:15 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:28:15 -0500 Subject: [Fedora-directory-commits] mod_admserv aclocal.m4, 1.8, 1.9 Makefile.am, 1.12, 1.13 Makefile.in, 1.16, 1.17 configure.in, 1.14, 1.15 Message-ID: <200602260028.k1Q0SGiQ023778@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_admserv/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aclocal.m4 24 Feb 2006 17:55:07 -0000 1.8 +++ aclocal.m4 26 Feb 2006 00:27:58 -0000 1.9 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,3763 +11,3263 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# Do all the work for Automake. -*- Autoconf -*- -# serial 47 AC_PROG_LIBTOOL +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# 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. -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) +# 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. -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# serial 8 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +AC_PREREQ([2.52]) -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_][CXX], + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) [...12435 lines suppressed...] +# #ifdef __CYGWIN__ +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# #endif +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ +])# _LT_AC_FILE_LTDLL_C -# Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# 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. +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# 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. +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) -# serial 1 +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && break + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +SED=$lt_cv_path_SED +]) +AC_MSG_RESULT([$SED]) +]) Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.in 24 Feb 2006 17:55:07 -0000 1.16 +++ Makefile.in 26 Feb 2006 00:27:58 -0000 1.17 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,255 +13,185 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -SOURCES = $(libmodadmserv_la_SOURCES) +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libmodadmserv_la_LIBADD = -am_libmodadmserv_la_OBJECTS = mod_admserv.lo -libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -SOURCES = $(libmodadmserv_la_SOURCES) -DIST_SOURCES = $(libmodadmserv_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APR_CONFIG = @APR_CONFIG@ APXS = @APXS@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ +RC = @RC@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ adminutil_inc = @adminutil_inc@ adminutil_lib = @adminutil_lib@ adminutil_ver = @adminutil_ver@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ apache_bin = @apache_bin@ apache_conf = @apache_conf@ apache_inc = @apache_inc@ apache_prefix = @apache_prefix@ apr_inc = @apr_inc@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ extra_cppflags = @extra_cppflags@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ icu_lib = @icu_lib@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ ldapsdk_inc = @ldapsdk_inc@ ldapsdk_lib = @ldapsdk_lib@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ lib_LTLIBRARIES = libmodadmserv.la + libmodadmserv_la_SOURCES = mod_admserv.c + #libmodadmserv_la_LDFLAGS = -module -avoid-version INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ + +LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 + EXTRA_CPPFLAGS = @extra_cppflags@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + +libmodadmserv_la_LDFLAGS = +libmodadmserv_la_LIBADD = +am_libmodadmserv_la_OBJECTS = mod_admserv.lo +libmodadmserv_la_OBJECTS = $(am_libmodadmserv_la_OBJECTS) + +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles + at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_admserv.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +CFLAGS = @CFLAGS@ +DIST_SOURCES = $(libmodadmserv_la_SOURCES) +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ + Makefile.in NEWS aclocal.m4 config.guess config.sub configure \ + configure.in depcomp install-sh ltmain.sh missing mkinstalldirs +SOURCES = $(libmodadmserv_la_SOURCES) + all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) + +$(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +libLTLIBRARIES_INSTALL = $(INSTALL) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ + test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -269,33 +199,34 @@ $(LINK) -rpath $(libdir) $(libmodadmserv_la_LDFLAGS) $(libmodadmserv_la_OBJECTS) $(libmodadmserv_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_admserv.Plo at am__quote@ +distclean-depend: + -rm -rf ./$(DEPDIR) + .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` .c.lo: - at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ mostlyclean-libtool: -rm -f *.lo @@ -307,6 +238,11 @@ -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -315,7 +251,6 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique -tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -327,24 +262,8 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: @@ -353,23 +272,29 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = . +distdir = $(PACKAGE)-$(VERSION) + +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + +GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -390,54 +315,26 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac + $(am__remove_distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + mkdir $(distdir)/=build + mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -445,49 +342,32 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ + && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ + if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) + installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done + $(mkinstalldirs) $(DESTDIR)$(libdir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -499,7 +379,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -507,7 +387,7 @@ clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -519,17 +399,13 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -546,9 +422,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) - -rm -f Makefile + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -556,30 +430,20 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ +.PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool dist dist-all dist-gzip \ + distcheck distclean distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ install-libLTLIBRARIES install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES + mostlyclean-generic mostlyclean-libtool tags uninstall \ + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES install-libLTLIBRARIES: libmodadmserv.la From fedora-directory-commits at redhat.com Sun Feb 26 00:31:19 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:31:19 -0500 Subject: [Fedora-directory-commits] mod_nss aclocal.m4, 1.8, 1.9 Makefile.am, 1.9, 1.10 Makefile.in, 1.16, 1.17 configure.in, 1.9, 1.10 Message-ID: <200602260031.k1Q0VJeX023860@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23807 Modified Files: aclocal.m4 Makefile.am Makefile.in configure.in Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 aclocal.m4 Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/mod_nss/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aclocal.m4 24 Feb 2006 20:16:23 -0000 1.8 +++ aclocal.m4 26 Feb 2006 00:30:55 -0000 1.9 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.9.2 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,3763 +11,3263 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# Do all the work for Automake. -*- Autoconf -*- -# serial 47 AC_PROG_LIBTOOL +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# 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. -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) +# 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. -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# serial 8 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +AC_PREREQ([2.52]) -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_][CXX], + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) [...12435 lines suppressed...] +# #ifdef __CYGWIN__ +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# #endif +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ +])# _LT_AC_FILE_LTDLL_C -# Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# 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. +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# 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. +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) -# serial 1 +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && break + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +SED=$lt_cv_path_SED +]) +AC_MSG_RESULT([$SED]) +]) Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/mod_nss/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.in 24 Feb 2006 20:16:24 -0000 1.16 +++ Makefile.in 26 Feb 2006 00:30:56 -0000 1.17 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,293 +13,235 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - - -SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES) +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) +transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ +host_alias = @host_alias@ host_triplet = @host@ -bin_PROGRAMS = nss_pcache$(EXEEXT) -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gencert.in \ - $(srcdir)/nss.conf.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing mkinstalldirs nss_expr_parse.c \ - nss_expr_scan.c -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = nss.conf gencert -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libmodnss_la_LIBADD = -am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \ - nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \ - nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \ - nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo \ - nss_expr_scan.lo nss_util.lo nss_engine_rand.lo -libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT) -nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS) -nss_pcache_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) -YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) -LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \ - $(AM_YFLAGS) -SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES) -DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ APR_CONFIG = @APR_CONFIG@ APXS = @APXS@ AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ +AS = @AS@ AWK = @AWK@ CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EXEEXT = @EXEEXT@ F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4 LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ +OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SSL2_FALSE = @SSL2_FALSE@ -SSL2_TRUE = @SSL2_TRUE@ +RC = @RC@ STRIP = @STRIP@ VERSION = @VERSION@ YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ -am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ apache_bin = @apache_bin@ apache_conf = @apache_conf@ apache_inc = @apache_inc@ apache_prefix = @apache_prefix@ apr_inc = @apr_inc@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ extra_cppflags = @extra_cppflags@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ nspr_dir = @nspr_dir@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ nss_dir = @nss_dir@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ lib_LTLIBRARIES = libmodnss.la + +bin_PROGRAMS = nss_pcache + nss_pcache_SOURCES = nss_pcache.c + libmodnss_la_SOURCES = mod_nss.c nss_engine_config.c nss_engine_init.c nss_engine_io.c nss_engine_kernel.c nss_engine_log.c nss_engine_pphrase.c nss_engine_vars.c nss_expr.c nss_expr_eval.c nss_expr_parse.y nss_expr_scan.l nss_util.c nss_engine_rand.c libmodnss_la_LDFLAGS = -module -avoid-version + INCLUDES = -I at apache_inc@ @nspr_inc@ @nss_inc@ @apr_inc@ +LIBS = @nspr_lib@ @nss_lib@ -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lplc4 -lplds4 -lnspr4 @SSL2_TRUE at AM_CFLAGS = -DWANT_SSL2 EXTRA_CPPFLAGS = @extra_cppflags@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_CLEAN_FILES = nss.conf gencert +LTLIBRARIES = $(lib_LTLIBRARIES) + +libmodnss_la_LIBADD = +am_libmodnss_la_OBJECTS = mod_nss.lo nss_engine_config.lo \ + nss_engine_init.lo nss_engine_io.lo nss_engine_kernel.lo \ + nss_engine_log.lo nss_engine_pphrase.lo nss_engine_vars.lo \ + nss_expr.lo nss_expr_eval.lo nss_expr_parse.lo nss_expr_scan.lo \ + nss_util.lo nss_engine_rand.lo +libmodnss_la_OBJECTS = $(am_libmodnss_la_OBJECTS) +bin_PROGRAMS = nss_pcache$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) + +am_nss_pcache_OBJECTS = nss_pcache.$(OBJEXT) +nss_pcache_OBJECTS = $(am_nss_pcache_OBJECTS) +nss_pcache_LDADD = $(LDADD) +nss_pcache_DEPENDENCIES = +nss_pcache_LDFLAGS = + +DEFS = @DEFS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles + at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mod_nss.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_config.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_init.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_io.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_kernel.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_log.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_pphrase.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_rand.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_engine_vars.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_eval.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_parse.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_expr_scan.Plo \ + at AMDEP_TRUE@ ./$(DEPDIR)/nss_pcache.Po ./$(DEPDIR)/nss_util.Plo +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +CFLAGS = @CFLAGS@ +LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) +LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) +YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) +LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS) +DIST_SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES) +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ + Makefile.in NEWS TODO aclocal.m4 config.guess config.sub \ + configure configure.in depcomp gencert.in install-sh ltmain.sh \ + missing mkinstalldirs nss.conf.in nss_expr_parse.c \ + nss_expr_scan.c +SOURCES = $(libmodnss_la_SOURCES) $(nss_pcache_SOURCES) + all: all-am .SUFFIXES: .SUFFIXES: .c .l .lo .o .obj .y -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) + +$(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -nss.conf: $(top_builddir)/config.status $(srcdir)/nss.conf.in +nss.conf: $(top_builddir)/config.status nss.conf.in cd $(top_builddir) && $(SHELL) ./config.status $@ -gencert: $(top_builddir)/config.status $(srcdir)/gencert.in +gencert: $(top_builddir)/config.status gencert.in cd $(top_builddir) && $(SHELL) ./config.status $@ +libLTLIBRARIES_INSTALL = $(INSTALL) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ + test -z "$dir" && dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libmodnss.la: $(libmodnss_la_OBJECTS) $(libmodnss_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libmodnss_la_LDFLAGS) $(libmodnss_la_OBJECTS) $(libmodnss_la_LIBADD) $(LIBS) +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ + rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: @@ -313,7 +255,7 @@ $(LINK) $(nss_pcache_LDFLAGS) $(nss_pcache_OBJECTS) $(nss_pcache_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) + -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c @@ -334,40 +276,42 @@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_pcache.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nss_util.Plo at am__quote@ +distclean-depend: + -rm -rf ./$(DEPDIR) + .c.o: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: - at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(COMPILE) -c `cygpath -w $<` .c.lo: - at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ + at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +CCDEPMODE = @CCDEPMODE@ .l.c: - $(LEXCOMPILE) $< + $(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$< sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@ rm -f $(LEX_OUTPUT_ROOT).c .y.c: - $(YACCCOMPILE) $< + $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< + sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@ + rm -f y.tab.c if test -f y.tab.h; then \ to=`echo "$*_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ - sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \ - y.tab.h >$*.ht; \ + sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.ht; \ rm -f y.tab.h; \ if cmp -s $*.ht $*.h; then \ rm -f $*.ht ;\ @@ -378,8 +322,6 @@ if test -f y.output; then \ mv y.output $*.output; \ fi - sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@ - rm -f y.tab.c mostlyclean-libtool: -rm -f *.lo @@ -391,6 +333,11 @@ -rm -f libtool uninstall-info-am: +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -399,7 +346,6 @@ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique -tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -411,24 +357,8 @@ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique GTAGS: @@ -437,24 +367,30 @@ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = . +distdir = $(PACKAGE)-$(VERSION) + +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + +GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + $(mkinstalldirs) $(distdir)/. + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -475,54 +411,26 @@ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac + $(am__remove_distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + mkdir $(distdir)/=build + mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -530,40 +438,23 @@ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ + && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ + if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am @@ -571,10 +462,10 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) install-binPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + install: install-am install-exec: install-exec-am install-data: install-data-am @@ -586,7 +477,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -594,13 +485,12 @@ clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f nss_expr_parse.c - -rm -f nss_expr_scan.c + -test -z "nss_expr_parse.cnss_expr_scan.c" || rm -f nss_expr_parse.c nss_expr_scan.c clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -608,17 +498,13 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-libtool distclean-tags dvi: dvi-am dvi-am: -html: html-am - info: info-am info-am: @@ -635,9 +521,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) - -rm -f Makefile + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am @@ -645,30 +529,20 @@ mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ uninstall-libLTLIBRARIES -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool dist dist-all \ + dist-gzip distcheck distclean distclean-compile \ + distclean-depend distclean-generic distclean-libtool \ + distclean-tags distcleancheck distdir dvi dvi-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES From fedora-directory-commits at redhat.com Sun Feb 26 00:32:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:32:45 -0500 Subject: [Fedora-directory-commits] mod_restartd configure,1.8,1.9 Message-ID: <200602260032.k1Q0WjHQ023901@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23873 Modified Files: configure Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 configure Index: configure =================================================================== RCS file: /cvs/dirsec/mod_restartd/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure 24 Feb 2006 22:21:04 -0000 1.8 +++ configure 26 Feb 2006 00:32:37 -0000 1.9 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.59. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -20,9 +19,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -41,7 +41,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -218,16 +218,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -277,7 +278,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then @@ -461,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags ap_ver_suf LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags ap_ver_suf LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -820,7 +821,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -860,10 +861,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -975,9 +976,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1021,8 +1022,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1092,12 +1093,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1108,7 +1142,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1122,8 +1156,7 @@ if $ac_init_version; then cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1135,7 +1168,7 @@ running configure, to aid debugging if configure makes a mistake. [...6781 lines suppressed...] - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -20656,16 +20603,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. if test "$ac_dir" != .; then @@ -20691,12 +20663,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -20714,10 +20719,10 @@ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -20727,30 +20732,36 @@ else continue fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -20766,10 +20777,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } From fedora-directory-commits at redhat.com Sun Feb 26 00:33:59 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:33:59 -0500 Subject: [Fedora-directory-commits] mod_admserv configure,1.17,1.18 Message-ID: <200602260033.k1Q0XxD1023941@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_admserv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915 Modified Files: configure Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf Index: configure =================================================================== RCS file: /cvs/dirsec/mod_admserv/configure,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- configure 24 Feb 2006 17:55:07 -0000 1.17 +++ configure 26 Feb 2006 00:33:51 -0000 1.18 @@ -462,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS! PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib adminutil_inc adminuti! l_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1022,8 +1022,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1508,7 +1508,7 @@ # Automake initialization -am__api_version="1.9" +am__api_version="1.6" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1671,6 +1671,7 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1684,39 +1685,6 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1786,16 +1754,7 @@ SET_MAKE="MAKE=${MAKE-make}" fi -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# test to see if srcdir already configured + # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1803,16 +1762,6 @@ { (exit 1); exit 1; }; } fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - # Define the identity of the package. PACKAGE=mod_admserv VERSION=1.0 @@ -1843,6 +1792,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +AMTAR=${AMTAR-"${am_missing_run}tar"} + install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1935,13 +1887,6 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - @@ -2876,16 +2821,24 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null + ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' -am__doit: +doit: @echo done -.PHONY: am__doit END # If we don't find an include directive, just comment out the code. echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 @@ -2900,7 +2853,7 @@ # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -2960,34 +2913,18 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -3005,25 +2942,13 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi + am_cv_CC_dependencies_compiler_type=$depmode + break fi done @@ -3039,18 +2964,6 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -3507,7 +3420,7 @@ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa2.*) + hppa*64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -3659,7 +3572,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3662 "configure"' > conftest.$ac_ext + echo '#line 3575 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4817,34 +4730,18 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub am_cv_CXX_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -4862,25 +4759,13 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi + am_cv_CXX_dependencies_compiler_type=$depmode + break fi done @@ -4896,18 +4781,6 @@ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5231,7 +5104,7 @@ # Provide some information about the compiler. -echo "$as_me:5234:" \ +echo "$as_me:5107:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6265,11 +6138,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6268: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6141: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6272: \$? = $ac_status" >&5 + echo "$as_me:6145: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6351,7 +6224,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -6388,7 +6261,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -6498,11 +6371,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6501: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6374: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6505: \$? = $ac_status" >&5 + echo "$as_me:6378: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6558,11 +6431,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6561: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6434: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6565: \$? = $ac_status" >&5 + echo "$as_me:6438: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7193,7 +7066,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -7202,7 +7075,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -7212,7 +7085,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: @@ -7807,7 +7680,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -7892,7 +7765,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 7895 "configure"' > conftest.$ac_ext + echo '#line 7768 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8763,7 +8636,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11047: \$? = $ac_status" >&5 + echo "$as_me:10920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11100,11 +10973,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11103: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10976: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11107: \$? = $ac_status" >&5 + echo "$as_me:10980: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11526,7 +11399,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -11611,7 +11484,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11614 "configure"' > conftest.$ac_ext + echo '#line 11487 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12482,7 +12355,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13283: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13414: \$? = $ac_status" >&5 + echo "$as_me:13287: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13467,11 +13340,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13470: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13343: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13474: \$? = $ac_status" >&5 + echo "$as_me:13347: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14082,7 +13955,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -14091,7 +13964,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -14101,7 +13974,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_F77='+b $libdir' hardcode_libdir_separator_F77=: @@ -14696,7 +14569,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -14781,7 +14654,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14784 "configure"' > conftest.$ac_ext + echo '#line 14657 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15522,11 +15395,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15525: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15398: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15529: \$? = $ac_status" >&5 + echo "$as_me:15402: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15608,7 +15481,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -15645,7 +15518,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -15755,11 +15628,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15758: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15631: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15762: \$? = $ac_status" >&5 + echo "$as_me:15635: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15815,11 +15688,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15691: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15822: \$? = $ac_status" >&5 + echo "$as_me:15695: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16450,7 +16323,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -16459,7 +16332,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -16469,7 +16342,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' hardcode_libdir_separator_GCJ=: @@ -17064,7 +16937,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -17149,7 +17022,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17152 "configure"' > conftest.$ac_ext + echo '#line 17025 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18020,7 +17893,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -21057,7 +20916,6 @@ s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s, at INSTALL_DATA@,$INSTALL_DATA,;t t -s, at CYGPATH_W@,$CYGPATH_W,;t t s, at PACKAGE@,$PACKAGE,;t t s, at VERSION@,$VERSION,;t t s, at ACLOCAL@,$ACLOCAL,;t t @@ -21065,17 +20923,13 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t +s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s, at mkdir_p@,$mkdir_p,;t t s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t -s, at am__leading_dot@,$am__leading_dot,;t t -s, at AMTAR@,$AMTAR,;t t -s, at am__tar@,$am__tar,;t t -s, at am__untar@,$am__untar,;t t s, at CC@,$CC,;t t s, at CFLAGS@,$CFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -21090,8 +20944,6 @@ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s, at CCDEPMODE@,$CCDEPMODE,;t t -s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s, at build@,$build,;t t s, at build_cpu@,$build_cpu,;t t s, at build_vendor@,$build_vendor,;t t @@ -21112,8 +20964,6 @@ s, at CXXFLAGS@,$CXXFLAGS,;t t s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at CXXDEPMODE@,$CXXDEPMODE,;t t -s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s, at CXXCPP@,$CXXCPP,;t t s, at F77@,$F77,;t t s, at FFLAGS@,$FFLAGS,;t t @@ -21517,21 +21367,27 @@ else continue fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue From fedora-directory-commits at redhat.com Sun Feb 26 00:35:05 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sat, 25 Feb 2006 19:35:05 -0500 Subject: [Fedora-directory-commits] mod_nss configure,1.13,1.14 Message-ID: <200602260035.k1Q0Z5xT023972@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23947 Modified Files: configure Log Message: Checking in automatically generated aclocal.m4 and derived files. aclocal-1.6; automake-1.6; autoconf Index: configure =================================================================== RCS file: /cvs/dirsec/mod_nss/configure,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure 24 Feb 2006 20:16:24 -0000 1.13 +++ configure 26 Feb 2006 00:34:57 -0000 1.14 @@ -462,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB! LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib nss_inc nss_lib nspr_dir nss_dir extra_cppflags LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT SSL2_TRUE SSL2_FALSE APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ns! pr_lib nss_inc nss_lib nspr_dir nss_dir extra_cppflags LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1022,8 +1022,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1504,7 +1504,7 @@ # Automake initialization -am__api_version="1.9" +am__api_version="1.6" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1667,6 +1667,7 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed + # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1680,39 +1681,6 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1782,16 +1750,7 @@ SET_MAKE="MAKE=${MAKE-make}" fi -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# test to see if srcdir already configured + # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1799,16 +1758,6 @@ { (exit 1); exit 1; }; } fi -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - # Define the identity of the package. PACKAGE=mod_nss VERSION=1.0 @@ -1839,6 +1788,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +AMTAR=${AMTAR-"${am_missing_run}tar"} + install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1931,13 +1883,6 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - @@ -2872,16 +2817,24 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" +rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null + ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' -am__doit: +doit: @echo done -.PHONY: am__doit END # If we don't find an include directive, just comment out the code. echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 @@ -2896,7 +2849,7 @@ # In particular we don't look at `^make:' because GNU make might # be invoked under some other name (usually "gmake"), in which # case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then am__include=include am__quote= _am_result=GNU @@ -2956,34 +2909,18 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub am_cv_CC_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -3001,25 +2938,13 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi + am_cv_CC_dependencies_compiler_type=$depmode + break fi done @@ -3035,18 +2960,6 @@ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -3503,7 +3416,7 @@ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; - hppa2.*) + hppa*64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; @@ -3655,7 +3568,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3658 "configure"' > conftest.$ac_ext + echo '#line 3571 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4813,34 +4726,18 @@ # using a relative directory. cp "$am_depcomp" conftest.dir cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub am_cv_CXX_dependencies_compiler_type=none if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # # We need to recreate these files for each test, as the compiler may # overwrite some of them when testing with obscure command lines. # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf case $depmode in nosideeffect) @@ -4858,25 +4755,13 @@ # mode. It turns out that the SunPro C++ compiler does not properly # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi + am_cv_CXX_dependencies_compiler_type=$depmode + break fi done @@ -4892,18 +4777,6 @@ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5227,7 +5100,7 @@ # Provide some information about the compiler. -echo "$as_me:5230:" \ +echo "$as_me:5103:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6261,11 +6134,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6264: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6137: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6268: \$? = $ac_status" >&5 + echo "$as_me:6141: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6347,7 +6220,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -6384,7 +6257,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -6494,11 +6367,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6370: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6501: \$? = $ac_status" >&5 + echo "$as_me:6374: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6554,11 +6427,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6557: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6430: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6561: \$? = $ac_status" >&5 + echo "$as_me:6434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7189,7 +7062,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -7198,7 +7071,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -7208,7 +7081,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: @@ -7803,7 +7676,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -7888,7 +7761,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 7891 "configure"' > conftest.$ac_ext + echo '#line 7764 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8759,7 +8632,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10912: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11043: \$? = $ac_status" >&5 + echo "$as_me:10916: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11096,11 +10969,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11099: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10972: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11103: \$? = $ac_status" >&5 + echo "$as_me:10976: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11522,7 +11395,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -11607,7 +11480,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11610 "configure"' > conftest.$ac_ext + echo '#line 11483 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12478,7 +12351,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13279: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13410: \$? = $ac_status" >&5 + echo "$as_me:13283: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13463,11 +13336,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13466: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13339: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13470: \$? = $ac_status" >&5 + echo "$as_me:13343: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14078,7 +13951,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -14087,7 +13960,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -14097,7 +13970,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_F77='+b $libdir' hardcode_libdir_separator_F77=: @@ -14692,7 +14565,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -14777,7 +14650,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14780 "configure"' > conftest.$ac_ext + echo '#line 14653 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15518,11 +15391,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15521: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15394: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15525: \$? = $ac_status" >&5 + echo "$as_me:15398: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15604,7 +15477,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -15641,7 +15514,7 @@ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) # +Z the default ;; *) @@ -15751,11 +15624,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15754: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15627: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15758: \$? = $ac_status" >&5 + echo "$as_me:15631: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15811,11 +15684,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15687: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15818: \$? = $ac_status" >&5 + echo "$as_me:15691: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16446,7 +16319,7 @@ hpux10* | hpux11*) if test "$GCC" = yes -a "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -16455,7 +16328,7 @@ esac else case "$host_cpu" in - hppa2.*|ia64*) + hppa*64*|ia64*) archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' ;; *) @@ -16465,7 +16338,7 @@ fi if test "$with_gnu_ld" = no; then case "$host_cpu" in - hppa2.*) + hppa*64*) hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' hardcode_libdir_separator_GCJ=: @@ -17060,7 +16933,7 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa2.*) + hppa*64*) shrext_cmds='.sl' hardcode_into_libs=yes dynamic_linker="$host_os dld.sl" @@ -17145,7 +17018,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17148 "configure"' > conftest.$ac_ext + echo '#line 17021 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18016,7 +17889,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&2;} { (exit 1); exit 1; }; } fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${SSL2_TRUE}" && test -z "${SSL2_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"SSL2\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21065,7 +20924,6 @@ s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s, at INSTALL_DATA@,$INSTALL_DATA,;t t -s, at CYGPATH_W@,$CYGPATH_W,;t t s, at PACKAGE@,$PACKAGE,;t t s, at VERSION@,$VERSION,;t t s, at ACLOCAL@,$ACLOCAL,;t t @@ -21073,17 +20931,13 @@ s, at AUTOMAKE@,$AUTOMAKE,;t t s, at AUTOHEADER@,$AUTOHEADER,;t t s, at MAKEINFO@,$MAKEINFO,;t t +s, at AMTAR@,$AMTAR,;t t s, at install_sh@,$install_sh,;t t s, at STRIP@,$STRIP,;t t s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s, at mkdir_p@,$mkdir_p,;t t s, at AWK@,$AWK,;t t s, at SET_MAKE@,$SET_MAKE,;t t -s, at am__leading_dot@,$am__leading_dot,;t t -s, at AMTAR@,$AMTAR,;t t -s, at am__tar@,$am__tar,;t t -s, at am__untar@,$am__untar,;t t s, at CC@,$CC,;t t s, at CFLAGS@,$CFLAGS,;t t s, at LDFLAGS@,$LDFLAGS,;t t @@ -21098,8 +20952,6 @@ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s, at CCDEPMODE@,$CCDEPMODE,;t t -s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s, at build@,$build,;t t s, at build_cpu@,$build_cpu,;t t s, at build_vendor@,$build_vendor,;t t @@ -21120,8 +20972,6 @@ s, at CXXFLAGS@,$CXXFLAGS,;t t s, at ac_ct_CXX@,$ac_ct_CXX,;t t s, at CXXDEPMODE@,$CXXDEPMODE,;t t -s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s, at CXXCPP@,$CXXCPP,;t t s, at F77@,$F77,;t t s, at FFLAGS@,$FFLAGS,;t t @@ -21527,21 +21377,27 @@ else continue fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue From fedora-directory-commits at redhat.com Sun Feb 26 06:40:32 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sun, 26 Feb 2006 01:40:32 -0500 Subject: [Fedora-directory-commits] mod_nss config.guess, 1.1.1.1, 1.2 config.sub, 1.1.1.1, 1.2 Message-ID: <200602260640.k1Q6eW6t003568@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3542 Modified Files: config.guess config.sub Log Message: upgraded config.guess and config.sub to 2004-09-07 (same as mod_admserv) Index: config.guess =================================================================== RCS file: /cvs/dirsec/mod_nss/config.guess,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.guess 17 May 2005 14:50:04 -0000 1.1.1.1 +++ config.guess 26 Feb 2006 06:40:23 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-04-20' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -87,33 +88,45 @@ exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 - if test $? = 0 ; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o $dummy.rel + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found + CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi at noc.rutgers.edu 8/24/94.) +# (ghazi at noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -127,29 +140,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then @@ -165,70 +180,123 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -242,33 +310,18 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -286,6 +339,13 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -314,7 +374,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -328,9 +388,6 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -357,17 +414,8 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} @@ -385,6 +433,7 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -406,15 +455,20 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -475,6 +529,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -486,8 +541,7 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -496,7 +550,7 @@ fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -536,10 +590,8 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -548,12 +600,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -586,11 +639,21 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -598,6 +661,7 @@ echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -623,8 +687,7 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -633,7 +696,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -652,9 +715,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -673,40 +733,37 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -720,9 +777,6 @@ *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -732,11 +786,17 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -748,112 +808,93 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - cat >$dummy.c < /* for printf() prototype */ -int main (int argc, char *argv[]) { -#else -int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __MIPSEB__ - printf ("%s-unknown-linux-gnu\n", argv[1]); -#endif -#ifdef __MIPSEL__ - printf ("%sel-unknown-linux-gnu\n", argv[1]); -#endif - return 0; -} + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; - ppc:Linux:*:*) - # Determine Lib Version - cat >$dummy.c < -#if defined(__GLIBC__) -extern char __libc_version[]; -extern char __libc_release[]; -#endif -main(argc, argv) - int argc; - char *argv[]; -{ -#if defined(__GLIBC__) - printf("%s %s\n", __libc_version, __libc_release); -#else - printf("unknown\n"); -#endif - return 0; -} + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then LIBC="libc1" ; fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) - cat <$dummy.s - .data - \$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - .text - .globl main - .align 4 - .ent main - main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) UNAME_MACHINE="alpha" ;; - 1-0) UNAME_MACHINE="alphaev5" ;; - 1-1) UNAME_MACHINE="alphaev56" ;; - 1-101) UNAME_MACHINE="alphapca56" ;; - 2-303) UNAME_MACHINE="alphaev6" ;; - 2-307) UNAME_MACHINE="alphaev67" ;; - esac - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) @@ -870,6 +911,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -883,71 +927,62 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_emulations=`cd /; ld --help 2>&1 \ - | sed -ne '/supported emulations:/!d + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i*86linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 - ;; - elf_i*86) + case "$ld_supported_targets" in + elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - i*86coff) + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 - ;; - esac - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - case "${UNAME_MACHINE}" in - i*86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; + exit 0 ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit 0 ;; esac # Determine whether the default compiler is a.out or elf - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) @@ -958,6 +993,26 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -966,36 +1021,32 @@ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i*86:*:5:7*) - # Fixed at (any) Pentium or better - UNAME_MACHINE=i586 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} - fi + i*86:*:5:[78]*) + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1019,9 +1070,15 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M68*:*:R3V[567]*:*) + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1038,9 +1095,6 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1067,8 +1121,8 @@ echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -1080,6 +1134,10 @@ # From seanf at swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green at stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; @@ -1108,6 +1166,9 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1115,18 +1176,25 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1149,11 +1217,6 @@ fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1172,11 +1235,25 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < @@ -1291,8 +1368,7 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.sub =================================================================== RCS file: /cvs/dirsec/mod_nss/config.sub,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.sub 17 May 2005 14:50:10 -0000 1.1.1.1 +++ config.sub 26 Feb 2006 06:40:23 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-04-20' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -117,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -157,6 +159,14 @@ os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; @@ -215,26 +225,50 @@ case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ - | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | hppa64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | sh[34] \ - | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp10 | pdp11 \ - | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ - | v850 | c4x \ - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ - | pj | pjl | h8500) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -242,7 +276,7 @@ basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' @@ -257,31 +291,62 @@ exit 1 ;; # Recognize the basic CPU types with company name. - # FIXME: clean up the formatting here. - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ - | alphaev6[78]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ - | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* | mcore-* \ - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | msp430-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -299,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -313,6 +381,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -344,6 +418,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -364,30 +442,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -568,28 +661,20 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -669,6 +754,14 @@ basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -691,42 +784,58 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; @@ -744,10 +853,26 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -755,7 +880,10 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -822,22 +950,42 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -859,8 +1007,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -881,13 +1029,13 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xmp) - basic_machine=xmp-cray - os=-unicos - ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -908,16 +1056,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -934,13 +1078,16 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -955,10 +1102,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1014,15 +1157,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1034,8 +1182,10 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1044,6 +1194,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1056,6 +1209,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1074,14 +1230,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1093,6 +1258,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1120,8 +1288,14 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1154,10 +1328,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1184,6 +1362,9 @@ mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1196,6 +1377,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1247,19 +1431,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1328,10 +1512,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1346,6 +1536,9 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; From fedora-directory-commits at redhat.com Sun Feb 26 06:41:45 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Sun, 26 Feb 2006 01:41:45 -0500 Subject: [Fedora-directory-commits] mod_restartd config.guess, 1.1, 1.2 config.sub, 1.1, 1.2 Message-ID: <200602260641.k1Q6fjdW003598@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/mod_restartd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3580 Modified Files: config.guess config.sub Log Message: upgraded config.guess and config.sub to 2004-09-07 (same as mod_admserv) Index: config.guess =================================================================== RCS file: /cvs/dirsec/mod_restartd/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.guess 1 Nov 2005 00:58:18 -0000 1.1 +++ config.guess 26 Feb 2006 06:41:37 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# Please send patches to . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -87,30 +88,42 @@ exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi at noc.rutgers.edu 1994-08-24) @@ -127,29 +140,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -166,74 +180,123 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + macppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvmeppc:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sun3:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -247,33 +310,18 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -291,6 +339,13 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -319,7 +374,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -333,12 +388,6 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -365,17 +414,8 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} @@ -415,15 +455,20 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -496,8 +541,7 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -506,7 +550,7 @@ fi exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -546,10 +590,8 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,13 +600,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -597,11 +639,21 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -635,8 +687,7 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -664,9 +715,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -685,9 +733,6 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -700,26 +745,25 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -733,9 +777,6 @@ *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; @@ -745,11 +786,17 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin @@ -761,25 +808,74 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu @@ -815,6 +911,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -828,7 +927,8 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -840,7 +940,7 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; @@ -852,32 +952,31 @@ esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -894,6 +993,26 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -915,22 +1034,19 @@ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -954,9 +1070,15 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M68*:*:R3V[567]*:*) + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -973,9 +1095,6 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1047,6 +1166,9 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; @@ -1054,18 +1176,25 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + *86) UNAME_PROCESSOR=i686 ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1088,11 +1217,6 @@ fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; @@ -1111,12 +1235,19 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1237,8 +1368,7 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.sub =================================================================== RCS file: /cvs/dirsec/mod_restartd/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.sub 1 Nov 2005 00:58:18 -0000 1.1 +++ config.sub 26 Feb 2006 06:41:37 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2001-09-07' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,7 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Please send patches to . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -117,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -143,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -226,32 +228,46 @@ 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ - | openrisc \ + | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,38 +294,57 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -329,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -343,6 +381,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -374,6 +418,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -394,30 +442,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -598,28 +661,20 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos @@ -699,6 +754,14 @@ basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -721,49 +784,55 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -784,10 +853,26 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -795,7 +880,10 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -862,22 +950,42 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -899,8 +1007,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -921,17 +1029,13 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xps | xps100) + basic_machine=xps100-honeywell ;; - xmp) - basic_machine=xmp-cray + ymp) + basic_machine=ymp-cray os=-unicos ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -952,16 +1056,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -978,13 +1078,16 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -999,10 +1102,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1058,17 +1157,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1080,8 +1182,10 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1090,6 +1194,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1102,6 +1209,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1120,14 +1230,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1139,6 +1258,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1166,8 +1288,14 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos ;; -none) ;; @@ -1200,10 +1328,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1230,6 +1362,9 @@ mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1242,6 +1377,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1293,19 +1431,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1374,10 +1512,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) From fedora-directory-commits at redhat.com Tue Feb 28 03:00:21 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 27 Feb 2006 22:00:21 -0500 Subject: [Fedora-directory-commits] ldapserver/lib/base systhr.cpp,1.6,1.7 Message-ID: <200602280300.k1S30LB9011169@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/lib/base In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113/lib/base Modified Files: systhr.cpp Log Message: Fixing nightly build Changes: 1) NSPR_RELDATE: v4.6.1 --> v4.6 2) ICU_LIB_VERSION: 34 --> 24 This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4. 3) lib/base/systhr.cpp: Applied NSPR sysfd table patch 4) DS version: 7.1 --> 7.2 Index: systhr.cpp =================================================================== RCS file: /cvs/dirsec/ldapserver/lib/base/systhr.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- systhr.cpp 19 Apr 2005 22:07:45 -0000 1.6 +++ systhr.cpp 28 Feb 2006 03:00:14 -0000 1.7 @@ -47,11 +47,19 @@ #ifdef USE_NSPR #include "nspr.h" #include "private/prpriv.h" +#ifdef LINUX +# include +# include +#else +/* This declaration should be removed when NSPR newer than v4.6 is picked up, + which should have the fix for bug 326110 + */ extern "C" { int32 PR_GetSysfdTableMax(void); int32 PR_SetSysfdTableSize(int table_size); } #endif +#endif #include "systems.h" #ifdef THREAD_WIN32 @@ -161,9 +169,25 @@ { PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 256); #ifdef XP_UNIX - /* XXXrobm allocate all the fd's we can... */ +#ifdef LINUX + /* + * NSPR 4.6 does not export PR_SetSysfdTableSize + * and PR_GetSysfdTableMax by mistake (NSPR Bugzilla + * bug 326110) on platforms that use GCC with symbol + * visibility, so we have to call the system calls + * directly. + */ + { + struct rlimit rlim; + if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) + return; + rlim.rlim_cur = rlim.rlim_max; + (void) setrlimit(RLIMIT_NOFILE, &rlim); + } +#else PR_SetSysfdTableSize(PR_GetSysfdTableMax()); #endif +#endif } From fedora-directory-commits at redhat.com Tue Feb 28 03:00:16 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Mon, 27 Feb 2006 22:00:16 -0500 Subject: [Fedora-directory-commits] ldapserver component_versions.mk, 1.41, 1.42 components.mk, 1.42, 1.43 internal_comp_deps.mk, 1.34, 1.35 Message-ID: <200602280300.k1S30kIN011182@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113 Modified Files: component_versions.mk components.mk internal_comp_deps.mk Log Message: Fixing nightly build Changes: 1) NSPR_RELDATE: v4.6.1 --> v4.6 2) ICU_LIB_VERSION: 34 --> 24 This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4. 3) lib/base/systhr.cpp: Applied NSPR sysfd table patch 4) DS version: 7.1 --> 7.2 Index: component_versions.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- component_versions.mk 13 Feb 2006 22:25:27 -0000 1.41 +++ component_versions.mk 28 Feb 2006 03:00:08 -0000 1.42 @@ -52,7 +52,7 @@ # naming scheme. # NSPR ifndef NSPR_RELDATE - NSPR_RELDATE = v4.6.1 + NSPR_RELDATE = v4.6 endif # SECURITY (NSS) LIBRARY @@ -205,7 +205,7 @@ # DOC ifndef DSDOC_RELDATE - DSDOC_RELDATE = 20051028 + DSDOC_RELDATE = 20050311 endif # WIX Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- components.mk 24 Feb 2006 22:52:10 -0000 1.42 +++ components.mk 28 Feb 2006 03:00:08 -0000 1.43 @@ -439,7 +439,7 @@ ### ICU package ########################################## -ICU_LIB_VERSION = 34 +ICU_LIB_VERSION = 24 ifdef ICU_SOURCE_ROOT ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin @@ -589,7 +589,7 @@ # else set in internal_buildpaths.mk endif # these are the subcomponents we use from the adminserver package -ADMINSERVER_SUBCOMPS=admin base setup.inf +ADMINSERVER_SUBCOMPS=admin base ifdef LDAPCONSOLE_SOURCE_ROOT LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- internal_comp_deps.mk 10 Feb 2006 23:21:43 -0000 1.34 +++ internal_comp_deps.mk 28 Feb 2006 03:00:08 -0000 1.35 @@ -273,6 +273,7 @@ ifndef ICU_SOURCE_ROOT ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) +#ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h ifndef ICU_PULL_METHOD ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -330,8 +331,8 @@ ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE) ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} ifeq ($(BUILD_MODE), int) - ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) -# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) + ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) else # ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) @@ -501,7 +502,7 @@ ifndef GET_ANT_FROM_PATH # (we use ant for building some Java code) ANTJAR = ant.jar -JAXPJAR = jaxp.jar +#JAXPJAR = jaxp.jar # ??? ANT_FILES = $(ANTJAR) $(JAXPJAR) ANT_RELEASE = $(COMPONENTS_DIR) ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION) From fedora-directory-commits at redhat.com Tue Feb 28 20:46:19 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 28 Feb 2006 15:46:19 -0500 Subject: [Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.35, 1.36 Message-ID: <200602282046.k1SKkJi9025166@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25136 Modified Files: internal_comp_deps.mk Log Message: Fixing the internal build (to build dsmlgw w/ ant, ant-launcher.jar is needed) Index: internal_comp_deps.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- internal_comp_deps.mk 28 Feb 2006 03:00:08 -0000 1.35 +++ internal_comp_deps.mk 28 Feb 2006 20:46:12 -0000 1.36 @@ -501,7 +501,7 @@ ifeq ($(BUILD_JAVA_CODE),1) ifndef GET_ANT_FROM_PATH # (we use ant for building some Java code) -ANTJAR = ant.jar +ANTJAR = ant.jar ant-launcher.jar #JAXPJAR = jaxp.jar # ??? ANT_FILES = $(ANTJAR) $(JAXPJAR) ANT_RELEASE = $(COMPONENTS_DIR) From fedora-directory-commits at redhat.com Tue Feb 28 21:51:34 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 28 Feb 2006 16:51:34 -0500 Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd slap.h, 1.10, 1.11 Message-ID: <200602282151.k1SLpYwQ030344@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver/ldap/servers/slapd In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30291/ldap/servers/slapd Modified Files: slap.h Log Message: Fixing Solaris build 1) NSCONFIG accidentally got a white space (for non-Linux platforms) 2) Solaris needs to include limits.h explicitly Index: slap.h =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slap.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- slap.h 25 Jan 2006 16:51:39 -0000 1.10 +++ slap.h 28 Feb 2006 21:51:26 -0000 1.11 @@ -91,6 +91,9 @@ #include #include #include +#if defined(SOLARIS) +#include /* for LONG_MAX */ +#endif /* there's a bug in the dbm code we import (from where?) -- FIXME */ #ifdef LINUX From fedora-directory-commits at redhat.com Tue Feb 28 21:51:28 2006 From: fedora-directory-commits at redhat.com (Noriko Hosoi (nhosoi)) Date: Tue, 28 Feb 2006 16:51:28 -0500 Subject: [Fedora-directory-commits] ldapserver nsconfig.mk,1.18,1.19 Message-ID: <200602282151.k1SLpwSp030354@cvs-int.fedora.redhat.com> Author: nhosoi Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30291 Modified Files: nsconfig.mk Log Message: Fixing Solaris build 1) NSCONFIG accidentally got a white space (for non-Linux platforms) 2) Solaris needs to include limits.h explicitly Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nsconfig.mk 15 Feb 2006 22:53:45 -0000 1.18 +++ nsconfig.mk 28 Feb 2006 21:51:21 -0000 1.19 @@ -286,23 +286,21 @@ ifeq ($(NSOS_ARCH),HP-UX) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), ia64) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif else ifeq ($(NSOS_TEST1),i86pc) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif endif - NSCONFIG += $(NS64TAG) - NSCONFIG_NOTAG += $(NS64TAG) endif endif From fedora-directory-commits at redhat.com Tue Feb 28 22:29:47 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 28 Feb 2006 17:29:47 -0500 Subject: [Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf, 1.13, 1.14 Message-ID: <200602282229.k1SMTlxF001474@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1456 Modified Files: admserv.conf Log Message: remove hardcoded reference to /home/rich - should be %%%sroot%%% Index: admserv.conf =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- admserv.conf 23 Feb 2006 01:12:11 -0000 1.13 +++ admserv.conf 28 Feb 2006 22:29:39 -0000 1.14 @@ -151,7 +151,7 @@ # need to add instance creation because you may want to create an instance # of DS on a low port, and instance creation starts the instance as well - AuthUserFile /home/rich/72srv/admin-serv/config/admpw + AuthUserFile %%%sroot%%%/admin-serv/config/admpw AuthType basic AuthName "Admin Server" Require valid-user From fedora-directory-commits at redhat.com Tue Feb 28 23:26:38 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 28 Feb 2006 18:26:38 -0500 Subject: [Fedora-directory-commits] dsbuild/ds/adminserver checksums, 1.4, 1.5 Message-ID: <200602282326.k1SNQc69008289@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild/ds/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8268 Modified Files: checksums Log Message: updated checksums Index: checksums =================================================================== RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- checksums 25 Feb 2006 00:32:31 -0000 1.4 +++ checksums 28 Feb 2006 23:26:30 -0000 1.5 @@ -1 +1 @@ -e4c863d213d39f031d80f7e515a6d496 download/fedora-adminserver-1.0.2.tar.gz +3dddb676c33a2580ff459d158a321e40 download/fedora-adminserver-1.0.2.tar.gz From fedora-directory-commits at redhat.com Tue Feb 28 23:40:32 2006 From: fedora-directory-commits at redhat.com (Richard Allen Megginson (rmeggins)) Date: Tue, 28 Feb 2006 18:40:32 -0500 Subject: [Fedora-directory-commits] dsbuild gar.lib.mk,1.1.1.1,1.2 Message-ID: <200602282340.k1SNeWhH009145@cvs-int.fedora.redhat.com> Author: rmeggins Update of /cvs/dirsec/dsbuild In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9128 Modified Files: gar.lib.mk Log Message: use make NOCACHE=1 to bypass caching proxies - useful when using makesum to regenerate the checksums files from pristine sources Index: gar.lib.mk =================================================================== RCS file: /cvs/dirsec/dsbuild/gar.lib.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gar.lib.mk 10 Feb 2006 15:28:52 -0000 1.1.1.1 +++ gar.lib.mk 28 Feb 2006 23:40:24 -0000 1.2 @@ -32,6 +32,9 @@ URLS = $(subst ://,//,$(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(PATCHFILES)))) +ifdef NOCACHE + NOCACHEARG = "--header=Cache-Control: no-cache" +endif # Download the file if and only if it doesn't have a preexisting # checksum file. Loop through available URLs and stop when you @@ -52,7 +55,7 @@ # download an http URL http//%: - @wget -c -nd --passive-ftp -P $(DOWNLOADDIR) http://$* + @wget $(NOCACHEARG) -c -nd --passive-ftp -P $(DOWNLOADDIR) http://$* # download an ftp URL ftp//%: